Changeset a43543 in indico

Timestamp:

04/20/11 15:25:03 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

77d8e3

Parents:

40200c

git-author:

Leszek Syroka <leszek.marek.syroka@…> (11/12/10 17:18:55)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (04/20/11 15:25:03)

Message:

[FIX] Next week/month overview

• link to the week/month overview was added in the category display page
• fix#579

Location:

indico/MaKaC/webinterface

Files:

• tpls/CategoryDisplay.tpl (modified) (5 diffs)
• urlHandlers.py (modified) (2 diffs)

indico/MaKaC/webinterface/tpls/CategoryDisplay.tpl

@@ -8 +8 @@
 <div class="categoryHeader">
 <ul>
-        % if not isRootCategory: 
+        % if not isRootCategory:
             <li><a href="${ urlHandlers.UHCategoryDisplay.getURL(categ.owner) }">${ _("Go to parent category") }</a>|</li>
         % endif
-            % if categ.getConferenceList() != []: 
+            % if categ.getConferenceList() != []:
                 <li><a href="${ urlHandlers.UHCategoryToiCal.getURL(categ) }">${ _("iCal export")}</a>|</li>
             % endif
         <li><a id="moreLink" class="dropDownMenu" href="#">${ _("View") }</a></li>
-        % if allowCreateEvent: 
+        % if allowCreateEvent:
             <li>|<a id="createEventLink" class="dropDownMenu" href="#">${ _("Create") }</a></li>
         % endif
-        % if allowUserModif: 
+        % if allowUserModif:
             <li style="font-weight: bold" >|<a id="manageLink" class="dropDownMenu highlight" href="#">${ _("Manage")}</a></li>
         % endif
 </ul>
 <h1 class="categoryTitle">
-% if isRootCategory and containsCategories: 
+% if isRootCategory and containsCategories:
     ${ _("Main categories") }
-% elif isRootCategory: 
+% elif isRootCategory:
     ${ _("All events") }
-% else: 
+% else:
     ${ name }
 % endif
 </h1>
 
-% if isRootCategory and containsCategories: 
+% if isRootCategory and containsCategories:
 <div class="categoryInfo">
     ${ _("Click on a category to start browsing through the hierarchy") }
 </div>
 % endif
-% if description: 
+% if description:
 <div class="categoryInfo">
     ${ description }
@@ -44 +44 @@
 
 
-% if managers: 
+% if managers:
     <div class="categoryManagers"><strong>${ _("Managers") }:</strong> ${ managers }</div>
 % endif
 
 <!--
-% if taskList: 
+% if taskList:
 <h2 class="subtitle">
     ${ taskList }
@@ -87 +87 @@
     var menuItems = {};
     menuItems["${ _("Today's events") }"] = "${ urlHandlers.UHCategoryOverview.getURL(categ) }";
+    menuItems["${ _("Week's events") }"] = "${ urlHandlers.UHCategoryOverview.getWeekOverviewUrl(categ) }";
+    //menuItems["${ _("Month's events") }"] = "${ urlHandlers.UHCategoryOverview.getMonthOverviewUrl(categ) }";
     menuItems['${ _("Calendar") }'] = "${ urlHandlers.UHCalendar.getURL([categ]) }";
     menuItems['${ _("Category map") }'] = "${ urlHandlers.UHCategoryMap.getURL(categ) }";
@@ -99 +101 @@
 
 
-% if allowCreateEvent: 
+% if allowCreateEvent:
 <script type="text/javascript">
 var createEventLink2 = $E('createEventLink');
@@ -124 +126 @@
 % endif
 
-% if allowUserModif: 
+% if allowUserModif:
 <script type="text/javascript">
 var manageLink = $E('manageLink');

indico/MaKaC/webinterface/urlHandlers.py

@@ -24 +24 @@
 from new import classobj
 from MaKaC.common.utils import utf8rep
+from MaKaC.common.timezoneUtils import nowutc
 
 """
@@ -2417 +2418 @@
     getURLFromOverview = classmethod( getURLFromOverview )
 
+    @classmethod
+    def getWeekOverviewUrl(cls, categ):
+        url = cls.getURL(categ)
+        p = {"day" : nowutc().day,
+             "month" : nowutc().month,
+             "year" : nowutc().year,
+             "period" : "week",
+             "detail" : "conference"}
+        url.addParams(p)
+        return url
+
+    @classmethod
+    def getMonthOverviewUrl(cls, categ):
+        url = cls.getURL(categ)
+        p = {"day" : nowutc().day,
+             "month" : nowutc().month,
+             "year" : nowutc().year,
+             "period" : "month",
+             "detail" : "conference"}
+        url.addParams(p)
+        return url
 
 class UHTaskList( URLHandler ):