Changeset 334896 in indico

Timestamp:

10/04/10 17:17:54 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

ac1609

Parents:

bf016b

git-author:

csvetelina.angelova@…> (01/29/10 13:56:20)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (10/04/10 17:17:54)

Message:

[FIX] - wording&layout changes

• side menu order - 1.Call of Abstracts; 2.Vontributions; 3.Reviewing
• Conference General Settings - the list of modules is sorted.
• Final Judge is now Final Judgement
• Contribution Display - the titles - Existing Materials and Existing Reviewing Materials are not shown, but only for the display.

Location:

indico/MaKaC

Files:

• conference.py (modified) (2 diffs)
• webinterface/pages/conferences.py (modified) (1 diff)
• webinterface/pages/contributionReviewing.py (modified) (1 diff)
• webinterface/pages/contributions.py (modified) (3 diffs)
• webinterface/tpls/ContributionDisplayFull.tpl (modified) (1 diff)
• webinterface/tpls/ShowExistingMaterial.tpl (modified) (1 diff)
• webinterface/tpls/ShowExistingReviewingMaterial.tpl (modified) (1 diff)
• webinterface/wcomponents.py (modified) (5 diffs)

indico/MaKaC/conference.py

@@ -5088 +5088 @@
         self._sections = {
             "cfa": _("Call for abstracts"),
-            #TODO: comment the following line to make the Paper Reviewing module not appear
+            #comment the following line to make the Paper Reviewing module not appear
             "paperReviewing" : _("Paper Reviewing"),
             "evaluation": _("Evaluation Form"),
@@ -5115 +5115 @@
         return l
 
-    def getSectionKeys(self):
-        return self._sections.keys()
+    def getSectionKeys(self, sort=False):
+        l=self._sections.keys()
+        if sort:
+            l.sort()
+        return l
 
     def getSection(self, id):

indico/MaKaC/webinterface/pages/conferences.py

@@ -2104 +2104 @@
         self._programMenuItem = wcomponents.SideMenuItem(_("Programme"),
             urlHandlers.UHConfModifProgram.getURL( self._conf ))
-        self._generalSection.addItem( self._programMenuItem)
-
-        self._reviewingMenuItem = wcomponents.SideMenuItem(_("Reviewing"),
-            urlHandlers.UHConfModifReviewingAccess.getURL( target = self._conf ) )
-        self._generalSection.addItem( self._reviewingMenuItem)        
-        
+        self._generalSection.addItem( self._programMenuItem)               
+                       
         self._abstractMenuItem = wcomponents.SideMenuItem(_("Call for Abstracts"),
             urlHandlers.UHConfModifCFA.getURL( self._conf ))
         self._generalSection.addItem( self._abstractMenuItem)
-
+        
         self._contribListMenuItem = wcomponents.SideMenuItem(_("Contributions"),
             urlHandlers.UHConfModifContribList.getURL( self._conf ))
         self._generalSection.addItem( self._contribListMenuItem)
+        
+        self._reviewingMenuItem = wcomponents.SideMenuItem(_("Reviewing"),
+            urlHandlers.UHConfModifReviewingAccess.getURL( target = self._conf ) )
+        self._generalSection.addItem( self._reviewingMenuItem) 
 
         self._regFormMenuItem = wcomponents.SideMenuItem(_("Registration"),

indico/MaKaC/webinterface/pages/contributionReviewing.py

@@ -114 +114 @@
         
     def _getTabContent( self, pars ):
-        wc=wcomponents.WShowExistingReviewingMaterial(self._target)
+        wc=wcomponents.WShowExistingReviewingMaterial(self._target, True)
         return wc.getHTML( pars )
     

indico/MaKaC/webinterface/pages/contributions.py

@@ -256 +256 @@
         
         from MaKaC.webinterface.rh.conferenceBase import RHSubmitMaterialBase
-        vars["MaterialList"] = wcomponents.WShowExistingMaterial(self._contrib).getHTML()
-        vars["ReviewingMatList"] = wcomponents.WShowExistingReviewingMaterial(self._contrib).getHTML()
+        vars["MaterialList"] = wcomponents.WShowExistingMaterial(self._contrib, False).getHTML()
+        vars["ReviewingMatList"] = wcomponents.WShowExistingReviewingMaterial(self._contrib, False).getHTML()
         
         vars["duration"]=""
@@ -408 +408 @@
                 urlHandlers.UHContributionModifReviewing.getURL( self._target ) )
                 if self._contrib.getReviewManager().isReferee(self._rh._getUser()) and not (confReviewChoice == 3 or confReviewChoice == 1):
-                    self._subTabJudgements = self._subtabReviewing.newSubTab( "final", _("Final Judge"), \
+                    self._subTabJudgements = self._subtabReviewing.newSubTab( "final", _("Final Judgement"), \
                     urlHandlers.UHContributionReviewingJudgements.getURL( self._target ) )
                 else:
@@ -507 +507 @@
 
     def _getTabContent( self, pars ):
-        wc=wcomponents.WShowExistingMaterial(self._target, mode='management')
+        wc=wcomponents.WShowExistingMaterial(self._target, mode='management', show=True)
         return wc.getHTML( pars )
 

indico/MaKaC/webinterface/tpls/ContributionDisplayFull.tpl

@@ -71 +71 @@
                             <b><%=_("Material")%>:</b>
                         </td>
-                        <td width="100%%" valign="top">
+                        <td width="100%%" valign="top" style="padding-top:5px;">
                             <%=MaterialList%>
                         </td>

indico/MaKaC/webinterface/tpls/ShowExistingMaterial.tpl

@@ -1 @@
-<div class="groupTitle"><%= _("Existing material")%></div>
+%(existingMaterialsTitle)s
 
 <div id="materialListPlace"><!-- DOM-filled materials list --></div>

indico/MaKaC/webinterface/tpls/ShowExistingReviewingMaterial.tpl

@@ -1 +1 @@
 <% import MaKaC.webinterface.urlHandlers as urlHandlers %>
 <% from MaKaC.webinterface.rh.conferenceBase import RHSubmitMaterialBase %>
-<div class="groupTitle"><%= _("Existing Reviewing material")%></div>
-
+%(existingMaterialsTitle)s
 <div id="reviewingMaterialListPlace"><!-- DOM-filled materials list --></div>
 <span id="container"></span>

indico/MaKaC/webinterface/wcomponents.py

@@ -5571 +5571 @@
 class WShowExistingMaterial(WTemplated):
 
-    def __init__(self,target, mode='display'):
+    def __init__(self,target, mode='display', show=True):
         """
         mode should be 'display' or 'management'
@@ -5577 +5577 @@
         self._target=target
         self._mode = mode
+        self._show = show
+
 
     def getVars(self):
         vars=WTemplated.getVars(self)
-
         # yes, this may look a bit redundant, but materialRegistry isn't
         # bound to a particular target
@@ -5586 +5587 @@
         vars["materialList"] = materialRegistry.getMaterialList(self._target)
 
+
+        if self._show:
+            vars["existingMaterialsTitle"] = """ <div class="groupTitle" id="title">%s</div>""" % _("Existing material")
+        else:
+            vars["existingMaterialsTitle"] = " "
         vars["materialModifHandler"] = vars.get("materialModifHandler", None)
         vars["materialProtectHandler"] = vars.get("materialProtectHandler", None)
@@ -5598 +5604 @@
 class WShowExistingReviewingMaterial(WTemplated):
     
-    def __init__(self,target):
+    def __init__(self,target,show=True):
         self._target=target
+        self._show=show
 
 
@@ -5605 +5612 @@
         vars=WTemplated.getVars(self)
         
+        if self._show:
+            vars["existingMaterialsTitle"] = """ <div class="groupTitle" id="title">%s</div>""" % _("Existing Reviewing material")
+        else:
+            vars["existingMaterialsTitle"] = " "
         vars["materialModifHandler"] = vars.get("materialModifHandler", None)
         vars["materialProtectHandler"] = vars.get("materialProtectHandler", None)