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

331.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlhead.phtml2023-03-09 02:52:22 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlhead.phtml2023-07-12 03:37:57 +0000

331.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged2310
Changed00
Inserted00
Removed120

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

331.4 Active regular expressions

No regular expressions were active.

331.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 = {    
51     paths: {    
52         'parallax': 'js/jquery.parallax.min',    
53         'owlcarousel': 'owl.carousel/owl.carousel',    
54         'floatelement': 'js/jquery.floatelement'    
55     },    
56     shim: {    
57         'owlcarousel': {    
58           deps: ['jquery']    
59         },    
60         'owlcarousel_thumbs': {    
61           deps: ['jquery','owlcarousel']    
62         },    
63         'floatelement': {    
64           deps: ['jquery']    
65         }    
66     }    
67 };    
68     
69 require.config(porto_config);    
70 </script> 50 </script>
71 <script type="text/javascript"> 51 <script type="text/javascript">
72 require([ 52 require([
73     'jquery', 53     'jquery',
74     'pt_animate' 54     'pt_animate'
75 ], function ($) { 55 ], function ($) {
76   $(window).on('load', function(){ 56   $(window).on('load', function(){
77     var $wrap = $(document.body); 57     var $wrap = $(document.body);
78     if ($.isFunction($.fn.themeAnimate)) { 58     if ($.isFunction($.fn.themeAnimate)) {
79       $wrap.find('[data-plugin-animate], [data-appear-animation]').each(function() { 59       $wrap.find('[data-plugin-animate], [data-appear-animation]').each(function() {
80         var $this = $(this), 60         var $this = $(this),
81             opts; 61             opts;
82  62 
83         var pluginOptions = $this.data('plugin-options'); 63         var pluginOptions = $this.data('plugin-options');
84         if (pluginOptions) { 64         if (pluginOptions) {
85           if (typeof pluginOptions == 'string') { 65           if (typeof pluginOptions == 'string') {
86             opts = JSON.parse(pluginOptions.replace(/'/g,'"').replace(';','')); 66             opts = JSON.parse(pluginOptions.replace(/'/g,'"').replace(';',''));
87           } else { 67           } else {
88             opts = pluginOptions; 68             opts = pluginOptions;
89           } 69           }
90         } 70         }
91         $this.themeAnimate(opts); 71         $this.themeAnimate(opts);
92       }); 72       });
93     } 73     }
94   }); 74   });
95 <?php if ($this->getConfig('porto_settings/header/sticky_header')): ?> 75 <?php if ($this->getConfig('porto_settings/header/sticky_header')): ?>
96     var scrolled = false; 76     var scrolled = false;
97     $(window).scroll(function(){ 77     $(window).scroll(function(){
98         if($(window).width()>=992){ 78         if($(window).width()>=992){
99             if(160<$(window).scrollTop() && !scrolled){ 79             if(160<$(window).scrollTop() && !scrolled){
100                 $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px'); 80                 $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px');
101                 $('.page-header').addClass("sticky-header"); 81                 $('.page-header').addClass("sticky-header");
102                 scrolled = true; 82                 scrolled = true;
103                 if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) { 83                 if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) {
104                   $('.page-header .minicart-wrapper').after('<div class="minicart-place hide"></div>'); 84                   $('.page-header .minicart-wrapper').after('<div class="minicart-place hide"></div>');
105                   var minicart = $('.page-header .minicart-wrapper').detach(); 85                   var minicart = $('.page-header .minicart-wrapper').detach();
106                   $('.page-header .navigation').append(minicart); 86                   $('.page-header .navigation').append(minicart);
107  87 
108                   <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> 88                   <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?>
109                   var logo_image = $('<div>').append($('.page-header .header .logo').clone()).html(); 89                   var logo_image = $('<div>').append($('.page-header .header .logo').clone()).html();
110                   $('.page-header .navigation').prepend('<div class="sticky-logo">'+logo_image+'</div>'); 90                   $('.page-header .navigation').prepend('<div class="sticky-logo">'+logo_image+'</div>');
111                   <?php endif; ?> 91                   <?php endif; ?>
112                 } 92                 }
113                 <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> 93                 <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?>
114                 <?php 94                 <?php
115                 if($logo_src = $this->getConfig('porto_settings/header/sticky_header_logo_src')){ 95                 if($logo_src = $this->getConfig('porto_settings/header/sticky_header_logo_src')){
116                     $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Stickylogo::UPLOAD_DIR; 96                     $folderName = \Smartwave\Porto\Model\Config\Backend\Image\Stickylogo::UPLOAD_DIR;
117                     $path = $folderName . '/' . $logo_src; 97                     $path = $folderName . '/' . $logo_src;
118                     $imageUrl = $porto_helper->getBaseUrl() . $path; 98                     $imageUrl = $porto_helper->getBaseUrl() . $path;
119                 ?> 99                 ?>
120                 $(".sticky-logo img").attr("src","<?php echo $imageUrl; ?>"); 100                 $(".sticky-logo img").attr("src","<?php echo $imageUrl; ?>");
121                 <?php 101                 <?php
122                 } 102                 }
123                 ?> 103                 ?>
124                 <?php endif; ?> 104                 <?php endif; ?>
125             } 105             }
126             if(160>=$(window).scrollTop() && scrolled){ 106             if(160>=$(window).scrollTop() && scrolled){
127                 $('.page-header.sticky-header').css("height",'auto'); 107                 $('.page-header.sticky-header').css("height",'auto');
128                 $('.page-header').removeClass("sticky-header"); 108                 $('.page-header').removeClass("sticky-header");
129                 scrolled = false; 109                 scrolled = false;
130                 if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) { 110                 if($(".page-header").hasClass("type1") || $(".page-header").hasClass("type2") || $(".page-header").hasClass("type6")) {
131                   var minicart; 111                   var minicart;
132                   minicart = $('.page-header .navigation .minicart-wrapper').detach(); 112                   minicart = $('.page-header .navigation .minicart-wrapper').detach();
133                   $('.minicart-place').after(minicart); 113                   $('.minicart-place').after(minicart);
134                   $('.minicart-place').remove(); 114                   $('.minicart-place').remove();
135                   $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide"); 115                   $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide");
136  116 
137                   <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?> 117                   <?php if ($this->getConfig('porto_settings/header/sticky_header_logo')): ?>
138                     $('.page-header .navigation > .sticky-logo').remove(); 118                     $('.page-header .navigation > .sticky-logo').remove();
139                   <?php endif; ?> 119                   <?php endif; ?>
140                 } 120                 }
141             } 121             }
142         } 122         }
143         if($('body').hasClass('mobile-sticky')) { 123         if($('body').hasClass('mobile-sticky')) {
144             if($(window).width()<=991){ 124             if($(window).width()<=991){
145                 if(130<$(window).scrollTop() && !scrolled){ 125                 if(130<$(window).scrollTop() && !scrolled){
146                   $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px'); 126                   $('.page-header:not(.sticky-header)').css("height",$('.page-header:not(.sticky-header)').height()+'px');
147                   $('.page-header').addClass("sticky-header"); 127                   $('.page-header').addClass("sticky-header");
148                   scrolled = true; 128                   scrolled = true;
149                 } 129                 }
150                 if(130>=$(window).scrollTop() && scrolled){ 130                 if(130>=$(window).scrollTop() && scrolled){
151                   $('.page-header.sticky-header').css("height",'auto'); 131                   $('.page-header.sticky-header').css("height",'auto');
152                   $('.page-header').removeClass("sticky-header"); 132                   $('.page-header').removeClass("sticky-header");
153                   scrolled = false; 133                   scrolled = false;
154                 } 134                 }
155             } 135             }
156         } 136         }
157     }); 137     });
158     $(window).resize(function(){ 138     $(window).resize(function(){
159       var b_w = $(window).width(); 139       var b_w = $(window).width();
160       if(b_w <= 991){ 140       if(b_w <= 991){
161         if($('.page-header .navigation .minicart-wrapper').length > 0) { 141         if($('.page-header .navigation .minicart-wrapper').length > 0) {
162           var minicart; 142           var minicart;
163           minicart = $('.page-header .navigation .minicart-wrapper').detach(); 143           minicart = $('.page-header .navigation .minicart-wrapper').detach();
164           $('.minicart-place').after(minicart); 144           $('.minicart-place').after(minicart);
165           $('.minicart-place').remove(); 145           $('.minicart-place').remove();
166           $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide"); 146           $('.page-header .minicart-wrapper-moved').addClass("minicart-wrapper").removeClass("minicart-wrapper-moved").removeClass("hide");
167         } 147         }
168       } 148       }
169     }); 149     });
170 <?php endif; ?> 150 <?php endif; ?>
171 }); 151 });
172 </script> 152 </script>
173 <?php if($this->getConfig('porto_settings/general/smartlayers')): ?> 153 <?php if($this->getConfig('porto_settings/general/smartlayers')): ?>
174 <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-58378513496862c5"></script> 154 <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-58378513496862c5"></script>
175 <?php endif; ?> 155 <?php endif; ?>

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