Changeset 782:01efbf050a8a for inc/admin/lib.dc.page.php

Timestamp:

12/06/11 11:43:14 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Parents:

781:b509ac00bf4a (diff), 779:58c45f1b96e5 (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 last default changes with formfilter branch

Files:

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

inc/admin/lib.dc.page.php

@@ -515 +515 @@
      }
      
+     public static function jqueryUI()
+     {
+          return
+          '<link rel="stylesheet" type="text/css" href="style/jquery-ui-1.8.16.custom.css" />'."\n".
+          self::jsLoad('js/jquery/jquery-ui-1.8.16.custom.min.js');
+     }
+
      public static function jsColorPicker()
      {

inc/admin/lib.dc.page.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2010 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -16 +16 @@
 class dcPage
 {
+     private static $loaded_js=array();
+
      # Auth check
      public static function check($permissions)
@@ -73 +75 @@
                __('Blogs:').' '.
                $core->formNonce().
-               form::combo('switchblog',$blogs,$core->blog->id,  '',1).
+               form::combo('switchblog',$blogs,$core->blog->id).
                '</label>'.
                '<noscript><div><input type="submit" value="'.__('ok').'" /></div></noscript>';
@@ -96 +98 @@
           
           self::jsLoadIE7().
-          '  <style type="text/css">'."\n". 
-          '  @import "style/default.css";'."\n".
-          "  </style>\n";
+          '    <link rel="stylesheet" href="style/default.css" type="text/css" media="screen" />'."\n"; 
           if (l10n::getTextDirection($GLOBALS['_lang']) == 'rtl') {
-               echo '  <style type="text/css">'."\n".'  @import "style/default-rtl.css";'."\n"."  </style>\n";
+               echo
+          '    <link rel="stylesheet" href="style/default-rtl.css" type="text/css" media="screen" />'."\n"; 
+          }
+
+          $core->auth->user_prefs->addWorkspace('interface');
+          $user_ui_hide_std_favicon = $core->auth->user_prefs->interface->hide_std_favicon;
+          if (!$user_ui_hide_std_favicon) {
+               echo '<link rel="icon" type="image/png" href="images/favicon.png" />';
           }
           
@@ -116 +123 @@
           '">'."\n".
           
-          '<div id="top"><h1><a href="index.php">'.DC_VENDOR_NAME.'</a></h1></div>'."\n";
-          
-          
-          echo
-          '<div id="info-box">'.
-          '<form action="index.php" method="post"><div>'.
+          '<div id="header">'.
+          '<ul id="prelude"><li><a href="#content">Aller au contenu</a></li><li><a href="#main-menu">Aller au menu</a></li></ul>'."\n".
+          '<div id="top"><h1><a href="index.php">'.DC_VENDOR_NAME.'</a></h1></div>'."\n"; 
+          
+          echo
+          '<div id="info-boxes">'.
+          '<div id="info-box1">'.
+          '<form action="index.php" method="post">'.
           $blog_box.
           '<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>'.
+          '</form>'.
           '</div>'.
-          '<div id="info-box2"><div>'.
-          ' '.__('User:').' <strong>'.$core->auth->userID().'</strong>'.
-          ' - <a href="index.php?logout=1" class="logout">'.__('Logout').' <img src="images/logout.png" alt="" /></a>'.
+          '<div id="info-box2">'.
+          '<a'.(preg_match('/index.php$/',$_SERVER['REQUEST_URI']) ? ' class="active"' : '').' href="index.php">'.__('My dashboard').'</a>'.
+          '<span> | </span><a'.(preg_match('/preferences.php(\?.*)?$/',$_SERVER['REQUEST_URI']) ? ' class="active"' : '').' href="preferences.php">'.__('My preferences').'</a>'.
+          '<span> | </span><a href="index.php?logout=1" class="logout">'.sprintf(__('Logout %s'),$core->auth->userID()).' <img src="images/logout.png" alt="" /></a>'.
+          '</div>'.
           '</div>'.
           '</div>';
@@ -172 +183 @@
           '<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
@@ -204 +214 @@
           
           self::jsLoadIE7().
-          '  <style type="text/css">'."\n". 
-          '  @import "style/default.css";'."\n".
-          "  </style>\n";
+          '    <link rel="stylesheet" href="style/default.css" type="text/css" media="screen" />'."\n"; 
           if (l10n::getTextDirection($GLOBALS['_lang']) == 'rtl') {
-               echo '  <style type="text/css">'."\n".'  @import "style/default-rtl.css";'."\n"."  </style>\n";
+               echo
+               '    <link rel="stylesheet" href="style/default-rtl.css" type="text/css" media="screen" />'."\n"; 
           }
           
@@ -264 +273 @@
                } else {
                     $prof_url = http::getSelfURI();
-                    $prof_url .= (strpos($prof_url,'?') === false) ? '?' : '&amp;';
+                    $prof_url .= (strpos($prof_url,'?') === false) ? '?' : '&';
                     $prof_url .= 'XDEBUG_PROFILE';
-                    $res .= '<p><a href="'.$prof_url.'">Trigger profiler</a></p>';
+                    $res .= '<p><a href="'.html::escapeURL($prof_url).'">Trigger profiler</a></p>';
                }
                
@@ -343 +352 @@
      public static function jsLoad($src)
      {
-          return '<script type="text/javascript" src="'.html::escapeHTML($src).'"></script>'."\n";
+          $escaped_src = html::escapeHTML($src);
+          if (!isset(self::$loaded_js[$escaped_src])) {
+               self::$loaded_js[$escaped_src]=true;
+               return '<script type="text/javascript" src="'.$escaped_src.'"></script>'."\n";
+          }
      }
      
@@ -358 +371 @@
           self::jsLoad('js/jquery/jquery.bgFade.js').
           self::jsLoad('js/common.js').
+          self::jsLoad('js/prelude.js').
           
           '<script type="text/javascript">'."\n".