summaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-08-08 12:48:43 +0200
committerJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-08-08 12:48:43 +0200
commitecd2738e8397e8773c13a8bc4bf4ebfb360442ba (patch)
treed7b062047ab412551727b0f9257a96da0bc0f7e6 /files
parent8c1e100fe069d95d584f2ae9ebd0e892392cc303 (diff)
downloadnextcloud-server-ecd2738e8397e8773c13a8bc4bf4ebfb360442ba.tar.gz
nextcloud-server-ecd2738e8397e8773c13a8bc4bf4ebfb360442ba.zip
fixed upload button
Diffstat (limited to 'files')
-rw-r--r--files/css/files.css14
-rw-r--r--files/templates/index.php16
2 files changed, 14 insertions, 16 deletions
diff --git a/files/css/files.css b/files/css/files.css
index 17ca1303a97..004e42338fc 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -1,18 +1,16 @@
/* FILE MENU */
-.actions { padding:.6em; float:right; margin-right:16em; }
+.actions { padding:.6em; float:right; margin-right:13em; }
.actions input { margin:0; padding:.3em; }
-.actions .file_upload_form input { padding-left:2em; }
-#file_menu { right:0px; position:absolute; top:0; }
+#file_menu { right:0; position:absolute; top:0; }
#file_menu a { display:block; float:left; background-image:none; text-decoration:none; }
.file_upload_form, #file_newfolder_form { display:inline; }
#fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; }
-.file_upload_filename, #file_newfolder_name { background-repeat:no-repeat; background-position:0.5em 0; padding-left:2em; }
-.file_upload_filename { background-image:url("../img/file.png"); font-weight:bold; }.file_upload_start { opacity:0;filter:alpha(opacity = 0); }
-input.highlight{ background-color:#ffc100; border:#dda600 1px solid; }
+.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .3em; padding-left:2em; }
+.file_upload_wrapper { background:url("../img/file.png"); font-weight:bold; position:relative; top:-1.2em; left:-2em; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; width:8em; }
+.file_upload_start { opacity:0; filter:alpha(opacity=0); }
#file_newfolder_name { background-image:url("../img/folder.png"); font-weight:bold; width:12em; }
-.file_upload_start, .file_upload_filename { position:absolute; top:0px; left:0px; width:12em; font-size:0.9em; }
-.file_upload_wrapper { position:relative; top:-1.2em; left:-2em; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; width:12em; }
+.file_upload_start, .file_upload_filename { position:absolute; top:0; left:0; font-size:1em; }
#file_newfolder_submit, #file_upload_submit { width:3em; }
.file_upload_target { display:none; }
diff --git a/files/templates/index.php b/files/templates/index.php
index 3f7b45ca855..46d47ee4e85 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -4,17 +4,17 @@
</span>
<div class="actions">
<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
- <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_["uploadMaxFilesize"] ?>" id="max_upload">
- <input type="hidden" class="max_human_file_size" value="(max <?php echo $_["uploadMaxHumanFilesize"]; ?>)">
- <input type="hidden" name="dir" value="<?php echo $_["dir"] ?>" id="dir">
- <div class='file_upload_wrapper'>
- <input class="prettybutton file_upload_filename" value="Upload (max. <?php echo $_["uploadMaxHumanFilesize"];?>)"/>
- <input class="prettybutton file_upload_start" type="file" name='files[]'/>
- </div>&nbsp;
+ <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+ <input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+ <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
+ <div class="file_upload_wrapper">
+ <input type="submit" class="file_upload_filename" value="Upload (max. <?php echo $_['uploadMaxHumanFilesize'];?>)"/>
+ <input class="file_upload_start" type="file" name='files[]'/>
+ </div>
<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
</form>
<form id="file_newfolder_form">
- <input type="text" class="prettybutton" name="file_newfolder_name" id="file_newfolder_name" value="New Folder" />&nbsp;
+ <input type="text" name="file_newfolder_name" id="file_newfolder_name" value="" placeholder="New Folder" />
</form>
</div>
<div id="file_action_panel">