Changeset 48:0891631a2623 for admin/auth.php

Timestamp:

04/29/11 10:32:38 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

userprefs

Children:

53:6e38af82ca33, 61:e7bd4fa52825

Parents:

47:15c028d94180 (diff), 46:36f4421937ed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge

File:

• admin/auth.php (modified) (3 diffs)

admin/auth.php

@@ -294 +294 @@
     };
     
+    if (navigator.cookieEnabled) {
+      $('#cookie_help').hide();
+    } else {
+      $('#cookie_help').show();
+    }
+    $('#issue h4').toggleWithLegend($('#issue').children().not('h4'),
+      {cookie:'dc_issue',fn: function(){$('#safe_mode_help').hide();}}
+    );
     $('a#safe_mode_link_help').click(function() {
       $(this).parent().next().slideToggle();
@@ -385 +393 @@
           '</fieldset>'.
           
-          '<p>'.__('You must accept cookies in order to use the private area.').'</p>';
+          '<p id="cookie_help">'.__('You must accept cookies in order to use the private area.').'</p>'.
+          
+          '<div id="issue">'.
+          '<h4>'.__('Connection issue').'</h4>';
           
           if ($safe_mode) {
@@ -403 +414 @@
                echo '<p><a href="auth.php?recover=1">'.__('I forgot my password').'</a></p>';
           }
+          echo
+          '</div>';
      }
 }