diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-10 22:56:44 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-10 23:02:41 +0200 |
| commit | 6af4c2dd0f0e3dce72814ebf34acdc44cf96ec10 (patch) | |
| tree | 50e2c1f1cf6fb718ba7cb013cd6d791f4b2941d8 /files | |
| parent | 05f391071851ce5d83d327961535545552e36e52 (diff) | |
| download | nextcloud-server-6af4c2dd0f0e3dce72814ebf34acdc44cf96ec10.tar.gz nextcloud-server-6af4c2dd0f0e3dce72814ebf34acdc44cf96ec10.zip | |
moved search box directly to template
Diffstat (limited to 'files')
| -rw-r--r-- | files/css/files.css | 4 | ||||
| -rw-r--r-- | files/templates/index.php | 29 |
2 files changed, 14 insertions, 19 deletions
diff --git a/files/css/files.css b/files/css/files.css index 23fdf2ee50e..9ec838a8d5d 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -5,11 +5,9 @@ /* FILE MENU */ .actions { padding:.6em; float:right; margin-right:13em; } .actions input { margin:0; padding:.3em; } -.actions div { position: relative; display:inline-block; } #file_menu { right:0; position:absolute; top:0; } #file_menu a { display:block; float:left; background-image:none; text-decoration:none; } -.file_upload_form { display: inline; z-index: 5;} -#file_newfolder_form { display:inline; z-index: 6;} +.file_upload_form, #file_newfolder_form { display:inline; } #fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; } .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; } diff --git a/files/templates/index.php b/files/templates/index.php index d9a6c2b4b80..3951787a25d 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -1,22 +1,19 @@ <div id="controls"> <?php echo($_['breadcrumb']); ?> <div class="actions"> - <div syle="z-index:4;"> - <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 type="submit" class="file_upload_filename" value="<?php echo $l->t('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> - </div><div style="z-index:5;"> - <form id="file_newfolder_form"> - <input type="text" name="file_newfolder_name" id="file_newfolder_name" value="" placeholder="<?php echo $l->t('New Folder')?>" /> - </form> - </div> + <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 type="submit" class="file_upload_filename" value="<?php echo $l->t('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" name="file_newfolder_name" id="file_newfolder_name" value="" placeholder="<?php echo $l->t('New Folder')?>" /> + </form> </div> <div id="file_action_panel"> </div> |