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

186.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_product_view.xml2018-06-18 23:08:08 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/layoutcatalog_product_view.xml2021-02-22 02:24:20 +0000

186.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged6318
Changed210
Inserted00
Removed315

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  * See COPYING.txt for license details. 7  * See COPYING.txt for license details.
8  */ 8  */
9 --> 9 -->
10 <page  10 <page 
11  layout="2columns-right"  11  layout="2columns-right" 
12  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  12  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
13  xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd" 13  xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
14 > 14 >
15       15      
16  <body> 16  <body>
17            17           
18   <referenceContainer  18   <referenceContainer 
19    name="sidebar.additional" 19    name="sidebar.additional"
20   > 20   >
21                 21                
22    <block  22    <block 
23     class="Smartwave\Porto\Block\Template"  23     class="Smartwave\Porto\Block\Template" 
24     name="product_view_custom_block"  24     name="product_view_custom_block" 
25     before="-"  25     before="-" 
26     template="Magento_Catalog::product/view/custom_block.phtml" 26     template="Magento_Catalog::product/view/custom_block.phtml"
27    /> 27    />
28             28            
29   </referenceContainer> 29   </referenceContainer>
30            30           
31   <move  31   <move 
32    element="product.info.stock.sku"     
33    destination="product.info.price"     
34    after="product.price.final"    
35   />    
36               
37   <move     
38    element="product.info.review"  32    element="product.info.review" 
39    destination="product.info.main 33    destination="product.info.main
40    before="product.info.price" 34    before="product.info.price"
41   /> 35   />
42            36           
43   <move  37   <move 
44    element="catalog.product.related"  38    element="catalog.product.related" 
45    destination="sidebar.additional"  39    destination="sidebar.additional" 
46    after="product_view_custom_block" 40    after="product_view_custom_block"
47   /> 41   />
48            42           
49   <!--<referenceBlock name="catalog.product.related" remove="true"/>-->    
50               
51   <move  43   <move 
52    element="product.info.overview 44    element="product.info.overview
53    destination="product.info.main 45    destination="product.info.main
54    after="product.info.review" 46    after="product.info.price"
    47   />
    48           
    49   <move 
    50    element="product.info.stock.sku" 
    51    destination="product.info.main
    52    after="product.info.price"
