From ee8e7eb3ee80ce0126a643223f6d8ea9bad46d69 Mon Sep 17 00:00:00 2001 From: Paul Becker Date: Tue, 27 Feb 2018 11:30:58 +0000 Subject: [PATCH] Paul Becker (PaulT commit): header.php: Add link to the Dashboard in the AppInfoUserDiv. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=8100) Signed-off-by: Tim Schofield --- doc/Change.log | 1 + includes/header.php | 51 +++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/doc/Change.log b/doc/Change.log index 29e700ba6..fcbb51e26 100644 --- a/doc/Change.log +++ b/doc/Change.log @@ -1,5 +1,6 @@ webERP Change Log +16/2/18 Paul Becker (PaulT commit): header.php: Add link to the Dashboard in the AppInfoUserDiv. (Forum contribution: http://www.weberp.org/forum/showthread.php?tid=8100) 16/2/18 PaulT: Remove unused $db parameter from many functions within the /api area. 16/2/18 PaulT: upgrade4.14.1-4.14.2.sql: Add SQL update to support commit 7961. 16/2/18 Paul Becker (PaulT commit): AgedControlledInventory.php: Add UOM to output. (Reported in forums: http://www.weberp.org/forum/showthread.php?tid=8091&pid=14286#pid14286) diff --git a/includes/header.php b/includes/header.php index 69c508e38..0d84f97cb 100644 --- a/includes/header.php +++ b/includes/header.php @@ -12,8 +12,8 @@ } } - $ViewTopic = isset($ViewTopic)?'?ViewTopic=' . $ViewTopic : ''; - $BookMark = isset($BookMark)? '#' . $BookMark : ''; + $ViewTopic = isset($ViewTopic) ? '?ViewTopic=' . $ViewTopic : ''; + $BookMark = isset($BookMark) ? '#' . $BookMark : ''; $StrictXHTML=False; if (!headers_sent()){ @@ -28,28 +28,29 @@ } echo '', '', - '', '', ''; + if ($StrictXHTML) { echo ''; } else { echo ''; } - echo ''; - echo '', + echo '', + '', '', '',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels). '', '', $Title, ''; + // If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text: if(isset($_SESSION['ShowPageHelp']) AND !$_SESSION['ShowPageHelp']) { echo ''; } - echo '', + echo '', '', '
', '', @@ -57,23 +58,24 @@ '
'; if (isset($Title)) { - echo '
'; //===HJ=== - echo '
'; - echo ''._('Company').'' . stripslashes($_SESSION['CompanyRecord']['coyname']); - echo '
'; - echo ''; - echo '
'; + echo '
', //===HJ=== + '
', + '', _('Company'), ' ', stripslashes($_SESSION['CompanyRecord']['coyname']), + '
', + '', + '
'; // Make the title text a class, can be set to display:none is some themes echo $Title; - echo '
'; - echo '
'; // AppInfoDiv - + echo '
', + '
'; // AppInfoDiv - echo '