# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-04-21 04:02:15
# Node ID b17a8f3c11975a87037dde6477eb4e2e796bc867
# Parent  9db59bee12251f6f2ad7870ffb9bd11a55a0b92b

file-upload: allow specfing custom filename for uploaded archives.

diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -660,7 +660,6 @@ class FilesController(BaseRepoController
         file_obj = r_post.get('upload_file', None)
 
         if file_obj is not None and hasattr(file_obj, 'filename'):
-            filename = file_obj.filename
             content = file_obj.file
 
             if hasattr(content, 'file'):
diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -2008,6 +2008,10 @@ BIN_FILENODE = 7
             input {
                 display: none;
             }
+          margin-top: 10px;
+        }
+        .file-upload-label {
+          margin-top: 10px;
         }
         p {
             margin-top: 5px;
diff --git a/rhodecode/templates/files/files_add.mako b/rhodecode/templates/files/files_add.mako
--- a/rhodecode/templates/files/files_add.mako
+++ b/rhodecode/templates/files/files_add.mako
@@ -56,11 +56,17 @@
         </div>
         <div id="upload_file_container" class="fieldset" style="display: none;">
             <div class="filename-label left-label">
+                ${_('Filename')}:
+            </div>
+            <div class="right-content">
+                <input class="input-small" type="text" value="" size="46" name="filename" id="filename_upload" placeholder="${_('No file selected')}">
+            </div>
+            <div class="filename-label left-label file-upload-label">
                 ${_('Upload file')}:
             </div>
             <div class="right-content file-upload-input">
                 <label for="upload_file" class="btn btn-default">Browse</label>
-                <span id="selected-file">${_('No file selected')}</span>
+
                 <input type="file" name="upload_file" id="upload_file">
                 <p>${_('or')} <a id="file_enable" href="#">${_('Create New File')}</a></p>
             </div>
@@ -155,10 +161,8 @@
     });
 
     $('#upload_file').on('change', function() {
-        if (detectIE() && detectIE() <= 9) {
-            if (this.files && this.files[0]) {
-                $('#selected-file').html(this.files[0].name);
-            }
+        if (this.files && this.files[0]) {
+            $('#filename_upload').val(this.files[0].name);
         }
     });