Improved menu styles and added admin menu and second sub menu, so you have all options available

This commit is contained in:
Andre Lorbach 2008-07-15 10:59:02 +02:00
parent b15cfe9792
commit 736d7edd84
9 changed files with 96 additions and 38 deletions

View File

@ -160,12 +160,14 @@ function DoLogOff()
function RedirectToUserLogin()
{
global $content;
// build referer
$referer = $_SERVER['PHP_SELF'];
if ( isset($_SERVER['QUERY_STRING']) && strlen($_SERVER['QUERY_STRING']) > 0 )
$referer .= "?" . $_SERVER['QUERY_STRING'];
header("Location: login.php?referer=" . urlencode($referer) );
header("Location: " . $content['BASEPATH'] . "login.php?referer=" . urlencode($referer) );
exit;
}

View File

@ -54,7 +54,9 @@ $content['pass'] = "";
// Set Referer
if ( isset($_GET['referer']) )
$szRedir = urldecode($_GET['referer']);
$szRedir = $_GET['referer'];
else if ( isset($_POST['referer']) )
$szRedir = $_POST['referer'];
else
$szRedir = "index.php"; // Default
@ -79,7 +81,7 @@ if ( isset($_POST['op']) && $_POST['op'] == "login" )
$content['ERROR_MSG'] = $content['LN_LOGIN_ERRWRONGPASSWORD'];
}
else
RedirectPage( $szRedir );
RedirectPage( urldecode($szRedir) );
}
else
{

View File

@ -1,18 +1,25 @@
<table width="100%" border="0" cellspacing="0" cellpadding="2">
<tr>
<td class="topmenu1" nowrap align="center" width="150"><a class="topmenu1_link" href="{BASEPATH}index.php?{additional_url}" target="_top"><img align="left" src="{MENU_HOMEPAGE}" width="16" height="16" vspace="0">{LN_ADMINMENU_HOMEPAGE}</a></td>
<td class="topmenu1" nowrap align="center" width="125"><a class="topmenu1_link" href="{BASEPATH}admin/index.php?{additional_url}" target="_top"><img align="left" src="{MENU_PREFERENCES}" width="16" height="16" vspace="0">{LN_ADMINMENU_GENOPT}</a></td>
<td class="topmenu1" nowrap align="center" width="125"><a class="topmenu1_link" href="{BASEPATH}admin/sources.php?{additional_url}" target="_top"><img align="left" src="{MENU_DATAEDIT}" width="16" height="16" vspace="0">{LN_ADMINMENU_SOURCEOPT}</a></td>
<td class="topmenu1" nowrap align="center" width="110"><a class="topmenu1_link" href="{BASEPATH}admin/views.php?{additional_url}" target="_top"><img align="left" src="{MENU_DOCUMENTVIEW}" width="16" height="16" vspace="0">{LN_ADMINMENU_VIEWSOPT}</a></td>
<td class="topmenu1" nowrap align="center" width="125"><a class="topmenu1_link" href="{BASEPATH}admin/searches.php?{additional_url}" target="_top"><img align="left" src="{MENU_TEXT_FIND}" width="16" height="16" vspace="0">{LN_ADMINMENU_SEARCHOPT}</a></td>
<td class="topmenu2begin" nowrap align="center" width="16"><img align="left" src="{MENU_BULLET_BLUE}" width="16" height="16" vspace="0"></td>
<!-- <td class="topmenu2" nowrap align="center" width="150"><a class="topmenu1_link" href="{BASEPATH}index.php?" target="_top"><img align="left" src="{MENU_HOMEPAGE}" width="16" height="16" vspace="0">{LN_ADMINMENU_HOMEPAGE}</a></td>-->
<td class="topmenu2" nowrap align="center" width="125"><a class="topmenu1_link" href="{BASEPATH}admin/index.php" target="_top"><img align="left" src="{MENU_PREFERENCES}" width="16" height="16" vspace="0">{LN_ADMINMENU_GENOPT}</a></td>
<td class="topmenu2" nowrap align="center" width="125"><a class="topmenu1_link" href="{BASEPATH}admin/sources.php" target="_top"><img align="left" src="{MENU_DATAEDIT}" width="16" height="16" vspace="0">{LN_ADMINMENU_SOURCEOPT}</a></td>
<td class="topmenu2" nowrap align="center" width="110"><a class="topmenu1_link" href="{BASEPATH}admin/views.php" target="_top"><img align="left" src="{MENU_DOCUMENTVIEW}" width="16" height="16" vspace="0">{LN_ADMINMENU_VIEWSOPT}</a></td>
<td class="topmenu2" nowrap align="center" width="125"><a class="topmenu1_link" href="{BASEPATH}admin/searches.php" target="_top"><img align="left" src="{MENU_TEXT_FIND}" width="16" height="16" vspace="0">{LN_ADMINMENU_SEARCHOPT}</a></td>
<!-- IF SESSION_ISADMIN="1" -->
<td class="topmenu1" nowrap align="center" width="110"><a class="topmenu1_link" href="{BASEPATH}admin/users.php?{additional_url}" target="_top"><img align="left" src="{MENU_ADMINUSERS}" width="16" height="16" vspace="0">{LN_ADMINMENU_USEROPT}</a></td>
<td class="topmenu1" nowrap align="center" width="110"><a class="topmenu1_link" href="{BASEPATH}admin/groups.php?{additional_url}" target="_top"><img align="left" src="{MENU_ADMINGROUPS}" width="16" height="16" vspace="0">{LN_ADMINMENU_GROUPOPT}</a></td>
<td class="topmenu2" nowrap align="center" width="110"><a class="topmenu1_link" href="{BASEPATH}admin/users.php" target="_top"><img align="left" src="{MENU_ADMINUSERS}" width="16" height="16" vspace="0">{LN_ADMINMENU_USEROPT}</a></td>
<td class="topmenu2" nowrap align="center" width="110"><a class="topmenu1_link" href="{BASEPATH}admin/groups.php" target="_top"><img align="left" src="{MENU_ADMINGROUPS}" width="16" height="16" vspace="0">{LN_ADMINMENU_GROUPOPT}</a></td>
<!-- ENDIF SESSION_ISADMIN="1" -->
<!-- <td class="topmenu1" nowrap align="center" width="100"><a class="topmenu1_link" href="?" target="_top">Refresh</a></td>-->
<td class="topmenuend" nowrap align="center" width="max">&nbsp;</td>
<!-- IF SESSION_LOGGEDIN="true" -->
<!-- <td class="topmenu2" nowrap align="center" width="100"><a class="topmenu1_link" href="{BASEPATH}login.php?op=logoff" target="_top"><img align="left" src="{MENU_ADMINLOGOFF}" width="16" height="16" vspace="0">{LN_MENU_LOGOFF}</a></td>-->
<td class="topmenu2end" nowrap align="center" width="max">&nbsp;</td>
<!-- <td class="topmenuend" nowrap align="center" width="max">{LN_MENU_LOGGEDINAS} "{SESSION_USERNAME}"</td>-->
<!-- ENDIF SESSION_LOGGEDIN="true" -->
<!-- IF SESSION_LOGGEDIN!="true" -->
<td class="topmenu2end" nowrap align="center" width="max">&nbsp;</td>
<!-- ENDIF SESSION_LOGGEDIN!="true" -->
</tr>
</table>

View File

@ -22,7 +22,7 @@
<td width="350" align="center" valign="top" height="20">
<!-- IF IS_LOGINPAGE!="true" -->
<form action="userchange.php" method="get" name="langidform">
<form action="{BASEPATH}userchange.php" method="get" name="langidform">
<table width="350" border="0" cellspacing="0" cellpadding="0" class="with_border" align="right">
<tr>
<td class="cellmenu1" width="150" nowrap><B>&nbsp;{LN_GEN_LANGUAGE}&nbsp;</B></td>
@ -46,8 +46,7 @@
<td width="100%" align="center" valign="top" height="20">
<!-- IF IS_LOGINPAGE!="true" -->
<!-- IF IS_ADMINPAGE!="true" -->
<form action="userchange.php" method="get" name="styleidform">
<form action="{BASEPATH}userchange.php" method="get" name="styleidform">
<table width="350" border="0" cellspacing="0" cellpadding="0" class="with_border" align="right">
<tr>
<td class="cellmenu1" width="150" nowrap><B>&nbsp;{LN_MAIN_SELECTSTYLE}&nbsp;</B></td>
@ -62,7 +61,6 @@
</tr>
</table>
</form>
<!-- ENDIF IS_ADMINPAGE!="true" -->
<!-- ENDIF IS_LOGINPAGE!="true" -->
</td>
@ -97,7 +95,7 @@
<!-- IF IS_LOGINPAGE!="true" -->
<!-- IF IS_ADMINPAGE!="true" -->
<form action="userchange.php" method="get" name="viewidform">
<form action="{BASEPATH}userchange.php" method="get" name="viewidform">
<table width="350" border="0" cellspacing="0" cellpadding="0" class="with_border" align="right">
<tr>
<td class="cellmenu1" width="150" nowrap><B>&nbsp;{LN_GEN_SELECTVIEW}&nbsp;</B></td>
@ -124,10 +122,11 @@
<tr>
<td>
<!-- IF IS_ADMINPAGE!="true" -->
<!-- INCLUDE include_menu.html -->
<!-- INCLUDE include_menu.html -->
<!-- ENDIF IS_ADMINPAGE!="true" -->
<!-- IF IS_ADMINPAGE="true" -->
<!-- INCLUDE admin/admin_menu.html -->
<!-- INCLUDE include_menu.html -->
<!-- INCLUDE admin/admin_menu.html -->
<!-- ENDIF IS_ADMINPAGE="true" -->
</td>
</tr>

View File

@ -1,7 +1,8 @@
<table width="100%" border="0" cellspacing="0" cellpadding="2">
<tr>
<td class="topmenu1" nowrap align="center" width="100"><a class="topmenu1_link" href="search.php" target="_top"><img align="left" src="{MENU_SEARCH}" width="16" height="16" vspace="0">{LN_MENU_SEARCH}</a></td>
<td class="topmenu1" nowrap align="center" width="100"><a class="topmenu1_link" href="index.php?{additional_url}" target="_top"><img align="left" src="{MENU_HOMEPAGE}" width="16" height="16" vspace="0">{LN_MENU_SHOWEVENTS}</a></td>
<tr>
<td class="topmenu1begin" nowrap align="center" width="16"><img align="left" src="{MENU_BULLET_GREEN}" width="16" height="16" vspace="0"></td>
<td class="topmenu1" nowrap align="center" width="100"><a class="topmenu1_link" href="{BASEPATH}search.php" target="_top"><img align="left" src="{MENU_SEARCH}" width="16" height="16" vspace="0">{LN_MENU_SEARCH}</a></td>
<td class="topmenu1" nowrap align="center" width="100"><a class="topmenu1_link" href="{BASEPATH}index.php?{additional_url}" target="_top"><img align="left" src="{MENU_HOMEPAGE}" width="16" height="16" vspace="0">{LN_MENU_SHOWEVENTS}</a></td>
<!-- <td class="topmenu1" nowrap align="center" width="125"><a class="topmenu1_link" href="" target="_top">Show SysLogTags</a></td>-->
<!-- <td class="topmenu1" nowrap align="center" width="100"><a class="topmenu1_link" href="" target="_top">User Options</a></td>-->
<!-- <td class="topmenu1" nowrap align="center" width="125"><a class="topmenu1_link" href="" target="_top">Database Options</a></td>-->
@ -10,12 +11,12 @@
<td class="topmenu1" nowrap align="center" width="200"><a class="topmenu1_link" href="http://kb.monitorware.com/search.php" target="_blank"><img align="left" src="{MENU_KB}" width="16" height="16" vspace="0">{LN_MENU_SEARCHINKB}</a></td>
<!-- IF UserDBEnabled="true" -->
<!-- IF SESSION_LOGGEDIN!="true" -->
<td class="topmenu1" nowrap align="center" width="100"><a class="topmenu1_link" href="login.php" target="_top"><img align="left" src="{MENU_ADMINLOGOFF}" width="16" height="16" vspace="0">{LN_MENU_LOGIN}</a></td>
<td class="topmenu1" nowrap align="center" width="100"><a class="topmenu1_link" href="{BASEPATH}login.php" target="_top"><img align="left" src="{MENU_ADMINLOGOFF}" width="16" height="16" vspace="0">{LN_MENU_LOGIN}</a></td>
<td class="topmenuend" nowrap align="center" width="max">&nbsp;</td>
<!-- ENDIF SESSION_LOGGEDIN!="true" -->
<!-- IF SESSION_LOGGEDIN="true" -->
<td class="topmenu1" nowrap align="center" width="110"><a class="topmenu1_link" href="admin/index.php" target="_top"><img align="left" src="{MENU_ADMINENTRY}" width="16" height="16" vspace="0">{LN_MENU_ADMINCENTER}</a></td>
<td class="topmenu1" nowrap align="center" width="100"><a class="topmenu1_link" href="login.php?op=logoff" target="_top"><img align="left" src="{MENU_ADMINLOGOFF}" width="16" height="16" vspace="0">{LN_MENU_LOGOFF}</a></td>
<td class="topmenu1" nowrap align="center" width="110"><a class="topmenu1_link" href="{BASEPATH}admin/index.php" target="_top"><img align="left" src="{MENU_ADMINENTRY}" width="16" height="16" vspace="0">{LN_MENU_ADMINCENTER}</a></td>
<td class="topmenu1" nowrap align="center" width="100"><a class="topmenu1_link" href="{BASEPATH}login.php?op=logoff" target="_top"><img align="left" src="{MENU_ADMINLOGOFF}" width="16" height="16" vspace="0">{LN_MENU_LOGOFF}</a></td>
<td class="topmenuend" nowrap align="center" width="max">{LN_MENU_LOGGEDINAS} "{SESSION_USERNAME}"</td>
<!-- ENDIF SESSION_LOGGEDIN="true" -->
<!-- ENDIF UserDBEnabled="true" -->

View File

@ -95,7 +95,7 @@
<table width="100%" align="center" border="0" cellpadding="1" cellspacing="1" class="with_border">
<tr>
<td nowrap width="100%"class="line2" align="left">
<td nowrap width="100%" class="line2" align="left">
<!-- IF main_currentpagenumber_found="true" -->
{LN_GEN_PAGE} {main_currentpagenumber}
<!-- ENDIF main_currentpagenumber_found="true" -->

View File

@ -50,7 +50,7 @@
<td align="center">
<input type="submit" value="Anmelden">
<input type="hidden" name="op" value="login">
<input type="hidden" name="url" value="{REDIR_LOGIN}">
<input type="hidden" name="referer" value="{REDIR_LOGIN}">
</td>
</tr>
</table>

View File

@ -191,6 +191,15 @@ font
}
/* TOP Menu Classes */
.topmenu1begin
{
height: 20px;
border:0px;
padding: 2px 2px 0px 2px;
vertical-align: middle;
background-color: #38110E;
}
.topmenu1
{
height: 20px;
@ -206,6 +215,8 @@ font
.topmenu1:hover
{
color: #FFFF99;
border:1px inset;
border-color: #D79993 #290604 #290604 #D79993;
background-color: #492D2B;
text-decoration: none;
}
@ -225,19 +236,32 @@ font
color: #FFFFFF;
background-color: #290604;
}
.topmenu2begin
{
height: 20px;
border:0px;
padding: 2px 2px 0px 2px;
vertical-align: middle;
background-color: #49221F;
}
.topmenu2
{
height: 16px;
height: 20px;
border:1px ridge;
border-color: #D79993 #290604 #290604 #D79993;
padding: 2px 2px 0px 2px;
vertical-align: middle;
font: 10px Verdana, Arial, Helvetica, sans-serif;
color: #FFFFFF;
background-color: #38110E;
background-color: #49221F;
}
.topmenu2:hover
{
color: #FFFF99;
border:1px inset;
border-color: #D79993 #290604 #290604 #D79993;
background-color: #492D2B;
text-decoration: none;
}
@ -252,12 +276,11 @@ font
}
.topmenu2end
{
height: 16px;
border:1px inset;
border-color: #D79993 #290604 #D79993 #D79993;
height: 20px;
border:0px;
font: 10px Verdana, Arial, Helvetica, sans-serif;
color: #FFFFFF;
background-color: #290604;
background-color: #49221F;
}
/* Cell Columns */

