133. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2020-08-14 00:01:36 +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.

133.1 Files compared

#LocationFileLast Modified
1Porto v3.2.3/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Contact/templatesgoogle_map.phtml2017-10-31 10:39:54 +0000
2Porto v3.2.4/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Contact/templatesgoogle_map.phtml2017-10-31 10:39:54 +0000

133.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged188
Changed00
Inserted00
Removed00

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

133.4 Active regular expressions

No regular expressions were active.

133.5 Comparison detail

1 <?php 1 <?php
2     $contacts_config = $this->getConfig('porto_settings/contacts'); 2     $contacts_config = $this->getConfig('porto_settings/contacts');
3     $_enable = $contacts_config['enable']; 3     $_enable = $contacts_config['enable'];
4     if($_enable){ 4     if($_enable){
5         $_apikey = $contacts_config['api_key']; 5         $_apikey = $contacts_config['api_key'];
6         $_full_width = $contacts_config['full_width']; 6         $_full_width = $contacts_config['full_width'];
7         $_address = $contacts_config['address']; 7         $_address = $contacts_config['address'];
8         $_zoom = $contacts_config['zoom']; 8         $_zoom = $contacts_config['zoom'];
9         $_center_lat = $contacts_config['latitude']; 9         $_center_lat = $contacts_config['latitude'];
10         $_center_lng = $contacts_config['longitude']; 10         $_center_lng = $contacts_config['longitude'];
11 ?> 11 ?>
12 <script type="text/javascript" src="//maps.googleapis.com/maps/api/js?<?php if($_apikey): ?>key=<?php echo $_apikey; ?><?php else: ?>v=3.17<?php endif; ?>"></script> 12 <script type="text/javascript" src="//maps.googleapis.com/maps/api/js?<?php if($_apikey): ?>key=<?php echo $_apikey; ?><?php else: ?>v=3.17<?php endif; ?>"></script>
13 <script type="text/javascript"> 13 <script type="text/javascript">
14     function initialize() { 14     function initialize() {
15         var pos = new google.maps.LatLng(<?php echo $_center_lat; ?>, <?php echo $_center_lng; ?>); 15         var pos = new google.maps.LatLng(<?php echo $_center_lat; ?>, <?php echo $_center_lng; ?>);
16         var mapOptions = { 16         var mapOptions = {
17             center: pos, 17             center: pos,
18             panControl: true, 18             panControl: true,
19             zoomControl: true, 19             zoomControl: true,
20             mapTypeControl: true, 20             mapTypeControl: true,
21             scaleControl: true, 21             scaleControl: true,
22             streetViewControl: true, 22             streetViewControl: true,
23             overviewMapControl: true, 23             overviewMapControl: true,
24             zoom: <?php echo $_zoom; ?> 24             zoom: <?php echo $_zoom; ?>
25         }; 25         };
26         var map = new google.maps.Map(document.getElementById("store_map"), mapOptions); 26         var map = new google.maps.Map(document.getElementById("store_map"), mapOptions);
27         var marker = new google.maps.Marker({ 27         var marker = new google.maps.Marker({
28             position: pos, 28             position: pos,
29             map: map, 29             map: map,
30             title: '<?php echo $_address; ?>' 30             title: '<?php echo $_address; ?>'
31         }); 31         });
32     } 32     }
33     google.maps.event.addDomListener(window, 'load', initialize); 33     google.maps.event.addDomListener(window, 'load', initialize);
34 </script> 34 </script>
35 <?php if(!$_full_width): ?> 35 <?php if(!$_full_width): ?>
36 <div class="container"> 36 <div class="container">
37 <?php endif; ?> 37 <?php endif; ?>
38 <div id="store_map" style="min-height: 300px; width: 100%;"></div> 38 <div id="store_map" style="min-height: 300px; width: 100%;"></div>
39 <?php if(!$_full_width): ?> 39 <?php if(!$_full_width): ?>
40 </div> 40 </div>
41 <?php endif; ?> 41 <?php endif; ?>
42 <?php 42 <?php
43     } 43     }
44 ?> 44 ?>