Changeset 36:939dd5995f91

Timestamp:

04/28/11 17:40:13 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

safemode

Message:

Better integration of safe mode

Files:

admin/auth.php

-                      r0
+                      r36
       return true;
     };
+    $('a#safe_mode_link_help').click(function() {
+      $(this).parent().next().slideToggle();
+    });
   });
   //]]>
 …
           } else {
                echo
+               '<p><a href="auth.php?safe_mode=1" id="safe_mode_link">'.__('I have a connection problem').'</a></p>';
+               '<p><a href="auth.php?safe_mode=1" id="safe_mode_link">'.__('I want to log in in safe mode').'</a></p>'.
+               '<p class="form-note"><a href="#" id="safe_mode_link_help">'.__('Know more about safe mode').'</a></p>'.
+               '<p id="safe_mode_help"><em>'.
+                    __('This mode allows you to log in without any plugin loaded (very usefull in case of conflict between two of them for example)').'&nbsp;'.
+                    __('Disable or delete plugin(s) which are giving you troubles then log out. You can after log in as usual').
+               '</em></p>';
+          }

-                      r0
+                      r36
      width: 100%;
+}
+#login-screen #safe_mode_help {
+     display : none;
+     margin : 0 0 1em 0;
+     padding: 5px 10px 5px 30px;
+     background: #fbfbfb url(msg-std.png) no-repeat 5px 5px;
+     border: 1px solid #999;
+     -moz-border-radius: 4px;
+     -webkit-border-radius: 4px;
+}

-                      r0
+                      r36
+          }
+          $safe_mode = isset($_SESSION['sess_safe_mode']) && $_SESSION['sess_safe_mode'];
           # Display
           header('Content-Type: text/html; charset=UTF-8');
 …
           echo
           "</head>\n".
+          '<body id="dotclear-admin">'."\n".
+          '<body id="dotclear-admin'.
+          ($safe_mode ? ' safe-mode' : '').
+          '">'."\n".
           '<div id="top"><h1><a href="index.php">'.DC_VENDOR_NAME.'</a></h1></div>'."\n";
 …
           '<div id="content">'."\n";
           # Recovery mode
           if (isset($_SESSION['sess_safe_mode']) && $_SESSION['sess_safe_mode'])
+          # Safe mode
+          if ($safe_mode)
+          {
                echo
                '<div class="error"><h3>'.__('Recovery mode').'</h3>'.
                '<p>'.__('You are in recovery mode means no plugin have been loaded.').'</p>'.
+               '<div class="error"><h3>'.__('Safe mode').'</h3>'.
+               '<p>'.__('You are in safe mode. All plugins have been temporary disabled. Remind to log out then log in again normally to get back all functionalities').'</p>'.
                '</div>';
+          }

Note: See TracChangeset for help on using the changeset viewer.