104. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-07-21 10:22:00 +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.

104.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Customer/templates/formresetforgottenpassword.phtml2021-02-04 04:20:22 +0000
2/Applications/Ampps/www/Porto v4.0.1/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Customer/templates/formresetforgottenpassword.phtml2021-02-04 04:20:22 +0000

104.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged192
Changed00
Inserted00
Removed00

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

104.4 Active regular expressions

No regular expressions were active.

104.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\Account\Resetpassword $block */ 7 /** @var \Magento\Customer\Block\Account\Resetpassword $block */
8 ?> 8 ?>
9 <form action="<?= $block->escapeUrl($block->getUrl('*/*/resetpasswordpost', ['_query' => ['token' => $block->getResetPasswordLinkToken()]])) ?>" 9 <form action="<?= $block->escapeUrl($block->getUrl('*/*/resetpasswordpost', ['_query' => ['token' => $block->getResetPasswordLinkToken()]])) ?>"
10       method="post" 10       method="post"
11         <?php if ($block->isAutocompleteDisabled()) : ?> autocomplete="off"<?php endif; ?> 11         <?php if ($block->isAutocompleteDisabled()) : ?> autocomplete="off"<?php endif; ?>
12       id="form-validate" 12       id="form-validate"
13       class="form password reset" 13       class="form password reset"
14       data-mage-init='{"validation":{}}'> 14       data-mage-init='{"validation":{}}'>
15     <fieldset class="fieldset" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>"> 15     <fieldset class="fieldset" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
16         <div class="field password required" data-mage-init='{"passwordStrengthIndicator": {}}'> 16         <div class="field password required" data-mage-init='{"passwordStrengthIndicator": {}}'>
17             <label class="label" for="password"><span><?= $block->escapeHtml(__('New Password')) ?></span></label> 17             <label class="label" for="password"><span><?= $block->escapeHtml(__('New Password')) ?></span></label>
18             <div class="control"> 18             <div class="control">
19                 <input type="password" class="input-text" name="password" id="password" 19                 <input type="password" class="input-text" name="password" id="password"
20                        data-password-min-length="<?= $block->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>" 20                        data-password-min-length="<?= $block->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
21                        data-password-min-character-sets="<?= $block->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>" 21                        data-password-min-character-sets="<?= $block->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
22                        data-validate="{required:true, 'validate-customer-password':true}" 22                        data-validate="{required:true, 'validate-customer-password':true}"
23                        autocomplete="off"> 23                        autocomplete="off">
24                 <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite"> 24                 <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
25                     <div id="password-strength-meter" class="password-strength-meter"> 25                     <div id="password-strength-meter" class="password-strength-meter">
26                         <?= $block->escapeHtml(__('Password Strength')) ?>: 26                         <?= $block->escapeHtml(__('Password Strength')) ?>:
27                         <span id="password-strength-meter-label" data-role="password-strength-meter-label"> 27                         <span id="password-strength-meter-label" data-role="password-strength-meter-label">
28                             <?= $block->escapeHtml(__('No Password')) ?> 28                             <?= $block->escapeHtml(__('No Password')) ?>
29                         </span> 29                         </span>
30                     </div> 30                     </div>
31                 </div> 31                 </div>
32             </div> 32             </div>
33         </div> 33         </div>
34         <div class="field confirmation required"> 34         <div class="field confirmation required">
35             <label class="label" for="password-confirmation"><span><?= $block->escapeHtml(__('Confirm New Password')) ?></span></label> 35             <label class="label" for="password-confirmation"><span><?= $block->escapeHtml(__('Confirm New Password')) ?></span></label>
36             <div class="control"> 36             <div class="control">
37                 <input type="password" class="input-text" name="password_confirmation" id="password-confirmation" data-validate="{required:true,equalTo:'#password'}" autocomplete="off"> 37                 <input type="password" class="input-text" name="password_confirmation" id="password-confirmation" data-validate="{required:true,equalTo:'#password'}" autocomplete="off">
38             </div> 38             </div>
39         </div> 39         </div>
40     </fieldset> 40     </fieldset>
41     <div class="actions-toolbar"> 41     <div class="actions-toolbar">
42         <div class="primary"> 42         <div class="primary">
43             <button type="submit" class="action submit primary"><span><?= $block->escapeHtml(__('Set a New Password')) ?></span></button> 43             <button type="submit" class="action submit primary"><span><?= $block->escapeHtml(__('Set a New Password')) ?></span></button>
44         </div> 44         </div>
45     </div> 45     </div>
46 </form> 46 </form>