From 7b1fe4fbf46881779b47980509334e502a159b1b Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 15 Jul 2009 18:26:08 +0000
Subject: [PATCH] Contextual menu in calendar views

Monotone-Parent: 32632141d8aa98b84dfa7b115552977245bbb185
Monotone-Revision: 0434c62b8e39bcee18f796c100eaf812cef0be1a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-15T18:26:08
Monotone-Branch: ca.inverse.sogo
---
 .../Localizable.strings                       |  9 ++++
 UI/Scheduler/Czech.lproj/Localizable.strings  |  9 ++++
 UI/Scheduler/Dutch.lproj/Localizable.strings  |  9 ++++
 .../English.lproj/Localizable.strings         |  9 ++++
 UI/Scheduler/French.lproj/Localizable.strings |  9 ++++
 UI/Scheduler/German.lproj/Localizable.strings |  9 ++++
 .../Italian.lproj/Localizable.strings         |  9 ++++
 .../Russian.lproj/Localizable.strings         |  9 ++++
 .../Spanish.lproj/Localizable.strings         |  9 ++++
 UI/Scheduler/Welsh.lproj/Localizable.strings  |  9 ++++
 UI/Templates/SchedulerUI/UIxCalDayView.wox    | 10 +++++
 UI/Templates/SchedulerUI/UIxCalMonthView.wox  |  9 ++++
 UI/Templates/SchedulerUI/UIxCalWeekView.wox   |  9 ++++
 UI/WebServerResources/SchedulerUI.js          | 42 +++++++++++++++++++
 14 files changed, 160 insertions(+)

diff --git a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
index 37aff43a9..64680daf4 100755
--- a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
@@ -44,6 +44,9 @@
 "dayLabelFormat" = "%m/%d/%Y";
 "today" = "Hoje";
 
+"Previous Day" = "Previous Day";
+"Next Day" = "Next Day";
+
 /* Week */
 
 "Week" = "Semana";
@@ -51,6 +54,9 @@
 
 "Week %d" = "Semana %d";
 
+"Previous Week" = "Previous Week";
+"Next Week" = "Next Week";
+
 /* Month */
 
 "this month" = "este mês";
@@ -81,6 +87,9 @@
 "a3_November" = "Novembro";
 "a3_December" = "Dezembro";
 
+"Previous Month" = "Previous Month";
+"Next Month" = "Next Month";
+
 /* Year */
 
 "this year" = "este ano";
diff --git a/UI/Scheduler/Czech.lproj/Localizable.strings b/UI/Scheduler/Czech.lproj/Localizable.strings
index dc5da1089..15f2deac3 100755
--- a/UI/Scheduler/Czech.lproj/Localizable.strings
+++ b/UI/Scheduler/Czech.lproj/Localizable.strings
@@ -44,6 +44,9 @@
 "dayLabelFormat" = "%d/%m/%Y";
 "today" = "Dnes";
 
+"Previous Day" = "Previous Day";
+"Next Day" = "Next Day";
+
 /* Week */
 
 "Week" = "Týdent";
@@ -51,6 +54,9 @@
 
 "Week %d" = "Týden %d";
 
+"Previous Week" = "Previous Week";
+"Next Week" = "Next Week";
+
 /* Month */
 
 "this month" = "tento měsíc";
@@ -81,6 +87,9 @@
 "a3_November" = "Listopad";
 "a3_December" = "Prosinec";
 
+"Previous Month" = "Previous Month";
+"Next Month" = "Next Month";
+
 /* Year */
 
 "this year" = "letos";
diff --git a/UI/Scheduler/Dutch.lproj/Localizable.strings b/UI/Scheduler/Dutch.lproj/Localizable.strings
index fd018179b..70d80bece 100644
--- a/UI/Scheduler/Dutch.lproj/Localizable.strings
+++ b/UI/Scheduler/Dutch.lproj/Localizable.strings
@@ -29,6 +29,9 @@
 "dayLabelFormat" = "%d/%m/%Y";
 "today" = "vandaag";
 
+"Previous Day" = "Previous Day";
+"Next Day" = "Next Day";
+
 /* Week */
 
 "Week" = "Week";
@@ -36,6 +39,9 @@
 
 "Week %d" = "Week %d";
 
+"Previous Week" = "Previous Week";
+"Next Week" = "Next Week";
+
 /* Month */
 
 "this month" = "deze maand";
@@ -66,6 +72,9 @@
 "a3_November" = "Nov";
 "a3_December" = "Dec";
 
+"Previous Month" = "Previous Month";
+"Next Month" = "Next Month";
+
 /* Year */
 
 "this year" = "dit jaar";
diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 8d1bd313f..1489aa6af 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -44,6 +44,9 @@
 "dayLabelFormat" = "%m/%d/%Y";
 "today" = "Today";
 
+"Previous Day" = "Previous Day";
+"Next Day" = "Next Day";
+
 /* Week */
 
 "Week" = "Week";
@@ -51,6 +54,9 @@
 
 "Week %d" = "Week %d";
 
+"Previous Week" = "Previous Week";
+"Next Week" = "Next Week";
+
 /* Month */
 
 "this month" = "this month";
