Changeset 15497 for trunk/templates

Timestamp:

09/11/11 22:07:21 (9 months ago)

Author:

Alexander Trofimov

Message:

uploaders

Location:

trunk/templates/base

Files:

• css/uploaders.css (modified) (1 diff)
• form_field_uploader.html (modified) (1 diff)
• scripts/BxBaseFormView.php (modified) (1 diff)
• scripts/BxBaseUploaderHTML5.php (modified) (3 diffs)
• uploader_button_html5.html (modified) (1 diff)
• uploader_button_simple.html (modified) (1 diff)
• uploader_form_simple.html (modified) (1 diff)
• uploader_nested_form_wrapper.html (added)

trunk/templates/base/css/uploaders.css

@@ -15 +15 @@
 .bx-uploader-form-cont {
     width:500px;
+}
+
+.bx-uploader-ghost-preview {
+    width:150px; 
+    float:left;
+}
+
+.bx-uploader-ghost-form {
+    width:500px; 
+    float:left;
 }
 

trunk/templates/base/form_field_uploader.html

@@ -5 +5 @@
 </div>
 __info__
-<div id="__id_container_errors__" class="bx-form-input-files-errors bx-def-margin-sec-top">&nbsp;</div>
-<div id="__id_container_result__" class="bx-form-input-files-result bx-def-margin-sec-top">&nbsp;</div>
+<div id="__id_container_errors__" class="bx-form-input-files-errors"></div>
+<div id="__id_container_result__" class="bx-form-input-files-result bx-def-margin-sec-top"></div>
 <script>
     $(document).ready(function(){

trunk/templates/base/scripts/BxBaseFormView.php

@@ -703 +703 @@
 
             }
-            $sUploaders .= $oUploader->getUploaderButton($sGhostTemplate);
+            $sUploaders .= $oUploader->getUploaderButton($sGhostTemplate, isset($aInput['multiple']) ? $aInput['multiple'] : true);
         }                
 

trunk/templates/base/scripts/BxBaseUploaderHTML5.php

@@ -27 +27 @@
      * @return HTML string 
      */
-    public function getUploaderButton($sGhostTemplate) {
-        $s = parent::getUploaderButton($sGhostTemplate);
+    public function getUploaderButton($sGhostTemplate, $isMultiple = true) {
+        $s = parent::getUploaderButton($sGhostTemplate, $isMultiple);
 
         $oTemplate = BxDolTemplate::getInstance();
@@ -77 +77 @@
             $aResponse = array ('success' => 1);
         } else {
-            $this->appendUploadErrorMessage("error uploading file (" . (isset($_FILES['qqfile']['name']) ? $_FILES['qqfile']['name'] : bx_get('qqfile')) . "): " . $oStorage->getErrorCode());
+            $this->appendUploadErrorMessage(_t('_sys_uploader_err_msg', isset($_FILES['qqfile']['name']) ? $_FILES['qqfile']['name'] : bx_get('qqfile'), $oStorage->getErrorCode()));
             $aResponse = array ('error' => $this->getUploadErrorMessages());
         }         
@@ -83 +83 @@
         require_once(BX_DIRECTORY_PATH_PLUGINS . 'Services_JSON.php');
         $oParser = new Services_JSON();
-        header('Content-type: text/html; charset=utf-8'); 
         echo htmlspecialchars($oParser->encode($aResponse), ENT_NOQUOTES);
     }

trunk/templates/base/uploader_button_html5.html

@@ -3 +3 @@
         $(document).ready(function(){
             __uploader_instance_name__ = new BxDolUploaderHTML5('__engine__', '__storage_object__', '__uniq_id__', {
-                'template_error_msg': '<div class="bx-uploader-msg-err">{error}</div>',
+                'multiple': __multiple__,
+                'template_error_msg': '<div class="bx-uploader-msg-err">{error}</div>',            
                 'template_ghost': __template_ghost__
             });

trunk/templates/base/uploader_button_simple.html

@@ -1 @@
-    <a href="javascript:void(0);" onclick="__uploader_instance_name__.showUploaderForm();" class="bx-btn bx-btn-primary bx-def-margin-sec-left"><bx_text:_sys_uploader_simple_button_name /></a>
+    <a href="javascript:void(0);" onclick="__uploader_instance_name__.showUploaderForm();" class="bx-btn bx-def-margin-sec-left"><bx_text:_sys_uploader_simple_button_name /></a>
     <script>
         $(document).ready(function(){
             __uploader_instance_name__ = new BxDolUploaderSimple('__engine__', '__storage_object__', '__uniq_id__', {
+                'multiple': __multiple__,
                 'template_error_msg': '<div class="bx-uploader-msg-err">{error}</div>',
                 'template_ghost': __template_ghost__

trunk/templates/base/uploader_form_simple.html

@@ -14 +14 @@
             <div class="bx-uploader-simple-file"><input name="f[]" type="file" /></div>
 
-            <div><a href="javascript:void(0);" onclick="$('#__form_container_id__ .bx-uploader-simple-file').first().clone().insertBefore(this)"><bx_text:_sys_uploader_simple_attach_one_more_file /></a></div>
+            <div class="bx-uploader-add-more-files"><a href="javascript:void(0);" onclick="$('#__form_container_id__ .bx-uploader-simple-file').first().clone().insertBefore(this)"><bx_text:_sys_uploader_simple_attach_one_more_file /></a></div>
 
             <input name="uo" value="__engine__" type="hidden" />