Changeset 3897

Timestamp:

03/23/11 17:56:25 (12 years ago)

Author:

alexandrecorreia

Message:

Ticket #1648 - Erro no upload do arquivo, colocado link de remover na primeira input tb.

Location:

branches/2.2/filemanager

Files:

• inc/class.uifilemanager.inc.php (modified) (1 diff)
• inc/upload.php (modified) (1 diff)
• js/handler.js (modified) (2 diffs)
• tp/expressowindow/xsl/upload.xsl (modified) (2 diffs)

branches/2.2/filemanager/inc/class.uifilemanager.inc.php

@@ -777 +777 @@
                          'lang_comment'                 => lang('Comment(s)'),
                          'lang_advanced_upload' => lang('Advanced Upload'),
+                         'lang_delete'                  => lang('delete'),
                          'lang_upload'                  => lang('Upload files'),
                          'max_size'                             => lang('The maximum size for each file is %1MB', ($this->current_config['filemanager_Max_file_size'])),

branches/2.2/filemanager/inc/upload.php

@@ -179 +179 @@
 
                                 $return[] = array(
-                                                                "file"          => $_FILES['upload_file']['name'][$i],                                                                  
+                                                                "file"          => $FILE_ORIGINAL,                                                                      
                                                                 "undefined"     => lang( "There is a file %1, that was not replaced", $FILE_ORIGINAL )
                                 );

branches/2.2/filemanager/js/handler.js

@@ -291 +291 @@
                                                         else if( response[i]['undefined'] )
                                                         {
-                                                                _div.innerHTML = "<span style='font-weight:bold' >Erro </span>:: "  + response[i]['undefined']; 
+                                                                _div.innerHTML = "<span style='font-weight:bold' >Arquivo Duplicado </span>:: "  + response[i]['file']; 
                                                         }
                                                         else if( response[i]['filesize'] )
@@ -297 +297 @@
                                                                 _div.innerHTML = "<span style='font-weight:bold' >Erro </span>:: "  + response[i]['filesize'];  
                                                         }
-                                                }
-                                                else
-                                                {
-                                                        write_msg( response[i]['undefined'] );
-                                                        _winBuild( "dwindownewUpload" , "remove" );     
                                                 }
                                         }

branches/2.2/filemanager/tp/expressowindow/xsl/upload.xsl

@@ -9 +9 @@
         <xsl:param name="lang_click_here"/>
         <xsl:param name="lang_comment" /> 
+        <xsl:param name="lang_delete" />        
         <xsl:param name="lang_file" />
         <xsl:param name="lang_more_files" />
@@ -42 +43 @@
                                                 <div></div>
                                                 <input maxlength="255" name="upload_file[]" type="file" style="margin-right:5px" />
-                                                <input name="upload_comment[]" type="text" />
-                                                <input type="hidden" name="uploadprocess" value="true" />
-                                                <input type="hidden" name="path" value="{$path}" />
+                                                <input name="upload_comment[]" type="text" style="margin-right:2px" />
+                                                <span style="color:red; cursor:pointer;" onclick="removeInput(this);"><xsl:value-of select="$lang_delete" /></span>
                                         </div>
-                                        
                                 </div>