diff options
| -rw-r--r-- | plugins/calendar/calendar.php | 1 | ||||
| -rw-r--r-- | plugins/calendar/skins/classic/templates/calendar.html | 4 | ||||
| -rw-r--r-- | plugins/calendar/skins/classic/templates/eventedit.html | 4 | ||||
| -rw-r--r-- | plugins/calendar/skins/larry/calendar.css | 8 | ||||
| -rw-r--r-- | plugins/calendar/skins/larry/templates/calendar.html | 7 | ||||
| -rw-r--r-- | 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 7259c99..d1f2617 100644 --- a/plugins/calendar/calendar.php +++ b/plugins/calendar/calendar.php @@ -271,6 +271,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()); diff --git a/plugins/calendar/skins/classic/templates/calendar.html b/plugins/calendar/skins/classic/templates/calendar.html index 6e70a16..0725987 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" /> + <input type="text" name="startdate" size="11" id="schedule-startdate" disabled="true" /> <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" /> + <input type="text" name="enddate" size="11" id="schedule-enddate" disabled="true" /> <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 3548478..a5ace0d 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" /> + <input type="text" name="startdate" size="11" id="edit-startdate" /> <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" /> + <input type="text" name="enddate" size="11" id="edit-enddate" /> <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 39d472e..1b0bb09 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 3f914f8..a814345 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" /> + <input type="text" name="startdate" size="11" id="schedule-startdate" disabled="true" /> <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" /> - <input type="text" name="endtime" size="6" id="schedule-endtime" disabled="true" /> + <input type="text" name="enddate" size="11" id="schedule-enddate" disabled="true" /> + <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 841baf7..6784891 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" /> + <input type="text" name="startdate" size="11" id="edit-startdate" /> <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" /> - <input type="text" name="endtime" size="6" id="edit-endtime" /> + <input type="text" name="enddate" size="11" id="edit-enddate" /> + <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> |