From 12533fbed3797a56c14af6ebe197baa90e0d1f99 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Wed, 6 Mar 2013 12:30:12 +0100
Subject: [PATCH] Minor calendar UI improvements: make date fields wide enough;
 display client's current timezone name

---
 plugins/calendar/calendar.php                           | 1 +
 plugins/calendar/skins/classic/templates/calendar.html  | 4 ++--
 plugins/calendar/skins/classic/templates/eventedit.html | 4 ++--
 plugins/calendar/skins/larry/calendar.css               | 8 ++++++++
 plugins/calendar/skins/larry/templates/calendar.html    | 7 ++++---
 plugins/calendar/skins/larry/templates/eventedit.html   | 6 +++---
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index eed008de..18354093 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -275,6 +275,7 @@ class calendar extends rcube_plugin
     // initialize attendees autocompletion
     rcube_autocomplete_init();
 
+    $this->rc->output->set_env('timezone', $this->timezone->getName());
     $this->rc->output->set_env('calendar_driver', $this->rc->config->get('calendar_driver'), false);
     $this->rc->output->set_env('mscolors', $this->driver->get_color_values());
     $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array('id' => 'edit-identities-list')));
diff --git a/plugins/calendar/skins/classic/templates/calendar.html b/plugins/calendar/skins/classic/templates/calendar.html
index 6e70a16f..07259877 100644
--- a/plugins/calendar/skins/classic/templates/calendar.html
+++ b/plugins/calendar/skins/classic/templates/calendar.html
@@ -106,12 +106,12 @@
   <div style="float:left; width:28em">
     <div class="form-section">
       <label for="schedule-startdate"><roundcube:label name="calendar.start" /></label>
-      <input type="text" name="startdate" size="10" id="schedule-startdate" disabled="true" /> &nbsp;
+      <input type="text" name="startdate" size="11" id="schedule-startdate" disabled="true" /> &nbsp;
       <input type="text" name="starttime" size="6" id="schedule-starttime" disabled="true" />
     </div>
     <div class="form-section">
       <label for="schedule-enddate"><roundcube:label name="calendar.end" /></label>
-      <input type="text" name="enddate" size="10" id="schedule-enddate" disabled="true" /> &nbsp;
+      <input type="text" name="enddate" size="11" id="schedule-enddate" disabled="true" /> &nbsp;
       <input type="text" name="endtime" size="6"  id="schedule-endtime" disabled="true" />
     </div>
   </div>
diff --git a/plugins/calendar/skins/classic/templates/eventedit.html b/plugins/calendar/skins/classic/templates/eventedit.html
index 35484788..a5ace0dc 100644
--- a/plugins/calendar/skins/classic/templates/eventedit.html
+++ b/plugins/calendar/skins/classic/templates/eventedit.html
@@ -26,12 +26,12 @@
       <div class="event-section">
         <label style="float:right;padding-right:0.5em"><input type="checkbox" name="allday" id="edit-allday" value="1" /><roundcube:label name="calendar.all-day" /></label>
         <label for="edit-startdate"><roundcube:label name="calendar.start" /></label>
-        <input type="text" name="startdate" size="10" id="edit-startdate" /> &nbsp;
+        <input type="text" name="startdate" size="11" id="edit-startdate" /> &nbsp;
         <input type="text" name="starttime" size="6" id="edit-starttime" />
       </div>
       <div class="event-section">
         <label for="edit-enddate"><roundcube:label name="calendar.end" /></label>
-        <input type="text" name="enddate" size="10" id="edit-enddate" /> &nbsp;
+        <input type="text" name="enddate" size="11" id="edit-enddate" /> &nbsp;
         <input type="text" name="endtime" size="6"  id="edit-endtime" />
       </div>
       <div class="event-section" id="edit-alarms">
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 282db50e..f7278a6d 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -125,6 +125,14 @@ div.sidebarclosed {
 	border-bottom-color: #ababab;
 }
 
+#calendar .timezonedisplay {
+	position: absolute;
+	bottom: 9px;
+	right: 8px;
+	font-size: 0.85em;
+	color: #666;
+}
+
 #print {
 	width: 680px;
 }
diff --git a/plugins/calendar/skins/larry/templates/calendar.html b/plugins/calendar/skins/larry/templates/calendar.html
index 5b46d4ff..54e7cb82 100644
--- a/plugins/calendar/skins/larry/templates/calendar.html
+++ b/plugins/calendar/skins/larry/templates/calendar.html
@@ -41,6 +41,7 @@
 	<div id="calendar">
 		<roundcube:object name="plugin.angenda_options" class="boxfooter" id="agendaoptions" />
 		<roundcube:object name="message" id="message" class="statusbar" />
+		<div class="timezonedisplay"><roundcube:var name="env:timezone" /></div>
 	</div>
 </div>
 
@@ -119,13 +120,13 @@
 	<div style="float:left; width:28em">
 		<div class="form-section">
 			<label for="schedule-startdate"><roundcube:label name="calendar.start" /></label>
-			<input type="text" name="startdate" size="10" id="schedule-startdate" disabled="true" /> &nbsp;
+			<input type="text" name="startdate" size="11" id="schedule-startdate" disabled="true" /> &nbsp;
 			<input type="text" name="starttime" size="6" id="schedule-starttime" disabled="true" />
 		</div>
 		<div class="form-section">
 			<label for="schedule-enddate"><roundcube:label name="calendar.end" /></label>
-			<input type="text" name="enddate" size="10" id="schedule-enddate" disabled="true" /> &nbsp;
-			<input type="text" name="endtime" size="6"	id="schedule-endtime" disabled="true" />
+			<input type="text" name="enddate" size="11" id="schedule-enddate" disabled="true" /> &nbsp;
+			<input type="text" name="endtime" size="6" id="schedule-endtime" disabled="true" />
 		</div>
 	</div>
 	<div style="float:left">
diff --git a/plugins/calendar/skins/larry/templates/eventedit.html b/plugins/calendar/skins/larry/templates/eventedit.html
index 841baf74..6784891b 100644
--- a/plugins/calendar/skins/larry/templates/eventedit.html
+++ b/plugins/calendar/skins/larry/templates/eventedit.html
@@ -23,13 +23,13 @@
 			<div class="event-section">
 				<label style="float:right;padding-right:0.5em"><input type="checkbox" name="allday" id="edit-allday" value="1" /><roundcube:label name="calendar.all-day" /></label>
 				<label for="edit-startdate"><roundcube:label name="calendar.start" /></label>
-				<input type="text" name="startdate" size="10" id="edit-startdate" /> &nbsp;
+				<input type="text" name="startdate" size="11" id="edit-startdate" /> &nbsp;
 				<input type="text" name="starttime" size="6" id="edit-starttime" />
 			</div>
 			<div class="event-section">
 				<label for="edit-enddate"><roundcube:label name="calendar.end" /></label>
-				<input type="text" name="enddate" size="10" id="edit-enddate" /> &nbsp;
-				<input type="text" name="endtime" size="6"	id="edit-endtime" />
+				<input type="text" name="enddate" size="11" id="edit-enddate" /> &nbsp;
+				<input type="text" name="endtime" size="6" id="edit-endtime" />
 			</div>
 			<div class="event-section" id="edit-alarms">
 				<label for="edit-alarm"><roundcube:label name="calendar.alarms" /></label>