@@ -81,6 +87,9 @@
 "a3_November" = "November";
 "a3_December" = "December";
 
+"Previous Month" = "Previous Month";
+"Next Month" = "Next Month";
+
 /* Year */
 
 "this year" = "this year";
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index 4f7f0f31b..c6e18b932 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -44,6 +44,9 @@
 "dayLabelFormat" = "%d/%m/%Y";
 "today" = "Aujourd'hui";
 
+"Previous Day" = "Jour précédent";
+"Next Day" = "Jour suivant";
+
 /* Week */
 
 "Week" = "Semaine";
@@ -51,6 +54,9 @@
 
 "Week %d" = "Semaine nº %d";
 
+"Previous Week" = "Semaine précédente";
+"Next Week" = "Semaine suivante";
+
 /* Month */
 
 "this month" = "ce mois";
@@ -81,6 +87,9 @@
 "a3_November" = "Nov";
 "a3_December" = "Dec";
 
+"Previous Month" = "Mois précédent";
+"Next Month" = "Mois suivant";
+
 /* Year */
 
 "this year" = "Cette année";
diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings
index 2bfdc6b22..f7d6c1bb0 100644
--- a/UI/Scheduler/German.lproj/Localizable.strings
+++ b/UI/Scheduler/German.lproj/Localizable.strings
@@ -44,6 +44,9 @@
 "dayLabelFormat" = "%d/%m/%Y";
 "today" = "Heute";
 
+"Previous Day" = "Previous Day";
+"Next Day" = "Next Day";
+
 /* Week */
 
 "Week" = "Woche";
@@ -51,6 +54,9 @@
 
 "Week %d" = "Woche %d";
 
+"Previous Week" = "Previous Week";
+"Next Week" = "Next Week";
+
 /* Month */
 
 "this month" = "dieser Monat";
@@ -81,6 +87,9 @@
 "a3_November" = "Nov";
 "a3_December" = "Dez";
 
+"Previous Month" = "Previous Month";
+"Next Month" = "Next Month";
+
 /* Year */
 
 "this year" = "dieses Jahr";
diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings
index 00d1fb913..b21600bbc 100644
--- a/UI/Scheduler/Italian.lproj/Localizable.strings
+++ b/UI/Scheduler/Italian.lproj/Localizable.strings
@@ -45,6 +45,9 @@
 "dayLabelFormat" = "%d/%m/%Y";
 "today" = "Oggi";
 
+"Previous Day" = "Previous Day";
+"Next Day" = "Next Day";
+
 /* Week */
 
 "Week" = "Settimana";
@@ -52,6 +55,9 @@
 
 "Week %d" = "Settimana %d";
 
+"Previous Week" = "Previous Week";
+"Next Week" = "Next Week";
+
 /* Month */
 
 "this month" = "questo mese";
@@ -82,6 +88,9 @@
 "a3_November" = "Novembre";
 "a3_December" = "Dicembre";
 
+"Previous Month" = "Previous Month";
+"Next Month" = "Next Month";
+
 /* Year */
 
 "this year" = "quest'anno";
diff --git a/UI/Scheduler/Russian.lproj/Localizable.strings b/UI/Scheduler/Russian.lproj/Localizable.strings
index 9184ead99..a43c6be2a 100644
--- a/UI/Scheduler/Russian.lproj/Localizable.strings
+++ b/UI/Scheduler/Russian.lproj/Localizable.strings
@@ -44,6 +44,9 @@
 "dayLabelFormat" = "%d/%m/%Y";
 "today" = "Сегодня";
 
+"Previous Day" = "Previous Day";
+"Next Day" = "Next Day";
+
 /* Week */
 
 "Week" = "Неделя";
@@ -51,6 +54,9 @@
 
 "Week %d" = "Неделя %d";
 
+"Previous Week" = "Previous Week";
+"Next Week" = "Next Week";
+
 /* Month */
 
 "this month" = "этот месяц";
@@ -81,6 +87,9 @@
 "a3_November" = "Ноября";
 "a3_December" = "Декабря";
 
+"Previous Month" = "Previous Month";
+"Next Month" = "Next Month";
+
 /* Year */
 
 "this year" = "этот год";
diff --git a/UI/Scheduler/Spanish.lproj/Localizable.strings b/UI/Scheduler/Spanish.lproj/Localizable.strings
index 2bf96b010..41263f199 100644
--- a/UI/Scheduler/Spanish.lproj/Localizable.strings
+++ b/UI/Scheduler/Spanish.lproj/Localizable.strings
@@ -47,6 +47,9 @@
 "dayLabelFormat" = "%d/%m/%Y";
 "today" = "Hoy";
 
+"Previous Day" = "Previous Day";
+"Next Day" = "Next Day";
+
 /* Week */
 
 "Week" = "Semana";
@@ -54,6 +57,9 @@
 
 "Week %d" = "Semana %d";
 
+"Previous Week" = "Previous Week";
+"Next Week" = "Next Week";
+
 /* Month */
 
 "this month" = "este mes";
@@ -84,6 +90,9 @@
 "a3_November" = "Noviembre";
 "a3_December" = "Diciembre";
 
