From abf7dcc0ebf5872767e68a17ee3d8ed88ed82155 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 17 Feb 2016 12:32:39 +0000
Subject: [PATCH] Mobile theme W.I.P.: - Fix styling for calendar listview

---
 calendar/templates/mobile/list.xet   | 22 ++++++++++------------
 calendar/templates/pixelegg/app.css  | 24 +++++++++++++++++++++++-
 calendar/templates/pixelegg/app.less | 23 +++++++++++++++++++++++
 3 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/calendar/templates/mobile/list.xet b/calendar/templates/mobile/list.xet
index 05575d6bc1..4e81e3d404 100644
--- a/calendar/templates/mobile/list.xet
+++ b/calendar/templates/mobile/list.xet
@@ -2,6 +2,9 @@
 <!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id: list.xet 54765 2016-01-19 00:48:21Z nathangray $ -->
 <overlay>
+	<template id="calendar.list.add" template="" lang="" group="0" version="16.1.001">
+		<button id="add" parent_node="calendar-list_plus_button_container"  class="plus_button"  onclick="egw.open('calendar');"/>
+	</template>
 	<template id="calendar.list.dates" template="" lang="" group="0" version="1.3.001">
 		<hbox>
 			<description value="Start"/>
@@ -15,7 +18,7 @@
 			<columns>
 				<column width="10"/>
 				<column width="95%" />
-				<column width="80"/>
+				<column width="50"/>
 			</columns>
 			<rows>
 				<row class="th">
@@ -27,13 +30,11 @@
 						<hbox class="calTitleRow">
 							<description id="${row}[title]" no_lang="1" class="$row_cont[sub_class] et2_ellipsis" overflow="hidden" width="100%" />
 						</hbox>
-						<box class="calDescRow">
-							<description id="${row}[description]" no_lang="1" activate_links="1"/>	
-						</box>	
-					</vbox>
-					<vbox class="calDates">
-						<date-time id="${row}[start]" readonly="true" options=",$cont[format]" class="noWrap"/>
-						<date-time id="${row}[end]" readonly="true" options=",$cont[format]" class="noWrap"/>
+						<hbox class="calDates">
+							<time_or_date id="${row}[start]" readonly="true" options=",$cont[format]" class="noWrap"/>
+							<description class="dash" value="-"/>
+							<time_or_date id="${row}[end]" readonly="true" options=",$cont[format]" class="noWrap"/>
+						</hbox>
 					</vbox>
 				</row>
 			</rows>
@@ -52,14 +53,11 @@
 				<row>
 					<description align="center" id="msg" no_lang="1" span="all" class="message"/>
 				</row>
-				<row disabled="1">
-					<template id="dates"/>
-				</row>
 				<row>
 					<description id="plus_button_container"/>
 				</row>
 				<row>
-					<nextmatch id="nm" template="calendar.list.rows"  header_left="calendar.list.dates" span="all"/>
+					<nextmatch id="nm" template="calendar.list.rows" header_right="calendar.list.add" header_left="calendar.list.dates" span="all"/>
 				</row>
 				<row>
 					<hbox>
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 9b7dcc6248..c1ef799366 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -11,7 +11,7 @@
  * @package calendar
  * @version $Id$
  */
-/* $Id: app.css 54966 2016-02-09 21:45:51Z nathangray $ */
+/* $Id: app.css 55035 2016-02-16 21:37:19Z nathangray $ */
 /*Media print classes*/
 @media print {
   .th td,
@@ -2632,4 +2632,26 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
     float: none;
     display: initial;
   }
+  span[id^="calendar-list_"][id$="title]"] {
+    font-size: 12pt;
+    white-space: nowrap;
+  }
+  div.calDescRow {
+    height: 30px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+  label[id^="calendar-list_"][id$="start]"] > time,
+  label[id^="calendar-list_"][id$="end]"] > time {
+    float: none;
+    color: #828282;
+  }
+  .calDates .dash {
+    text-align: center;
+    padding: 0px 5px 0 5px !important;
+  }
+  body button.plus_button {
+    bottom: 65px;
+  }
 }
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 8817de36bb..1dc7565ccb 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -1428,4 +1428,27 @@ div#calendar-container {
 		float: none;
 		display: initial;
 	}
+	span[id^="calendar-list_"][id$="title]"] {
+		font-size: 12pt;
+		white-space: nowrap;
+	}
+	div.calDescRow {
+		height: 30px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+	
+	label[id^="calendar-list_"][id$="start]"]> time ,label[id^="calendar-list_"][id$="end]"]> time{
+		float: none;
+		color:#828282;
+	}
+	
+	.calDates .dash {
+		text-align: center;
+		padding: 0px 5px 0 5px !important;
+	}
+	body button.plus_button {
+		bottom: 65px;
+	}
 }
\ No newline at end of file