65. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-11-23 04:31:24 +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.

65.1 Files compared

#LocationFileLast Modified
1/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme 4.0.6/app/design/frontend/Smartwave/porto/Magento_Customer/templates/formlogin.phtml2023-02-26 08:43:20 +0000
2/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme 4.0.7/app/design/frontend/Smartwave/porto/Magento_Customer/templates/formlogin.phtml2023-02-26 08:43:20 +0000

65.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1120
Changed00
Inserted00
Removed00

65.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

65.4 Active regular expressions

No regular expressions were active.

65.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 $objectManager = \Magento\Framework\App\ObjectManager::getInstance(); 8 $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
9 $storeManager = $objectManager->get('\Magento\Store\Model\StoreManagerInterface'); 9 $storeManager = $objectManager->get('\Magento\Store\Model\StoreManagerInterface');
10  10 
11 ?> 11 ?>
12 <div class="row"> 12 <div class="row">
13   <div class="block block-customer-login col-md-6 mx-auto mb-4 w-100"> 13   <div class="block block-customer-login col-md-6 mx-auto mb-4 w-100">
14       <div class="block-title"> 14       <div class="block-title">
15           <strong id="block-customer-login-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Registered Customers')) ?></strong> 15           <strong id="block-customer-login-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Registered Customers')) ?></strong>
16       </div> 16       </div>
17       <div class="block-content" aria-labelledby="block-customer-login-heading"> 17       <div class="block-content" aria-labelledby="block-customer-login-heading">
18           <form class="form form-login" 18           <form class="form form-login"
19                 action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>" 19                 action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>"
20                 method="post" 20                 method="post"
21                 id="login-form" 21                 id="login-form"
22                 data-mage-init='{"validation":{}}'> 22                 data-mage-init='{"validation":{}}'>
23               <?= $block->getBlockHtml('formkey') ?> 23               <?= $block->getBlockHtml('formkey') ?>
24               <fieldset class="fieldset login" data-hasrequired="<?= $block->escapeHtml(__('* Required Fields')) ?>"> 24               <fieldset class="fieldset login" data-hasrequired="<?= $block->escapeHtml(__('* Required Fields')) ?>">
25                   <div class="field note"><?= $block->escapeHtml(__('If you have an account, sign in with your email address.')) ?></div> 25                   <div class="field note"><?= $block->escapeHtml(__('If you have an account, sign in with your email address.')) ?></div>
26                   <div class="field email required"> 26                   <div class="field email required">
27                       <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label> 27                       <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
28                       <div class="control"> 28                       <div class="control">
29                           <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}"> 29                           <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}">
30                       </div> 30                       </div>
31                   </div> 31                   </div>
32                   <div class="field password required"> 32                   <div class="field password required">
33                       <label for="pass" class="label"><span><?= $block->escapeHtml(__('Password')) ?></span></label> 33                       <label for="pass" class="label"><span><?= $block->escapeHtml(__('Password')) ?></span></label>
34                       <div class="control"> 34                       <div class="control">
35                           <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}"> 35                           <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}">
36                       </div> 36                       </div>
37                   </div> 37                   </div>
38                   <?= $block->getChildHtml('form_additional_info') ?> 38                   <?= $block->getChildHtml('form_additional_info') ?>
39                   <div class="field"> 39                   <div class="field">
40                     <a class="action remind" href="<?= $block->escapeUrl($block->getForgotPasswordUrl()) ?>"><span><?= $block->escapeHtml(__('Forgot Your Password?')) ?></span></a> 40                     <a class="action remind" href="<?= $block->escapeUrl($block->getForgotPasswordUrl()) ?>"><span><?= $block->escapeHtml(__('Forgot Your Password?')) ?></span></a>
41                   </div> 41                   </div>
42                   <div class="actions-toolbar"> 42                   <div class="actions-toolbar">
43                       <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> 43                       <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>
44                       <div class="secondary"> 44                       <div class="secondary">
45                         <a href="<?php echo $storeManager->getStore()->getBaseUrl();?>customer/account/create/" class="action create primary btn-v-dark py-3 text-md w-100"><span><?= $block->escapeHtml(__('Create an Account')) ?></span></a> 45                         <a href="<?php echo $storeManager->getStore()->getBaseUrl();?>customer/account/create/" class="action create primary btn-v-dark py-3 text-md w-100"><span><?= $block->escapeHtml(__('Create an Account')) ?></span></a>
46                       </div> 46                       </div>
47                       <style> 47                       <style>
48           »     »       »       »       »       »       »       .customer-account-login .action.create { 48           »     »       »       »       »       »       »       .customer-account-login .action.create {
49           »     »       »       »       »       »       »       »       display: none; 49           »     »       »       »       »       »       »       »       display: none;
50           »     »       »       »       »       »       »       } 50           »     »       »       »       »       »       »       }
51                         .actions-toolbar .action.create { 51                         .actions-toolbar .action.create {
52                           display: block; 52                           display: block;
53                         } 53                         }
54                       </style> 54                       </style>
55                   </div> 55                   </div>
56               </fieldset> 56               </fieldset>
57           </form> 57           </form>
58       </div> 58       </div>
59   </div> 59   </div>
60 </div> 60 </div>