241. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:01:07 +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.

241.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlcustom_notice.phtml2021-04-23 08:30:02 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlcustom_notice.phtml2021-04-23 08:30:02 +0000

241.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged160
Changed00
Inserted00
Removed00

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

241.4 Active regular expressions

No regular expressions were active.

241.5 Comparison detail

1 <?php 1 <?php
2 if($this->getConfig('porto_settings/general/show_site_notice')) { 2 if($this->getConfig('porto_settings/general/show_site_notice')) {
3     $static_block_id = $this->getConfig('porto_settings/general/custom_notice_block');  3     $static_block_id = $this->getConfig('porto_settings/general/custom_notice_block'); 
4     $bg_color = $this->getConfig('porto_design/header/notice_bgcolor'); 4     $bg_color = $this->getConfig('porto_design/header/notice_bgcolor');
5     $text_color = $this->getConfig('porto_design/header/notice_text_color'); 5     $text_color = $this->getConfig('porto_design/header/notice_text_color');
6     $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block'); 6     $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block');
7     if($block) { 7     if($block) {
8         $block->setBlockId($static_block_id); 8         $block->setBlockId($static_block_id);
9     } 9     }
10 ?> 10 ?>
11 <div class="porto-block-html-top"> 11 <div class="porto-block-html-top">
12   <div class="background-color-<?php echo $bg_color;?> text-color-<?php echo $text_color;?><?php if($this->getConfig('porto_settings/general/show_site_notice_button')):?> d-none<?php endif;?>"> 12   <div class="background-color-<?php echo $bg_color;?> text-color-<?php echo $text_color;?><?php if($this->getConfig('porto_settings/general/show_site_notice_button')):?> d-none<?php endif;?>">
13     <?php  if($block) echo $block->toHtml(); ?> 13     <?php  if($block) echo $block->toHtml(); ?>
14   </div> 14   </div>
15 </div> 15 </div>
16 <?php if($this->getConfig('porto_settings/general/show_site_notice_button')) {?> 16 <?php if($this->getConfig('porto_settings/general/show_site_notice_button')) {?>
17 <script type="text/javascript"> 17 <script type="text/javascript">
18   require([ 18   require([
19       'jquery' 19       'jquery'
20   ], function ($) { 20   ], function ($) {
21       $('.porto-block-html-top > div').removeClass('d-none').append('<button class="mfp-close">×</button>'); 21       $('.porto-block-html-top > div').removeClass('d-none').append('<button class="mfp-close">×</button>');
22       $('body').on('click', '.porto-block-html-top .mfp-close', function() { 22       $('body').on('click', '.porto-block-html-top .mfp-close', function() {
23         $(this).parent().fadeOut(); 23         $(this).parent().fadeOut();
24       }); 24       });
25   }); 25   });
26 </script> 26 </script>
27 <?php 27 <?php
28 } 28 }
29 } 29 }
30 ?> 30 ?>