MAGETWO-66768: Removed default values for title, meta description, be…

…tter labels. #6834
magento · Mar 25, 2017 · 0df6c90 · 0df6c90
2 parents 76b1742 + 82ea4cf
commit 0df6c90
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/app/code/Magento/Theme/etc/config.xml b/app/code/Magento/Theme/etc/config.xml
@@ -15,8 +15,6 @@
             </invalid_caches>
             <head translate="default_description">
                 <default_title>Magento Commerce</default_title>
-                <default_description>Default Description</default_description>
-                <default_keywords>Magento, Varien, E-commerce</default_keywords>
                 <default_media_type>text/html</default_media_type>
                 <default_charset>utf-8</default_charset>
                 <demonotice>0</demonotice>
@@ -44,7 +42,6 @@ Disallow: /*SID=
                 </default_custom_instructions>
             </search_engine_robots>
             <header translate="welcome">
-                <logo_alt>Magento Commerce</logo_alt>
                 <welcome>Default welcome msg!</welcome>
             </header>
             <footer translate="copyright">

diff --git a/app/code/Magento/Theme/i18n/en_US.csv b/app/code/Magento/Theme/i18n/en_US.csv
@@ -133,7 +133,6 @@ Configuration,Configuration
 "Edit custom instruction of robots.txt File","Edit custom instruction of robots.txt File"
 "Reset to Defaults","Reset to Defaults"
 "This action will delete your custom instructions and reset robots.txt file to system's default settings.","This action will delete your custom instructions and reset robots.txt file to system's default settings."
-"Default Description","Default Description"
 "Default welcome msg!","Default welcome msg!"
 "Copyright © 2013-2017 Magento, Inc. All rights reserved.","Copyright © 2013-2017 Magento, Inc. All rights reserved."
 "Design Config Grid","Design Config Grid"
@@ -145,11 +144,12 @@ Configuration,Configuration
 "HTML Head","HTML Head"
 "Favicon Icon","Favicon Icon"
 "Allowed file types: ico, png, gif, jpg, jpeg, apng, svg. Not all browsers support all these formats!","Allowed file types: ico, png, gif, jpg, jpeg, apng, svg. Not all browsers support all these formats!"
-"Default Title","Default Title"
-"Title Prefix","Title Prefix"
-"Title Suffix","Title Suffix"
-"Default Keywords","Default Keywords"
 "Miscellaneous Scripts","Miscellaneous Scripts"
+"Default Page Title","Default Page Title"
+"Page Title Prefix","Page Title Prefix"
+"Page Title Suffix","Page Title Suffix"
+"Default Meta Description","Default Meta Description"
+"Default Meta Keywords","Default Meta Keywords"
 "Display Demo Store Notice","Display Demo Store Notice"
 Header,Header
 "Logo Image","Logo Image"

diff --git a/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml b/app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml
@@ -77,7 +77,7 @@
             <field name="head_default_title">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Default Title</item>
+                        <item name="label" xsi:type="string" translate="true">Default Page Title</item>
                         <item name="dataType" xsi:type="string">text</item>
                         <item name="formElement" xsi:type="string">input</item>
                         <item name="dataScope" xsi:type="string">head_default_title</item>
@@ -90,7 +90,7 @@
             <field name="head_title_prefix">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Title Prefix</item>
+                        <item name="label" xsi:type="string" translate="true">Page Title Prefix</item>
                         <item name="dataType" xsi:type="string">text</item>
                         <item name="formElement" xsi:type="string">input</item>
                         <item name="dataScope" xsi:type="string">head_title_prefix</item>
@@ -103,7 +103,7 @@
             <field name="head_title_suffix">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Title Suffix</item>
+                        <item name="label" xsi:type="string" translate="true">Page Title Suffix</item>
                         <item name="dataType" xsi:type="string">text</item>
                         <item name="formElement" xsi:type="string">input</item>
                         <item name="dataScope" xsi:type="string">head_title_suffix</item>
@@ -116,7 +116,7 @@
             <field name="head_default_description">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Default Description</item>
+                        <item name="label" xsi:type="string" translate="true">Default Meta Description</item>
                         <item name="dataType" xsi:type="string">text</item>
                         <item name="formElement" xsi:type="string">textarea</item>
                         <item name="dataScope" xsi:type="string">head_default_description</item>
@@ -129,7 +129,7 @@
             <field name="head_default_keywords">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
-                        <item name="label" xsi:type="string" translate="true">Default Keywords</item>
+                        <item name="label" xsi:type="string" translate="true">Default Meta Keywords</item>
                         <item name="dataType" xsi:type="string">text</item>
                         <item name="formElement" xsi:type="string">textarea</item>
                         <item name="dataScope" xsi:type="string">head_default_keywords</item>