View File

@ -194,6 +194,15 @@ font
}
/* TOP Menu Classes */
.topmenu1begin
{
height: 20px;
border:0px;
padding: 2px 2px 0px 2px;
vertical-align: middle;
background-color: #597196;
}
.topmenu1
{
height: 20px;
@ -209,6 +218,8 @@ font
.topmenu1:hover
{
color: #FFFF99;
border:1px inset;
border-color: #79AABE #09506C #79AABE #79AABE;
background-color: #6A88B8;
text-decoration: none;
}
@ -228,19 +239,32 @@ font
color: #FFFFFF;
background-color: #597196;
}
.topmenu2begin
{
height: 20px;
border:0px;
padding: 2px 2px 0px 2px;
vertical-align: middle;
background-color: #7A92A6;
}
.topmenu2
{
height: 20px;
border:1px ridge;
border-color: #79AABE #79AABE #09506C #79AABE;
border-color: #BDEEFF #79AABE #09506C #09506C;
padding: 2px 2px 0px 2px;
vertical-align: middle;
font: 10px Verdana, Arial, Helvetica, sans-serif;
color: #FFFFFF;
background-color: #597196;
background-color: #7A92A6;
}
.topmenu2:hover
{
color: #FFFF99;
border:1px inset;
border-color: #BDEEFF #79AABE #09506C #09506C;
background-color: #6A88B8;
text-decoration: none;
}
@ -257,10 +281,10 @@ font
{
height: 20px;
border:1px inset;
border-color: #09506C #79AABE #09506C #09506C;
border-color: #BDEEFF #79AABE #09506C #09506C;
font: 10px Verdana, Arial, Helvetica, sans-serif;
color: #FFFFFF;
background-color: #6A8296;
background-color: #7A92A6;
}