258. Araxis Merge File Comparison Report

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

258.1 Files compared

#	Location	File	Last Modified
1	Porto v4.0.5/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/layout	catalog_category_view.xml	2023-03-06 03:23:43 +0000
2	Porto v4.0.6/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Catalog/layout	catalog_category_view.xml	2023-07-04 08:07:58 +0000

258.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	4	186
Changed	0	0
Inserted	2	17
Removed	1	11

258.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

258.4 Active regular expressions

No regular expressions were active.

258.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"	32	name="columns.top"
33	>	33	>
34		34
35	<container	35	<container
36	name="category.view.container"	36	name="category.view.container"
37	htmlTag="div"	37	htmlTag="div"
38	htmlClass="category-view"	38	htmlClass="category-view"
39	after="-"	39	after="-"
40	>	40	>
41		41
42	<block	42	<block
43	class="Magento\Catalog\Block\Category\View"	43	class="Magento\Catalog\Block\Category\View"
44	name="category.description.default"	44	name="category.description.default"
45	template="Magento_Catalog::category/description.phtml"	45	template="Magento_Catalog::category/description.phtml"
46	/>	46	/>
47		47
		48	<block
		49	class="Magento\Catalog\Block\Category\View"
		50	name="category.cms"
		51	template="Magento_Catalog::category/cms.phtml"
		52	/>
		53
48	</container>	54	</container>
49		55
50	</referenceContainer>	56	</referenceContainer>
51		57
52	<referenceContainer	58	<referenceContainer
53	name="content"	59	name="content"
54	>	60	>
55		61
56	<block	62	<block
57	class="Magento\Catalog\Block\Category\View"	63	class="Magento\Catalog\Block\Category\View"
58	name="category_desc_main_column"	64	name="category_desc_main_column"
59	template="category/desc_main_column.phtml"	65	template="category/desc_main_column.phtml"
60	ifconfig="porto_settings/category/category_description"	66	ifconfig="porto_settings/category/category_description"
61	before="category.products"	67	before="category.products"
62	/>	68	/>
63		69
64	</referenceContainer>	70	</referenceContainer>
65		71
66	<referenceContainer	72	<referenceContainer
67	name="after.body.start"	73	name="after.body.start"
68	>	74	>
69		75
70	<block	76	<block
71	class="Smartwave\Porto\Block\Template"	77	class="Smartwave\Porto\Block\Template"
72	name="catalog_view_config"	78	name="catalog_view_config"
73	after="-"	79	after="-"
74	template="Magento_Catalog::category/config.phtml"	80	template="Magento_Catalog::category/config.phtml"
75	/>	81	/>
76		82
77	</referenceContainer>	83	</referenceContainer>
78		84
79	<move
80	element="category.image"
81	destination="content"
82	before="category_desc_main_column"
83	/>
84
85	<referenceBlock
86	name="category.description"
87	remove="1"
88	/>
89
90	<referenceContainer	85	<referenceContainer
91	name="sidebar.main"	86	name="sidebar.main"
92	>	87	>
93		88
94	<block	89	<block
95	class="Smartwave\Porto\Block\Template"	90	class="Smartwave\Porto\Block\Template"
96	name="category_view_custom_block"	91	name="category_view_custom_block"
97	after="-"	92	after="-"
98	template="Magento_Catalog::category/custom_block.phtml"	93	template="Magento_Catalog::category/custom_block.phtml"
99	/>	94	/>
100		95
101	</referenceContainer>	96	</referenceContainer>
102		97
		98	<move
		99	element="category.image"
		100	destination="content"
		101	before="category_desc_main_column"
		102	/>
		103
		104	<referenceBlock
		105	name="category.description"
		106	remove="1"
		107	/>
		108
103	</body>	109	</body>
104	</page>	110	</page>