From c866e15bb61e96493a347027a7f992abded53efe Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 4 Mar 2016 14:21:39 +0000
Subject: [PATCH] Mobile theme W.I.P: - Drop timesheet index columns into 2
 columns

---
 timesheet/templates/mobile/app.css   |  4 ++--
 timesheet/templates/mobile/app.less  |  4 ++--
 timesheet/templates/mobile/index.xet | 32 ++++++++++++----------------
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/timesheet/templates/mobile/app.css b/timesheet/templates/mobile/app.css
index c251c2d218..cd4e1d84c5 100644
--- a/timesheet/templates/mobile/app.css
+++ b/timesheet/templates/mobile/app.css
@@ -14,7 +14,6 @@
 @media only screen and (max-device-width: 1024px) {
   #timesheet-index table.egwGridView_outer tbody label[id^='timesheet-index'][id$='ts_start]'] > time {
     font-weight: bold;
-    float: left;
   }
   #timesheet-index table.egwGridView_outer tbody ul[id^='timesheet-index'][id$='ts_owner]'] > li {
     overflow: hidden;
@@ -32,8 +31,9 @@
     font-size: 10pt;
   }
   #timesheet-index table.egwGridView_outer tbody span[id^='timesheet-index'][id$='ts_description]'] {
-    height: 30px;
+    height: 19px;
     white-space: nowrap;
+    line-height: 18px;
     overflow: hidden;
     text-overflow: ellipsis;
     font-size: 10pt;
diff --git a/timesheet/templates/mobile/app.less b/timesheet/templates/mobile/app.less
index 39a276c530..5dd4ea75ca 100644
--- a/timesheet/templates/mobile/app.less
+++ b/timesheet/templates/mobile/app.less
@@ -20,7 +20,6 @@
 		table.egwGridView_outer tbody {
 			label[id^='timesheet-index'][id$='ts_start]'] > time{
 				font-weight: bold;
-				float: left;
 			}
 			ul[id^='timesheet-index'][id$='ts_owner]'] > li {
 				overflow: hidden;
@@ -38,8 +37,9 @@
 				.mob-fontsize-n;
 			}
 			span[id^='timesheet-index'][id$='ts_description]'] {
-				height: 30px;
+				height: 19px;
 				white-space: nowrap;
+				line-height: 18px;
 				overflow: hidden;
 				text-overflow: ellipsis;
 				.mob-fontsize-n;
diff --git a/timesheet/templates/mobile/index.xet b/timesheet/templates/mobile/index.xet
index 9b67831c55..540b3c8431 100644
--- a/timesheet/templates/mobile/index.xet
+++ b/timesheet/templates/mobile/index.xet
@@ -17,37 +17,33 @@
 		<grid width="100%">
 			<columns>
 				<column width="10"/>
+				<column width="80%" />
 				<column width="110"/>
-				<column width="90%" />
-				<column width="60"/>
 			</columns>
 			<rows>
 				<row class="th">
-					
+
 				</row>
 				<row class="$row_cont[class] timesheetRow">
 					<description class=" cat_$row_cont[cat_id] mobile_cat_col"/>
-					<vbox>
-						<date-time id="${row}[ts_start]" readonly="true" options=",8"/>
-						<menulist class="$cont[ownerClass]">
-							<menupopup type="select-account" id="${row}[ts_owner]" readonly="true"/>
-						</menulist>
-						<menulist class="noWrap">
-							<menupopup type="select-cat" id="${row}[cat_id]" readonly="true"/>
-						</menulist>
-					</vbox>
 					<vbox>
 						<description id="${row}[ts_title]" no_lang="1" class="ts_title $row_cont[titleClass]"/>
 						<description id="${row}[ts_description]" class="ts_description" no_lang="1"/>
 						<link id="${row}[ts_link]" no_lang="1"/>
 					</vbox>
 					<vbox class="timesheet3Col">
-						<date-duration id="${row}[ts_duration]" readonly="true" options=",h,,,1" align="right"/>
-						<textbox type="float" id="${row}[ts_quantity]" no_lang="1" readonly="true" precision="3"/>
-						<textbox type="float" id="${row}[ts_total]" no_lang="1" readonly="true" precision="2"/>
-						<menulist>
-							<menupopup id="${row}[ts_status]" readonly="true"/>
-						</menulist>
+						<hbox>
+							<time_or_date id="${row}[ts_start]" readonly="true" options=",8" align="left"/>
+						</hbox>
+
+						<hbox>
+							<menulist class="$cont[ownerClass]">
+								<menupopup type="select-account" id="${row}[ts_owner]" readonly="true"/>
+							</menulist>
+						</hbox>
+						<hbox>
+							<date-duration id="${row}[ts_duration]" readonly="true" options=",h,,,1"/>
+						</hbox>
 					</vbox>
 				</row>
 			</rows>