Merge branch 'master' into sharing

Conflicts:
	.gitignore

14 files changed, 24 insertions, 13 deletions

diff --git a/files/admin.php b/files/admin.php
index 7161de6e196..db47bc7c033 100644
--- a/files/admin.php
+++ b/files/admin.php
@@ -28,7 +28,7 @@ require_once('../lib/base.php');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
-	header( "Location: ".OC_Helper::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( "files", "index.php" ));
 	exit();
 }
 
diff --git a/files/ajax/download.php b/files/ajax/download.php
index 2bbf1df4eca..4c756f9b190 100644
--- a/files/ajax/download.php
+++ b/files/ajax/download.php
@@ -26,7 +26,7 @@ require_once('../../lib/base.php');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	header( "Location: ".OC_Helper::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( "", "index.php" ));
 	exit();
 }
 
diff --git a/files/appinfo/app.php b/files/appinfo/app.php
index 94cd43ab0a2..e8b2f0c3169 100644
--- a/files/appinfo/app.php
+++ b/files/appinfo/app.php
@@ -4,6 +4,6 @@ $l=new OC_L10N('files');
 
 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" => $l->t("Files") ));
+OC_App::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_Helper::linkTo( "files", "index.php" ), "icon" => OC_Helper::imagePath( "core", "places/home.svg" ), "name" => $l->t("Files") ));
 
 ?>
diff --git a/files/css/files.css b/files/css/files.css
index aca612ce1e6..8613fd8904e 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -11,8 +11,9 @@
 #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_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
 
-#file_newfolder_name { background-image:url("../img/folder.png"); font-weight:bold; width:8em; }
+#file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:bold; width:8em; }
 .file_upload_start, .file_upload_filename { font-size:1em; }
 #file_newfolder_submit, #file_upload_submit { width:3em; }
 .file_upload_target { display:none; }
@@ -20,6 +21,8 @@
 .file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;}
 .file_upload_filename { z-index:100; cursor:pointer;}
 
+.file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; }
+
 /* 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%; }
@@ -57,4 +60,4 @@ table thead.fixed {height:2em}
 .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 */
-#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.png') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; }
+#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; }
diff --git a/files/download.php b/files/download.php
index cc52b930f72..ccd3eb43d8e 100644
--- a/files/download.php
+++ b/files/download.php
@@ -26,7 +26,7 @@ require_once('../lib/base.php');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	header( "Location: ".OC_Helper::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( "", "index.php" ));
 	exit();
 }
 
diff --git a/files/img/file.png b/files/img/file.png
deleted file mode 100644
index 49790448897..00000000000
--- a/files/img/file.png
+++ /dev/null
diff --git a/files/img/folder.png b/files/img/folder.png
deleted file mode 100644
index 3edbe257a34..00000000000
--- a/files/img/folder.png
+++ /dev/null
diff --git a/files/img/home.png b/files/img/home.png
deleted file mode 100644
index b3fb9bbaf6f..00000000000
--- a/files/img/home.png
+++ /dev/null
diff --git a/files/img/loading.gif b/files/img/loading.gif
deleted file mode 100644
index 5b33f7e54f4..00000000000
--- a/files/img/loading.gif
+++ /dev/null
diff --git a/files/js/filelist.js b/files/js/filelist.js
index 4a34385fd0b..50a995bf254 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -3,7 +3,7 @@ FileList={
 		$('#fileList').empty().html(fileListHtml);
 	},
 	addFile:function(name,size,lastModified,loading){
-		var img=(loading)?'img/loading.gif':'img/file.png';
+		var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file.png');
 		var html='<tr data-file="'+name+'" data-type="file" data-size="'+size+'">';
 		if(name.indexOf('.')!=-1){
 			var basename=name.substr(0,name.indexOf('.'));
diff --git a/files/js/files.js b/files/js/files.js
index bc040b54d57..950f06a31a1 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -12,6 +12,12 @@ $(document).ready(function() {
 	$('#plugins>ul>li:first-child').data('dir','');
 	$('#plugins>ul>li:first-child').droppable(crumbDropOptions);
 	
+	// Triggers invisible file input
+	$('#file_upload_button_wrapper').bind('click', function() {
+		$('#file_upload_start').trigger('click');
+		return false;
+	});
+
 	// Sets the file-action buttons behaviour :
 	$('tr').live('mouseenter',function(event) {
 		FileActions.display($(this).children('td.filename'));
diff --git a/files/settings.php b/files/settings.php
index 1f2e9d9868c..2bbcb2acd3a 100644
--- a/files/settings.php
+++ b/files/settings.php
@@ -27,7 +27,7 @@ require_once('../lib/base.php');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn()){
-	header( "Location: ".OC_Helper::linkTo( "index.php" ));
+	header( "Location: ".OC_Helper::linkTo( "", "index.php" ));
 	exit();
 }
 
diff --git a/files/templates/index.php b/files/templates/index.php
index 137c5ce5922..008051492d0 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -5,14 +5,16 @@
 			<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 class="file_upload_wrapper" class="svg">
+				<input type="submit" class="file_upload_filename" value="<?php echo $l->t('Upload');
+				 if($_['uploadMaxFilesize']<(10000000000)){echo ' (max. '.$_['uploadMaxHumanFilesize'].')';}?>"/>
+				<input id="file_upload_start" class="file_upload_start" type="file" name='files[]'/>
+				<a href="#" id="file_upload_button_wrapper" onclick="return false;"></a>
 			</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')?>" />
+			<input class="svg" 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">
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 8b3823f391b..942f749c828 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -7,7 +7,7 @@
 			$relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14
 			if($relative_date_color>200) $relative_date_color = 200; ?>
 			<tr data-file="<?php echo $file['name'];?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
-				<td class="filename" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)">
+				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)">
 					<input type="checkbox" />
 					<a class="name" 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">