Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5559] trunk
|
From: <dai...@us...> - 2012-07-26 08:28:06
|
Revision: 5559
http://web-erp.svn.sourceforge.net/web-erp/?rev=5559&view=rev
Author: daintree
Date: 2012-07-26 08:27:54 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
Hindra's theming work
Modified Paths:
--------------
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/includes/footer.inc
trunk/includes/header.inc
trunk/index.php
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2012-07-25 09:31:43 UTC (rev 5558)
+++ trunk/css/aguapop/default.css 2012-07-26 08:27:54 UTC (rev 5559)
@@ -1,79 +1,311 @@
-/*** hj aquapop new ***/
+/***
+
+New AguaPop theme for WebERP by Hindra Joshua
+
+Using new theming support any without background images
+
+****/
+
body {
- background: silver;
-}
-#CanvasDiv {
- background: none;
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 9px;
- margin-left: auto;
- margin-right: auto;
- width: 960px;
+ font-size: 8pt;
+/* color:white;*/
+ background: silver;
+ margin:0;
+ padding:0;
}
+
+img {
+ vertical-align:middle;
+}
+/*a {
+ color: blue;
+ text-decoration: none;
+}
+a:hover {
+ color: lightblue;
+ text-decoration: none;
+}*/
+table {
+ background-color: none;
+ margin: 0 auto;
+ width:90%
+}
+
+
+/*** CANVAS ************************************************************/
+
+#CanvasDiv {
+ background:steelblue;
+ margin:10px;
+ border:thick outset steelblue;
+ border-radius:20px;
+}
+
/*** HEADER ************************************************************/
+
#HeaderDiv {
- background: url(images/top_bg.png) top no-repeat silver;
+ padding:2px;
+ color:white;
}
-.HeaderTbl {
- padding-top:12px;
- width:99%;
+#HeaderDiv a{
+ color:white;
+ text-decoration:none;
+ border:2px inset transparent;
+ border-radius:10px;
+ padding:3px;
}
+#HeaderDiv a:hover{
+ color:cyan;
+ border:2px inset steelblue;
+ border-radius:10px;
+ padding:3px;
+}
+#HeaderWrapDiv{
+}
+#AppInfoDiv{
+ float:left;
+}
+#AppInfoCompanyDiv{
+ float:left;
+}
+#AppInfoUserDiv{
+ float:left;
+}
+#AppInfoModuleDiv{
+ font-weight:bold;
+ font-size:10pt;
+}
+
+/*** Quick Menu ***/
+
+#QuickMenuDiv{
+ float:right;
+}
+#QuickMenuDiv ul{
+ list-style:none;
+ float:right;
+}
+#QuickMenuDiv ul li{
+ display:inline;
+ margin: 0px 3px;
+ float: left;
+}
+
/*** BODY **************************************************************/
+
#BodyDiv {
- background:url("images/body_bg.png") repeat-y scroll center center silver;
- text-align:center;
+ clear:both;
}
-.BodyTbl {
- background:none repeat scroll 0 0 steelblue;
- width:932px;
+#BodyWrapDiv{
+ background:lightsteelblue;
+ margin:5px;
}
-/*** eof BodyDiv ***
-/*** FOOTER ************************************************************/
-#FooterDiv {
- background: url(images/footer.png) bottom no-repeat silver;
- padding-top: 10px;
- padding-bottom: 18px;
+/*** MAIN MENU ***/
+
+#MainMenuDiv{
+ float:left;
+ width:10%;
+ white-space:nowrap;
+ text-align:center;
+ padding:3px;
}
+#MainMenuDiv ul{
+ margin:0;
+ padding:0;
+}
+#MainMenuDiv li{
+ list-style:none;
+}
+#MainMenuDiv li a:link, a:visited{
+ color:white;
+ text-decoration:none;
+}
+#MainMenuDiv li a:hover{
+ color:cyan;
+}
-.FooterTbl {
- width:838px;
+.main_menu_unselected {
+ border:2px inset transparent;
+ border-radius:10px;
+ padding:3px;
}
-/************************************************************************/
+.main_menu_unselected:hover{
+ border:2px inset steelblue;
+ border-radius:10px;
+ padding:3px;
+}
+.main_menu_unselected a{
+}
+.main_menu_unselected a:hover{
+}
-img {
- border: none;
- vertical-align:middle;
+.main_menu_selected {
+ border:2px inset steelblue;
+ border-radius:10px;
+ padding:3px;
}
+.main_menu_selected:hover{
+ border:2px inset steelblue;
+ border-radius:10px;
+ padding:3px;
+}
+.main_menu_selected a{
+}
+.main_menu_selected a:hover{
+}
-/*links before selection */
-a {
+/*********************************************/
+#SubMenuDiv{
+ float:right;
+ margin:0;
+ padding:0;
+ overflow: hidden;
+ width: 87%;
+}
+#SubMenuDiv ul{
+ margin:0;
+ padding:0;
+}
+#SubMenuDiv li{
+ list-style:none;
+}
+#SubMenuDiv a{
+ color:black;
+ text-decoration:none;
+}
+#SubMenuDiv a:hover{
+ color:blue;
+ text-decoration:none;
+}
+#TransactionsDiv{
+ background:whitesmoke;
+ border:thin inset whitesmoke;
+ float:left;
+ list-style:none;
+ width:32%;
+ padding:0px;
+}
+#InquiriesDiv{
+ background:whitesmoke;
+ border:thin inset whitesmoke;
+ float:left;
+ list-style:none;
+ width:32%;
+ padding:0px;
+}
+#MaintenanceDiv{
+ background:whitesmoke;
+ border:thin inset whitesmoke;
+ float:left;
+ list-style:none;
+ width:32%;
+ padding:0px;
+}
+.menu_group_headers {
+ background:steelblue;
+ border:thin outset steelblue;
+ padding:3px;
+ text-align:center;
+ color:white;
+}
+.menu_group_headers table{
+}
+.menu_group_img {
+ background-color: gainsboro;
+ text-align: center;
+ width: 90px;
+ position: relative;
+ left: 3px;
+}
+
+.menu_group_img img{
+ position: relative;
+ top: 10px;
+}
+
+.menu_group_area {
font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 9px;
+ font-size: 11px;
font-weight: bold;
- text-decoration: none;
- color: black;
+ border-top: 0px;
+ margin-top: 0px;
+ padding-top: 0px; /*this creates the border*/
+ color: seagreen;
}
-/*links on any screen when mouse is hovering over them */
-a:hover {
- color: seagreen;
- text-decoration: none;
+.blank_area table {
+ border: 0px;
+ width: 100%;
}
-table {
- background-color: none;
- margin: 0 auto;
- width:90%
+
+
+.menu_group_headers_text {
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: white;
}
+.menu_group_items {
+ vertical-align: top;
+ background-color: white;
+ font-weight: bold;
+ padding: 15px;
+ border: 1px inset steelblue;
+}
+
+.menu_group_item {
+ padding:3px;
+}
+.menu_group_item:hover{
+ background:lightblue;
+}
+
+.menu_group_item p {
+ color: steelblue; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+ text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
+ margin: 0 0 0 12px;
+}
+/*** FOOTER ************************************************************/
+#FooterDiv{
+ clear:both;
+ color:black;
+ height:52px;
+}
+#FooterWrapDiv{
+ padding:5px;
+}
+#FooterLogoDiv{
+ background:white;
+ border:2px outset sandybrown;
+ border-radius:8px 8px 8px 8px;
+ float:left;
+ padding:5px;
+}
+#FooterVersionDiv{
+ float:left;
+ margin-left:10px;
+ margin-top:15px;
+
+}
+#FooterTimeDiv{
+ float:right;
+ margin-top:15px;
+}
+
+/************************************************************************/
+
+
.dpTbl {
border: solid navy 1px;
}
div.centre {
- /*padding-bottom:10px;*/
+ padding-bottom:5px;
text-align:center;
}
@@ -89,8 +321,8 @@
}
table.selection {
- background:none repeat scroll 0 0 lightsteelblue;
- border:2px outset steelblue;
+ background:whitesmoke;
+ border:2px inset whitesmoke;
padding:0;
width:90%;
}
@@ -400,47 +632,6 @@
margin: 2px;
}
-.main_menu_unselected {
- background-color: steelblue;
- padding: 2px;
- border-bottom: 2px;
- font-weight: normal;
- position: relative;
- top: 0px;
- text-align: left;
- white-space: nowrap;
-
-}
-
-.main_menu_unselected:hover{
-}
-.main_menu_selected:hover{
-}
-
-.main_menu_unselected a{
-}
-
-.main_menu_unselected a:hover{
-}
-
-.main_menu_selected {
- background: url(images/tab_bg.png)right no-repeat steelblue;
- padding: 3px;
- padding-right: 0px;
- font-weight: normal;
- position: relative;
- text-align: right;
- white-space: nowrap;
-}
-
-.main_menu_selected a{
-
-}
-
-.main_menu_selected a:hover{
-
-}
-
span.main_menu_nolink {
font-family: Arial, Verdana, Helvetica, sans-serif;
font-size: 10px;
@@ -462,73 +653,12 @@
color: lightsteelblue;
}
-.menu_group_img {
- background-color: gainsboro;
- text-align: center;
- width: 90px;
- position: relative;
- left: 3px;
-}
-.menu_group_img img{
- position: relative;
- top: 10px;
-}
-.menu_group_area {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 11px;
- font-weight: bold;
- border-top: 0px;
- margin-top: 0px;
- padding-top: 0px; /*this creates the border*/
- color: seagreen;
-}
-
-.blank_area table {
- border: 0px;
- width: 100%;
-}
-
-.menu_group_headers {
- background:lightsteelblue;
-}
-
-.menu_group_headers table{
- }
-
-.menu_group_headers_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: white;
-}
-
-.menu_group_items {
- vertical-align: top;
- background-color: white;
- font-weight: bold;
- padding: 15px;
- border: 1px inset steelblue;
-}
-
-.menu_group_item {
- background-color: white;
- padding-top: 2px;
- padding-bottom: 2px;
-}
-
-.menu_group_item p {
- color: steelblue; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
- text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
- margin: 0 0 0 12px;
-}
-
.page_title_text {
font-weight:bold;
- margin-top:0;
- padding-bottom:5px;
- padding-top:5px;
+ text-align:center;
+ padding-top:5px;
}
DIV.page_help_text {
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2012-07-25 09:31:43 UTC (rev 5558)
+++ trunk/css/default/default.css 2012-07-26 08:27:54 UTC (rev 5559)
@@ -1,25 +1,20 @@
-/*--------------------------------------------------\
-| | | default.css |
-|---------------------------------------------------|
-| For use with: |
-| Web-ERP - http://web-erp.sourceforge.net |
-\--------------------------------------------------*/
+/***
-/* $Id$*/
+New Default Theme for WebERP
+***/
+
body {
font-family: Arial, Verdana, Helvetica, sans-serif;
font-size: 10px;
background-color: #CCCCDD;
- margin-left: 0px;
- margin-top: 0px;
- margin-bottom: 0px;
- margin-right: 0px;
- padding: 0px;
+ margin:0;
+ padding:0
}
img {
border:none;
+ vertical-align:middle;
}
/*links before selection */
@@ -41,17 +36,259 @@
table {
background-color: #587BA6;
margin: 0 auto;
+ width:100%;
}
-.dpTbl {
- border: solid navy 1px;
+
+/*** CANVAS ***/
+
+#CanvasDiv {
}
+/*** HEADER ***/
+
+#HeaderDiv {
+ color:white;
+ background:#588BB6;
+ overflow:hidden;
+}
+#HeaderDiv a{
+ color:white;
+}
+#HeaderDiv a:hover{
+ color:black;
+ background:white;
+ text-decoration:underline;
+}
+#HeaderWrapDiv{
+}
+
+/*** HEADER - APP INFO ***/
+
+#AppInfoDiv{
+ display:table;
+ float:left;
+ padding:
+}
+#AppInfoDiv img{
+ vertical-align:middle;
+}
+#AppInfoCompanyDiv{
+ display:table-cell;
+}
+#AppInfoUserDiv{
+ display:table-cell;
+}
+#AppInfoModuleDiv{
+ display:table-row-group;
+}
+
+/*** HEADER - QUICK MENU ***/
+
+#QuickMenuDiv{
+ float:right;
+}
+#QuickMenuDiv ul{
+}
+#QuickMenuDiv ul li{
+ display:inline;
+ border-left:thin ridge #588BB6;
+ padding:10px;
+}
+
+/*** BODY ***/
+
+#BodyDiv {
+ clear:both;
+/* margin-left:5px;
+ margin-right:5px;*/
+ color:black;
+ background:#588BB6;
+ overflow:hidden;
+}
+#BodyDiv table {
+ width:90%;
+ text-align:center;
+}
+
+#BodyWrapDiv{
+ background:#CCCCCC;
+}
+
+/*** BODY - MAIN MENU ***/
+
+#MainMenuDiv{
+ float:left;
+ width:11%;
+ white-space:nowrap;
+ text-align:center;
+ border:thin solid gray;
+}
+#MainMenuDiv ul{
+ margin:0;
+ padding:0;
+}
+#MainMenuDiv li{
+ list-style:none;
+}
+#MainMenuDiv li a:link, a:visited{
+/* color:black;
+ font-weight:bold;*/
+}
+#MainMenuDiv li a:hover{
+ color:black;
+ background:white;
+ text-decoration:underline;
+}
+
+.main_menu_unselected{
+ background:#40FC40;
+ padding:2px;
+}
+.main_menu_unselected:hover{
+ background:white;
+}
+.main_menu_unselected a{
+}
+.main_menu_unselected a:hover{
+}
+.main_menu_selected {
+ background-color: white;
+ border:thin solid gray;
+ font-weight: normal;
+ text-align: center;
+ white-space: nowrap;
+ padding:2px;
+}
+.main_menu_selected:hover{
+}
+.main_menu_selected a{
+}
+.main_menu_selected a:hover{
+}
+
+/*** BODY - SUB MENU ***/
+
+#SubMenuDiv{
+ display:table;
+ float:right;
+ overflow: hidden;
+ min-width: 88%;
+}
+#SubMenuDiv ul{
+ margin:0;
+ padding:0;
+}
+#SubMenuDiv li{
+ list-style:none;
+}
+#SubMenuDiv a{
+}
+#SubMenuDiv a:hover{
+ color:green;
+ text-decoration:underline;
+}
+#TransactionsDiv{
+ float:left;
+ list-style:none;
+ width:33%;
+ border:thin solid black;
+ background:#EEEEEE;
+/* display:table-cell; */
+}
+#InquiriesDiv{
+ float:left;
+ list-style:none;
+ width:33%;
+ border:thin solid black;
+ background:#EEEEEE;
+/* display:table-cell; */
+}
+#MaintenanceDiv{
+ float:left;
+ list-style:none;
+ width:33%;
+ border:thin solid black;
+ background:#EEEEEE;
+/* display:table-cell; */
+}
+.menu_group_headers {
+ text-align:center;
+ color:black;
+ background:#EEEEEE;
+ border: thin outset #EEEEEE;
+}
+/*.menu_group_headers table{
+}*/
+/*.menu_group_headers_text {
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 10px;
+ font-weight: normal;
+ color: white;
+}
+*/
+/*.menu_group_items {
+ background-color: white;
+ font-weight: normal;
+ padding: 15px;
+ border-top: 0px #AAAAAA solid;
+ border-left: 0px #AAAAAA solid;
+ border-right: 0px white solid;
+ border-bottom: 0px white solid;
+}*/
+.menu_group_item {
+ background-color: white;
+ padding:2px;
+}
+.menu_group_item p {
+ color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+ text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
+ margin: 0 0 0 12px; /* One thing that I didn´t like of the li was that it had no left margin applied */
+}
+
+/*** FOOTER ***/
+
+#FooterDiv{
+ clear:both;
+ color:#CCCCCC;
+ background:#588BB6;
+ overflow:hidden;
+}
+#FooterWrapDiv{
+ overflow:hidden;
+ padding:5px;
+}
+#FooterLogoDiv{
+ background:white;
+ border-radius:8px 8px 8px 8px;
+ float:left;
+ padding:5px;
+}
+#FooterVersionDiv{
+ float:left;
+ margin-left:10px;
+ margin-top:15px;
+
+}
+#FooterTimeDiv{
+ float:right;
+ margin-top:15px;
+}
+
+/*** MISC ***/
+
div.centre {
margin: 0 auto;
text-align:center;
}
+
+
+/*
+.dpTbl {
+ border: solid navy 1px;
+}
+
/*table detail items default format */
td {
font-family: Arial, Verdana, Helvetica, sans-serif;
@@ -410,55 +647,8 @@
margin-bottom: 2px;
}
-.main_menu_unselected {
- background-color: #40fc40;
- border-left: 1px #AAAAAA solid;
- border-right: 1px #AAAAAA solid;
- border-bottom: 0px;
- font-weight: normal;
- height: 16pt;
- position: relative;
- top: 3px;
- text-align: center;
- white-space: nowrap;
-}
-.main_menu_unselected:hover{
-}
-.main_menu_selected:hover{
-}
-
-.main_menu_unselected a{
-}
-
-.main_menu_unselected a:hover{
-}
-
-.main_menu_selected {
- background-color: white;
- border-top: 1px #AAAAAA solid;
- border-left: 1px #AAAAAA solid;
- border-right: 1px #AAAAAA solid;
- border-bottom: 0px;
- font-weight: normal;
- height: 16pt;
- position: relative;
- top: 3px;
- text-align: center;
- white-space: nowrap;
-}
-
-.main_menu_selected a{
- color: #eee;
- font-weight:bold;
-}
-
-.main_menu_selected a:hover{
- color: #fff;
- text-decoration: none;
-}
-
span.main_menu_nolink {
font-family: Arial, Verdana, Helvetica, sans-serif;
font-size: 10px;
@@ -507,43 +697,8 @@
width: 100%;
}
-.menu_group_headers {
- border: 0px outset #AAAAAA;
- width: 25%;
-}
-.menu_group_headers table{
- }
-.menu_group_headers_text {
- font-family: Arial, Verdana, Helvetica, sans-serif;
- font-size: 10px;
- font-weight: normal;
- color: white;
-}
-
-.menu_group_items {
- background-color: white;
- font-weight: normal;
- padding: 15px;
- border-top: 0px #AAAAAA solid;
- border-left: 0px #AAAAAA solid;
- border-right: 0px white solid;
- border-bottom: 0px white solid;
-}
-
-.menu_group_item {
- background-color: white;
- padding-top: 2px;
- padding-bottom: 2px;
-}
-
-.menu_group_item p {
- color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
- text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
- margin: 0 0 0 12px; /* One thing that I didn´t like of the li was that it had no left margin applied */
-}
-
.page_title_text {
font-family: Arial, Verdana, Helvetica, sans-serif;
padding-top: 2px;
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-07-25 09:31:43 UTC (rev 5558)
+++ trunk/includes/footer.inc 2012-07-26 08:27:54 UTC (rev 5559)
@@ -2,19 +2,32 @@
/* $Id$*/
-echo '<table width="100%" id="footer">
- <tr>
- <td style="width:33%"></td><td class="footer">
- <img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © weberp.org - ' . date('Y') . '" />
- </td>
- <td class="footer" style="text-align: right;width:33%">'. DisplayDateTime() .'</td>
- </tr>
- <tr>
- <td colspan="3" class="footer">webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . '</td>
- </tr>
- </table>
- </div>
- </body>
- </html>';
+echo '</div>'; // BodyWrapDiv ===HJ===
+echo '</div>'; // BodyDiv ===HJ===
+echo '<div id="FooterDiv">'; //===HJ===
+echo '<div id="FooterWrapDiv">'; //===HJ===
+
+echo '<div id="FooterLogoDiv">'; //===HJ===
+ echo '<img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © weberp.org - ' . date('Y') . '" /></td>';
+echo '</div>';
+
+echo '<div id="FooterVersionDiv">'; //===HJ===
+ echo 'webERP ' ._('version') .' ' . $_SESSION['VersionNumber'];
+echo '</div>';
+
+echo '<div id="FooterTimeDiv">'; //===HJ===
+ echo DisplayDateTime();
+echo '</div>';
+
+// if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) {
+// echo '<tr><td class="footer"><a href="https://sourceforge.net/projects/web-erp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=391629&type=12" width="120" height="30" border="0" alt="Get webERP web-based ERP Accounting at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr>';
+// }
+
+echo '</div>'; // FooterWrapDiv ===HJ===
+echo '</div>'; // FooterDiv ===HJ===
+
+echo '</body>';
+echo '</html>';
+
?>
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2012-07-25 09:31:43 UTC (rev 5558)
+++ trunk/includes/header.inc 2012-07-26 08:27:54 UTC (rev 5559)
@@ -11,9 +11,11 @@
$rootpath = '';
}
}
+
+ $ViewTopic = isset($ViewTopic)?'?ViewTopic=' . $ViewTopic : '';
+ $BookMark = isset($BookMark)? '#' . $BookMark : '';
$StrictXHTML=False;
- $ViewTopic = isset($ViewTopic)?"?ViewTopic=$ViewTopic":'';
- $BookMark = isset($BookMark)? "#$BookMark":'';
+
if (!headers_sent()){
if ($StrictXHTML) {
header('Content-type: application/xhtml+xml; charset=utf-8');
@@ -27,7 +29,6 @@
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-
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" />';
@@ -39,40 +40,45 @@
echo '<link href="' . $rootpath . '/css/'. $_SESSION['Theme'] .'/default.css" rel="stylesheet" type="text/css" />';
echo '<script type="text/javascript" src = "'.$rootpath.'/javascripts/MiscFunctions.js"></script>';
echo '</head>';
-
echo '<body>';
- echo '<div id="canvas">';
- echo '<table class="callout_main" cellpadding="0" cellspacing="0">';
- echo '<tr>';
- echo '<td colspan="2" rowspan="2">';
+ echo '<div id="CanvasDiv">';
+ echo '<div id="HeaderDiv">';
+ echo '<div id="HeaderWrapDiv">';
+
+
if (isset($title)) {
- echo '<table cellpadding="0" cellspacing="0" border="0" id="quick_menu" class="quick_menu">';
- echo '<tr>';
- echo '<td align="left" style="width:100%;" class="quick_menu_left">';
-// Use icons for company and user data, saves screen realestate, use alt tag in case theme icon not avail.
- echo '<img src="'.$rootpath.'/css/'.$theme.'/images/company.png" title="' . _('Company') . '" alt="' . _('Company') . '" />';
- echo ' ' . stripslashes($_SESSION['CompanyRecord']['coyname']) . ' <a href="' . $rootpath . '/UserSettings.php"><img src="'.$rootpath.'/css/'.$theme.'/images/user.png" title="User" alt="' . _('User') . '" />' . stripslashes($_SESSION['UsersRealName']) . '</a>';
-// Make the title text a class, can be set to display:none is some themes
- echo '<br />' . $title . '</td>';
- echo '<td class="quick_menu_tabs">';
- echo '<table cellpadding="0" cellspacing="0" class="quick_menu_tabs"><tr>';
- echo '<td class="quick_menu_tab" align="center"><a href="' . $rootpath . '/index.php"><span style="text-decoration:underline;">1</span> ' . _('Main Menu') . '</a></td>';
- if (count($_SESSION['AllowedPageSecurityTokens'])>1){
+
+ echo '<div id="AppInfoDiv">'; //===HJ===
+ echo '<div id="AppInfoCompanyDiv">';
+ echo '<img src="'.$rootpath.'/css/'.$theme.'/images/company.png" title="'._('Company').'" alt="'._('Company').'"/>'.stripslashes($_SESSION['CompanyRecord']['coyname']);
+ echo '</div>';
+ echo '<div id="AppInfoUserDiv">';
+ echo '<a href="'. $rootpath.'/UserSettings.php"><img src="'.$rootpath.'/css/'.$theme.'/images/user.png" title="User" alt="'._('User').'"/>'.stripslashes($_SESSION['UsersRealName']).'</a>';
+ echo '</div>';
+ echo '<div id="AppInfoModuleDiv">';
+ // Make the title text a class, can be set to display:none is some themes
+ echo $title;
+ echo '</div>';
+ echo '</div>'; // AppInfoDiv
- echo '<td class="quick_menu_tab" align="center"><a href="' . $rootpath . '/SelectCustomer.php"><span style="text-decoration:underline;">2</span> ' . _('Customers') . '</a></td>';
- echo '<td class="quick_menu_tab" align="center"><a href="' . $rootpath . '/SelectProduct.php"><span style="text-decoration:underline;">3</span> ' . _('Items') . '</a></td>';
+ echo '<div id="QuickMenuDiv"><ul>';
+
+ echo '<li><a href="'.$rootpath.'/index.php">'._('Main Menu').'</a></li>'; //take off inline formatting, use CSS instead ===HJ===
- echo '<td class="quick_menu_tab" align="center"><a href="' . $rootpath . '/SelectSupplier.php"><span style="text-decoration:underline;">4</span> ' . _('Suppliers') . '</a></td>';
+ if (count($_SESSION['AllowedPageSecurityTokens'])>1){
+ echo '<li><a href="'.$rootpath.'/SelectCustomer.php">'._('Customers').'</a></li>';
+ echo '<li><a href="'.$rootpath.'/SelectProduct.php">' ._('Items') .'</a></li>';
+ echo '<li><a href="'.$rootpath.'/SelectSupplier.php">'._('Suppliers').'</a></li>';
+
+ $DefaultManualLink = '<li><a rel="external" accesskey="8" href="' . $rootpath . '/doc/Manual/ManualContents.php'. $ViewTopic . $BookMark. '">'._('Manual').'</a></li>';
- $DefaultManualLink = '<td class="quick_menu_tab" align="center"><a rel="external" accesskey="8" href="' . $rootpath . '/doc/Manual/ManualContents.php'. $ViewTopic . $BookMark. '"><span style="text-decoration:underline;">8</span> ' . _('Manual') . '</a></td>';
-
- if (mb_substr($_SESSION['Language'],0,2) !='en'){
- if (file_exists('locale/' . $_SESSION['Language'] . '/Manual/ManualContents.php')){
- echo '<td class="quick_menu_tab" align="center"><a target="_blank" href="' . $rootpath . '/locale/' . $_SESSION['Language'] . '/Manual/ManualContents.php'.$ViewTopic . $BookMark.'"><span style="text-decoration:underline;">8</span> ' . _('Manual') . '</a></td>';
+ if (mb_substr($_SESSION['Language'],0,2) != 'en'){
+ if (file_exists('locale/'.$_SESSION['Language'].'/Manual/ManualContents.php')){
+ echo '<li><a target="_blank" href="'.$rootpath.'/locale/'.$_SESSION['Language'].'/Manual/ManualContents.php'. $ViewTopic . $BookMark. '">'._('Manual').'</a></li>';
} else {
echo $DefaultManualLink;
}
@@ -81,15 +87,13 @@
}
}
- echo '<td class="quick_menu_tab" align="center"><a href="' . $rootpath . '/Logout.php" onclick="return confirm(\'' . _('Are you sure you wish to logout?') . '\');"><span style="text-decoration:underline;">0</span> ' . _('Logout') . '</a></td>';
+ echo '<li><a href="'.$rootpath.'/Logout.php" onclick="return confirm(\''._('Are you sure you wish to logout?').'\');">'._('Logout').'</a></l>';
- echo '</tr></table>';
- echo '</td></tr></table>';
-
+ echo '</ul></div>'; // QuickMenuDiv
}
+ echo '</div>'; // HeaderWrapDiv
+ echo '</div>'; // Headerdiv
+ echo '<div id="BodyDiv">';
+ echo '<div id="BodyWrapDiv">';
-echo '</td>';
-echo '</tr>';
-echo '</table>';
-
-?>
\ No newline at end of file
+?>
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2012-07-25 09:31:43 UTC (rev 5558)
+++ trunk/index.php 2012-07-26 08:27:54 UTC (rev 5559)
@@ -5,6 +5,7 @@
$title=_('Main Menu');
include('includes/header.inc');
+
/*The module link codes are hard coded in a switch statement below to determine the options to show for each tab */
include('includes/MainMenuLinksArray.php');
@@ -46,6 +47,7 @@
</td>
</tr>
</table>';
+
include('includes/footer.inc');
exit;
}
@@ -54,15 +56,10 @@
$_SESSION['Module'] = $_GET['Application'];
}
-echo '<table width="99%">
- <tr>
- <td style="width:10%" valign="top">';
-echo '<table class="main_menu" width="100%" cellspacing="0" cellpadding="0" border="0">';
-
+//=== MainMenuDiv =======================================================================
+echo '<div id="MainMenuDiv"><ul>'; //===HJ===
$i=0;
-
while ($i < count($ModuleLink)){
-
// This determines if the user has display access to the module see config.php and header.inc
// for the authorisation and security code
if ($_SESSION['ModulesEnabled'][$i]==1) {
@@ -72,121 +69,103 @@
$_SESSION['Module']=$ModuleLink[$i];
}
if ($ModuleLink[$i] == $_SESSION['Module']){
- echo '<tr>
- <td class="main_menu_selected"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td>
- </tr>';
+ echo '<li class="main_menu_selected">';
} else {
- echo '<tr>
- <td class="main_menu_unselected"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></td>
- </tr>';
+ echo '<li class="main_menu_unselected">';
+
}
+ echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Application='. $ModuleLink[$i] . '">' . $ModuleList[$i] . '</a></li>';
}
$i++;
}
+echo '</ul></div>'; // MainMenuDiv ===HJ===
-echo '</table>';
-echo '</td>';
-echo '<td style="width:30%" valign="top">';
+//=== SubMenuDiv (wrapper) ==============================================================================
+echo '<div id="SubMenuDiv">'; //===HJ===
+
+
+echo '<div id="TransactionsDiv"><ul>'; //=== TransactionsDiv ===
+
+echo '<li class="menu_group_headers">'; //=== SubMenuHeader ===
if ($_SESSION['Module']=='system') {
$Header='<img src="' . $rootpath . '/css/' . $theme . '/images/company.png" title="' . _('General Setup Options') . '" alt="' . _('General Setup Options') . '" /><b>' . _('General Setup Options') . '</b>';
} else {
$Header='<img src="' . $rootpath . '/css/' . $theme . '/images/transactions.png" title="' . _('Transactions') . '" alt="' . _('Transactions') . '" /><b>'. _('Transactions') . '</b>';
}
-echo ' <table width="100%" class="selection">
- <tr>
- <td class="menu_group_headers">
- <div class="centre">
- ' . $Header . '
- </div>
- </td>
- </tr>';
+echo $Header;
+echo '</li>'; // SubMenuHeader
+//=== SubMenu Items ===
$i=0;
foreach ($MenuItems[$_SESSION['Module']]['Transactions']['Caption'] as $Caption) {
/* Transactions Menu Item */
$ScriptNameArray = explode('?', substr($MenuItems[$_SESSION['Module']]['Transactions']['URL'][$i],1));
$PageSecurity = $_SESSION['PageSecurityArray'][$ScriptNameArray[0]];
if ((in_array($PageSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PageSecurity))) {
- echo '<tr>
- <td class="menu_group_item">
- <p>• <a href="' . $rootpath . $MenuItems[$_SESSION['Module']]['Transactions']['URL'][$i] .'">' . $Caption . '</a></p>
- </td>
- </tr>';
+ echo '<li class="menu_group_item">
+ <p>• <a href="' . $rootpath . $MenuItems[$_SESSION['Module']]['Transactions']['URL'][$i] .'">' . $Caption . '</a></p>
+ </li>';
}
$i++;
}
-echo '</table>';
-echo '</td>';
+echo '</ul></div>'; //=== TransactionsDiv ===
-echo '<td style="width:30%" valign="top">';
+echo '<div id="InquiriesDiv"><ul>'; //=== InquiriesDiv ===
+
+echo '<li class="menu_group_headers">';
if ($_SESSION['Module']=='system') {
$Header='<img src="' . $rootpath . '/css/' . $theme . '/images/ar.png" title="' . _('Receivables/Payables Setup') . '" alt="' . _('Receivables/Payables Setup') . '" /><b>' . _('Receivables/Payables Setup') . '</b>';
} else {
$Header='<img src="' . $rootpath . '/css/' . $theme . '/images/reports.png" title="' . _('Inquiries and Reports') . '" alt="' . _('Inquiries and Reports') . '" /><b>'. _('Inquiries and Reports') . '</b>';
}
-echo ' <table width="100%" class="selection">
- <tr>
- <td class="menu_group_headers">
- <div class="centre">
- ' . $Header . '
- </div>
- </td>
- </tr>';
+echo $Header;
+echo '</li>';
+
+
$i=0;
foreach ($MenuItems[$_SESSION['Module']]['Reports']['Caption'] as $Caption) {
/* Transactions Menu Item */
$ScriptNameArray = explode('?', substr($MenuItems[$_SESSION['Module']]['Reports']['URL'][$i],1));
$PageSecurity = $_SESSION['PageSecurityArray'][$ScriptNameArray[0]];
if ((in_array($PageSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PageSecurity))) {
- echo '<tr>
- <td class="menu_group_item">
- <p>• <a href="' . $rootpath . $MenuItems[$_SESSION['Module']]['Reports']['URL'][$i] .'">' . $Caption . '</a></p>
- </td>
- </tr>';
+ echo '<li class="menu_group_item">
+ <p>• <a href="' . $rootpath . $MenuItems[$_SESSION['Module']]['Reports']['URL'][$i] .'">' . $Caption . '</a></p>
+ </li>';
}
$i++;
}
-echo GetRptLinks($_SESSION['Module']);
-echo '</table>';
-echo '</td>';
+echo GetRptLinks($_SESSION['Module']); //=== GetRptLinks() must be modified!!! ===
+echo '</ul></div>'; //=== InquiriesDiv ===
-echo '<td style="width:30%" valign="top">';
+echo '<div id="MaintenanceDiv"><ul>'; //=== MaintenanceDive ===
+
+echo '<li class="menu_group_headers">';
if ($_SESSION['Module']=='system') {
$Header='<img src="' . $rootpath . '/css/' . $theme . '/images/inventory.png" title="' . _('Inventory Setup') . '" alt="' . _('Inventory Setup') . '" /><b>' . _('Inventory Setup') . '</b>';
} else {
$Header='<img src="' . $rootpath . '/css/' . $theme . '/images/maintenance.png" title="' . _('Maintenance') . '" alt="' . _('Maintenance') . '" /><b>'. _('Maintenance') . '</b>';
}
-echo ' <table width="100%" class="selection">
- <tr>
- <td class="menu_group_headers">
- <div class="centre">
- ' . $Header . '
- </div>
- </td>
- </tr>';
+echo $Header;
+echo '</li>';
+
$i=0;
foreach ($MenuItems[$_SESSION['Module']]['Maintenance']['Caption'] as $Caption) {
/* Transactions Menu Item */
$ScriptNameArray = explode('?', substr($MenuItems[$_SESSION['Module']]['Maintenance']['URL'][$i],1));
$PageSecurity = $_SESSION['PageSecurityArray'][$ScriptNameArray[0]];
if ((in_array($PageSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PageSecurity))) {
- echo '<tr>
- <td class="menu_group_item">
- <p>• <a href="' . $rootpath . $MenuItems[$_SESSION['Module']]['Maintenance']['URL'][$i] .'">' . $Caption . '</a></p>
- </td>
- </tr>';
+ echo '<li class="menu_group_item">
+ <p>• <a href="' . $rootpath . $MenuItems[$_SESSION['Module']]['Maintenance']['URL'][$i] .'">' . $Caption . '</a></p>
+ </li>';
}
$i++;
}
-echo '</table>';
-echo '</td>';
+echo '</ul></div>'; // MaintenanceDive ===HJ===
+echo '</div>'; // SubMenuDiv ===HJ===
-echo '</tr>
- </table>';
-
include('includes/footer.inc');
function GetRptLinks($GroupID) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
