335. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-07-12 04:43:10 +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.

335.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmllogin.phtml2016-10-16 08:58:02 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmllogin.phtml2016-10-16 08:58:02 +0000

335.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1108
Changed00
Inserted00
Removed00

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

335.4 Active regular expressions

No regular expressions were active.

335.5 Comparison detail

1 <div class="block block-customer-login block-header-customer-login"> 1 <div class="block block-customer-login block-header-customer-login">
2     <div class="block-content" aria-labelledby="block-customer-login-heading"> 2     <div class="block-content" aria-labelledby="block-customer-login-heading">
3         <form class="form form-login" 3         <form class="form form-login"
4               action="<?php /* @escapeNotVerified */ echo $block->getPostActionUrl() ?>" 4               action="<?php /* @escapeNotVerified */ echo $block->getPostActionUrl() ?>"
5               method="post" 5               method="post"
6               id="header-login-form" 6               id="header-login-form"
7               data-mage-init='{"validation":{}}'> 7               data-mage-init='{"validation":{}}'>
8             <?php echo $block->getBlockHtml('formkey'); ?> 8             <?php echo $block->getBlockHtml('formkey'); ?>
9             <fieldset class="fieldset login" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>"> 9             <fieldset class="fieldset login" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
10                 <div class="field email required"> 10                 <div class="field email required">
11                     <div class="control"> 11                     <div class="control">
12                         <input name="login[username]" value="<?php echo $block->escapeHtml($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()) :?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?php /* @escapeNotVerified */ echo __('Email') ?>" data-validate="{required:true, 'validate-email':true}" placeholder="<?php /* @escapeNotVerified */ echo __('Email') ?>"> 12                         <input name="login[username]" value="<?php echo $block->escapeHtml($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()) :?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?php /* @escapeNotVerified */ echo __('Email') ?>" data-validate="{required:true, 'validate-email':true}" placeholder="<?php /* @escapeNotVerified */ echo __('Email') ?>">
13                     </div> 13                     </div>
14                 </div> 14                 </div>
15                 <div class="field password required"> 15                 <div class="field password required">
16                     <div class="control"> 16                     <div class="control">
17                         <input name="login[password]" type="password" <?php if ($block->isAutocompleteDisabled()) :?> autocomplete="off"<?php endif; ?> class="input-text" id="pass" title="<?php /* @escapeNotVerified */ echo __('Password') ?>" data-validate="{required:true}" placeholder="<?php /* @escapeNotVerified */ echo __('Password') ?>"> 17                         <input name="login[password]" type="password" <?php if ($block->isAutocompleteDisabled()) :?> autocomplete="off"<?php endif; ?> class="input-text" id="pass" title="<?php /* @escapeNotVerified */ echo __('Password') ?>" data-validate="{required:true}" placeholder="<?php /* @escapeNotVerified */ echo __('Password') ?>">
18                     </div> 18                     </div>
19                 </div> 19                 </div>
20                 <div class="actions-toolbar"> 20                 <div class="actions-toolbar">
21                     <div class="primary"><button type="submit" class="action login primary" name="send" id="send2"><span><?php /* @escapeNotVerified */ echo __('Sign In') ?></span></button></div> 21                     <div class="primary"><button type="submit" class="action login primary" name="send" id="send2"><span><?php /* @escapeNotVerified */ echo __('Sign In') ?></span></button></div>
22                     <div class="secondary"><a class="action remind" href="<?php /* @escapeNotVerified */ echo $block->getForgotPasswordUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('Forgot Your Password?') ?></span></a></div> 22                     <div class="secondary"><a class="action remind" href="<?php /* @escapeNotVerified */ echo $block->getForgotPasswordUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('Forgot Your Password?') ?></span></a></div>
23                 </div> 23                 </div>
24             </fieldset> 24             </fieldset>
25         </form> 25         </form>
26     </div> 26     </div>
27 </div> 27 </div>
28 <script type="text/javascript"> 28 <script type="text/javascript">
29 require([ 29 require([
30     'jquery' 30     'jquery'
31 ], function ($) { 31 ], function ($) {
32     $(document).ready(function(){ 32     $(document).ready(function(){
33         var href = $(".header.links .authorization-link > a").attr("href"); 33         var href = $(".header.links .authorization-link > a").attr("href");
34         if(href.indexOf("logout") == -1) { 34         if(href.indexOf("logout") == -1) {
35             $(".block-header-customer-login").detach().appendTo(".authorization-link"); 35             $(".block-header-customer-login").detach().appendTo(".authorization-link");
36             $(".block-header-customer-login").click(function(e){ 36             $(".block-header-customer-login").click(function(e){
37                 e.stopPropagation(); 37                 e.stopPropagation();
38             }) 38             })
39             $("html,body").click(function(){ 39             $("html,body").click(function(){
40                 if($(".block-header-customer-login").hasClass("open")) 40                 if($(".block-header-customer-login").hasClass("open"))
41                     $(".block-header-customer-login").removeClass("open"); 41                     $(".block-header-customer-login").removeClass("open");
42             }); 42             });
43             $(".header.links .authorization-link > a").off("click").on("click", function(){ 43             $(".header.links .authorization-link > a").off("click").on("click", function(){
44                 if(!$(".block-header-customer-login").hasClass("open")) 44                 if(!$(".block-header-customer-login").hasClass("open"))
45                     $(".block-header-customer-login").addClass("open"); 45                     $(".block-header-customer-login").addClass("open");
46                 else 46                 else
47                     $(".block-header-customer-login").removeClass("open"); 47                     $(".block-header-customer-login").removeClass("open");
48                      48                     
49                 return false; 49                 return false;
50             }); 50             });
51         } 51         }
52     }); 52     });
53 }); 53 });
54 </script> 54 </script>