From: hickert Date: Thu, 25 Feb 2010 17:29:15 +0000 (+0000) Subject: Updated theme to allow logout again. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=62952d8436cb10d18263c92b25ec8952de163cf7;p=gosa.git Updated theme to allow logout again. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15727 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/html/logout.php b/gosa-core/html/logout.php index a29726d59..f4c2c3d4d 100644 --- a/gosa-core/html/logout.php +++ b/gosa-core/html/logout.php @@ -71,7 +71,7 @@ if (isset($config)){ } /* If GET request is posted, the logout was forced by pressing the link */ -if (isset($_GET['request'])){ +if (isset($_POST['forcedlogout'])){ /* destroy old session */ session::destroy (); diff --git a/gosa-core/ihtml/themes/modern/framework.tpl b/gosa-core/ihtml/themes/modern/framework.tpl index 1672d0f6b..d811b164a 100644 --- a/gosa-core/ihtml/themes/modern/framework.tpl +++ b/gosa-core/ihtml/themes/modern/framework.tpl @@ -1,37 +1,53 @@ - - -{$php_errors} -
+ + + {$php_errors} - -
-
    -
  • -
  • -
  • You're logged in as {$username}
  • -
-
- + +
+
    +
  • +
  • +
    + + + + + +
    +
  • +
  • +
    You're logged in as {$username} +
    +
  • +
+
+ -{$menu} +
+ {$menu} -{$msg_dialogs} + {$msg_dialogs} - -
-
-
    -
  • -
  • Welcome to GOsa
  • -
  • Help
  • -
  • Change password
  • -
  • My account
  • -
-
+ +
+
+
    +
  • +
  • Welcome to GOsa
  • +
  • Help
  • +
  • Change password
  • +
  • My account
  • +
+
- {if $channel != ""} - - {/if} -{$errors}{$focus} + {if $channel != ""} + + {/if} + {$errors} + {$focus} + + + +