diff --git a/core/css/styles.css b/core/css/styles.css
index 0e4ac7ac3eb45d5c87c4f37f8ceba89abf3ab999..6c07c48b8a6e29950f1fb914fa6d74e1f8998e0a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -74,7 +74,7 @@ background: linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */ }
#metanav { float:right; position:relative; top:0.5em; right:2.5em; list-style:none; margin:0; padding:0; }
#metanav li { display:inline; }
#metanav li a { margin:.2em; padding:.7em; }
-#metanav li a:hover, #metanav li a:focus { background:rgba(0,0,0,.5); -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; outline:0; box-shadow:#555 0 1px 0; -moz-box-shadow:#555 0 1px 0; -webkit-box-shadow:#555 0 1px 0; }
+#metanav li a:hover, #metanav li a:focus { background:rgba(0,0,0,.5); -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:#555 0 1px 0; -moz-box-shadow:#555 0 1px 0; -webkit-box-shadow:#555 0 1px 0; }
#metanav li a img { vertical-align:middle; }
/* SEARCH --------------------------------------------------------------------- */
diff --git a/files/css/files.css b/files/css/files.css
index 31f041884fd5f74241d25057c6a1677432c5d26f..c66a42a9d33f6a8c937e9cfbf62ac6a55e349e23 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -16,20 +16,20 @@
table { position:relative; top:37px; width:100%; }
tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#eee; }
tbody a { color:#000; }
-
-span.extention { color:#999; }
+span.extention, td.date { color:#999; }
div.crumb { float:left; display:block; background-repeat:no-repeat; background-position:right 0px; font-weight:bold; padding-top:8px; padding-left:8px; height:28px; /*36-8*/ }
table tr.mouseOver td { background-color:#eee; }
table th { padding:.5em; }
table th .name { float:left; margin-left:.5em; }
table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
table td { border-bottom:1px solid #eee; font-style:normal; }
-table th#headerSize, table td.filesize, table th#headerDate, table td.date { width:5em; padding:0 1em; text-align:right; cursor:help; }
+table th#headerSize, table td.filesize { width:5em; padding:0 1em; text-align:right; cursor:help; }
+table th#headerDate, table td.date { width:15em; padding:0 .1em 0 1em; text-align:left; }
table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
-table td.filename a.name { display:block; background-image:url('../img/file.png'); text-decoration:none; }
-table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.5em .5em .5em 3em; background-position:1em center; background-repeat:no-repeat; }
-table td.filename a:hover, table td.filename a:focus { outline:0; }
-table td.filename a:active { outline:0; }
+table td.filename a.name { display:block; background-image:url('../img/file.png'); }
+table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.3em .5em .5em 3em; background-position:1em .5em; background-repeat:no-repeat; }
+table td.filename .nametext, .modified { float:left; padding:.3em 0; }
+table td.filename .nametext { width:80%; }
table td.filename a.folder-up { background-image:url('../img/back.png'); font-style:italic; }
table td.filename a.folder { background-image:url('../img/folder.png'); }
table td.filename a.folder-home { background-image:url('../img/home.png'); }
@@ -50,10 +50,10 @@ table td.delete { background-image:url('../img/delete.png'); }
#fileList tr input[type=checkbox]:checked, #fileList tr:hover input[type=checkbox] { display:inline; }
#fileList tr.selected td.filename a, #fileList tr:hover td.filename a { background-image:none !important }
#select_all { float:left; margin:0.2em; margin-left:0.6em; }
-#selectedActions { float:right; display:none; }
-#selectedActions a { margin:0 .5em; }
#uploadsize-message { display:none; }
-a.file_action { float:right; display:inline; padding:3px !important }
+.selectedActions a, a.file_action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
+.selectedActions { display:none; }
+.selectedActions a:hover, a.file_action:hover { background:#fff; -moz-box-shadow:0 0 10px #fff; -webkit-box-shadow:0 0 10px #fff; box-shadow:0 0 10px #fff; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
/* add breadcrumb divider to the File item in navigation panel */
#plugins li:first-child { background-position:15.7em 0px; background-repeat:no-repeat; background-image:url("/owncloud/core/img/breadcrumb-divider-start.png"); width:15.7em; padding-right:11px; }
diff --git a/files/js/files.js b/files/js/files.js
index 23d4c0205f0d58b044558f476c4bb900ac2c7e7f..e9ae0ecd012b983738e6ab9b6ac42d944c7c5f76 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -329,11 +329,11 @@ function procesSelection(){
if(selectedFiles.length==0 && selectedFolders.length==0){
$('#headerName>span.name').text('Name');
$('#headerSize').text('Size MB');
- $('#headerDate').text('Modified');
+ $('#modified').text('Modified');
$('th').css({background:'#fff',fontWeight:'normal'});
- $('#selectedActions').hide();
+ $('.selectedActions').hide();
}else{
- $('#selectedActions').show();
+ $('.selectedActions').show();
var totalSize=0;
for(var i=0;i<selectedFiles.length;i++){
totalSize+=selectedFiles[i].size;
@@ -369,7 +369,7 @@ function procesSelection(){
}
}
$('#headerName>span.name').text(selection);
- $('#headerDate').text('');
+ $('#modified').text('');
$('th').css({background:'#ddd', fontWeight:'bold'});
}
}
diff --git a/files/templates/index.php b/files/templates/index.php
index ac890257394acde6f0460452c9a47f21323b113c..c098a4e06322f8be7bfff9fe6df20762db311d12 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -28,14 +28,13 @@
<th id='headerName'>
<input type="checkbox" id="select_all" />
<span class='name'><?php echo $l->t( 'Name' ); ?></span>
- <span id='selectedActions'>
- <a href="" title="Download" class="download"><img alt="Download" src="../core/img/actions/download.svg" /></a>
- <!--<a href="" title="" class="share">Share</a>-->
- <a href="" title="Delete" class="delete"><img alt="Delete" src="../core/img/actions/delete.svg" /></a>
+ <span class='selectedActions'>
+ <a href="" title="Download" class="download"><img alt="Download" src="../core/img/actions/download.svg" /></a>
+ <!--<a href="" title="" class="share">Share</a>-->
</span>
</th>
<th id='headerSize'><?php echo $l->t( 'Size MB' ); ?></th>
- <th id='headerDate'><?php echo $l->t( 'Modified' ); ?></th>
+ <th id='headerDate'><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class='selectedActions'><a href="" title="Delete" class="delete"><img alt="Delete" src="../core/img/actions/delete.svg" /></a></span></th>
</tr>
</thead>
<tbody id="fileList">
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index cce0080b4dbb1908715eae11dbb260b7d5009448..1d78b77ae3e6d9fcd38a58534c85177b8861ae26 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -5,14 +5,16 @@
<td class="filename">
<input type="checkbox" />
<a class="name" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)" href="<?php if($file['type'] == 'dir') echo link_to('files', 'index.php?dir='.$file['directory'].'/'.$file['name']); else echo link_to('files', 'download.php?file='.$file['directory'].'/'.$file['name']); ?>" title="">
+ <span class="nametext">
<?php if($file['type'] == 'dir'):?>
<strong><?php echo htmlspecialchars($file['name']);?></strong>
<?php else:?>
<?php echo htmlspecialchars($file['basename']);?><span class='extention'><?php echo $file['extention'];?></span>
<?php endif;?>
+ </span>
</a>
</td>
<td class="filesize" title="<?php echo human_file_size($file['size']); ?>" style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)"><?php echo $simple_file_size; ?></td>
- <td class="date"><?php echo $file['date']; ?></td>
+ <td class="date"><span class="modified"><?php echo $file['date']; ?></span></td>
</tr>
<?php endforeach; ?>