resolved merge conflict

6 files changed, 43 insertions, 29 deletions

diff --git a/files/css/files.css b/files/css/files.css
index 9fcc24a80af..093d317e683 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -3,17 +3,17 @@
  See the COPYING-README file. */
 
 /* FILE MENU */
-.actions { padding:.6em; float:right; margin-right:13em; }
-.actions input { margin:0; padding:.3em; }
+.actions { padding:.3em; float:left; }
+.actions input { margin: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; float: left;}
 #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 { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin-right:1.5em;}
+.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; }
+.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:.1em 1em;}
 .file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
 
-#file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:bold; width:8em; }
+#file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:normal; width:6em; }
 .file_upload_start, .file_upload_filename { font-size:1em; }
 #file_newfolder_submit, #file_upload_submit { width:3em; }
 .file_upload_target { display:none; }
@@ -26,7 +26,6 @@
 /* FILE TABLE */
 span#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
 table { position:relative; top:37px; width:100%; }
-table tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
 tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; height:1em; }
 tbody tr.selected { background-color:#eee; }
 tbody a { color:#000; }
@@ -54,13 +53,14 @@ 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 { 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 td.filename>input[type="checkbox"]:checked:first-child, #fileList tr:hover td.filename>input[type="checkbox"]:first-child { opacity:1; }
+#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:.5; }
+#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; }
 #fileList tr.selected td.filename, #fileList tr:hover td.filename { background-image:url('') !important; }
 #select_all { float:left; margin:.2em; margin-left:.6em; }
 #uploadsize-message,#delete-confirm { display:none; }
-.selectedActions a, a.file_action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
+.selectedActions a, a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; }
 .selectedActions { display:none; }
 
 /* add breadcrumb divider to the File item in navigation panel */
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 2bc79abe723..a0a04ff1662 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -53,7 +53,7 @@ FileActions={
 	},
 	display:function(parent){
 		FileActions.currentFile=parent;
-		$('.file_action').remove();
+		$('.action').remove();
 		var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
 		var file=FileActions.getCurrentFile();
 		if($('tr[data-file="'+file+'"]').data('renaming')){
@@ -66,7 +66,7 @@ FileActions={
 				if(img.call){
 					img=img(file);
 				}
-				var html='<a href="#" title="'+name+'" class="file_action"/>';
+				var html='<a href="#" title="'+name+'" class="action" />';
 				var element=$(html);
 				if(img){
 					element.append($('<img src="'+img+'"/>'));
@@ -85,7 +85,7 @@ FileActions={
 		}
 		if(actions['Delete']){
 			var img=FileActions.icons['Delete'];
-			var html='<a href="#" title="Delete" class="file_action"/>';
+			var html='<a href="#" title="Delete" class="action" />';
 			var element=$(html);
 			if(img){
 				element.append($('<img src="'+img+'"/>'));
@@ -101,12 +101,12 @@ FileActions={
 			});
 			parent.parent().children().last().append(element);
 		}
-		$('.file_action').hide();
-		$('.file_action').fadeIn(200);
+		$('.action').hide();
+		$('.action').fadeIn(200);
 		return false;
 	},
 	hide:function(){
-		$('.file_action').fadeOut(200,function(){
+		$('.action').fadeOut(200,function(){
 			$(this).remove();
 		});
 	},
diff --git a/files/js/files.js b/files/js/files.js
index 8fdbd418462..f5a61a69a15 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -17,10 +17,6 @@ $(document).ready(function() {
 		$(this).parent().children('.file_upload_start').trigger('click');
 		return false;
 	});
-	
-	$('#file_upload_button_wrapper').tipsy({gravity:'e'}); 
-	$('td.filesize').tipsy({gravity:'se', live:true});
-	$('td .modified').tipsy({gravity:'s', live:true});
 
 	// Sets the file-action buttons behaviour :
 	$('tr').live('mouseenter',function(event) {
diff --git a/files/l10n/de.php b/files/l10n/de.php
new file mode 100644
index 00000000000..ade5a049503
--- /dev/null
+++ b/files/l10n/de.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Files" => "Dateien",
+"Maximum upload size" => "Maximale Größe",
+"Nothing in here. Upload something!" => "Alles leer. Lad’ was hoch!",
+"Upload" => "Hochladen",
+"New Folder" => "Neuer Ordner",
+"Name" => "Name",
+"Download" => "Herunterladen",
+"Size" => "Größe",
+"Modified" => "Bearbeitet",
+"Delete" => "Löschen",
+"Upload too large" => "Upload zu groß",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
+);
diff --git a/files/l10n/fr.php b/files/l10n/fr.php
new file mode 100644
index 00000000000..ccaf9a3867d
--- /dev/null
+++ b/files/l10n/fr.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Files" => "Fichiers",
+"Maximum upload size" => "Taille max. d'envoi",
+"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
+"Upload" => "Envoyer",
+"New Folder" => "Nouveau dossier",
+"Name" => "Nom",
+"Download" => "Téléchargement",
+"Size" => "Taille",
+"Modified" => "Modifié",
+"Delete" => "Supprimer",
+"Upload too large" => "Fichier trop volumineux",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur."
+);
diff --git a/files/templates/admin.php b/files/templates/admin.php
index e0cf2608301..0122865ee72 100644
--- a/files/templates/admin.php
+++ b/files/templates/admin.php
@@ -7,14 +7,4 @@
 	<?php else:?>
 		No settings currently available.
 	<?php endif;?>
-<!--	<input type="checkbox" name="publicEnable" id="publicEnable" /><label for="publicEnable"> <?php echo $l->t( 'Allow public folders' ); ?></label><br>
-
-	<div style="padding-left: 20px">
-		<input type="radio" name="sharingaim" id="separated" /><label for="separated"> <?php echo $l->t( 'separated from webdav storage' ); ?></label><br>
-		<input type="radio" name="sharingaim" id="userdecide" /><label for="userdecide"> <?php echo $l->t( 'let the user decide' ); ?></label><br>
-		<input type="radio" name="sharingaim" id="inwebdav" /><label for="inwebdav"> <?php echo $l->t( 'folder "/public" in webdav storage' ); ?></label>
-	</div>
-
-	<input type="checkbox" id="downloadShared" /><label for="downloadShared"> <?php echo $l->t( 'Allow downloading shared files' ); ?></label><br>
-	<input type="checkbox" id="uploadShared" /><label for="uploadShared"> <?php echo $l->t( 'Allow uploading in shared directory' ); ?></label><br>-->
 </form>