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

244.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlhead.phtml2022-09-08 04:58:53 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlhead.phtml2023-03-09 02:52:22 +0000

244.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged4306
Changed25
Inserted119
Removed00

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

244.4 Active regular expressions

No regular expressions were active.

244.5 Comparison detail

1 <?php 1 <?php
2     $_helper = $this->helper('Smartwave\Porto\Helper\Cssconfig'); 2     $_helper = $this->helper('Smartwave\Porto\Helper\Cssconfig');
3     $porto_helper = $this->helper('Smartwave\Porto\Helper\Data'); 3     $porto_helper = $this->helper('Smartwave\Porto\Helper\Data');
4     $_redirect_cart = $porto_helper->getConfig('checkout/cart/redirect_to_cart'); 4     $_redirect_cart = $porto_helper->getConfig('checkout/cart/redirect_to_cart');
5 ?> 5 ?>
6 <?php 6 <?php
7     $d = $this->getConfig('porto_design'); 7     $d = $this->getConfig('porto_design');
8     $charSubset = ""; 8     $charSubset = "";
9     if (isset($d['font']['char_latin_ext']) && $d['font']['char_latin_ext']==1 ) { 9     if (isset($d['font']['char_latin_ext']) && $d['font']['char_latin_ext']==1 ) {
10       $charSubset .= ',latin-ext'; 10       $charSubset .= ',latin-ext';
11     } 11     }
12     if (isset($d['font']['char_subset']) && $d['font']['char_subset']){ 12     if (isset($d['font']['char_subset']) && $d['font']['char_subset']){
13         $charSubset .= ','.$d['font']['char_subset']; 13         $charSubset .= ','.$d['font']['char_subset'];
14     } 14     }
15     $font_sizes = "%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic";  15     $font_sizes = "%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic";
16     if (isset($d['font']['custom']) && $d['font']['custom'] && $d['font']['font_family'] == 'google'){ 16     if (isset($d['font']['custom']) && $d['font']['custom'] && $d['font']['font_family'] == 'google'){
17       $font_family = str_replace(' ', '+', $d['font']['google_font_family']).$font_sizes.$charSubset; 17       $font_family = str_replace(' ', '+', $d['font']['google_font_family']).$font_sizes.$charSubset;
18     } 18     }
19 ?> 19 ?>
20 <?php if (isset($d['font']['custom']) && $d['font']['custom'] && $d['font']['font_family'] == 'google'){ ?> 20 <?php if (isset($d['font']['custom']) && $d['font']['custom'] && $d['font']['font_family'] == 'google'){ ?>
21 <link rel='stylesheet' href='//fonts.googleapis.com/css?family=<?php echo $font_family;?>' type='text/css' /> 21 <link rel='stylesheet' href='//fonts.googleapis.com/css?family=<?php echo $font_family;?>' type='text/css' />
22 <?php }else{ ?> 22 <?php }else{ ?>
23 <link rel='stylesheet' href="//fonts.googleapis.com/css?family=Open+Sans%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic&amp;v1&amp;subset=latin%2Clatin-ext" type="text/css" media="screen"/> 23 <link rel='stylesheet' href="//fonts.googleapis.com/css?family=Open+Sans%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic&amp;v1&amp;subset=latin%2Clatin-ext" type="text/css" media="screen"/>
24 <?php } ?> 24 <?php } ?>
25 <link href="//fonts.googleapis.com/css?family=Oswald:300,400,500,600,700" rel="stylesheet"> 25 <link href="//fonts.googleapis.com/css?family=Oswald:300,400,500,600,700" rel="stylesheet">
26 <link href="//fonts.googleapis.com/css?family=Poppins:200,300,400,500,600,700,800" rel="stylesheet"> 26 <link href="//fonts.googleapis.com/css?family=Poppins:200,300,400,500,600,700,800" rel="stylesheet">
27 <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic&amp;v1&amp;subset=latin%2Clatin-ext" type="text/css" media="screen"/> 27 <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans%3A300%2C300italic%2C400%2C400italic%2C600%2C600italic%2C700%2C700italic%2C800%2C800italic&amp;v1&amp;subset=latin%2Clatin-ext" type="text/css" media="screen"/>
28 <?php if ($this->getConfig('porto_settings/optimization/bootstrap')): ?> 28 <?php if ($this->getConfig('porto_settings/optimization/bootstrap')): ?>
29     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.min.css'; ?>"> 29     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.min.css'; ?>">
30 <?php else: ?> 30 <?php else: ?>
31     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.optimized.min.css'; ?>"> 31     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'bootstrap/css/bootstrap.optimized.min.css'; ?>">
32 <?php endif; ?> 32 <?php endif; ?>
33 <?php if ($this->getConfig('porto_settings/optimization/animate')): ?> 33 <?php if ($this->getConfig('porto_settings/optimization/animate')): ?>
34     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.css'; ?>"> 34     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.css'; ?>">
35 <?php else: ?> 35 <?php else: ?>
36     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.optimized.css'; ?>"> 36     <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/animate.optimized.css'; ?>">
37 <?php endif; ?> 37 <?php endif; ?>
38 <?php 38 <?php
39     $header_type = $this->getConfig('porto_settings/header/header_type'); 39     $header_type = $this->getConfig('porto_settings/header/header_type');
40 ?> 40 ?>
41 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/header/type'.$header_type.'.css'; ?>"> 41 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/header/type'.$header_type.'.css'; ?>">
42 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/custom.css'; ?>"> 42 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getPortoWebDir().'css/custom.css'; ?>">
43 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getDesignFile()?>"> 43 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getDesignFile()?>">
44 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getSettingsFile()?>"> 44 <link rel="stylesheet" type="text/css" media="all" href="<?php echo $_helper->getSettingsFile()?>">
45 <script type="text/javascript"> 45 <script type="text/javascript">
46 var redirect_cart = false; 46 var redirect_cart = false;
47 <?php if($_redirect_cart):?> 47 <?php if($_redirect_cart):?>
48     redirect_cart = true; 48     redirect_cart = true;
49 <?php endif;?> 49 <?php endif;?>
50 var porto_config = { 50 var porto_config = {
51     paths: { 51     paths: {
52         'parallax': 'js/jquery.parallax.min', 52         'parallax': 'js/jquery.parallax.min',
53         'owlcarousel': 'owl.carousel/owl.carousel', 53         'owlcarousel': 'owl.carousel/owl.carousel',
54         'floatelement': 'js/jquery.floatelement' 54         'floatelement': 'js/jquery.floatelement'
55     }, 55     },
56     shim: { 56     shim: {
57         'owlcarousel': { 57         'owlcarousel': {
58           deps: ['jquery'] 58           deps: ['jquery']
59         }, 59         },
60         'owlcarousel_thumbs': { 60         'owlcarousel_thumbs': {
61           deps: ['jquery','owlcarousel'] 61           deps: ['jquery','owlcarousel']
62         }, 62         },
63         'floatelement': { 63         'floatelement': {
64           deps: ['jquery'] 64           deps: ['jquery']
65         } 65         }
66     } 66     }
67 }; 67 };
68  68 
69 require.config(porto_config); 69 require.config(porto_config);
70 </script> 70 </script>
71 <script type="text/javascript"> 71 <script type="text/javascript">
72 require([ 72 require([
73     'jquery'
 73     'jquery',
    74     'pt_animate'
74 ], function ($) { 75 ], function ($) {
    76   $(window).on('load', function(){
    77     var $wrap = $(document.body);
    78     if ($.isFunction($.fn.themeAnimate)) {
    79       $wrap.find('[data-plugin-animate], [data-appear-animation]').each(function() {
    80         var $this = $(this),
    81             opts;
    82 
    83         var pluginOptions = $this.data('plugin-options');
    84         if (pluginOptions) {
    85           if (typeof pluginOptions == 'string') {
    86             opts = JSON.parse(pluginOptions.replace(/'/g,'"').replace(';',''));
    87           } else {
    88             opts = pluginOptions;
    89           }
    90         }
    91         $this.themeAnimate(opts);
    92       });
    93     }
    94   });
75 <?php if ($this->getConfig('porto_settings/header/sticky_header')): ?> 95 <?php if ($this->getConfig('porto_settings/header/sticky_header')): ?>
76     var scrolled = false; 96     var scrolled = false;
77     $(window).scroll(function(){ 97     $(window).scroll(function(){
78         if($(window).width()>=992){ 98         if($(window).width()>=992){
79             if(160<$(window).scrollTop() && !scrolled){ 99             if(160<$(window).scrollTop() && !scrolled){
80                 $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px'); 100                 $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px');
81                 $('.page-header').addClass("sticky-header"); 101                 $('.page-header').addClass("sticky-header");
82                 scrolled = true; 102                 scrolled = true;
83                 if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) { 103                 if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) {
84                   $('.page-header .minicart-wrapper').after('<div class="minicart-place hide"></div>'); 104                   $('.page-header .minicart-wrapper').after('<div class="minicart-place hide"></div>');
85                   var minicart = $('.page-header .minicart-wrapper').detach(); 105                   var minicart = $('.page-header .minicart-wrapper').detach();
86                   $('.page-header .navigation').append(minicart); 106                   $('.page-header .navigation').append(minicart);
87  107 
88                   <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> 108                   <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?>
89                   var logo_image = $('<div>').append($('.page-header .header .logo').clone()).html(); 109                   var logo_image = $('<div>').append($('.page-header .header .logo').clone()).html();
90                   $('.page-header .navigation').prepend('<div class="sticky-logo">'+logo_image+'</div>'); 110                   $('.page-header .navigation').prepend('<div class="sticky-logo">'+logo_image+'</div>');
91                   <?php endif; ?> 111                   <?php endif; ?>
92                 } 112                 }
93                 <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> 113                 <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?>
94                 <?php 114                 <?php
95                 if($logo_src = $this->getConfig('porto_settings/header/sticky_header_logo_src')){ 115                 if($logo_src = $this->getConfig('porto_settings/header/sticky_header_logo_src')){
96                     $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Stickylogo::UPLOAD_DIR; 116                     $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Stickylogo::UPLOAD_DIR;
97                     $path = $folderName . '/' . $logo_src; 117                     $path = $folderName . '/' . $logo_src;
98                     $imageUrl = $porto_helper->getBaseUrl() . $path; 118                     $imageUrl = $porto_helper->getBaseUrl() . $path;
99                 ?> 119                 ?>
100                 $(".sticky-logo img").attr("src","<?php echo $imageUrl; ?>"); 120                 $(".sticky-logo img").attr("src","<?php echo $imageUrl; ?>");
101                 <?php 121                 <?php
102                 } 122                 }
103                 ?> 123                 ?>
104                 <?php endif; ?> 124                 <?php endif; ?>
105             } 125             }
106             if(160>=$(window).scrollTop() && scrolled){ 126             if(160>=$(window).scrollTop() && scrolled){
107                 $('.page-header.sticky-header').css("height",'auto'); 127                 $('.page-header.sticky-header').css("height",'auto');
108                 $('.page-header').removeClass("sticky-header"); 128                 $('.page-header').removeClass("sticky-header");
109                 scrolled = false; 129                 scrolled = false;
110                 if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) { 130                 if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) {
111                   var minicart; 131                   var minicart;
112                   minicart = $('.page-header .navigation .minicart-wrapper').detach(); 132                   minicart = $('.page-header .navigation .minicart-wrapper').detach();
113                   $('.minicart-place').after(minicart); 133                   $('.minicart-place').after(minicart);
114                   $('.minicart-place').remove(); 134                   $('.minicart-place').remove();
115                   $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide"); 135                   $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide");
116  136 
117                   <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> 137                   <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?>
118                     $('.page-header .navigation > .sticky-logo').remove(); 138                     $('.page-header .navigation > .sticky-logo').remove();
119                   <?php endif; ?> 139                   <?php endif; ?>
120                 } 140                 }
121             } 141             }
122         } 142         }
123         if($('body').hasClass('mobile-sticky')) { 143         if($('body').hasClass('mobile-sticky')) {
124             if($(window).width()<=991){ 144             if($(window).width()<=991){
125                 if(130<$(window).scrollTop() && !scrolled){ 145                 if(130<$(window).scrollTop() && !scrolled){
126                   $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px'); 146                   $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px');
127                   $('.page-header').addClass("sticky-header"); 147                   $('.page-header').addClass("sticky-header");
128                   scrolled = true; 148                   scrolled = true;
129                 } 149                 }
130                 if(130>=$(window).scrollTop() && scrolled){ 150                 if(130>=$(window).scrollTop() && scrolled){
131                   $('.page-header.sticky-header').css("height",'auto'); 151                   $('.page-header.sticky-header').css("height",'auto');
132                   $('.page-header').removeClass("sticky-header"); 152                   $('.page-header').removeClass("sticky-header");
133                   scrolled = false; 153                   scrolled = false;
134                 } 154                 }
135             } 155             }
136         } 156         }
137     }); 157     });
138     $(window).resize(function(){ 158     $(window).resize(function(){
139       var b_w = $(window).width(); 159       var b_w = $(window).width();
140       if(b_w <= 991){ 160       if(b_w <= 991){
141         if($('.page-header .navigation .minicart-wrapper').length > 0) { 161         if($('.page-header .navigation .minicart-wrapper').length > 0) {
142           var minicart; 162           var minicart;
143           minicart = $('.page-header .navigation .minicart-wrapper').detach(); 163           minicart = $('.page-header .navigation .minicart-wrapper').detach();
144           $('.minicart-place').after(minicart); 164           $('.minicart-place').after(minicart);
145           $('.minicart-place').remove(); 165           $('.minicart-place').remove();
146           $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide"); 166           $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide");
147         } 167         }
148       } 168       }
149     }); 169     });
150 <?php endif; ?> 170 <?php endif; ?>
151 }); 171 });
152 </script> 172 </script>
153 <?php if($this->getConfig('porto_settings/general/smartlayers')): ?> 173 <?php if($this->getConfig('porto_settings/general/smartlayers')): ?>
154 <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-58378513496862c5"></script> 174 <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-58378513496862c5"></script>
155 <?php endif; ?> 175 <?php endif; ?>

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.