diff --git a/src/include/functions_users.php b/src/include/functions_users.php index 2e03043..5f7a862 100644 --- a/src/include/functions_users.php +++ b/src/include/functions_users.php @@ -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; } diff --git a/src/login.php b/src/login.php index 4b0da04..a9e4277 100644 --- a/src/login.php +++ b/src/login.php @@ -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 { diff --git a/src/templates/admin/admin_menu.html b/src/templates/admin/admin_menu.html index b4f959f..a639dc4 100644 --- a/src/templates/admin/admin_menu.html +++ b/src/templates/admin/admin_menu.html @@ -1,18 +1,25 @@ - - - - - + + + + + + + - - + + - - - + + + + + + + +
{LN_ADMINMENU_HOMEPAGE}{LN_ADMINMENU_GENOPT}{LN_ADMINMENU_SOURCEOPT}{LN_ADMINMENU_VIEWSOPT}{LN_ADMINMENU_SEARCHOPT}{LN_ADMINMENU_GENOPT}{LN_ADMINMENU_SOURCEOPT}{LN_ADMINMENU_VIEWSOPT}{LN_ADMINMENU_SEARCHOPT} {LN_ADMINMENU_USEROPT}{LN_ADMINMENU_GROUPOPT}{LN_ADMINMENU_USEROPT}{LN_ADMINMENU_GROUPOPT}    
diff --git a/src/templates/include_header.html b/src/templates/include_header.html index 088dfe4..c89a45b 100644 --- a/src/templates/include_header.html +++ b/src/templates/include_header.html @@ -22,7 +22,7 @@ -
+ @@ -46,8 +46,7 @@ @@ -97,7 +95,7 @@ - +
 {LN_GEN_LANGUAGE}  - - + @@ -62,7 +61,6 @@
 {LN_MAIN_SELECTSTYLE} 
-
@@ -124,10 +122,11 @@ diff --git a/src/templates/include_menu.html b/src/templates/include_menu.html index 4fbb177..bb65c31 100644 --- a/src/templates/include_menu.html +++ b/src/templates/include_menu.html @@ -1,7 +1,8 @@
 {LN_GEN_SELECTVIEW} 
- + - + +
- - - + + + + @@ -10,12 +11,12 @@ - + - - + + diff --git a/src/templates/index.html b/src/templates/index.html index 957e720..c63404f 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -95,7 +95,7 @@
{LN_MENU_SEARCH}{LN_MENU_SHOWEVENTS}
{LN_MENU_SEARCH}{LN_MENU_SHOWEVENTS} {LN_MENU_SEARCHINKB} {LN_MENU_LOGIN}{LN_MENU_LOGIN}   {LN_MENU_ADMINCENTER}{LN_MENU_LOGOFF}{LN_MENU_ADMINCENTER}{LN_MENU_LOGOFF} {LN_MENU_LOGGEDINAS} "{SESSION_USERNAME}"
-
+ {LN_GEN_PAGE} {main_currentpagenumber} diff --git a/src/templates/login.html b/src/templates/login.html index db75825..2f4a71c 100644 --- a/src/templates/login.html +++ b/src/templates/login.html @@ -50,7 +50,7 @@ - +
diff --git a/src/themes/dark/main.css b/src/themes/dark/main.css index 7f7f05b..5f32dda 100644 --- a/src/themes/dark/main.css +++ b/src/themes/dark/main.css @@ -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 */ diff --git a/src/themes/default/main.css b/src/themes/default/main.css index c38750d..1e49e04 100644 --- a/src/themes/default/main.css +++ b/src/themes/default/main.css @@ -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; }