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 f4c2c3d4d62e250687e4f8c57d4f1c47246a5e45..acfdaa19f0412ef0db22fc64afb1e5ffebc25733 100644 (file)
--- 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 5d8a3a0ad7ceb55b5ae6de01f6e2e77596904eae..c724f57dc20405af73dfe6b0cf5ca57e9b87b9a7 100644 (file)
--- 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 7e2b8d5e7841889916b9ee3b83aacb73aca562ef..737c27c7fbf0d88fb0fc344f81534fb6ee55860f 100644 (file)
--- 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>