184. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:01 +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.

184.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/layoutcatalog_category_view.xml2018-03-29 23:03:56 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/layoutcatalog_category_view.xml2021-01-19 08:38:30 +0000

184.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged2130
Changed00
Inserted113
Removed00

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

184.4 Active regular expressions

No regular expressions were active.

184.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="content" 32    name="content"
33   > 33   >
34                 34                
35    <block  35    <block 
36     class="Magento\Catalog\Block\Category\View"  36     class="Magento\Catalog\Block\Category\View" 
37     name="category_desc_main_column"  37     name="category_desc_main_column" 
38     template="category/desc_main_column.phtml"  38     template="category/desc_main_column.phtml" 
39     ifconfig="porto_settings/category/category_description"  39     ifconfig="porto_settings/category/category_description" 
40     before="category.products" 40     before="category.products"
41    /> 41    />
42             42            
43   </referenceContainer> 43   </referenceContainer>
44            44           
    45   <referenceContainer 
    46    name="after.body.start"
    47   >
    48                
    49    <block 
    50     class="Smartwave\Porto\Block\Template" 
    51     name="catalog_view_config" 
    52     after="-" 
    53     template="Magento_Catalog::category/config.phtml"
    54    />
    55            
    56   </referenceContainer>
    57           
45   <move  58   <move 
46    element="category.image"  59    element="category.image" 
47    destination="content 60    destination="content
48    before="category_desc_main_column" 61    before="category_desc_main_column"
49   /> 62   />
50            63           
51   <referenceContainer  64   <referenceContainer 
52    name="sidebar.main" 65    name="sidebar.main"
53   > 66   >
54                 67                
55    <block  68    <block 
56     class="Smartwave\Porto\Block\Template"  69     class="Smartwave\Porto\Block\Template" 
57     name="category_view_custom_block"  70     name="category_view_custom_block" 
58     after="-"  71     after="-" 
59     template="Magento_Catalog::category/custom_block.phtml" 72     template="Magento_Catalog::category/custom_block.phtml"
60    /> 73    />
61             74            
62   </referenceContainer> 75   </referenceContainer>
63        76       
64  </body> 77  </body>
65 </page> 78 </page>