From 4b47e5de83163e9c9bf38b7d2e20c1859c54d210 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 30 Mar 2015 15:11:20 -0400 Subject: [PATCH] Calendar module: initial AngularJS-based templates --- UI/Templates/SchedulerUI/UIxCalDayTable.wox | 3 + UI/Templates/SchedulerUI/UIxCalMainView.wox | 224 ++++++++++-------- UI/Templates/SchedulerUI/UIxCalWeekView.wox | 42 ++-- .../SchedulerUI/UIxCalendarSelector.wox | 45 +--- UI/Templates/UIxSidenavToolbarTemplate.wox | 30 +++ .../scss/components/checkbox/checkbox.scss | 8 +- .../scss/components/sidenav/sidenav.scss | 5 +- .../scss/views/SchedulerUI.scss | 124 ++++++++++ UI/WebServerResources/scss/views/_view.scss | 1 + 9 files changed, 306 insertions(+), 176 deletions(-) create mode 100644 UI/Templates/UIxSidenavToolbarTemplate.wox create mode 100644 UI/WebServerResources/scss/views/SchedulerUI.scss diff --git a/UI/Templates/SchedulerUI/UIxCalDayTable.wox b/UI/Templates/SchedulerUI/UIxCalDayTable.wox index 8f687d181..998128ea5 100644 --- a/UI/Templates/SchedulerUI/UIxCalDayTable.wox +++ b/UI/Templates/SchedulerUI/UIxCalDayTable.wox @@ -101,6 +101,9 @@ +
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox index 4e937be09..ccb0d6e5f 100644 --- a/UI/Templates/SchedulerUI/UIxCalMainView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox @@ -9,7 +9,7 @@ className="UIxPageFrame" const:userDefaultsKeys="SOGoRefreshViewCheck, SOGoCalendarCategoriesColors,SOGoDefaultCalendar" const:userSettingsKeys="Calendar,ShowCompletedTasks" - const:jsFiles="SchedulerUIDnD.js,jquery-ui.js" + const:jsFiles="Common/resource.js, Common/user-model.js, Common/acl-model.js, Contacts/card-model.js, Contacts/addressbook-model.js, Appointments/component-model.js, Appointments/calendar-model.js" title="title"> + + + +
  • !- separator -
  • -
  • +
  • !- separator -
  • -
  • +
  • !- separator -
  • @@ -71,10 +74,10 @@
    • -
    • +
    • !- separator -
    • -
    • +
    • !- separator -
    @@ -82,28 +85,28 @@ @@ -129,97 +132,110 @@ - -
    -
    -
    -
    - -
    - -
    -
    -
      -
    • -
    • -
    -
    -
    - - - - - - - - - - - - - -
    -
    -
    -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    -
    -
    -
    -
    -
    + --> + +
    + + +
    diff --git a/UI/Templates/SchedulerUI/UIxCalWeekView.wox b/UI/Templates/SchedulerUI/UIxCalWeekView.wox index 6e36775ef..db32215db 100644 --- a/UI/Templates/SchedulerUI/UIxCalWeekView.wox +++ b/UI/Templates/SchedulerUI/UIxCalWeekView.wox @@ -6,35 +6,21 @@ xmlns:rsrc="OGo:url" xmlns:label="OGo:label"> -