Merge pull request #416 from magento-webdev/PR

[WD] Bugfixes

Author: Momotenko,Natalia(nmomotenko)

app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml

@@ -9,5 +9,5 @@
 ?>
 <p class="copyright">
     <a class="link-copyright" href="http://magento.com" target="_blank" title="<?php echo __('Magento') ?>"></a>
-    <?php echo __('Copyright &copy; %1 Magento, Inc. All rights reserved.', date('Y')) ?>
+    <?php echo __('Copyright &copy; %1 Magento. All rights reserved.', date('Y')) ?>
 </p>

app/code/Magento/Backend/view/install/templates/page/copyright.phtml

@@ -17,7 +17,7 @@
 <?php echo $block->getChildHtml('form_fields_before')?>
 <?php /* Extensions placeholder */ ?>
 <?php echo $block->getChildHtml('customer.form.register.extra')?>
-<form class="form create account" action="<?php echo $block->getPostActionUrl() ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
+<form class="form create account form-create-account" action="<?php echo $block->getPostActionUrl() ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
     <fieldset class="fieldset create info">
         <legend class="legend"><span><?php echo __('Personal Information') ?></span></legend><br>
         <input type="hidden" name="success_url" value="<?php echo $block->getSuccessUrl() ?>">

app/code/Magento/Customer/view/frontend/templates/form/register.phtml

@@ -29,16 +29,19 @@ $prefix = $block->showPrefix();
 $middle = $block->showMiddlename();
 $suffix = $block->showSuffix();
 ?>
+
 <?php if ($prefix || $middle || $suffix && !$block->getNoWrap()): ?>
 <div class="field required fullname <?php echo $block->getContainerClassName() ?>">
     <label for="<?php echo $block->getFieldId('firstname') ?>" class="label">
         <span><?php echo __('Name') ?></span>
     </label>
     <div class="control">
-        <div class="fields group <?php echo 2 + intval($prefix) + intval($middle) + intval($suffix) ?>">
-    <?php endif; ?>
-    <?php if ($prefix): ?>$
-        <div class="field name prefix<?php if ($block->isPrefixRequired()) echo ' required' ?>">
+        <fieldset class="fieldset fieldset-fullname">
+        <div class="fields">
+<?php endif; ?>
+
+    <?php if ($prefix): ?>
+        <div class="field field-name-prefix<?php if ($block->isPrefixRequired()) echo ' required' ?>">
             <label class="label" for="<?php echo $block->getFieldId('prefix') ?>">
                 <span><?php echo $block->getStoreLabel('prefix') ?></span>
             </label>
@@ -65,7 +68,7 @@ $suffix = $block->showSuffix();
             </div>
         </div>
     <?php endif; ?>
-        <div class="field name firstname required">
+        <div class="field field-name-firstname required">
             <label class="label" for="<?php echo $block->getFieldId('firstname') ?>">
                 <span><?php echo $block->getStoreLabel('firstname') ?></span>
             </label>
@@ -80,7 +83,7 @@ $suffix = $block->showSuffix();
         </div>
     <?php if ($middle): ?>
         <?php $isMiddlenameRequired = $block->isMiddlenameRequired(); ?>
-        <div class="field name middlename<?php echo $isMiddlenameRequired ? ' required' : '' ?>">
+        <div class="field field-name-middlename<?php echo $isMiddlenameRequired ? ' required' : '' ?>">
             <label class="label" for="<?php echo $block->getFieldId('middlename') ?>">
                 <span><?php echo $block->getStoreLabel('middlename') ?></span>
             </label>
@@ -94,7 +97,7 @@ $suffix = $block->showSuffix();
             </div>
         </div>
     <?php endif; ?>
-        <div class="field name lastname required">
+        <div class="field field-name-lastname required">
             <label class="label"  for="<?php echo $block->getFieldId('lastname') ?>">
                 <span><?php echo $block->getStoreLabel('lastname') ?></span>
             </label>
@@ -108,7 +111,7 @@ $suffix = $block->showSuffix();
             </div>
         </div>
     <?php if ($suffix): ?>
-        <div class="field name suffix<?php if ($block->isSuffixRequired()) echo ' required' ?>">
+        <div class="field field-name-suffix<?php if ($block->isSuffixRequired()) echo ' required' ?>">
             <label class="label" for="<?php echo $block->getFieldId('suffix') ?>">
                 <span><?php echo $block->getStoreLabel('suffix') ?></span>
             </label>
@@ -135,8 +138,10 @@ $suffix = $block->showSuffix();
             </div>
         </div>
     <?php endif; ?>
+
     <?php if ($prefix || $middle || $suffix && !$block->getNoWrap()): ?>
-        </div>
+            </div>
+        </fieldset>
     </div>
 </div>
 <?php endif; ?>

app/code/Magento/Customer/view/frontend/templates/widget/name.phtml

@@ -42,7 +42,7 @@ Disallow: /*SID=
                 <welcome>Default welcome msg!</welcome>
             </header>
             <footer translate="copyright">
-                <copyright>&amp;copy; 2015 Magento Demo Store. All Rights Reserved.</copyright>
+                <copyright>Copyright &#169; 2015 Magento. All rights reserved.</copyright>
             </footer>
         </design>
         <theme>

app/code/Magento/Theme/etc/config.xml

@@ -239,6 +239,21 @@
         }
     }
 
+    .form-create-account {
+        .fieldset-fullname {
+            .fields {
+                .field {
+                    float: left;
+                    margin: 0 @indent__s @indent__s 0;
+                }
+            }
+            .field-name-prefix,
+            .field-name-suffix {
+                width: 50px;
+            }
+        }
+    }
+
     .form.password.reset,
     .form.send.confirmation,
     .form.password.forget,

app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less

@@ -68,6 +68,16 @@
     }
 }
 
+.form-create-account {
+    .fieldset-fullname {
+        .fields {
+            .field {
+                float: none;
+            }
+        }
+    }
+}
+
 .box-billing-address,
 .box-shipping-address,
 .box-information,
@@ -224,6 +234,21 @@
         }
     }
 
+    .form-create-account {
+        .fieldset-fullname {
+            .fields {
+                .field {
+                    float: left;
+                    margin: 0 @indent__s @indent__s 0;
+                }
+            }
+            .field-name-prefix,
+            .field-name-suffix {
+                width: 50px;
+            }
+        }
+    }
+
     .form.password.reset,
     .form.send.confirmation,
     .form.password.forget,

app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less

@@ -394,7 +394,7 @@ public function testEditAction()
 
         $body = $this->getResponse()->getBody();
         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode(), $body);
-        $this->assertContains('<div class="field name firstname required">', $body);
+        $this->assertContains('<div class="field field-name-firstname required">', $body);
         // Verify the password check box is not checked
         $this->assertContains('<input type="checkbox" name="change_password" id="change-password" value="1" ' .
             'title="Change Password" class="checkbox"/>', $body);
@@ -411,7 +411,7 @@ public function testChangePasswordEditAction()
 
         $body = $this->getResponse()->getBody();
         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode(), $body);
-        $this->assertContains('<div class="field name firstname required">', $body);
+        $this->assertContains('<div class="field field-name-firstname required">', $body);
         // Verify the password check box is checked
         $this->assertContains('<input type="checkbox" name="change_password" id="change-password" value="1" ' .
             'title="Change Password" checked="checked" class="checkbox"/>', $body);