94. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2022-09-08 08:49:14 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

94.1 Files compared

#LocationFileLast Modified
1/Volumes/Data 1/Ampps/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Customer/templates/formlogin.phtml2022-04-30 08:15:11 +0000
2Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Customer/templates/formlogin.phtml2022-04-30 08:15:11 +0000

94.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1114
Changed00
Inserted00
Removed00

94.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

94.4 Active regular expressions

No regular expressions were active.

94.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Copyright © Magento, Inc. All rights reserved. 3  * Copyright © Magento, Inc. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6  6 
7 /** @var \Magento\Customer\Block\Form\Login $block */ 7 /** @var \Magento\Customer\Block\Form\Login $block */
8 ?> 8 ?>
9 <div class="row"> 9 <div class="row">
10   <div class="block block-customer-login col-md-6 mx-auto mb-4 w-100"> 10   <div class="block block-customer-login col-md-6 mx-auto mb-4 w-100">
11       <div class="block-title"> 11       <div class="block-title">
12           <strong id="block-customer-login-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Registered Customers')) ?></strong> 12           <strong id="block-customer-login-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Registered Customers')) ?></strong>
13       </div> 13       </div>
14       <div class="block-content" aria-labelledby="block-customer-login-heading"> 14       <div class="block-content" aria-labelledby="block-customer-login-heading">
15           <form class="form form-login" 15           <form class="form form-login"
16                 action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>" 16                 action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>"
17                 method="post" 17                 method="post"
18                 id="login-form" 18                 id="login-form"
19                 data-mage-init='{"validation":{}}'> 19                 data-mage-init='{"validation":{}}'>
20               <?= $block->getBlockHtml('formkey') ?> 20               <?= $block->getBlockHtml('formkey') ?>
21               <fieldset class="fieldset login" data-hasrequired="<?= $block->escapeHtml(__('* Required Fields')) ?>"> 21               <fieldset class="fieldset login" data-hasrequired="<?= $block->escapeHtml(__('* Required Fields')) ?>">
22                   <div class="field note"><?= $block->escapeHtml(__('If you have an account, sign in with your email address.')) ?></div> 22                   <div class="field note"><?= $block->escapeHtml(__('If you have an account, sign in with your email address.')) ?></div>
23                   <div class="field email required"> 23                   <div class="field email required">
24                       <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label> 24                       <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
25                       <div class="control"> 25                       <div class="control">
26                           <input name="login[username]" value="<?= $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()) : ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text line-height-xl" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}"> 26                           <input name="login[username]" value="<?= $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()) : ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text line-height-xl" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
27                       </div> 27                       </div>
28                   </div> 28                   </div>
29                   <div class="field password required"> 29                   <div class="field password required">
30                       <label for="pass" class="label"><span><?= $block->escapeHtml(__('Password')) ?></span></label> 30                       <label for="pass" class="label"><span><?= $block->escapeHtml(__('Password')) ?></span></label>
31                       <div class="control"> 31                       <div class="control">
32                           <input name="login[password]" type="password" <?php if ($block->isAutocompleteDisabled()) : ?> autocomplete="off"<?php endif; ?> class="input-text line-height-xl" id="pass" title="<?= $block->escapeHtmlAttr(__('Password')) ?>" data-validate="{required:true}"> 32                           <input name="login[password]" type="password" <?php if ($block->isAutocompleteDisabled()) : ?> autocomplete="off"<?php endif; ?> class="input-text line-height-xl" id="pass" title="<?= $block->escapeHtmlAttr(__('Password')) ?>" data-validate="{required:true}">
33                       </div> 33                       </div>
34                   </div> 34                   </div>
35                   <?= $block->getChildHtml('form_additional_info') ?> 35                   <?= $block->getChildHtml('form_additional_info') ?>
36                   <div class="field"> 36                   <div class="field">
37                     <a class="action remind" href="<?= $block->escapeUrl($block->getForgotPasswordUrl()) ?>"><span><?= $block->escapeHtml(__('Forgot Your Password?')) ?></span></a> 37                     <a class="action remind" href="<?= $block->escapeUrl($block->getForgotPasswordUrl()) ?>"><span><?= $block->escapeHtml(__('Forgot Your Password?')) ?></span></a>
38                   </div> 38                   </div>
39                   <div class="actions-toolbar"> 39                   <div class="actions-toolbar">
40                       <div class="primary"><button type="submit" class="action login primary btn-v-dark py-3 text-md w-100" name="send" id="send2"><span><?= $block->escapeHtml(__('Sign In')) ?></span></button></div> 40                       <div class="primary"><button type="submit" class="action login primary btn-v-dark py-3 text-md w-100" name="send" id="send2"><span><?= $block->escapeHtml(__('Sign In')) ?></span></button></div>
41                       <div class="secondary"> 41                       <div class="secondary">
42                         <a href="/customer/account/create/" class="action create primary btn-v-dark py-3 text-md w-100"><span><?= $block->escapeHtml(__('Create an Account')) ?></span></a> 42                         <a href="/customer/account/create/" class="action create primary btn-v-dark py-3 text-md w-100"><span><?= $block->escapeHtml(__('Create an Account')) ?></span></a>
43                       </div> 43                       </div>
44                       <style> 44                       <style>
45           »     »       »       »       »       »       »       .customer-account-login .action.create { 45           »     »       »       »       »       »       »       .customer-account-login .action.create {
46           »     »       »       »       »       »       »       »       display: none; 46           »     »       »       »       »       »       »       »       display: none;
47           »     »       »       »       »       »       »       } 47           »     »       »       »       »       »       »       }
48                         .actions-toolbar .action.create { 48                         .actions-toolbar .action.create {
49                           display: block; 49                           display: block;
50                         } 50                         }
51                       </style> 51                       </style>
52                   </div> 52                   </div>
53               </fieldset> 53               </fieldset>
54           </form> 54           </form>
55       </div> 55       </div>
56   </div> 56   </div>
57 </div> 57 </div>