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

237.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/layoutdefault.xml2021-07-05 10:31:26 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Porto/layoutdefault.xml2023-03-07 05:14:14 +0000

237.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged5506
Changed314
Inserted134
Removed00

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

237.4 Active regular expressions

No regular expressions were active.

237.5 Comparison detail

1 <?xml  1 <?xml 
2  version="1.0" 2  version="1.0"
3 ?> 3 ?>
4 <!-- 4 <!--
5 /** 5 /**
6  * Copyright © 2015 Magento. All rights reserved. 6  * Copyright © 2015 Magento. All rights reserved.
7  * See COPYING.txt for license details. 7  * See COPYING.txt for license details.
8  */ 8  */
9 --> 9 -->
10 <page  10 <page 
11  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  11  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
12  xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" 12  xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"
13 > 13 >
14       14      
15  <body> 15  <body>
16            16           
17   <referenceContainer  17   <referenceContainer 
18    name="head.additional" 18    name="head.additional"
19   > 19   >
20                 20                
21    <block  21    <block 
22     class="Smartwave\Porto\Block\Template"  22     class="Smartwave\Porto\Block\Template" 
23     name="porto_custom_head"  23     name="porto_custom_head" 
24     template="html/head.phtml"  24     template="html/head.phtml" 
25     before="-" 25     before="-"
26    /> 26    />
27             27            
28   </referenceContainer> 28   </referenceContainer>
29            29           
30   <referenceContainer  30   <referenceContainer 
31    name="after.body.start" 31    name="after.body.start"
32   > 32   >
33                 33                
34    <block  34    <block 
35     class="Magento\Newsletter\Block\Subscribe"  35     class="Magento\Newsletter\Block\Subscribe" 
36     name="porto_newsletter_popup"  36     name="porto_newsletter_popup" 
37     template="subscribe_popup.phtml"  37     template="subscribe_popup.phtml" 
38     before="-" 38     before="-"
39    /> 39    />
40                 40                
41    <block  41    <block 
42     class="Smartwave\Porto\Block\Template"  42     class="Smartwave\Porto\Block\Template" 
43     name="porto_sidebar_sticky"  43     name="porto_sidebar_sticky" 
44     template="html/sidebar_sticky.phtml"  44     template="html/sidebar_sticky.phtml" 
45     after="-" 45     after="-"
46    />  46    /> 
47             47            
48   </referenceContainer> 48   </referenceContainer>
49            49           
50   <referenceContainer  50   <referenceContainer 
51    name="page.wrapper" 51    name="page.wrapper"
52   > 52   >
53                 53              
54    <block  54    <block 
55     class="Smartwave\Porto\Block\Template"  55     class="Smartwave\Porto\Block\Template" 
56     name="porto_header"  56     name="porto_header" 
57     template="html/header.phtml"  57     template="html/header.phtml" 
58     before="main.content" 58     before="main.content"
59    > 59    >
60                      60                   
61     <block  61     <block 
62      class="Magento\Framework\View\Element\Html\Links"  62      class="Magento\Framework\View\Element\Html\Links" 
63      name="header.links" 63      name="header.links"
64     > 64     >
65                           65                        
66      <arguments> 66      <arguments>
67                                67                             
68       <argument  68       <argument 
69        name="css_class"  69        name="css_class" 
70        xsi:type="string" 70        xsi:type="string"
71       > 71       >
72        header links 72        header links
73       </argument> 73       </argument>
74                            74                         
75      </arguments> 75      </arguments>
76                       76                    
77     </block> 77     </block>
78                      78                   
79     <block  79     <block 
80      class="Smartwave\Porto\Block\Form\Login"  80      class="Smartwave\Porto\Block\Form\Login" 
81      name="header_customer_form_login"  81      name="header_customer_form_login" 
82      ifconfig="porto_settings/header/login_popup"  82      ifconfig="porto_settings/header/login_popup" 
83      template="Smartwave_Porto::html/login.phtml" 83      template="Smartwave_Porto::html/login.phtml"
84     /> 84     />
85                      85                   
86     <block  86     <block 
87      class="Magento\Store\Block\Switcher"  87      class="Magento\Store\Block\Switcher" 
88      name="store_language"  88      name="store_language" 
89      as="store_language"  89      as="store_language" 
90      template="switch/languages.phtml" 90      template="switch/languages.phtml"
91     /> 91     />
92                      92                   
93     <block  93     <block 
94      class="Magento\Framework\View\Element\Template"  94      class="Magento\Framework\View\Element\Template" 
95      name="top.search"  95      name="top.search" 
96      as="topSearch"  96      as="topSearch" 
97      template="Magento_Search::form.mini.phtml"  97      template="Magento_Search::form.mini.phtml" 
98     /> 98     />
99                      99                   
100     <block  100     <block 
101      class="Smartwave\Porto\Block\Template"  101      class="Smartwave\Porto\Block\Template" 
102      name="custom_block"  102      name="custom_block" 
103      template="html/header_custom_block.phtml"  103      template="html/header_custom_block.phtml" 
104      ifconfig="porto_settings/header/static_block"  104      ifconfig="porto_settings/header/static_block" 
105      after="-" 105      after="-"
106     /> 106     />
107                      107                   
108     <block  108     <block 
109      class="Smartwave\Porto\Block\Template"  109      class="Smartwave\Porto\Block\Template" 
110      name="custom_block_top"  110      name="custom_block_top" 
111      template="html/top_custom_block.phtml"  111      template="html/top_custom_block.phtml" 
112      ifconfig="porto_settings/header/static_block_top"  112      ifconfig="porto_settings/header/static_block_top" 
113      after="-" 113      after="-"
114     /> 114     />
115                      115                   
116     <block  116     <block 
117      class="Smartwave\Porto\Block\Template"  117      class="Smartwave\Porto\Block\Template" 
118      name="custom_block_menu"  118      name="custom_block_menu" 
119      template="html/header_custom_block_menu.phtml"  119      template="html/header_custom_block_menu.phtml" 
120      after="-" 120      after="-"
121     /> 121     />
122                  122                   
123     <block  123     <block 
124      class="Smartwave\Porto\Block\Template"  124      class="Smartwave\Porto\Block\Template" 
125      name="porto_custom_notice"  125      name="porto_custom_notice" 
126      template="html/custom_notice.phtml"  126      template="html/custom_notice.phtml" 
127      after="-" 127      after="-"
128     /> 128     />
129                  129               
130    </block> 130    </block>
131             131            
132   </referenceContainer> 132   </referenceContainer>
133            133           
134   <move  134   <move 
135    element="navigation.sections"  135    element="navigation.sections" 
136    destination="porto_header" 136    destination="porto_header"
137   /> 137   />
138            138           
139   <move  139   <move 
140    element="top.search"  140    element="top.search" 
141    destination="porto_header" 141    destination="porto_header"
142   /> 142   />
143            143           
144   <move  144   <move 
145    element="minicart"  145    element="minicart" 
146    destination="porto_header" 146    destination="porto_header"
147   /> 147   />
148            148           
149   <move  149   <move 
150    element="currency"  150    element="currency" 
151    destination="porto_header" 151    destination="porto_header"
152   /> 152   />
153            153           
154   <move  154   <move 
155    element="logo"  155    element="logo" 
156    destination="porto_header" 156    destination="porto_header"
157   /> 157   />
158            158           
159   <move  159   <move 
160    element="skip_to_content"  160    element="skip_to_content" 
161    destination="porto_header" 161    destination="porto_header"
162   /> 162   />
163    163           
    164   <!--move element="breadcrumbs" destination="columns.top" before="-"/-->
