summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/scripts/fileuploaderextended.js5
-rw-r--r--lib/tpl/default/_fileuploader.css11
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js
index 60a3427a8..36fc3ec63 100644
--- a/lib/scripts/fileuploaderextended.js
+++ b/lib/scripts/fileuploaderextended.js
@@ -56,6 +56,8 @@ qq.extend(qq.FileUploader.prototype, {
this._find(item, 'size').style.display = 'none';
var nameElement = this._find(item, 'nameInput');
+ fileName = fileName.toLowerCase();
+ fileName = fileName.replace(/([^a-z0-9_\.\-]+)/g, '_');
nameElement.value = fileName;
nameElement.id = 'mediamanager__upload_item'+id;
@@ -77,8 +79,9 @@ qq.FileUploaderExtended = function(o){
'<div class="qq-upload-drop-area"><span>' + LANG.media_drop + '</span></div>' +
'<div class="qq-upload-button">' + LANG.media_select + '</div>' +
'<div class="qq-upload-list"></div>' +
+ '<div><input class="button" type="submit" value="' + LANG.media_upload_btn + '" id="mediamanager__upload_button">' +
'<label class="check" for="dw__ow"><input id="dw__ow" type="checkbox" value="1" name="ow"><span>' + LANG.media_overwrt + '</span></label>' +
- '<div><input class="button" type="submit" value="' + LANG.media_upload_btn + '" id="mediamanager__upload_button"></div>' +
+ '</div>' +
'</div>',
// template for one item in file list
diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
index 07f3158a1..e87ba94db 100644
--- a/lib/tpl/default/_fileuploader.css
+++ b/lib/tpl/default/_fileuploader.css
@@ -87,5 +87,14 @@
}
.qq-uploader #dw__ow {
- margin: 10px 0;
+ margin: 10px 3px -5px 10px;
}
+
+.qq-uploader .check {
+ line-height: 18px;
+}
+
+.qq-uploader #mediamanager__upload_button {
+ margin-top: -5px;
+ margin-bottom: 10px;
+} \ No newline at end of file