Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7324] trunk
|
From: <rc...@us...> - 2015-06-20 14:49:59
|
Revision: 7324
http://sourceforge.net/p/web-erp/reponame/7324
Author: rchacon
Date: 2015-06-20 14:49:56 +0000 (Sat, 20 Jun 2015)
Log Message:
-----------
Add meta tag to keep relationship between CSS pixels and device pixels.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/includes/header.inc
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2015-06-19 11:43:05 UTC (rev 7323)
+++ trunk/doc/Change.log 2015-06-20 14:49:56 UTC (rev 7324)
@@ -1,9 +1,10 @@
webERP Change Log
+20/06/15 RChacon: In header.inc, add meta tag to keep relationship between CSS pixels and device pixels.
19/06/15 : Kif (from webERP Chinese Community QQ group) fixed the menu cannot show completely on mobile phone in xenos/default.css.
04/06/15 TurboPT: Currencies.php: Add closing select, td and tr tags to complete last table row.
27/05/15 Thumb: Fix error_reporting() bug change && to & in install/index.php.
-25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
+25/5/15 Tom Barry: SupplierInquiry.php moved SQL to get the users authorisation to put supplier invoices on hold outside the loop to avoid unecessary round trips to the SQL server
21/5/15 RChacon: Adjust CustomerAccount.php for direct printing.
19/5/15 RChacon: Add documentation and help for users in Locations.php and ManualInventory.html.
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2015-06-19 11:43:05 UTC (rev 7323)
+++ trunk/includes/header.inc 2015-06-20 14:49:56 UTC (rev 7324)
@@ -3,8 +3,8 @@
// Titles and screen header
// Needs the file config.php loaded where the variables are defined for
- // $RootPath
- // $Title - should be defined in the page this file is included with
+ // $RootPath
+ // $Title - should be defined in the page this file is included with
if (!isset($RootPath)){
$RootPath = dirname(htmlspecialchars($_SERVER['PHP_SELF']));
if ($RootPath == '/' OR $RootPath == "\\") {
@@ -26,32 +26,31 @@
if($Title == _('Copy a BOM to New Item Code')){//solve the cannot modify heaer information in CopyBOM.php scritps
ob_start();
}
- echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+ echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+ '<html xmlns="http://www.w3.org/1999/xhtml">',
- echo '<html xmlns="http://www.w3.org/1999/xhtml"><head><title>' . $Title . '</title>';
- echo '<link rel="shortcut icon" href="'. $RootPath.'/favicon.ico" />';
- echo '<link rel="icon" href="' . $RootPath.'/favicon.ico" />';
+ '<head>',
+ '<link rel="icon" href="', $RootPath, '/favicon.ico" />',
+ '<link rel="shortcut icon" href="', $RootPath, '/favicon.ico" />';
if ($StrictXHTML) {
echo '<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />';
} else {
echo '<meta http-equiv="Content-Type" content="application/html; charset=utf-8" />';
}
- echo '<link href="' . $RootPath . '/css/print.css" rel="stylesheet" type="text/css" media="print" />';
- echo '<link href="' . $RootPath . '/css/'. $_SESSION['Theme'] .'/default.css" rel="stylesheet" type="text/css" media="screen"/>';
- echo '<script type="text/javascript" src = "'.$RootPath.'/javascripts/MiscFunctions.js"></script>';
- echo '</head>';
- echo '<body>';
+ echo '<link href="', $RootPath, '/css/print.css" rel="stylesheet" type="text/css" media="print" />',
+ '<link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>',
+/* '<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels).*/
+ '<script type="text/javascript" src="', $RootPath, '/javascripts/MiscFunctions.js"></script>',
+ '<title>', $Title, '</title>',
+ '</head>',
- echo '<div id="CanvasDiv">';
- echo '<input type="hidden" name="Lang" id="Lang" value="'.$Lang.'" />';
- echo '<div id="HeaderDiv">';
- echo '<div id="HeaderWrapDiv">';
+ '<body>',
+ '<div id="CanvasDiv">',
+ '<input type="hidden" name="Lang" id="Lang" value="', $Lang, '" />',
+ '<div id="HeaderDiv">',
+ '<div id="HeaderWrapDiv">';
-
if (isset($Title)) {
-
-
echo '<div id="AppInfoDiv">'; //===HJ===
echo '<div id="AppInfoCompanyDiv">';
echo '<img alt="'._('Company').'" src="'.$RootPath.'/css/'.$Theme.'/images/company.png" title="'._('Company').'" />' . stripslashes($_SESSION['CompanyRecord']['coyname']);
@@ -92,9 +91,9 @@
echo '</ul></div>'; // QuickMenuDiv
}
- echo '</div>'; // HeaderWrapDiv
- echo '</div>'; // Headerdiv
- echo '<div id="BodyDiv">';
- echo '<div id="BodyWrapDiv">';
+ echo '</div>',// Close HeaderWrapDiv
+ '</div>',// Close Headerdiv
+ '<div id="BodyDiv">',
+ '<div id="BodyWrapDiv">';
-?>
\ No newline at end of file
+?>
|
