From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 13 Apr 2010 13:55:40 +0000 (+0000)
Subject: Updated logout button added logout message
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8b1f4e8817c4a60aed83360323a201fd7ddd28f0;p=gosa.git

Updated logout button added logout message


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17656 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/html/logout.php b/gosa-core/html/logout.php
index f4c2c3d4d..acfdaa19f 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($_POST['forcedlogout'])){
+if (isset($_POST['forcedlogout']) || isset($_GET['forcedlogout'])){
   
   /* destroy old session */
   session::destroy ();
diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 5d8a3a0ad..c724f57dc 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -268,7 +268,7 @@ if (isset($_GET['reset'])){
 
 /* show web frontend */
 $smarty->assign ("logo", image(get_template_path("images/logo.png")));
-$smarty->assign ("logout", image(get_template_path("images/btn-logout.png"), "log-out", _("Log out")));
+$smarty->assign ("logoutimage", get_template_path("images/btn-logout.png"));
 $smarty->assign ("date", date("l, dS F Y H:i:s O"));
 $smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
 $smarty->assign ("must", "<span class='required'>*</span>");
diff --git a/gosa-core/ihtml/themes/modern/framework.tpl b/gosa-core/ihtml/themes/modern/framework.tpl
index 7e2b8d5e7..737c27c7f 100644
--- a/gosa-core/ihtml/themes/modern/framework.tpl
+++ b/gosa-core/ihtml/themes/modern/framework.tpl
@@ -6,7 +6,9 @@
      <li class='right table-wrapper'>
        <div class='logout-label'>
          <form action='logout.php' name='logoutframe' method='post' enctype='multipart/form-data'>
-          {$logout}
+          <div style='cursor:pointer' onClick="
+                    return question('Sie bearbeiten gerade einen Datenbankeintrag. Sollen die Daten verworfen werden?',
+            'logout.php?forcedlogout');">{image path="{$logoutimage}"}</div>
           <input type='hidden' name='forcedlogout' value='1'>
           <input type="hidden" name="php_c_check" value="1">
          </form>