Changeset 18:3b981ecb888d for inc

Timestamp:

04/27/11 16:32:48 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

userprefs

Parents:

16:40836c17e96a (diff), 17:6fc4226eaebd (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:

Merged safe_mode removal on userprefs branch

Files:

• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/admin/lib.dc.page.php (modified) (3 diffs)

inc/admin/lib.dc.page.php

@@ -131 +131 @@
           '<div id="main">'."\n".
           '<div id="content">'."\n";
-          
-          # Recovery mode
-          if (isset($_SESSION['sess_safe_mode']) && $_SESSION['sess_safe_mode'])
-          {
-               echo
-               '<div class="error"><h3>'.__('Recovery mode').'</h3>'.
-               '<p>'.__('You are in recovery mode means no plugin have been loaded.').'</p>'.
-               '</div>';
-          }
           
           if ($core->error->flag()) {

inc/admin/lib.dc.page.php

@@ -118 +118 @@
           '<form action="index.php" method="post"><div>'.
           $blog_box.
-          ' - <a href="'.$core->blog->url.'" class="button">'.__('View site').'</a>'.
-          ' - '.__('User:').' <strong>'.$core->auth->userID().'</strong>'.
-          ' - <a href="index.php?logout=1" class="logout">'.__('Logout').'</a>'.
+          '<a href="'.$core->blog->url.'"onclick="window.open(this.href);return false;" title="'.__('Go to site').' ('.__('new window').')'.'">'.__('Go to site').' <img src="images/outgoing.png" alt="" /></a>'.
+          '</div></form>'.
+          '</div>'.
+          '<div id="info-box2"><form action="index.php" method="post><div>"'.
+          ' '.__('User:').' <strong>'.$core->auth->userID().'</strong>'.
+          ' - <a href="index.php?logout=1" class="logout">'.__('Logout').' <img src="images/logout.png" alt="" /></a>'.
           '</div></form>'.
           '</div>';
@@ -153 +156 @@
           echo
           '</div>'."\n".      // End of #main-menu
-          '<div id="footer"><p><img src="images/dotclear_pw.png" alt="Dotclear" /> '.
-          sprintf(__('Thank you for using %s.'),'<a href="http://dotclear.org/">Dotclear</a>').
+          '<div id="footer"><p>'.
+          sprintf(__('Thank you for using %s.'),'<a href="http://dotclear.org/">Dotclear '.DC_VERSION.'</a>').
+          ' <span class="credit"> (Icons by <a href="http://dryicons.com/">Dryicons</a>)</span>'.
           '</p></div>'."\n".
           "</div>\n";         // End of #wrapper
@@ -319 +323 @@
           
           echo
-          '<div id="help"><hr /><div class="help-content"><h2>'.__('Help').'</h2>'.
+          '<div id="help"><hr /><div class="help-content clear"><h2>'.__('Help').'</h2>'.
           $content.
           '</div></div>';