186. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:01:04 +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.

186.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/layoutcatalog_category_view.xml2022-05-12 09:13:45 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/layoutcatalog_category_view.xml2023-03-06 03:23:43 +0000

186.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged3166
Changed00
Inserted121
Removed15

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

186.4 Active regular expressions

No regular expressions were active.

186.5 Comparison detail

1 <?xml  1 <?xml 
2  version="1.0" 2  version="1.0"
3 ?> 3 ?>
4 <!-- 4 <!--
5 /** 5 /**
6  * Copyright © 2018 Porto. All rights reserved. 6  * Copyright © 2018 Porto. All rights reserved.
7  */ 7  */
8 --> 8 -->
9 <page  9 <page 
10  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  10  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
11  layout="2columns-left"  11  layout="2columns-left" 
12  xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd" 12  xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
13 > 13 >
14       14      
15  <body> 15  <body>
16            16           
17   <referenceContainer  17   <referenceContainer 
18    name="page.top" 18    name="page.top"
19   > 19   >
20                  20                 
21    <block  21    <block 
22     class="Magento\Catalog\Block\Category\View"  22     class="Magento\Catalog\Block\Category\View" 
23     name="category_banner"  23     name="category_banner" 
24     template="category/banner.phtml"  24     template="category/banner.phtml" 
25     ifconfig="porto_settings/category/category_description"  25     ifconfig="porto_settings/category/category_description" 
26     before="-" 26     before="-"
27    /> 27    />
28             28            
29   </referenceContainer> 29   </referenceContainer>
30            30           
31   <referenceContainer  31   <referenceContainer 
    32    name="columns.top"
    33   >
    34                
    35    <container 
    36     name="category.view.container" 
    37     htmlTag="div" 
    38     htmlClass="category-view" 
    39     after="-"
    40    >
    41                     
    42     <block 
    43      class="Magento\Catalog\Block\Category\View" 
    44      name="category.description.default" 
    45      template="Magento_Catalog::category/description.phtml"
    46     />
    47                 
    48    </container>
    49            
    50   </referenceContainer>
    51           
    52   <referenceContainer 
32    name="content" 53    name="content"
33   > 54   >
34                 55                
35    <block  56    <block 
36     class="Magento\Catalog\Block\Category\View"  57     class="Magento\Catalog\Block\Category\View" 
37     name="category_desc_main_column"  58     name="category_desc_main_column" 
38     template="category/desc_main_column.phtml"  59     template="category/desc_main_column.phtml" 
39     ifconfig="porto_settings/category/category_description"  60     ifconfig="porto_settings/category/category_description" 
40     before="category.products" 61     before="category.products"
41    /> 62    />
42             63            
43   </referenceContainer> 64   </referenceContainer>
44            65           
45   <referenceContainer  66   <referenceContainer 
46    name="after.body.start" 67    name="after.body.start"
47   > 68   >
48                 69                
49    <block  70    <block 
50     class="Smartwave\Porto\Block\Template"  71     class="Smartwave\Porto\Block\Template" 
51     name="catalog_view_config"  72     name="catalog_view_config" 
52     after="-"  73     after="-" 
53     template="Magento_Catalog::category/config.phtml" 74     template="Magento_Catalog::category/config.phtml"
54    /> 75    />
55             76            
56   </referenceContainer> 77   </referenceContainer>
57            78           
58   <move  79   <move 
59    element="category.image"  80    element="category.image" 
60    destination="content 81    destination="content
61    before="category_desc_main_column" 82    before="category_desc_main_column"
62   /> 83   />
63            84           
64   <referenceBlock  85   <referenceBlock 
65    name="category.description"  86    name="category.description" 
66    remove="1" 87    remove="1"
67   /> 88   />
68            89           
69   <referenceBlock     
70    name="category.cms"     
71    remove="1"    
72   />    
73               
74   <referenceContainer  90   <referenceContainer 
75    name="sidebar.main" 91    name="sidebar.main"
76   > 92   >
77                 93                
78    <block  94    <block 
79     class="Smartwave\Porto\Block\Template"  95     class="Smartwave\Porto\Block\Template" 
80     name="category_view_custom_block"  96     name="category_view_custom_block" 
81     after="-"  97     after="-" 
82     template="Magento_Catalog::category/custom_block.phtml" 98     template="Magento_Catalog::category/custom_block.phtml"
83    /> 99    />
84             100            
85   </referenceContainer> 101   </referenceContainer>
86        102       
87  </body> 103  </body>
88 </page> 104 </page>