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

243.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlfooter.phtml2017-12-23 09:26:04 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/templates/htmlfooter.phtml2017-12-23 09:26:04 +0000

243.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1320
Changed00
Inserted00
Removed00

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

243.4 Active regular expressions

No regular expressions were active.

243.5 Comparison detail

1 <?php 1 <?php
2     $footer = $this->getConfig('porto_settings/footer'); 2     $footer = $this->getConfig('porto_settings/footer');
3 ?> 3 ?>
4 <div class="footer"> 4 <div class="footer">
5 <?php 5 <?php
6     if( $footer['footer_top'] ){ 6     if( $footer['footer_top'] ){
7 ?> 7 ?>
8     <div class="footer-top"> 8     <div class="footer-top">
9         <div class="container"> 9         <div class="container">
10             <div class="row"> 10             <div class="row">
11                 <div class="col-lg-12"> 11                 <div class="col-lg-12">
12                 <?php 12                 <?php
13                     $area = 'footer_top_block'; 13                     $area = 'footer_top_block';
14                     $type = $footer[$area]; 14                     $type = $footer[$area];
15                     if( $type == 'custom' && $footer['footer_top_custom'] ){ 15                     if( $type == 'custom' && $footer['footer_top_custom'] ){
16                         $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block'); 16                         $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block');
17                         if($block) { 17                         if($block) {
18                             $block->setBlockId($footer['footer_top_custom']); 18                             $block->setBlockId($footer['footer_top_custom']);
19                         } 19                         }
20                         if($block){ 20                         if($block){
21                             echo '<div class="custom-block">'.$block->toHtml().'</div>'; 21                             echo '<div class="custom-block">'.$block->toHtml().'</div>';
22                         } 22                         }
23                     } 23                     }
24  24 
25                 ?> 25                 ?>
26                 </div> 26                 </div>
27             </div> 27             </div>
28         </div> 28         </div>
29     </div> 29     </div>
30 <?php 30 <?php
31     } 31     }
32     if( $footer['footer_middle'] ){ 32     if( $footer['footer_middle'] ){
33 ?> 33 ?>
34     <div class="footer-middle"> 34     <div class="footer-middle">
35         <div class="container"> 35         <div class="container">
36         <?php 36         <?php
37             if( $footer['footer_ribbon'] ){ 37             if( $footer['footer_ribbon'] ){
38         ?> 38         ?>
39             <div class="footer-ribbon"> 39             <div class="footer-ribbon">
40                 <span><?php echo $footer['footer_ribbon_text'] ?></span> 40                 <span><?php echo $footer['footer_ribbon_text'] ?></span>
41             </div> 41             </div>
42         <?php 42         <?php
43             } 43             }
44         ?> 44         ?>
45             <div class="row"> 45             <div class="row">
46             <?php 46             <?php
47                 for( $i = 1; $i <= 4; $i++ ){ 47                 for( $i = 1; $i <= 4; $i++ ){
48                     $area = 'footer_middle_column_'.$i; 48                     $area = 'footer_middle_column_'.$i;
49                     $type = $footer[$area]; 49                     $type = $footer[$area];
50                     if( $type ){ 50                     if( $type ){
51                         echo '<div class="col-lg-'.$footer[$area.'_size'].'">'; 51                         echo '<div class="col-lg-'.$footer[$area.'_size'].'">';
52                     } 52                     }
53                     if( $type == 'custom' && $footer[$area.'_custom'] ){ 53                     if( $type == 'custom' && $footer[$area.'_custom'] ){
54                         $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block'); 54                         $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block');
55                         if($block) { 55                         if($block) {
56                             $block->setBlockId($footer[$area.'_custom']); 56                             $block->setBlockId($footer[$area.'_custom']);
57                         } 57                         }
58                         if($block){ 58                         if($block){
59                             echo $block->toHtml(); 59                             echo $block->toHtml();
60                         } 60                         }
61                     } 61                     }
62                     if( $type == 'newsletter' ){ 62                     if( $type == 'newsletter' ){
63                         echo $this->getChildHtml('footer.newsletter'); 63                         echo $this->getChildHtml('footer.newsletter');
64                     } 64                     }
65                     if( $type ){ 65                     if( $type ){
66                         echo '</div>'; 66                         echo '</div>';
67                     } 67                     }
68                 } 68                 }
69             ?> 69             ?>
70             </div> 70             </div>
71         </div> 71         </div>
72     </div> 72     </div>
73 <?php 73 <?php
74     } 74     }
75     if( $footer['footer_middle_2'] ){ 75     if( $footer['footer_middle_2'] ){
76 ?> 76 ?>
77     <div class="footer-middle footer-middle-2"> 77     <div class="footer-middle footer-middle-2">
78         <div class="container"> 78         <div class="container">
79             <div class="row"> 79             <div class="row">
80             <?php 80             <?php
81                 for( $i = 1; $i <= 4; $i++ ){ 81                 for( $i = 1; $i <= 4; $i++ ){
82                     $area = 'footer_middle_2_column_'.$i; 82                     $area = 'footer_middle_2_column_'.$i;
83                     $type = $footer[$area]; 83                     $type = $footer[$area];
84                     if( $type ){ 84                     if( $type ){
85                         echo '<div class="col-lg-'.$footer[$area.'_size'].'">'; 85                         echo '<div class="col-lg-'.$footer[$area.'_size'].'">';
86                     } 86                     }
87                     if( $type == 'custom' && $footer[$area.'_custom'] ){ 87                     if( $type == 'custom' && $footer[$area.'_custom'] ){
88                         $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block'); 88                         $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block');
89                         if($block) { 89                         if($block) {
90                             $block->setBlockId($footer[$area.'_custom']); 90                             $block->setBlockId($footer[$area.'_custom']);
91                         } 91                         }
92                         if($block){ 92                         if($block){
93                             echo $block->toHtml(); 93                             echo $block->toHtml();
94                         } 94                         }
95                     } 95                     }
96                     if( $type == 'newsletter' ){ 96                     if( $type == 'newsletter' ){
97                         echo $this->getChildHtml('footer.newsletter'); 97                         echo $this->getChildHtml('footer.newsletter');
98                     } 98                     }
99                     if( $type ){ 99                     if( $type ){
100                         echo '</div>'; 100                         echo '</div>';
101                     } 101                     }
102                 } 102                 }
103             ?> 103             ?>
104             </div> 104             </div>
105         </div> 105         </div>
106     </div> 106     </div>
107 <?php 107 <?php
108     } 108     }
109     if( $footer['footer_bottom'] ){ 109     if( $footer['footer_bottom'] ){
110 ?> 110 ?>
111     <div class="footer-bottom"> 111     <div class="footer-bottom">
112         <div class="container"> 112         <div class="container">
113             <?php 113             <?php
114             if($footer['footer_logo_src']){ 114             if($footer['footer_logo_src']){
115                  115                 
116                 $url = $this->getFooterLogoSrc(); 116                 $url = $this->getFooterLogoSrc();
117             ?> 117             ?>
118             <?php if ($this->isHomePage()):?> 118             <?php if ($this->isHomePage()):?>
119                 <strong class="logo"> 119                 <strong class="logo">
120             <?php else: ?> 120             <?php else: ?>
121                 <a class="logo" href="<?php echo $this->getUrl(''); ?>" title=""> 121                 <a class="logo" href="<?php echo $this->getUrl(''); ?>" title="">
122             <?php endif; ?> 122             <?php endif; ?>
123                 <img src="<?php echo $url ?>" alt=""/> 123                 <img src="<?php echo $url ?>" alt=""/>
124             <?php if ($this->isHomePage()):?> 124             <?php if ($this->isHomePage()):?>
125                 </strong> 125                 </strong>
126             <?php else:?> 126             <?php else:?>
127                 </a> 127                 </a>
128             <?php endif?> 128             <?php endif?>
129             <?php 129             <?php
130             } 130             }
131             if($footer['footer_bottom_custom_1']){ 131             if($footer['footer_bottom_custom_1']){
132                 $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block'); 132                 $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block');
133                 if($block) { 133                 if($block) {
134                     $block->setBlockId($footer['footer_bottom_custom_1']); 134                     $block->setBlockId($footer['footer_bottom_custom_1']);
135                 } 135                 }
136                 if($block){ 136                 if($block){
137                     echo '<div class="custom-block">'.$block->toHtml().'</div>'; 137                     echo '<div class="custom-block">'.$block->toHtml().'</div>';
138                 } 138                 }
139             } 139             }
140             ?> 140             ?>
141             <?php 141             <?php
142             if($footer['footer_bottom_custom_2']){ 142             if($footer['footer_bottom_custom_2']){
143                 $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block'); 143                 $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block');
144                 if($block) { 144                 if($block) {
145                     $block->setBlockId($footer['footer_bottom_custom_2']); 145                     $block->setBlockId($footer['footer_bottom_custom_2']);
146                 } 146                 }
147                 if($block){ 147                 if($block){
148                     echo '<div class="custom-block f-right">'.$block->toHtml().'</div>'; 148                     echo '<div class="custom-block f-right">'.$block->toHtml().'</div>';
149                 } 149                 }
150             } 150             }
151             ?> 151             ?>
152             <address><?php echo $footer['footer_bottom_copyrights'] ?></address> 152             <address><?php echo $footer['footer_bottom_copyrights'] ?></address>
153             <?php if($footer['footer_store_switcher']) echo $this->getChildHtml("footer.store_switcher"); ?> 153             <?php if($footer['footer_store_switcher']) echo $this->getChildHtml("footer.store_switcher"); ?>
154         </div> 154         </div>
155     </div> 155     </div>
156 <?php 156 <?php
157     } 157     }
158 ?> 158 ?>
159 </div> 159 </div>
160 <a href="javascript:void(0)" id="totop"><em class="porto-icon-up-open"></em></a> 160 <a href="javascript:void(0)" id="totop"><em class="porto-icon-up-open"></em></a>