Changeset 1461:b58a6d10a368

Timestamp:

08/18/13 20:15:28 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Fix issue #1555 : load templates from external files. x-tmpl templates made html invalid.

Files:

• admin/js/_media.js (modified) (1 diff)
• admin/js/jsUpload/template-download.js (added)
• admin/js/jsUpload/template-upload.js (added)
• inc/admin/lib.dc.page.php (modified) (3 diffs)

admin/js/_media.js

@@ -57 +57 @@
           autoUpload: false,
           sequentialUploads: true,
-          disabled: true
+          uploadTemplateId: null,
+          downloadTemplateId: null,
+          uploadTemplate: template_upload,
+          downloadTemplate: template_download
      }).bind('fileuploadadd', function(e, data) {
           $('.button.cancel','#fileupload .fileupload-buttonbar').show();

inc/admin/lib.dc.page.php

@@ -730 +730 @@
      '<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++) { %}
-     <li 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>
-     {% } %}
-     </li>
-     {% } %}
-     </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++) { %}
-     <li 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>
-     </li>
-     {% } %}
-     </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".
@@ -799 +746 @@
      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.')).
@@ -805 +754 @@
      self::jsVar('dotclear.jsUpload.base_url',$base_url).
      "\n//]]>\n".
-     "</script>\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');
 }