240. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-07-12 04:43:05 +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.

240.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/code/Smartwave/Porto/etcconfig.xml2023-03-07 15:16:40 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/code/Smartwave/Porto/etcconfig.xml2023-03-07 15:16:40 +0000

240.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1960
Changed00
Inserted00
Removed00

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

240.4 Active regular expressions

No regular expressions were active.

240.5 Comparison detail

1 <?xml  1 <?xml 
2  version="1.0" 2  version="1.0"
3 ?> 3 ?>
4 <config  4 <config 
5  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  5  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
6  xsi:noNamespaceSchemaLocation="../../Store/etc/config.xsd" 6  xsi:noNamespaceSchemaLocation="../../Store/etc/config.xsd"
7 > 7 >
8       8      
9  <default> 9  <default>
10            10           
11   <porto_settings> 11   <porto_settings>
12                 12                
13    <general> 13    <general>
14                      14                     
15     <boxed> 15     <boxed>
16      wide 16      wide
17     </boxed> 17     </boxed>
18                      18                     
19     <custom_notice_block> 19     <custom_notice_block>
20      porto_custom_notice 20      porto_custom_notice
21     </custom_notice_block>  21     </custom_notice_block> 
22                  22                 
23    </general> 23    </general>
24                 24                
25    <optimization> 25    <optimization>
26                      26                     
27     <lazyload> 27     <lazyload>
28      0 28      0
29     </lazyload> 29     </lazyload>
30                  30                 
31    </optimization> 31    </optimization>
32                 32                
33    <header> 33    <header>
34                      34                     
35     <header_type> 35     <header_type>
36      1 36      1
37     </header_type> 37     </header_type>
38                      38                     
39     <new_skin> 39     <new_skin>
40      0 40      0
41     </new_skin> 41     </new_skin>
42                      42                     
43     <static_block> 43     <static_block>
44      porto_custom_block_for_header 44      porto_custom_block_for_header
45     </static_block> 45     </static_block>
46                      46                     
47     <toggle_text> 47     <toggle_text>
48      <![CDATA[<em class="porto-icon-menu"></em> SHOP BY CATEGORY]]> 48      <![CDATA[<em class="porto-icon-menu"></em> SHOP BY CATEGORY]]>
49     </toggle_text> 49     </toggle_text>
50                      50                     
51     <static_block_8> 51     <static_block_8>
52      porto_custom_block_type_8 52      porto_custom_block_type_8
53     </static_block_8> 53     </static_block_8>
54                      54                     
55     <compare_link> 55     <compare_link>
56      0 56      0
57     </compare_link> 57     </compare_link>
58                  58                 
59    </header> 59    </header>
60                 60                
61    <footer> 61    <footer>
62                      62                     
63     <footer_newsletter_title> 63     <footer_newsletter_title>
64      Be the First to Know 64      Be the First to Know
65     </footer_newsletter_title> 65     </footer_newsletter_title>
66                      66                     
67     <footer_newsletter_text> 67     <footer_newsletter_text>
68      <![CDATA[Get all the latest information on Events,<br/>Sales and Offers. Sign up for newsletter today.]]> 68      <![CDATA[Get all the latest information on Events,<br/>Sales and Offers. Sign up for newsletter today.]]>
69     </footer_newsletter_text> 69     </footer_newsletter_text>
70                      70                     
71     <footer_top> 71     <footer_top>
72      0 72      0
73     </footer_top> 73     </footer_top>
74                      74                     
75     <footer_top_block> 75     <footer_top_block>
76      custom 76      custom
77     </footer_top_block> 77     </footer_top_block>
78                      78                     
79     <footer_top_custom> 79     <footer_top_custom>
80      porto_footer_top_custom_block 80      porto_footer_top_custom_block
81     </footer_top_custom> 81     </footer_top_custom>
82                      82                     
83     <footer_middle> 83     <footer_middle>
84      1 84      1
85     </footer_middle> 85     </footer_middle>
86                      86                     
87     <footer_ribbon> 87     <footer_ribbon>
88      1 88      1
89     </footer_ribbon> 89     </footer_ribbon>
90                      90                     
91     <footer_ribbon_text> 91     <footer_ribbon_text>
92      Ribbon Text 92      Ribbon Text
93     </footer_ribbon_text> 93     </footer_ribbon_text>
94                      94                     
95     <footer_middle_column_1> 95     <footer_middle_column_1>
96      custom 96      custom
97     </footer_middle_column_1> 97     </footer_middle_column_1>
98                      98                     
99     <footer_middle_column_1_custom> 99     <footer_middle_column_1_custom>
100      porto_footer_links 100      porto_footer_links
101     </footer_middle_column_1_custom> 101     </footer_middle_column_1_custom>
102                      102                     
103     <footer_middle_column_1_size> 103     <footer_middle_column_1_size>
104      3 104      3
105     </footer_middle_column_1_size> 105     </footer_middle_column_1_size>
106                      106                     
107     <footer_middle_column_2> 107     <footer_middle_column_2>
108      custom 108      custom
109     </footer_middle_column_2> 109     </footer_middle_column_2>
110                      110                     
111     <footer_middle_column_2_custom> 111     <footer_middle_column_2_custom>
112      porto_footer_contact_information 112      porto_footer_contact_information
113     </footer_middle_column_2_custom> 113     </footer_middle_column_2_custom>
114                      114                     
115     <footer_middle_column_2_size> 115     <footer_middle_column_2_size>
116      3 116      3
117     </footer_middle_column_2_size> 117     </footer_middle_column_2_size>
118                      118                     
119     <footer_middle_column_3> 119     <footer_middle_column_3>
120      custom 120      custom
121     </footer_middle_column_3> 121     </footer_middle_column_3>
122                      122                     
123     <footer_middle_column_3_custom> 123     <footer_middle_column_3_custom>
124      porto_footer_features 124      porto_footer_features
125     </footer_middle_column_3_custom> 125     </footer_middle_column_3_custom>
126                      126                     
127     <footer_middle_column_3_size> 127     <footer_middle_column_3_size>
128      3 128      3
129     </footer_middle_column_3_size> 129     </footer_middle_column_3_size>
130                      130                     
131     <footer_middle_column_4> 131     <footer_middle_column_4>
132      newsletter 132      newsletter
133     </footer_middle_column_4> 133     </footer_middle_column_4>
134                      134                     
135     <footer_middle_column_4_custom> 135     <footer_middle_column_4_custom>
136      porto_footer_links 136      porto_footer_links
137     </footer_middle_column_4_custom> 137     </footer_middle_column_4_custom>
138                      138                     
139     <footer_middle_column_4_size> 139     <footer_middle_column_4_size>
140      3 140      3
141     </footer_middle_column_4_size> 141     </footer_middle_column_4_size>
142                      142                     
143     <footer_middle_2> 143     <footer_middle_2>
144      0 144      0
145     </footer_middle_2> 145     </footer_middle_2>
146                      146                     
147     <footer_middle_2_column_1> 147     <footer_middle_2_column_1>
148      custom 148      custom
149     </footer_middle_2_column_1> 149     </footer_middle_2_column_1>
150                      150                     
151     <footer_middle_2_column_1_custom> 151     <footer_middle_2_column_1_custom>
152      porto_footer_links 152      porto_footer_links
153     </footer_middle_2_column_1_custom> 153     </footer_middle_2_column_1_custom>
154                      154                     
155     <footer_middle_2_column_1_size> 155     <footer_middle_2_column_1_size>
156      3 156      3
157     </footer_middle_2_column_1_size> 157     </footer_middle_2_column_1_size>
158                      158                     
159     <footer_middle_2_column_2> 159     <footer_middle_2_column_2>
160      custom 160      custom
161     </footer_middle_2_column_2> 161     </footer_middle_2_column_2>
162                      162                     
163     <footer_middle_2_column_2_custom> 163     <footer_middle_2_column_2_custom>
164      porto_footer_links 164      porto_footer_links
165     </footer_middle_2_column_2_custom> 165     </footer_middle_2_column_2_custom>
166                      166                     
167     <footer_middle_2_column_2_size> 167     <footer_middle_2_column_2_size>
168      3 168      3
169     </footer_middle_2_column_2_size> 169     </footer_middle_2_column_2_size>
170                      170                     
171     <footer_middle_2_column_3> 171     <footer_middle_2_column_3>
172      custom 172      custom
173     </footer_middle_2_column_3> 173     </footer_middle_2_column_3>
174                      174                     
175     <footer_middle_2_column_3_custom> 175     <footer_middle_2_column_3_custom>
176      porto_footer_links 176      porto_footer_links
177     </footer_middle_2_column_3_custom> 177     </footer_middle_2_column_3_custom>
178                      178                     
179     <footer_middle_2_column_3_size> 179     <footer_middle_2_column_3_size>
180      3 180      3
181     </footer_middle_2_column_3_size> 181     </footer_middle_2_column_3_size>
182                      182                     
183     <footer_middle_2_column_4> 183     <footer_middle_2_column_4>
184      custom 184      custom
185     </footer_middle_2_column_4> 185     </footer_middle_2_column_4>
186                      186                     
187     <footer_middle_2_column_4_custom> 187     <footer_middle_2_column_4_custom>
188      porto_footer_links 188      porto_footer_links
189     </footer_middle_2_column_4_custom> 189     </footer_middle_2_column_4_custom>
190                      190                     
191     <footer_middle_2_column_4_size> 191     <footer_middle_2_column_4_size>
192      3 192      3
193     </footer_middle_2_column_4_size> 193     </footer_middle_2_column_4_size>
194                      194                     
195     <footer_bottom> 195     <footer_bottom>
196      1 196      1
197     </footer_bottom> 197     </footer_bottom>
198                      198                     
199     <footer_store_switcher> 199     <footer_store_switcher>
200      0 200      0
201     </footer_store_switcher> 201     </footer_store_switcher>
202                      202                     
203     <footer_logo_src> 203     <footer_logo_src>
204     </footer_logo_src> 204     </footer_logo_src>
205                      205                     
206     <footer_bottom_copyrights> 206     <footer_bottom_copyrights>
207      <![CDATA[&copy;Copyright 2015 by SW-THEMES. All Rights Reserved.]]> 207      <![CDATA[&copy;Copyright 2015 by SW-THEMES. All Rights Reserved.]]>
208     </footer_bottom_copyrights> 208     </footer_bottom_copyrights>
209                      209                     
210     <footer_bottom_custom_1> 210     <footer_bottom_custom_1>
211      porto_footer_bottom_custom_block 211      porto_footer_bottom_custom_block
212     </footer_bottom_custom_1> 212     </footer_bottom_custom_1>
213                      213                     
214     <footer_bottom_custom_2> 214     <footer_bottom_custom_2>
215     </footer_bottom_custom_2> 215     </footer_bottom_custom_2>
216                  216                 
217    </footer> 217    </footer>
218                 218                
219    <category> 219    <category>
220                      220                     
221     <alternative_image> 221     <alternative_image>
222      1 222      1
223     </alternative_image> 223     </alternative_image>
224                      224                     
225     <aspect_ratio> 225     <aspect_ratio>
226      0 226      0
227     </aspect_ratio> 227     </aspect_ratio>
228                      228                     
229     <ratio_width> 229     <ratio_width>
230      300 230      300
231     </ratio_width> 231     </ratio_width>
232                      232                     
233     <ratio_height> 233     <ratio_height>
234      400 234      400
235     </ratio_height> 235     </ratio_height>
236                      236                     
237     <rating_star> 237     <rating_star>
238      1 238      1
239     </rating_star> 239     </rating_star>
240                      240                     
241     <product_price> 241     <product_price>
242      1 242      1
243     </product_price> 243     </product_price>
244                      244                     
245     <actions> 245     <actions>
246      1 246      1
247     </actions> 247     </actions>
248                      248                     
249     <addtocompare> 249     <addtocompare>
250      1 250      1
251     </addtocompare> 251     </addtocompare>
252                      252                     
253     <addtowishlist> 253     <addtowishlist>
254      1 254      1
255     </addtowishlist> 255     </addtowishlist>
256                      256                     
257     <page_layout> 257     <page_layout>
258      2columns-left 258      2columns-left
259     </page_layout> 259     </page_layout>
260                      260                     
261     <category_description> 261     <category_description>
262      main_column 262      main_column
263     </category_description> 263     </category_description>
264                      264                     
265     <side_custom_block> 265     <side_custom_block>
266      porto_category_side_custom_block 266      porto_category_side_custom_block
267     </side_custom_block> 267     </side_custom_block>
268                  268                 
269    </category> 269    </category>
270                 270                
271    <category_grid> 271    <category_grid>
272                      272                     
273     <product_type> 273     <product_type>
274      1 274      1
275     </product_type> 275     </product_type>
276                      276                     
277     <columns> 277     <columns>
278      4 278      4
279     </columns> 279     </columns>
280                  280                 
281    </category_grid> 281    </category_grid>
282                 282                
283    <product> 283    <product>
284                      284                     
285     <!--<aspect_ratio>0</aspect_ratio> 285     <!--<aspect_ratio>0</aspect_ratio>
286                     <ratio_width>600</ratio_width> 286                     <ratio_width>600</ratio_width>
287                     <ratio_height>800</ratio_height>--> 287                     <ratio_height>800</ratio_height>-->
288                      288                     
289     <product_image_size> 289     <product_image_size>
290      6 290      6
291     </product_image_size> 291     </product_image_size>
292                      292                     
293     <main_custom_block> 293     <main_custom_block>
294     </main_custom_block> 294     </main_custom_block>
295                      295                     
296     <side_custom_block> 296     <side_custom_block>
297      porto_product_side_custom_block 297      porto_product_side_custom_block
298     </side_custom_block> 298     </side_custom_block>
299                      299                     
300     <prev_next> 300     <prev_next>
301      1 301      1
302     </prev_next> 302     </prev_next>
303                      303                     
304     <prev_text> 304     <prev_text>
305      <![CDATA[<em class="porto-icon-left-open"></em>]]> 305      <![CDATA[<em class="porto-icon-left-open"></em>]]>
306     </prev_text> 306     </prev_text>
307                      307                     
308     <next_text> 308     <next_text>
309      <![CDATA[<em class="porto-icon-right-open"></em>]]> 309      <![CDATA[<em class="porto-icon-right-open"></em>]]>
310     </next_text> 310     </next_text>
311                      311                     
312     <page_layout> 312     <page_layout>
313      2columns-right 313      2columns-right
314     </page_layout> 314     </page_layout>
315                      315                     
316     <upsell_columns> 316     <upsell_columns>
317      4 317      4
318     </upsell_columns> 318     </upsell_columns>
319                      319                     
320     <move_related_columns> 320     <move_related_columns>
321      4 321      4
322     </move_related_columns> 322     </move_related_columns>
323                  323                 
324    </product> 324    </product>
325                 325                
326    <product_label> 326    <product_label>
327                      327                     
328     <new_label> 328     <new_label>
329      1 329      1
330     </new_label> 330     </new_label>
331                      331                     
332     <new_label_text> 332     <new_label_text>
333      NEW 333      NEW
334     </new_label_text> 334     </new_label_text>
335                      335                     
336     <sale_label> 336     <sale_label>
337      1 337      1
338     </sale_label> 338     </sale_label>
339                      339                     
340     <sale_label_percent> 340     <sale_label_percent>
341      1 341      1
342     </sale_label_percent> 342     </sale_label_percent>
343                      343                     
344     <sale_label_text> 344     <sale_label_text>
345      SALE 345      SALE
346     </sale_label_text> 346     </sale_label_text>
347                  347                 
348    </product_label> 348    </product_label>
349                 349                
350    <newsletter> 350    <newsletter>
351                      351                     
352     <enable> 352     <enable>
353      1 353      1
354     </enable> 354     </enable>
355                      355                     
356     <delay> 356     <delay>
357      5000 357      5000
358     </delay> 358     </delay>
359                      359                     
360     <logo_src> 360     <logo_src>
361      default/logo.png 361      default/logo.png
362     </logo_src> 362     </logo_src>
363                      363                     
364     <content> 364     <content>
365      <![CDATA[<h2>BE THE FIRST TO KNOW</h2><p>Subscribe to the Porto eCommerce newsletter to receive timely updates from your favorite products.</p>]]> 365      <![CDATA[<h2>BE THE FIRST TO KNOW</h2><p>Subscribe to the Porto eCommerce newsletter to receive timely updates from your favorite products.</p>]]>
366     </content> 366     </content>
367                      367                     
368     <width> 368     <width>
369      700px 369      700px
370     </width> 370     </width>
371                      371                     
372     <height> 372     <height>
373      320px 373      320px
374     </height> 374     </height>
375                      375                     
376     <bg_color> 376     <bg_color>
377     </bg_color> 377     </bg_color>
378                      378                     
379     <bg_image> 379     <bg_image>
380     </bg_image> 380     </bg_image>
381                      381                     
382     <custom_style> 382     <custom_style>
383      <![CDATA[]]> 383      <![CDATA[]]>
384     </custom_style> 384     </custom_style>
385                  385                 
386    </newsletter> 386    </newsletter>
387                 387                
388    <contacts> 388    <contacts>
389                      389                     
390     <enable> 390     <enable>
391      1 391      1
392     </enable> 392     </enable>
393                      393                     
394     <api_key> 394     <api_key>
395     </api_key> 395     </api_key>
396                      396                     
397     <full_width> 397     <full_width>
398      0 398      0
399     </full_width> 399     </full_width>
400                      400                     
401     <address> 401     <address>
402      Porto2 Store 402      Porto2 Store
403     </address> 403     </address>
404                      404                     
405     <latitude> 405     <latitude>
406      -34.398 406      -34.398
407     </latitude> 407     </latitude>
408                      408                     
409     <longitude> 409     <longitude>
410      150.884 410      150.884
411     </longitude> 411     </longitude>
412                      412                     
413     <zoom> 413     <zoom>
414      18 414      18
415     </zoom> 415     </zoom>
416                      416                     
417     <infoblock> 417     <infoblock>
418      <![CDATA[<div class="row"> 418      <![CDATA[<div class="row">
419          <div class="col-md-12"> 419          <div class="col-md-12">
420              <i class="porto-icon-phone"></i> 420              <i class="porto-icon-phone"></i>
421              <p>0201 203 2032</p> 421              <p>0201 203 2032</p>
422              <p>0201 203 2032</p> 422              <p>0201 203 2032</p>
423          </div> 423          </div>
424      </div> 424      </div>
425      <div class="row"> 425      <div class="row">
426          <div class="col-md-12"> 426          <div class="col-md-12">
427              <i class="porto-icon-mobile"></i> 427              <i class="porto-icon-mobile"></i>
428              <p>201-123-3922</p> 428              <p>201-123-3922</p>
429              <p>302-123-3928</p> 429              <p>302-123-3928</p>
430          </div> 430          </div>
431      </div> 431      </div>
432      <div class="row"> 432      <div class="row">
433          <div class="col-md-12"> 433          <div class="col-md-12">
434              <i class="porto-icon-mail-alt"></i> 434              <i class="porto-icon-mail-alt"></i>
435              <p>porto@gmail.com</p> 435              <p>porto@gmail.com</p>
436              <p>porto@portotemplate.com</p> 436              <p>porto@portotemplate.com</p>
437          </div> 437          </div>
438      </div> 438      </div>
439      <div class="row"> 439      <div class="row">
440          <div class="col-md-12"> 440          <div class="col-md-12">
441              <i class="porto-icon-skype"></i> 441              <i class="porto-icon-skype"></i>
442              <p>porto_skype</p> 442              <p>porto_skype</p>
443              <p>proto_template</p> 443              <p>proto_template</p>
444          </div> 444          </div>
445      </div>]]> 445      </div>]]>
446     </infoblock> 446     </infoblock>
447                      447                     
448     <customblock> 448     <customblock>
449     </customblock> 449     </customblock>
450                  450                 
451    </contacts> 451    </contacts>
452             452            
453   </porto_settings> 453   </porto_settings>
454            454           
455   <csp> 455   <csp>
456                 456                
457    <mode> 457    <mode>
458                      458                     
459     <storefront> 459     <storefront>
460                           460                          
461      <report_only> 461      <report_only>
462       0 462       0
463      </report_only> 463      </report_only>
464                       464                      
465     </storefront> 465     </storefront>
466                      466                     
467     <admin> 467     <admin>
468                           468                          
469      <report_only> 469      <report_only>
470       0 470       0
471      </report_only> 471      </report_only>
472                       472                      
473     </admin> 473     </admin>
474                  474                 
475    </mode> 475    </mode>
476             476            
477   </csp> 477   </csp>
478        478       
479  </default> 479  </default>
480 </config> 480 </config>