164            165           
165   <move  166   <move 
166    element="page.top"  167    element="page.top" 
167    destination="page.wrapper"  168    destination="page.wrapper" 
168    after="porto_header" 169    after="porto_header"
169   /> 170   />
170    171   
171            172           
172   <referenceContainer  173   <referenceContainer 
173    name="header.container"  174    name="header.container" 
174    remove="1" 175    remove="1"
175   /> 176   />
176            177           
177   <referenceContainer  178   <referenceContainer 
178    name="header.panel"  179    name="header.panel" 
179    remove="1" 180    remove="1"
180   /> 181   />
181            182           
182   <referenceContainer  183   <referenceContainer 
183    name="header-wrapper"  184    name="header-wrapper" 
184    remove="1" 185    remove="1"
185   /> 186   />
186            187           
187   <referenceContainer  188   <referenceContainer 
188    name="sidebar.main" 189    name="sidebar.main"
189   > 190   >
190                 191                
191    <block  192    <block 
192     class="Smartwave\Megamenu\Block\Topmenu"  193     class="Smartwave\Megamenu\Block\Topmenu" 
193     name="sw.sidenav"  194     name="sidebar.menu" 
    195     template="Smartwave_Megamenu::sidebar_menu.phtml"
    196    >
    197    </block>
    198                
    199    <block 
    200     class="Smartwave\Megamenu\Block\Topmenu" 
    201     name="sw.sidebarnav" 
