improves behaviour after unauthorized server reply

diff --git a/inc/i10n/en/syp.php b/inc/i10n/en/syp.php
index ffaf07a54b415c1187396071dea4930484c8bf4b..55e66bbc186c83e0b23f2f822de05e7a53cfdfaa 100644 (file)
--- a/inc/i10n/en/syp.php
+++ b/inc/i10n/en/syp.php
@@ -165,6 +165,9 @@
         "Delete item"
           => "",
 
+        "You need to have cookies enabled to administrate SYP"
+          => "",
+
         "password"
           => "",
 

diff --git a/inc/i10n/fr/syp.php b/inc/i10n/fr/syp.php
index 1b7031ab8994a89cc3a9ada10511e8a4671dd0b2..9b1f815d304f3ccff88efeb725b18cb0d7c7039b 100644 (file)
--- a/inc/i10n/fr/syp.php
+++ b/inc/i10n/fr/syp.php
@@ -271,6 +271,11 @@
         "Supprimer la fiche"
           ,
 
+        "You need to have cookies enabled to administrate SYP"
+          =>
+        "Vous devez activer les cookies pour pouvoir administrer SYP"
+          ,
+
         "password"
           =>
         "mot de passe"

diff --git a/inc/templates_admin.php b/inc/templates_admin.php
index ce7e3b4230069f83bcfb124307bdae92a3210105..b02e5a800ab146d61f4686c59624af8035d8930b 100644 (file)
--- a/inc/templates_admin.php
+++ b/inc/templates_admin.php
@@ -148,6 +148,7 @@ if (!$usrtblexists || !$itemstblexists) {
      <div id="login_padding"></div>
      <div id="login_content">
         <form id="login_form" method="post">
+        <div id="cookie_warning" class="center warn"><?php ptrans('You need to have cookies enabled to administrate SYP')?></div>
             <table>
                 <tr>
                     <td><label for="password"><?php ptrans('password')?></label></td>

diff --git a/js/admin.js b/js/admin.js
index e0a27ea58570c14b946ff4a84f6f7e85659f5e7d..02c88e3cb5d0d557815b4f9c49bff6b1701d84e8 100644 (file)
--- a/js/admin.js
+++ b/js/admin.js
@@ -406,7 +406,9 @@ var FeatureMgr = {
                 switch (xml.documentElement.getAttribute("reason")) {
                     case "unauthorized":
                         $("#login_area").show();
+                        $("#cookie_warning").show();
                         this.reset();
+                        Admin.cancelCurrentFeature();
                         Admin.reset();
                     break;
                     case "server":

diff --git a/media/admin.css b/media/admin.css
index c3815136684d4ff15e906ae180537d7fed274439..fdef832fe5749fb39ed8666eb6070d86b4f19d56 100644 (file)
--- a/media/admin.css
+++ b/media/admin.css
@@ -145,6 +145,10 @@ html>/**/body #img { /* hide from ie7 */
     background-color: white;
 }
 
+#cookie_warning {
+    display: none;
+}
+
 #password {
     display: block;
     width: 100%;