From e08442ca50f839b38f780382d8da85f7c9bc8144 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Thu, 5 Nov 2009 18:15:32 +0100 Subject: [PATCH] Advanced event editing (just design, not working yet). --- kronolith/js/kronolith.js | 62 ++++++++---- kronolith/templates/index/edit.inc | 195 +++++++++++++++++++++++++++++-------- kronolith/themes/screen.css | 59 ++++++++++- 3 files changed, 257 insertions(+), 59 deletions(-) diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js index 1231eed41..b1c7c687a 100644 --- a/kronolith/js/kronolith.js +++ b/kronolith/js/kronolith.js @@ -1899,21 +1899,11 @@ KronolithCore = { e.stop(); return; - case 'id_fullday': - this.eventForm.select('.edit_at').each(Element.toggle); - e.stop(); - return; - case 'kronolithNewEvent': this.go('event'); e.stop(); return; - case 'kronolithEventSave': - this.saveEvent(); - e.stop(); - return; - case 'kronolithQuickEvent': this.updateCalendarDropDown('kronolithQuickinsertCalendars'); $('kronolithQuickinsert').appear({ @@ -1936,6 +1926,42 @@ KronolithCore = { e.stop(); return; + case 'kronolithEventAllday': + $('kronolithEventStartTimeLabel').setStyle({ 'visibility': $('kronolithEventStartTimeLabel').getStyle('visibility') == 'visible' ? 'hidden' : 'visible' }); + $('kronolithEventEndTimeLabel').setStyle({ 'visibility': $('kronolithEventEndTimeLabel').getStyle('visibility') == 'visible' ? 'hidden' : 'visible' }); + return; + + case 'kronolithEventLinkDescription': + case 'kronolithEventLinkReminder': + case 'kronolithEventLinkRecur': + case 'kronolithEventLinkUrl': + case 'kronolithEventLinkAttendees': + case 'kronolithEventLinkTags': + $('kronolithEventDialog').select('.kronolithTabsOption').invoke('hide'); + $(id.replace(/Link/, 'Tab')).show(); + $('kronolithEventDialog').select('.kronolithTabs li').invoke('removeClassName', 'selected'); + elt.parentNode.addClassName('selected'); + e.stop(); + return; + + case 'kronolithEventLinkNone': + case 'kronolithEventLinkDaily': + case 'kronolithEventLinkWeekly': + case 'kronolithEventLinkMonthly': + case 'kronolithEventLinkYearly': + case 'kronolithEventLinkLength': + $('kronolithEventTabRecur').select('DIV').invoke('hide'); + if (id != 'kronolithEventLinkNone') { + $(id.replace(/Link/, 'Repeat')).show(); + $('kronolithEventRepeatLength').show(); + } + return; + + case 'kronolithEventSave': + this.saveEvent(); + e.stop(); + return; + case 'kronolithEventDelete': var cal = $F('kronolithEventCalendar'), eventid = $F('kronolithEventId'); @@ -2024,13 +2050,6 @@ KronolithCore = { e.stop(); return; } - } else if (orig.hasClassName('kronolithDay')) { - var date = orig.retrieve('date'); - if (date) { - this.go('day:' + date); - e.stop(); - return; - } } e.stop(); return; @@ -2126,6 +2145,14 @@ KronolithCore = { e.stop(); return; } else if (elt.hasClassName('kronolithMonthDay')) { + if (orig.hasClassName('kronolithDay')) { + var date = orig.retrieve('date'); + if (date) { + this.go('day:' + date); + e.stop(); + return; + } + } this.go('event:' + elt.retrieve('date')); e.stop(); return; @@ -2219,6 +2246,7 @@ KronolithCore = { RedBox.onDisplay = null; }; + this.updateCalendarDropDown('kronolithEventCalendars'); $('kronolithEventTags').autocompleter.init(); $('kronolithEventForm').enable(); $('kronolithEventForm').reset(); diff --git a/kronolith/templates/index/edit.inc b/kronolith/templates/index/edit.inc index 3470cabde..9c4ffe821 100644 --- a/kronolith/templates/index/edit.inc +++ b/kronolith/templates/index/edit.inc @@ -4,71 +4,184 @@
-
+
-
-
- - · -
+ + + +
+
+ + 		+
+ + · +
- - +
- - + + + - - - - - - - - - - - +
 
- +
- +
-
-
- + +
+ +
+
-
-
+ + + + + + + + + + -
-
" class="button ok" /> " class="button ko" /> - " class="button cancel" /> - |
+
-
+ +
diff --git a/kronolith/themes/screen.css b/kronolith/themes/screen.css index 4050ba516..3b74110f1 100644 --- a/kronolith/themes/screen.css +++ b/kronolith/themes/screen.css @@ -514,6 +514,12 @@ span#kronolithQuickEvent { padding: 5px; margin: 5px 5px 5px 15px; } +#kronolithQuickinsert label { + font-weight: bold; +} +.kronolithFormInfo { + font-style: italic; +} /* Navigation bar */ #kronolithBar { @@ -599,7 +605,7 @@ span#kronolithQuickEvent { /* Event form dialog */ #kronolithEventDialog { - width: 400px; + width: 700px; padding: 10px 20px; background: #efefef; border: 1px #c0c0c0 solid; @@ -607,6 +613,10 @@ span#kronolithQuickEvent { #kronolithEventDialog div { margin-bottom: 5px; } +#kronolithEventDialog td { + padding-right: 10px; + vertical-align: top; +} #kronolithEventForm label { font-weight: bold; } @@ -629,6 +639,12 @@ div#kronolithEventActions #kronolithEventAdvancedLink a { color: inherit; } +#kronolithEventStartTime, #kronolithEventEndTime, .kronolithEventValue { + text-align: center; +} +#kronolithEventLocation { + width: 300px; +} div#kronolithEventTopTags { max-height: 75px; overflow: auto; @@ -647,6 +663,42 @@ div#kronolithEventTopTags span:hover { cursor: pointer; } +.kronolithTabs { + margin: 15px 0; + list-style: none; +} +.kronolithTabs li { + border: 1px solid #c0c0c0; + float: left; + height: 25px; + line-height: 25px; +} +.kronolithTabs a { + padding: 0 14px; + font-weight: bold; + text-decoration: none; +} + +.kronolithTabsOption { + line-height: 250%; +} +#kronolithEventTabAttendees td, #kronolithEventTabAttendees th { + padding: 1px; + width: 24px; + font-size: 85%; + line-height: 140%; +} +#kronolithEventTabAttendees th { + background-color: #fff; + text-align: center; +} +#kronolithEventTabAttendees th:first-child { + text-align: left; +} +#kronolithEventTabAttendees th.night { + background-color: #c0c0c0; +} + /* Mini calendar */ .kronolithMinical { position: relative; @@ -1204,6 +1256,11 @@ div.kronolithView div.kronolithViewBody div.kronolithRow div .kronolithEvent.kro overflow: hidden; } +/* Redbox styles. */ +#RB_window { + top: 50px !important; +} + /* Tags */ .panel-tags { margin-left: 10px; -- 2.11.0