55   /> 53   />
56            54           
57   <referenceContainer  55   <referenceContainer 
58    name="after.body.start" 56    name="after.body.start"
59   > 57   >
60                 58                
61    <block  59    <block 
62     class="Magento\Catalog\Block\Product\View"  60     class="Magento\Catalog\Block\Product\View" 
63     name="product_custom 61     name="product_custom
64     template="Magento_Catalog::product/view/product_custom.phtml 62     template="Magento_Catalog::product/view/product_custom.phtml
65     before="-" 63     before="-"
66    /> 64    />
67                 65                
68    <block  66    <block 
69     class="Smartwave\Porto\Block\Template"  67     class="Smartwave\Porto\Block\Template" 
70     name="product_view_config"  68     name="product_view_config" 
71     after="-"  69     after="-" 
72     template="Magento_Catalog::product/view/config.phtml" 70     template="Magento_Catalog::product/view/config.phtml"
73    /> 71    />
74             72            
75   </referenceContainer> 73   </referenceContainer>
76            74           
77   <referenceContainer  75   <referenceContainer 
78    name="columns.top" 76    name="columns.top"
79   > 77   >
80                 78                
81    <block  79    <block 
82     class="Magento\Catalog\Block\Product\View"  80     class="Magento\Catalog\Block\Product\View" 
83     name="prev_next_products"  81     name="prev_next_products" 
84     template="Magento_Catalog::product/view/prev_next.phtml"  82     template="Magento_Catalog::product/view/prev_next.phtml" 
85     before="-" 83     before="-"
86    /> 84    />
87             85            
88   </referenceContainer> 86   </referenceContainer>
89            87           
90   <move  88   <move 
91    element="prev_next_products"  89    element="prev_next_products" 
92    destination="product.info.main 90    destination="product.info.main
93    before="-" 91    before="-"
94   /> 92   />
95            93           
96   <move  94   <move 
97    element="page.main.title"  95    element="page.main.title" 
98    destination="product.info.main 96    destination="product.info.main
99    before="-" 97    before="-"
100   /> 98   />
101            99           
102   <referenceContainer  100   <referenceContainer 
103    name="product.info.social" 101    name="product.info.social"
104   > 102   >
105                 103                
106    <block  104    <block 
107     class="Smartwave\Porto\Block\Template"  105     class="Smartwave\Porto\Block\Template" 
108     name="product_view_addthis_links"  106     name="product_view_addthis_links" 
109     after="-"  107     before="-" 
110     template="Magento_Catalog::product/view/addthis.phtml" 108     template="Magento_Catalog::product/view/addthis.phtml"
111    /> 109    />
112             110            
113   </referenceContainer> 111   </referenceContainer>
114            112           
115   <referenceContainer  113   <referenceContainer 
116    name="content" 114    name="content"
117   > 115   >
118                 116                
119    <block  117    <block 
120     class="Smartwave\Porto\Block\RickSnippet 118     class="Smartwave\Porto\Block\RickSnippet
121     name="rich_snippet"  119     name="rich_snippet" 
122     template="Magento_Catalog::product/view/rich_snippet.phtml"  120     template="Magento_Catalog::product/view/rich_snippet.phtml" 
123     before="-" 121     before="-"
124    /> 122    />
125                 123                
126    <block  124    <block 
127     class="Smartwave\Porto\Block\Template"  125     class="Smartwave\Porto\Block\Template" 
128     name="product_view_main_custom_block"  126     name="product_view_main_custom_block" 
129     ifconfig="porto_settings/product/main_custom_block 127     ifconfig="porto_settings/product/main_custom_block
130     before="product.info.main"  128     before="product.info.main" 
131     template="Magento_Catalog::product/view/main_custom_block.phtml" 129     template="Magento_Catalog::product/view/main_custom_block.phtml"
132    /> 130    />
133                 131                
134    <block  132    <block 
135     class="Smartwave\Porto\Block\Template"  133     class="Smartwave\Porto\Block\Template" 
136     name="product_view_main_custom_block2"     
137     after="-"     
138     template="Magento_Catalog::product/view/main_custom_block2.phtml"    
139    />    
140                    
141    <block     
142     class="Smartwave\Porto\Block\Template"     
143     name="product.clearer"  134     name="product.clearer" 
144     after="product.info.media"  135     after="product.info.media" 
145     template="Magento_Catalog::product/view/clearer.phtml" 136     template="Magento_Catalog::product/view/clearer.phtml"
146    /> 137    />
147             138            
148   </referenceContainer> 139   </referenceContainer>
149            140           
150   <move  141   <move 
151    element="product_view_main_custom_block2 142    element="product_view_main_custom_block2
152    destination="product.info.main 143    destination="product.info.main
153    after="product.info.overview" 144    after="product.info.overview"
154   /> 145   />
155            146           
156   <move  147   <move 
157    element="product.info.main"  148    element="product.info.main" 
158    destination="content 149    destination="content
159    after="product.info.media" 150    after="product.info.media"
160   /> 151   />
161            152           
162   <referenceContainer  153   <referenceContainer 
163    name="columns" 154    name="columns"
164   > 155   >
165                 156                
166    <block  157    <block 
167     class="Smartwave\Porto\Block\Template"  158     class="Smartwave\Porto\Block\Template" 
168     name="side_popup"  159     name="side_popup" 
169     after="-"  160     after="-" 
170     template="Magento_Catalog::product/view/side_popup.phtml" 161     template="Magento_Catalog::product/view/side_popup.phtml"
171    /> 162    />
172             163            
173   </referenceContainer> 164   </referenceContainer>
174        165       
175  </body> 166  </body>
176 </page> 167 </page>