+"Previous Month" = "Previous Month";
+"Next Month" = "Next Month";
+
 /* Year */
 
 "this year" = "este año";
diff --git a/UI/Scheduler/Welsh.lproj/Localizable.strings b/UI/Scheduler/Welsh.lproj/Localizable.strings
index 8167e804b..0466da88d 100644
--- a/UI/Scheduler/Welsh.lproj/Localizable.strings
+++ b/UI/Scheduler/Welsh.lproj/Localizable.strings
@@ -44,6 +44,9 @@
 "dayLabelFormat" = "%m/%d/%Y";
 "today" = "Heddiw";
 
+"Previous Day" = "Previous Day";
+"Next Day" = "Next Day";
+
 /* Week */
 
 "Week" = "wythnos";
@@ -51,6 +54,9 @@
 
 "Week %d" = "Week %d";
 
+"Previous Week" = "Previous Week";
+"Next Week" = "Next Week";
+
 /* Month */
 
 "this month" = "mis hon";
@@ -81,6 +87,9 @@
 "a3_November" = "Tachwedd";
 "a3_December" = "Rhagfyr";
 
+"Previous Month" = "Previous Month";
+"Next Month" = "Next Month";
+
 /* Year */
 
 "this year" = "y flwyddyn hon";
diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
index deca9e61b..742a37785 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -6,6 +6,16 @@
   xmlns:const="http://www.skyrix.com/od/constant"
   xmlns:rsrc="OGo:url"
   xmlns:label="OGo:label">
+
+  <div class="menu" id="currentViewMenu">
+    <ul>
+      <li><var:string label:value="New Event..."/></li>
+      <li><var:string label:value="New Task..."/></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Previous Day"/></li>
+      <li><var:string label:value="Next Day"/></li>
+    </ul>
+  </div>
   <a href="#"
     class="leftNavigationArrow"
     var:date="prevDayQueryParameters.day"
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
index 614842bb2..c30d0ff3a 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -7,6 +7,15 @@
   xmlns:rsrc="OGo:url"
   xmlns:label="OGo:label">
 
+  <div class="menu" id="currentViewMenu">
+    <ul>
+      <li><var:string label:value="New Event..."/></li>
+      <li><var:string label:value="New Task..."/></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Previous Month"/></li>
+      <li><var:string label:value="Next Month"/></li>
+    </ul>
+  </div>
   <a href="#"
     class="leftNavigationArrow"
     var:date="prevMonthQueryParameters.month"
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekView.wox b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
index be9544814..0ca3892aa 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekView.wox
@@ -6,6 +6,15 @@
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label">
 
+  <div class="menu" id="currentViewMenu">
+    <ul>
+      <li><var:string label:value="New Event..."/></li>
+      <li><var:string label:value="New Task..."/></li>
+      <li><!-- separator --></li>
+      <li><var:string label:value="Previous Week"/></li>
+      <li><var:string label:value="Next Week"/></li>
+    </ul>
+  </div>
     <a href="#"
       class="leftNavigationArrow"
       var:date="prevWeekQueryParameters.day"
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index f096f0bb8..de15e2969 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -722,6 +722,16 @@ function restoreCurrentDaySelection(div) {
   }
 }
 
+function loadPreviousView(event) {
+	var previousArrow = $$("A.leftNavigationArrow").first();
+	onCalendarGotoDay(previousArrow);
+}
+
+function loadNextView(event) {
+	var nextArrow = $$("A.rightNavigationArrow").first();
+	onCalendarGotoDay(nextArrow);
+}
+
 function changeDateSelectorDisplay(day, keepCurrentDay) {
   var url = ApplicationBaseURL + "dateselector";
   if (day) {
@@ -1120,11 +1130,43 @@ function calendarDisplayCallback(http) {
       && http.status == 200) {
     document.dayDisplayAjaxRequest = null;
     div.update(http.responseText);
+
     if (http.callbackData["view"])
       currentView = http.callbackData["view"];
     if (http.callbackData["day"])
       currentDay = http.callbackData["day"];
 
+		// Initialize contextual menu
+		var menu;
+		var observer;
+		if (currentView == 'dayview') {
+			menu = new Array(onMenuNewEventClick,
+											 onMenuNewTaskClick,
+											 "-",
+											 loadPreviousView,
+											 loadNextView);
+			observer = $("daysView");
+		}
+		else if (currentView == 'weekview') {
+			menu = new Array(onMenuNewEventClick,
+											 onMenuNewTaskClick,
+											 "-",
+											 loadPreviousView,
+											 loadNextView);
+			observer = $("daysView");
+		}
+		else {
+			menu = new Array(onMenuNewEventClick,
+											 onMenuNewTaskClick,
+											 "-",
+											 loadPreviousView,
+											 loadNextView);
+			observer = $("monthDaysView");
+		}
+		initMenu($("currentViewMenu"), menu);
+		observer.observe("contextmenu", function(event) {
+				popupMenu(event, 'currentViewMenu', this); });
+		
     var contentView;
     if (currentView == "monthview")
       contentView = $("calendarContent");