From fef7e9d5f448c490cd9f6184381d9bc73dd23a63 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sat, 27 Aug 2011 22:16:39 -0400
Subject: [PATCH] Style changes for multiselect and add tipsy for file size

---
 core/js/js.js       | 1 +
 files/css/files.css | 4 ++--
 files/js/files.js   | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index a72573e326..f2b60790c7 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -339,6 +339,7 @@ $(document).ready(function(){
 	$('.file_upload_button_wrapper').tipsy({gravity:'e', fade:true}); 
 	$('td.filesize').tipsy({gravity:'s', fade:true, live:true});
 	$('td .modified').tipsy({gravity:'s', fade:true, live:true});
+	$('#headerSize').tipsy({gravity:'s', fade:true, live:true});
 
 	$('input').tipsy({gravity:'w', fade:true});
 	$('input[type=text]').focus(function(){
diff --git a/files/css/files.css b/files/css/files.css
index 787efa49e0..27ead667dc 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -51,13 +51,13 @@ table td.filename a, table td.login, table td.logout, table td.download, table t
 table td.filename .nametext, .modified { float:left; padding:.3em 0; }
 table td.filename .nametext { width:60%; }
 table td.filename form { float:left; font-size:.85em; }
-table thead.fixed tr{ position:fixed; top:6.3em; z-index:49; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
+table thead.fixed tr{ position:fixed; top:6.5em; z-index:49; -moz-box-shadow:0 -3px 7px #ddd; -webkit-box-shadow:0 -3px 7px #ddd; box-shadow:0 -3px 7px #ddd; }
 table thead.fixed { height:2em; }
 #fileList tr td.filename>input[type=checkbox]:first-child { opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
 #fileList tr:hover td.filename>input[type="checkbox"]:first-child { opacity:.8; }
 #fileList tr td.filename>input[type="checkbox"]:checked:first-child { opacity:1; }
 #fileList tr td.filename { -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; }
-#select_all { float:left; margin:.2em; margin-left:.6em; }
+#select_all { float:left; margin:.3em 0.6em 0 .5em; }
 #uploadsize-message,#delete-confirm { display:none; }
 .selectedActions a, a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
 .selectedActions { display:none; }
diff --git a/files/js/files.js b/files/js/files.js
index 9829789fe0..82cfc34acc 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -311,8 +311,8 @@ function procesSelection(){
 	var selectedFiles=selected.filter(function(el){return el.type=='file'});
 	var selectedFolders=selected.filter(function(el){return el.type=='dir'});
 	if(selectedFiles.length==0 && selectedFolders.length==0){
-		$('#headerName>span.name').text('Name');
-		$('#headerSize').text(t('files','Size MB'));
+		$('#headerName>span.name').text(t('files','Name'));
+		$('#headerSize').text(t('files','Size'));
 		$('#modified').text(t('files','Modified'));
 		$('th').removeClass('multiselect');
 		$('.selectedActions').hide();
@@ -327,7 +327,7 @@ function procesSelection(){
 		$('#headerName').css('width',width.name);
 		$('#headerSize').css('width',width.size);
 		$('#headerDate').css('width',width.date);
-		$('table').css('padding-top','2em');
+		$('table').css('padding-top','2.1em');
 		$('.selectedActions').show();
 		var totalSize=0;
 		for(var i=0;i<selectedFiles.length;i++){
@@ -337,7 +337,7 @@ function procesSelection(){
 			totalSize+=selectedFolders[i].size;
 		};
 		simpleSize=simpleFileSize(totalSize);
-		$('#headerSize').text(simpleSize+' MB');
+		$('#headerSize').text(simpleSize);
 		$('#headerSize').attr('title',humanFileSize(totalSize));
 		var selection='';
 		if(selectedFolders.length>0){