Changeset 1490:60501ef579eb for inc/admin/lib.dc.page.php

Timestamp:

08/19/13 08:04:33 (12 years ago)

Author:

Dsls

Branch:

twig

Parents:

1489:f2398e7f3395 (diff), 1466:e67efe636ce1 (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:

Fusion avec default

File:

• inc/admin/lib.dc.page.php (modified) (11 diffs)

inc/admin/lib.dc.page.php

@@ -49 +49 @@
 
      # Top of admin page
-     public static function open($title='',$head='',$breadcrumb='')
+     public static function open($title='', $head='')
      {
           global $core;
@@ -159 +159 @@
           }
 
-          // Display breadcrumb (if given) before any error message
-          echo $breadcrumb;
-
           if ($core->error->flag()) {
                echo
@@ -213 +210 @@
      }
 
-     public static function openPopup($title='',$head='',$breadcrumb='')
+     public static function openPopup($title='', $head='')
      {
           global $core;
@@ -258 +255 @@
           '<div id="content">'."\n";
 
-          // display breadcrumb if given
-          echo $breadcrumb;
-
           if ($core->error->flag()) {
                echo
@@ -279 +273 @@
      }
 
-     public static function breadcrumb($elements=null,$with_home_link=true,$echo=false)
+     public static function breadcrumb($elements=null,$no_home_link=false)
      {
           // First item of array elements should be blog's name, System or Plugins
-          $res = '<h2>'.($with_home_link ?
-               '<a class="go_home" href="index.php"><img src="style/dashboard.png" alt="'.__('Go to dashboard').'" /></a>' :
-               '<img src="style/dashboard-alt.png" alt="" />');
+          $res = '<h2>'.($no_home_link ?
+               '<img src="style/dashboard-alt.png" alt="" />' :
+               '<a class="go_home" href="index.php"><img src="style/dashboard.png" alt="'.__('Go to dashboard').'" /></a>');
           $index = 0;
           foreach ($elements as $element => $url) {
-               $res .= ($with_home_link ? ($index == 1 ? ' : ' : ' &rsaquo; ') : ($index == 0 ? ' ' : ' &rsaquo; ')).
-                    ($url ? '<a href="'.$url.'">' : '').$element.($url ? '</a>' : '');
+               $res .= ($no_home_link ? ' ' : ($index == 1 ? ' : ' : ' &rsaquo; ')).($url ? '<a href="'.$url.'">' : '').$element.($url ? '</a>' : '');
                $index++;
           }
           $res .= '</h2>';
-          if ($echo) {
-               echo $res;
-          }
           return $res;
      }
@@ -365 +355 @@
      {
           $args = func_get_args();
-
-          $args = new ArrayObject($args);
-
-          # --BEHAVIOR-- adminPageHelpBlock
-          $GLOBALS['core']->callBehavior('adminPageHelpBlock',$args);
-
           if (empty($args)) {
                return;
@@ -476 +460 @@
           self::jsVar('dotclear.msg.confirm_delete_post',
                __("Are you sure you want to delete this entry?")).
-          self::jsVar('dotclear.msg.click_to_unlock',
-               __("Click here to unlock the field")).
           self::jsVar('dotclear.msg.confirm_spam_delete',
                __('Are you sure you want to delete all spams?')).
@@ -527 +509 @@
      {
           return
-          '<!--[if lt IE 9]>'."\n".
-          self::jsLoad('js/ie7/IE9.js').
+          '<!--[if lt IE 8]>'."\n".
+          self::jsLoad('js/ie7/IE8.js').
           '<link rel="stylesheet" type="text/css" href="style/iesucks.css" />'."\n".
           '<![endif]-->'."\n";
@@ -730 +712 @@
      '<link rel="stylesheet" type="text/css" href="style/jsUpload/style.css" />'."\n".
 
+     '<script id="template-upload" type="text/x-tmpl">
+     {% for (var i=0, file; file=o.files[i]; i++) { %}
+     <div class="template-upload fade">
+     <div class="upload-file">
+     <div class="upload-fileinfo">
+          <span class="upload-filename">{%=file.name%}</span>
+          <span class="upload-filesize">({%=o.formatFileSize(file.size)%})</span>
+          <span class="upload-filecancel cancel">'.__('Cancel').'</span>
+          {% if (!o.files.error && !i && !o.options.autoUpload) { %}
+          <input type="submit" class="button start"  value="'.__('Send').'"/>
+          {% } %}
+          <span class="upload-filemsg"></span>
+     </div>
+     {% if (!o.files.error) { %}
+     <div class="upload-progress progress progress-success progress-striped active"><div class="bar" style="width:0%;"></div></div>
+     {% } %}
+     </div>
+     {% } %}
+     </script>
+     <!-- The template to display files available for download -->
+     <script id="template-download" type="text/x-tmpl">
+     {% for (var i=0, file; file=o.files[i]; i++) { %}
+     <div class="template-download fade">
+     <div class="upload-file">
+     <div class="upload-fileinfo">
+          <span class="upload-filename">{%=file.name%}</span>
+          <span class="upload-filesize">({%=o.formatFileSize(file.size)%})</span>
+          <span class="upload-filemsg{% if (file.error) { %} upload-error{% } %}">
+          {% if (file.error) { %}
+          '.__('Error:').' {%=file.error%}
+          {% } else { %}
+          '.__('File successfully uploaded.').'
+          {% } %}
+          </span>
+     </div>
+     <div class="upload-progress">
+          {% if (!file.error) { %}
+          <div class="bar" style="width:100%;">100%</div>
+          {% } %}
+     </div>
+     </div>
+     {% } %}
+     </script>'.
+
+     self::jsLoad('js/jsUpload/vendor/jquery.ui.widget.js').
+     self::jsLoad('js/jsUpload/tmpl.js').
+     self::jsLoad('js/jsUpload/load-image.js').
+     self::jsLoad('js/jsUpload/jquery.iframe-transport.js').
+     self::jsLoad('js/jsUpload/jquery.fileupload.js').
+     self::jsLoad('js/jsUpload/jquery.fileupload-process.js').
+     self::jsLoad('js/jsUpload/jquery.fileupload-resize.js').
+     self::jsLoad('js/jsUpload/jquery.fileupload-ui.js').
+
      '<script type="text/javascript">'."\n".
      "//<![CDATA[\n".
@@ -746 +781 @@
      self::jsVar('dotclear.jsUpload.msg.clean',__('Clean')).
      self::jsVar('dotclear.jsUpload.msg.upload',__('Upload')).
-     self::jsVar('dotclear.jsUpload.msg.send',__('Send')).
-     self::jsVar('dotclear.jsUpload.msg.file_successfully_uploaded',__('File successfully uploaded.')).
      self::jsVar('dotclear.jsUpload.msg.no_file_in_queue',__('No file in queue.')).
      self::jsVar('dotclear.jsUpload.msg.file_in_queue',__('1 file in queue.')).
@@ -754 +787 @@
      self::jsVar('dotclear.jsUpload.base_url',$base_url).
      "\n//]]>\n".
-     "</script>\n".
-
-     self::jsLoad('js/jsUpload/vendor/jquery.ui.widget.js').
-     self::jsLoad('js/jsUpload/tmpl.js').
-     self::jsLoad('js/jsUpload/template-upload.js').
-     self::jsLoad('js/jsUpload/template-download.js').
-     self::jsLoad('js/jsUpload/load-image.js').
-     self::jsLoad('js/jsUpload/jquery.iframe-transport.js').
-     self::jsLoad('js/jsUpload/jquery.fileupload.js').
-     self::jsLoad('js/jsUpload/jquery.fileupload-process.js').
-     self::jsLoad('js/jsUpload/jquery.fileupload-resize.js').
-     self::jsLoad('js/jsUpload/jquery.fileupload-ui.js');
+     "</script>\n";
 }