|
From: <tu...@us...> - 2018-02-06 20:23:10
|
Revision: 7940
http://sourceforge.net/p/web-erp/reponame/7940
Author: turbopt
Date: 2018-02-06 20:23:07 +0000 (Tue, 06 Feb 2018)
Log Message:
-----------
geo_displaymap_customers.php, geo_displaymap_suppliers.php: Fix a few PHP short-tags, and move some javascript from PHP output to fix 'missing tag' validation complaints.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/geo_displaymap_customers.php
trunk/geo_displaymap_suppliers.php
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-02-06 19:49:24 UTC (rev 7939)
+++ trunk/doc/Change.log 2018-02-06 20:23:07 UTC (rev 7940)
@@ -1,5 +1,6 @@
webERP Change Log
+6/2/18 geo_displaymap_customers.php, geo_displaymap_suppliers.php: Fix a few PHP short-tags, and move some javascript from PHP output to fix 'missing tag' validation complaints.
6/2/18 MRPPlannedPurchasekOrders.php, MRPPlannedWorkOrders.php: PaulT: Add missing table cell to work orders to match recent change to planned purchase orders and replace 'where clause joins' with table join in both files. Paul B/PaulT: Apply consistent code formatting between both files. (Some consistency matters reported in forums: http://www.weberp.org/forum/showthread.php?tid=8061)
5/2/18 PaulT: SalesGraph.php: Rework previous 7908 implementation that caused graphing to break. (Reported broken in forums by Paul Becker: http://www.weberp.org/forum/showthread.php?tid=8071)
4/2/18 PaulT: InternalStockRequestInquiry.php: Restore ONE space to previous 7936 commit.
Modified: trunk/geo_displaymap_customers.php
===================================================================
--- trunk/geo_displaymap_customers.php 2018-02-06 19:49:24 UTC (rev 7939)
+++ trunk/geo_displaymap_customers.php 2018-02-06 20:23:07 UTC (rev 7940)
@@ -31,13 +31,13 @@
}
</style>
-<?
+<?php
echo '<script src="http://' . $Map_Host . '/maps/api/js?key=' . $Api_Key . '&sensor=false"';
-echo ' type="text/javascript"></script>';
-echo ' <script type="text/javascript">';
-echo " //<![CDATA[ "; ?>
-?>
+echo ' type="text/javascript"></script>';?>
+<script type="text/javascript">
+//<![CDATA[
+
var customIcons = {
4: {
icon: 'http://labs.google.com/ridefinder/images/mm_20_blue.png'
@@ -49,7 +49,7 @@
function load() {
var map = new google.maps.Map(document.getElementById("map"), {
-<? echo 'center:new google.maps.LatLng(' . $Center_Lat . ', ' . $Center_Long . '),'; ?>
+<?php echo 'center:new google.maps.LatLng(' . $Center_Lat . ', ' . $Center_Long . '),'; ?>
zoom: 4,
mapTypeId: 'roadmap'
});
@@ -111,10 +111,10 @@
<body onload="load()" onunload="GUnload()">
<p>
- <? echo '<div class="centre" id="map" style="width: ' . $Map_Width . 'px; height: ' . $Map_Height . 'px"></div>'; ?>
+ <?php echo '<div class="centre" id="map" style="width: ' . $Map_Width . 'px; height: ' . $Map_Height . 'px"></div>'; ?>
</p>
</body>
-<?
+<?php
echo '<div class="centre"><a href="' . $RootPath . '/GeocodeSetup.php">' . _('Go to Geocode Setup') . '</a></div></p>';
include ('includes/footer.php');
?>
Modified: trunk/geo_displaymap_suppliers.php
===================================================================
--- trunk/geo_displaymap_suppliers.php 2018-02-06 19:49:24 UTC (rev 7939)
+++ trunk/geo_displaymap_suppliers.php 2018-02-06 20:23:07 UTC (rev 7940)
@@ -31,12 +31,11 @@
}
</style>
-<?
+<?php
echo '<script src="http://' . $Map_Host . '/maps/api/js?key=' . $Api_Key . '&sensor=false"';
-echo ' type="text/javascript"></script>';
-echo ' <script type="text/javascript">';
-echo " //<![CDATA[ "; ?>
-?>
+echo ' type="text/javascript"></script>';?>
+<script type="text/javascript">
+//<![CDATA[
var customIcons = {
4: {
@@ -49,7 +48,7 @@
function load() {
var map = new google.maps.Map(document.getElementById("map"), {
- <? echo 'center:new google.maps.LatLng(' . $Center_Lat . ', ' . $Center_Long . '),'; ?>
+ <?php echo 'center:new google.maps.LatLng(' . $Center_Lat . ', ' . $Center_Long . '),'; ?>
zoom: 4,
mapTypeId: 'roadmap'
});
@@ -111,10 +110,10 @@
<body onload="load()" onunload="GUnload()">
<p>
- <? echo '<div class="centre" id="map" style="width: ' . $Map_Width . 'px; height: ' . $Map_Height . 'px"></div>'; ?>
+ <?php echo '<div class="centre" id="map" style="width: ' . $Map_Width . 'px; height: ' . $Map_Height . 'px"></div>'; ?>
</p>
</body>
-<?
+<?php
echo '<div class="centre"><a href="' . $RootPath . '/GeocodeSetup.php">' . _('Go to Geocode Setup') . '</a></div></p>';
include ('includes/footer.php');
?>
|