194     before="category_leftnav"  202     before="category_leftnav" 
195     template="Smartwave_Megamenu::sidemenu.phtml"  203     template="Smartwave_Megamenu::sidemenu.phtml" 
196     ifconfig="sw_megamenu/general/sidemenu_enable" 204     ifconfig="sw_megamenu/general/sidebarmenu_enable"
197    > 205    >
198    </block> 206    </block>
199             207            
200   </referenceContainer> 208   </referenceContainer>
201            209           
202   <referenceContainer  210   <referenceContainer 
203    name="sidebar.second" 211    name="sidebar.second"
204   > 212   >
205                 213                
206    <block  214    <block 
207     class="Smartwave\Porto\Block\Template"  215     class="Smartwave\Porto\Block\Template" 
208     name="sidebar_second_block"  216     name="sidebar_second_block" 
209     after="-"  217     after="-" 
210     template="Smartwave_Porto::custom_block.phtml"  218     template="Smartwave_Porto::custom_block.phtml" 
211     ifconfig="porto_settings/general/sidebar_second_block" 219     ifconfig="porto_settings/general/sidebar_second_block"
212    /> 220    />
213             221            
214   </referenceContainer> 222   </referenceContainer>
    223   
    224           
    225   <referenceContainer 
    226    name="main.content"
    227   >
    228                
    229    <container 
    230     name="div.page.main.container" 
    231     htmlTag="div" 
    232     htmlClass="page-main-inner"
    233    >
    234                   
    235     <container 
    236      name="div.sidebar.menu" 
    237      htmlTag="div" 
    238      htmlClass="sidebar-nav" 
    239      before="-"
    240     />
    241                 
    242    </container>
    243            
    244   </referenceContainer>
    245           
    246   <move 
    247    element="sidebar.menu" 
    248    destination="div.sidebar.menu"
    249   />
    250           
    251   <move 
    252    element="columns" 
    253    destination="div.page.main.container" 
    254    before="-"
    255   />
    256   
215            257           
216   <referenceContainer  258   <referenceContainer 
217    name="footer-container" 259    name="footer-container"
218   > 260   >
219                 261                
220    <block  262    <block 
221     class="Smartwave\Porto\Block\Template"  263     class="Smartwave\Porto\Block\Template" 
222     name="footer_block"  264     name="footer_block" 
223     template="html/footer.phtml" 265     template="html/footer.phtml"
224    > 266    >
225                      267                     
226     <block  268     <block 
227      class="Magento\Store\Block\Switcher"  269      class="Magento\Store\Block\Switcher" 
228      name="footer.store_switcher"  270      name="footer.store_switcher" 
229      template="switch/stores.phtml" 271      template="switch/stores.phtml"
230     /> 272     />
231                      273                     
232     <block  274     <block 
233      class="Magento\Newsletter\Block\Subscribe"  275      class="Magento\Newsletter\Block\Subscribe" 
234      name="footer.newsletter"  276      name="footer.newsletter" 
235      template="subscribe_footer.phtml" 277      template="subscribe_footer.phtml"
236     /> 278     />
237                  279                 
238    </block> 280    </block>
239             281            
240   </referenceContainer> 282   </referenceContainer>
241    283   
242            284           
243   <referenceBlock  285   <referenceBlock 
244    name="header.links" 286    name="header.links"
245   > 287   >
246                 288                
247    <block  289    <block 
248     class="Smartwave\Porto\Block\Template"  290     class="Smartwave\Porto\Block\Template" 
249     name="custom_link"  291     name="custom_link" 
250     template="html/custom_link.phtml"  292     template="html/custom_link.phtml" 
251    /> 293    />
252             294            
253   </referenceBlock> 295   </referenceBlock>
254        296       
255  </body> 297  </body>
256 </page> 298 </page>

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