Fixed cookie error messages

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

diff --git a/TODO b/TODO
index c45d9c2ec21ebc6d02a6f5b5c19d53e85aa3f64e..f0e46b0298af9c83058ffcca3430c358caf9ea95 100644 (file)
--- a/TODO
+++ b/TODO
@@ -9,10 +9,10 @@ Target for 2.4.1:
 * Check virenschleuder/Winstations in Admin->Systems 
        LDAP-Fehler: Cannot modify object class (structural object class modification from 'person' to 'inetOrgPerson' not allowed)
 
-* Add glpi pictures (Monitor/HDD ...)
-
 * Test DNS plugin. Add some more checks 
 
+* Check application moving with release management (!)
+
 * Phone account is not removable if the mysql database is not reachable.
   This is no real problem, but I'd like to see the hint message for it.
 

diff --git a/html/index.php b/html/index.php
index c098c7081cd355858e8e7bd97e9cb0e9da04eaae..d50359b2e4e50f5df45e881714b04bdd458d7236 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -240,7 +240,7 @@ if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
 }
 
 /* Translation of cookie-warning. Whether to display it, is determined by JavaScript */
-$smarty->assign ("cookies", "<b>"._("Warning").":</b> "._("Your Browser has cookies disabled. Please enable cookies and reload this page once, before you log in."));
+$smarty->assign ("cookies", "<b>"._("Warning").":</b> "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
 
 
 /* Generate server list */

diff --git a/ihtml/themes/default/login.tpl b/ihtml/themes/default/login.tpl
index 26583c4201e3dd41381aad3dbb404e43e5d14e23..7c771cb1d756854c6b6ecb6e94865db1e5a036c0 100644 (file)
--- a/ihtml/themes/default/login.tpl
+++ b/ihtml/themes/default/login.tpl
@@ -20,20 +20,6 @@
             <!-- Display SSL warning message on demand -->
     <p class='gosaLoginWarning'> {$ssl} </p>
  
-    <!-- check, if cookies are enabled -->
-    <p class='gosaLoginWarning'>
-     <script language="JavaScript" type="text/javascript">
-        <!--
-            document.cookie = "gosatest=empty;path=/";
-            if (document.cookie.indexOf( "gosatest=") > -1 )
-                document.cookie = "gosatest=empty;path=/;expires=Thu, 01-Jan-1970 00:00:01 GMT";
-            else
-                document.write("{$cookies}");
-        -->
-     </script>
-    </p>
-
-
     <!-- Formular data, containing a table to center fields -->
     <form action='index.php' method='post' name='mainform' onSubmit='js_check(this);return true;'>
      <table summary="" style='vertical-align:middle; text-align:left;' cellspacing='7' align='center'>
@@ -78,6 +64,20 @@
 
     <!-- Display error message on demand -->
     <p class='gosaLoginWarning'> {$message} </p>
+    <!-- check, if cookies are enabled -->
+    <p class='gosaLoginWarning'>
+     <script language="JavaScript" type="text/javascript">
+        <!--
+            document.cookie = "gosatest=empty;path=/";
+            if (document.cookie.indexOf( "gosatest=") > -1 )
+                document.cookie = "gosatest=empty;path=/;expires=Thu, 01-Jan-1970 00:00:01 GMT";
+            else
+                document.write("{$cookies}");
+        -->
+     </script>
+    </p>
+
+
 
    </div>
   </td>