From 369bca9536eafe0b9c073104ed4c6460e6002c9a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 11 Feb 2016 11:19:33 +0000
Subject: [PATCH] Mobile theme W.I.P.: -Fix filemanager upload button and
 header toolbars

---
 filemanager/templates/mobile/index.xet  | 12 ++++----
 filemanager/templates/pixelegg/app.css  | 38 +++++++++++++++++++++++++
 filemanager/templates/pixelegg/app.less | 34 ++++++++++++++++++++++
 3 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/filemanager/templates/mobile/index.xet b/filemanager/templates/mobile/index.xet
index a149378097..1103c55467 100644
--- a/filemanager/templates/mobile/index.xet
+++ b/filemanager/templates/mobile/index.xet
@@ -35,10 +35,10 @@
 			<image label="Up" src="goup" onclick="app.filemanager.change_dir('..',widget);" id="up"/>
 			<image label="Go to your home directory" src="gohome" onclick="app.filemanager.change_dir('~',widget);" id="home"/>
 			<vfs-name label="Path" id="path" onchange="if(widget.getValue() == '') { app.filemanager.change_dir('~',widget);} return true;" size="80" class="address"/>
-			<hbox id="buttons">
+		</hbox>
+		<hbox id="buttons">
 				<button label="Go to" id="button[go]" image="key_enter"/>
 				<buttononly label="Tile view" id="button[change_view]" onclick="app.filemanager.change_view" options="list_tile"/>
-				<image id="tarp" src="buttonseparator"/>
 				<buttononly statustext="Rename, change permissions or ownership" label="Edit settings" id="button[edit]" onclick="app.filemanager.editprefs();" options="edit"/>
 				<buttononly label="Create directory" id="button[createdir]" onclick="app.filemanager.createdir();" options="button_createdir,createdir_disabled"/>
 				<buttononly label="Create a link" id="button[symlink]" onclick="app.filemanager.symlink();" options="link,link_disabled"/>
@@ -46,11 +46,13 @@
 				<buttononly label="Paste link" id="button[linkpaste]" onclick="app.filemanager.paste('linkpaste');" options="linkpaste,linkpaste_disabled"/>
 				<buttononly label="Mail paste" id="button[mailpaste]" onclick="app.filemanager.paste('mailpaste');" options="mailpaste,mailpaste_disabled"/>
 				<button label="File a file" onclick="window.open(egw::link('/index.php','menuaction=stylite.stylite_filemanager.upload'),'_blank','dependent=yes,width=550,height=350,scrollbars=yes,status=yes'); return false;" image="upload"/>
-				<file statustext="Select file to upload in current directory" id="upload" progress_dropdownlist = "true" drop_target ="divAppbox" multiple="true" onFinishOne="app.filemanager.uploadOnOne"/>
+				
 			</hbox>
-		</hbox>
 	</template>
 	<template id="filemanager.index" template="" lang="" group="0" version="1.9.003">
-		<nextmatch id="nm" template="filemanager.index.rows" header_left="filemanager.index.header_left"/>
+		<nextmatch id="nm" template="filemanager.index.rows" header_left="filemanager.index.header_left" />
+		<hbox>
+			<file statustext="Select file to upload in current directory" value=" " class="plus_button" id="upload" progress_dropdownlist = "true" drop_target ="divAppbox" multiple="true" onFinishOne="app.filemanager.uploadOnOne"/>
+		</hbox>
 	</template>
 </overlay>
diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index 08a55e52f1..292536e96a 100755
--- a/filemanager/templates/pixelegg/app.css
+++ b/filemanager/templates/pixelegg/app.css
@@ -558,6 +558,44 @@ div#stylite-filemanager-upload .dialogFooterToolbar button:active {
   #filemanager-index_nm table.egwGridView_outer tbody label[id^='filemanager-index'][id$='name]'] span {
     white-space: nowrap;
   }
+  #filemanager-index_nm #filemanager-index_buttons {
+    position: initial;
+    display: inline-block;
+  }
+  #filemanager-index_nm #filemanager-index_tarp {
+    display: none !important;
+  }
+  .et2_file.plus_button {
+    position: absolute !important;
+    right: 15px;
+    bottom: 15px;
+    border-radius: 50%;
+    width: 60px;
+    height: 60px;
+    background-position: center;
+    z-index: 100;
+    background-color: #0c5da5;
+    border: none;
+    box-shadow: 0px 1px 5px 3px silver;
+    background-image: none !important;
+    margin: 0;
+    padding: 0;
+  }
+  .et2_file.plus_button .et2_file_span {
+    display: none;
+  }
+  .et2_file.plus_button .et2_file_upload {
+    width: 60px;
+    height: 60px;
+    top: 0;
+  }
+  .et2_file.plus_button:after {
+    content: '+';
+    font-weight: bold;
+    font-size: 34pt;
+    color: #fafafa;
+    margin-left: 10px;
+  }
   .previewImage img {
     max-width: 100%;
   }
diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less
index 485e85f100..bb96971f2c 100644
--- a/filemanager/templates/pixelegg/app.less
+++ b/filemanager/templates/pixelegg/app.less
@@ -367,6 +367,40 @@ div#stylite-filemanager-upload{
 				}
 			}
 		}
+		#filemanager-index_buttons {
+			position: initial;
+			display: inline-block;
+		}
+		#filemanager-index_tarp {display: none !important;}
+	}
+	.et2_file.plus_button {
+		position: absolute !important;
+		right: 15px;
+		bottom: 15px;
+		border-radius: 50%;
+		width: 60px;
+		height: 60px;
+		background-position: center;
+		z-index: 100;
+		background-color: #0c5da5;
+		border: none;
+		box-shadow: 0px 1px 5px 3px silver;
+		background-image: none !important;
+		margin: 0;
+		padding: 0;
+		.et2_file_span{display: none;}
+		.et2_file_upload {
+			width: 60px;
+			height: 60px;
+			top: 0;
+		}
+		&:after{
+			content: '+';
+			font-weight: bold;
+			font-size: 34pt;
+			color: #fafafa;
+			margin-left: 10px;
+		}
 	}
 	.previewImage img {max-width: 100%;}
 	div#filemanager-file_tabs td.eaclAccount,td.eaclRights {display: block;}