diff --git a/phpgwapi/templates/linux-at-work.de/head.tpl b/phpgwapi/templates/linux-at-work.de/head.tpl index a693271d7e..0f215ab684 100644 --- a/phpgwapi/templates/linux-at-work.de/head.tpl +++ b/phpgwapi/templates/linux-at-work.de/head.tpl @@ -14,13 +14,14 @@ A.main_menu, A.main_menu:LINK, A.main_menu:VISITED { } A.main_menu:HOVER { - background-color: #7C92DC; + background-color: #7C92FC; } DIV.main_menu { position : absolute; border : 0px dotted; background : #7C92DC; + background : #7C92BC; padding : 0px 0px 0px 0px; padding-bottom : 0px; padding-left : 0px; @@ -30,8 +31,8 @@ DIV.main_menu { DIV.main_body { position : absolute; - border : 0px dotted; - background-color : #B8FEAB; + border-width : 1px; + background-color : #7C92BC; padding-bottom : 0px; padding-left : 0px; padding-right : 0px; @@ -52,6 +53,7 @@ TD.main_menu { margin-right: 10px; vertical-align:middle; text-align:right; + white-space: nowrap; } TD.main_menu_bottom { @@ -115,7 +117,7 @@ TD.main_menu_info { margin-right: 0px; margin-left: 0px; font-family: "{font_family}"; - background-color : #B8FEAB; + background-color : #7C92BC; } .tablink { color: #000000; } {app_css} @@ -123,13 +125,18 @@ TD.main_menu_info { {website_title} - {app_name} - - + diff --git a/phpgwapi/templates/linux-at-work.de/login.tpl b/phpgwapi/templates/linux-at-work.de/login.tpl index 832ec3760c..5ea203116b 100644 --- a/phpgwapi/templates/linux-at-work.de/login.tpl +++ b/phpgwapi/templates/linux-at-work.de/login.tpl @@ -8,20 +8,43 @@ + + {website_title} - Login - +
{lang_message}

 

+ -

-Benutzername: demo1, demo2 oder demo3
-Passwort: demo

-Probleme? => lkneschke@phpgw.de + +Support: http://linux-at-work.de +


@@ -37,11 +60,11 @@ Probleme? => lkneschke@phpgw.de - Benutzername:  + Benutzername:  - Passwort:  + Passwort:  @@ -67,10 +90,6 @@ Probleme? => lkneschke@phpgw.de
-

- -Support: http://phpgw.de
diff --git a/phpgwapi/templates/linux-at-work.de/navbar.inc.php b/phpgwapi/templates/linux-at-work.de/navbar.inc.php index 71b7e95c9f..2b1b95561a 100644 --- a/phpgwapi/templates/linux-at-work.de/navbar.inc.php +++ b/phpgwapi/templates/linux-at-work.de/navbar.inc.php @@ -95,12 +95,10 @@ } $var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname(); - $now = time(); $var['user_info_date'] = - lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' ' - . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']); -// . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' ' -// . $GLOBALS['phpgw']->common->show_date($now,'d, Y'); + lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' ' + . lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' ' + . $GLOBALS['phpgw']->common->show_date(time(),'d, Y'); $var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date']; $var['user_info_size'] = '2'; $var['user_info_color'] = '#000000'; @@ -143,13 +141,8 @@ { $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); $tpl->set_unknowns('remove'); - - $tpl->set_file(array('footer' => 'footer.tpl')); - // as of Dec 10, 2001 this powered by code is somewhat broken - // can cause a loop of error message about power bottom being invalid - // needs repair (ed: Angles) - /* + $tpl->set_file(array('footer' => 'footer.tpl')); $tpl->set_block('footer','B_powered_bottom','V_powered_bottom'); if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'bottom') @@ -168,8 +161,7 @@ { $tpl->set_var('V_powered_bottom',''); } - */ - + $GLOBALS['phpgw']->common->hook('navbar_end'); $tpl->pfp('out','footer'); } diff --git a/phpgwapi/templates/linux-at-work.de/navbar.tpl b/phpgwapi/templates/linux-at-work.de/navbar.tpl index 3885252507..56536a6569 100755 --- a/phpgwapi/templates/linux-at-work.de/navbar.tpl +++ b/phpgwapi/templates/linux-at-work.de/navbar.tpl @@ -42,5 +42,7 @@ -
+