diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-09 10:42:50 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-09 10:42:50 -0400 |
| commit | ec6aed847585565f703e0c8bef0b75782bfe4560 (patch) | |
| tree | ae8e3a897143ea2198381dfb736ae82b2949dd49 /files | |
| parent | 9a8eb7298c16ea3c10019d04695be04d6205a701 (diff) | |
| parent | 1419d7f2b02a2182eb746443b62572f1b4b3f655 (diff) | |
| download | nextcloud-server-ec6aed847585565f703e0c8bef0b75782bfe4560.tar.gz nextcloud-server-ec6aed847585565f703e0c8bef0b75782bfe4560.zip | |
Merge branch 'master' into sharing
Diffstat (limited to 'files')
| -rw-r--r-- | files/admin.php | 2 | ||||
| -rw-r--r-- | files/appinfo/app.php | 5 | ||||
| -rw-r--r-- | files/css/files.css | 2 | ||||
| -rw-r--r-- | files/js/filelist.js | 2 | ||||
| -rw-r--r-- | files/templates/index.php | 2 |
5 files changed, 4 insertions, 9 deletions
diff --git a/files/admin.php b/files/admin.php index 0b8639f38ca..7161de6e196 100644 --- a/files/admin.php +++ b/files/admin.php @@ -42,7 +42,7 @@ if(isset($_POST['maxUploadSize'])){ OC_App::setActiveNavigationEntry( "files_administration" ); // return template -$tmpl = new OC_Template( "files", "admin", "admin" ); +$tmpl = new OC_Template( "files", "admin", "user" ); $tmpl->assign( 'htaccessWorking', $htaccessWorking ); $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize); $tmpl->printPage(); diff --git a/files/appinfo/app.php b/files/appinfo/app.php index 0f95b19f592..a4cec3d6ec2 100644 --- a/files/appinfo/app.php +++ b/files/appinfo/app.php @@ -3,10 +3,5 @@ OC_App::register( array( "order" => 2, "id" => "files", "name" => "Files" )); OC_App::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_Helper::linkTo( "files", "index.php" ), "icon" => OC_Helper::imagePath( "files", "home.png" ), "name" => "Files" )); -OC_App::addAdminPage( array( "id" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => "Files", "icon" => OC_Helper::imagePath( "files", "folder.png" ))); - - -// To add navigation sub entries use -// OC_App::addNavigationSubEntry( "files_index", array( ... )); ?> diff --git a/files/css/files.css b/files/css/files.css index b57d1a9bed2..883fed5be4a 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -9,7 +9,7 @@ .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_newfolder_name { background-image:url("../img/folder.png"); font-weight:bold; width:8em; } .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/js/filelist.js b/files/js/filelist.js index 8fd3bceafb1..ce9595d3495 100644 --- a/files/js/filelist.js +++ b/files/js/filelist.js @@ -113,7 +113,7 @@ FileList={ var tr=$('tr[data-file="'+name+'"]'); tr.data('renaming',true); var td=tr.children('td.filename'); - var input=$('<input value='+name+' class="filename"></input>'); + var input=$('<input value="'+name+'" class="filename"></input>'); var form=$('<form action="#"></form>') form.append(input); td.children('a.name').text(''); diff --git a/files/templates/index.php b/files/templates/index.php index 155bcf1ad51..1d059d88501 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -1,4 +1,4 @@ -<div class="controls"> +<div id="controls"> <span class="nav"> <?php echo($_['breadcrumb']); ?> </span> |