-
-
+
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekView.wox b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
index bcd628801..018be928f 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
@@ -1,63 +1,43 @@
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:var="http://www.skyrix.com/od/binding"
+ xmlns:const="http://www.skyrix.com/od/constant"
+ xmlns:rsrc="OGo:url"
+ xmlns:label="OGo:label">
-
- ![]()
+
- ![]()
-
+
+ ![]()
+
+
+
+ ![]()
+
+ ![]()
+
+ className="UIxCalDayTable"
+ startDate="startDate"
+ const:CSSClass="weekOverview"
+ const:numberOfDays="7" />
diff --git a/UI/WebServerResources/SOGoTabsController.js b/UI/WebServerResources/SOGoTabsController.js
index d4d7f10bb..31c988823 100644
--- a/UI/WebServerResources/SOGoTabsController.js
+++ b/UI/WebServerResources/SOGoTabsController.js
@@ -67,6 +67,7 @@ SOGoTabsController.prototype = {
attachToTabsContainer: function STC_attachToTabsContainer(container) {
this.container = container;
+ container.controller = this;
this.onTabMouseDownBound
= this.onTabMouseDown.bindAsEventListener(this);
this.onTabClickBound
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index e09af2f73..1199a518c 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -319,23 +319,23 @@ SPAN.weeksHeader,
SPAN.monthsHeader
{ display: block;
white-space: nowrap;
+ text-align: center;
background-color: #DFDFDF;
overflow: hidden;
width: 100%;
margin: 0px;
height: 3em;
- padding: 2px 1.5em;
+ padding: 2px 0px;
border-bottom: 1px solid #ccc; }
SPAN.daysHeader SPAN,
SPAN.weeksHeader SPAN,
SPAN.monthsHeader SPAN
-{ display: block;
+{ font-size: large;
margin: .1em;
- float: left;
- width: 18%;
- padding: 0px;
+ padding: 6px 12px;
text-align: center;
+ line-height: 1.5em;
border: 1px solid transparent;
vertical-align: top; }
@@ -343,67 +343,51 @@ SPAN.daysHeader A,
SPAN.weeksHeader A,
SPAN.monthsHeader A
{ border: 1px solid transparent;
- color: #000;
line-height: 1.5em;
- padding: 0px .5em; }
+ padding: 0px 0.7em; }
-A.leftNavigationArrow,
-A.rightNavigationArrow
-{ border: 1px solid transparent;
- padding: .5em;
- text-align: center;
- vertical-align: bottom; }
-
-A.leftNavigationArrow:hover,
-A.rightNavigationArrow:hover,
-SPAN.daysHeader A:hover,
-SPAN.weeksHeader A:hover,
-SPAN.monthsHeader A:hover
+.day1 A:hover,
+.week1 A:hover,
+.month1 A:hover
{ border-top: 1px solid #fff;
border-left: 1px solid #fff;
border-bottom: 1px solid #828482;
border-right: 1px solid #828482; }
-A.leftNavigationArrow:active,
-A.rightNavigationArrow:active,
-SPAN.daysHeader A:active,
-SPAN.weeksHeader A:active,
-SPAN.monthsHeader A:active
+.day1 A:active,
+.week1 A:active,
+.month1 A:active
{ border-top: 1px solid #828482;
border-left: 1px solid #828482;
border-bottom: 1px solid #fff;
border-right: 1px solid #fff; }
-SPAN.week2, SPAN.month2
-{ font-size: small; }
-
-SPAN.day2, SPAN.week1, SPAN.month1
-{ font-size: medium; }
-
-SPAN.day1, SPAN.week0, SPAN.month0
-{ font-size: large; }
-
-SPAN.day0
-{ font-size: x-large; }
-
-SPAN.day0, SPAN.week0, SPAN.month0
-{ border-top: 1px solid #909090 !important;
- border-left: 1px solid #909090 !important;
- border-bottom: 1px solid #FFFFFF !important;
- border-right: 1px solid #FFFFFF !important;
- background-color: #ddd; }
-
-A.leftNavigationArrow
+#listCollapse
{ position: absolute;
- display: block;
- top: .5em;
- left: .5em; }
+ top: .2em;
+ right: 0;
+ margin: 0.5em 1em; }
-A.rightNavigationArrow
-{ position: absolute;
- display: block;
- top: .5em;
- right: .5em; }
+#listCollapse img
+{ position: absolute; }
+
+#listCollapse img.collapse
+{ clip: rect(0 18px 18px 0);
+ left: 0;
+ top: 0; }
+
+#listCollapse img.collapse:hover
+{ clip: rect(0 36px 18px 18px);
+ left: -18px; }
+
+#listCollapse img.rise
+{ clip: rect(18px 18px 36px 0);
+ left: 0;
+ top: -18px; }
+
+#listCollapse img.rise:hover
+{ clip: rect(18px 36px 36px 18px);
+ left: -18px; }
DIV#calendarHeader,
DIV#daysView
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index bd7ad3943..e518cd6c8 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -3205,6 +3205,11 @@ function deletePersonalCalendarCallback(http) {
}
function configureLists() {
+ // Move calendar view if lists are collapsed
+ if (!$("schedulerTabs").visible()) {
+ $('calendarView').setStyle({ top: '0' }).show();
+ }
+
// TASK LIST
var list = $("tasksList");
list.multiselect = true;
@@ -3292,6 +3297,37 @@ function drawNowLine() {
}
}
+function onListCollapse(event, element) {
+ var img = element.select('img').first();
+ var tabs = $("schedulerTabs");
+ var handle = $("rightDragHandle");
+ var view = jQuery("#calendarView");
+ var state = 'collapse';
+
+ if (tabs.visible()) {
+ img.removeClassName('collapse').addClassName('rise');
+ handle.hide();
+ view.animate({ top: '0' }, 200, function() {
+ tabs.hide();
+ });
+ }
+ else {
+ state = 'rise';
+ img.removeClassName('rise').addClassName('collapse');
+ tabs.show();
+ tabs.controller.onWindowResize();
+ view.animate({ top: handle.getStyle('top') }, 200, function() {
+ handle.show();
+ });
+ }
+
+ var url = ApplicationBaseURL + "saveListState";
+ var params = "state=" + state;
+ triggerAjaxRequest(url, null, null, params,
+ { "Content-type": "application/x-www-form-urlencoded" });
+
+}
+
function onDocumentKeydown(event) {
var target = Event.element(event);
if (target.tagName != "INPUT") {
@@ -3367,7 +3403,7 @@ function initScheduler() {
// Calendar import form
$("uploadCancel").observe("click", hideCalendarImport);
$("uploadOK").observe("click", hideImportResults);
-
+ $("calendarView").on("click", "#listCollapse", onListCollapse);
Event.observe(document, "keydown", onDocumentKeydown);
}