Changeset 690cc2 in indico

Timestamp:

02/03/10 19:07:04 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 36509dd327b5670bb394f5ec070c14653b4c9c19

Children:

de203c

Parents:

c83d00

git-author:

Jose Benito <jose.benito.gonzalez@…> (02/03/10 19:00:23)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/03/10 19:07:04)

Message:

[IMP] search inside category

fixes #30

Location:

indico/MaKaC/webinterface

Files:

• tpls/SearchBox.tpl (modified) (1 diff)
• wcomponents.py (modified) (343 diffs)

indico/MaKaC/webinterface/tpls/SearchBox.tpl

@@ -1 +1 @@
 <form method="get" action="%(searchAction)s" id="searchBoxForm" style="margin: 0px;">
-<input type="hidden" id="searchCategId" name="categId" value="0"/>
+<input type="hidden" id="searchCategId" name="categId" value="<%=categId%>"/>
 <div id="UISearchBox">
     <div id="searchControls">

indico/MaKaC/webinterface/wcomponents.py

@@ -94 +94 @@
 
 
-        if DBMgr.getInstance().isConnected():        
-            template = info.HelperMaKaCInfo.getMaKaCInfoInstance().getDefaultTemplateSet()    
-        
+        if DBMgr.getInstance().isConnected():
+            template = info.HelperMaKaCInfo.getMaKaCInfoInstance().getDefaultTemplateSet()
+
             if template != None :
                 specTpl = "%s.%s.%s" % (tplId, template, extension)
-            
-                if os.path.exists(os.path.join(dir,specTpl)):          
+
+                if os.path.exists(os.path.join(dir,specTpl)):
                     return specTpl
 
-        
+
         return "%s.%s" % (tplId, extension)
 
@@ -115 +115 @@
         dir = cfg.getTPLDir()
         file = cfg.getTPLFile( self.tplId )
-        
+
         if file == "":
             file = self._getSpecificTPL(dir,self.tplId)
@@ -123 +123 @@
                                               self.tplId,
                                               extension='wohl')
-    
+
         self.helpFile = os.path.join(dir,'chelp',hfile)
-        
+
 
     def getVars( self ):
@@ -139 +139 @@
         cfg = Configuration.Config.getInstance()
         vars = cfg.getTPLVars()
-        
+
         for paramName in self.__params:
             vars[ paramName ] = self.__params[ paramName ]
@@ -146 +146 @@
         else:
             vars["errorMsg"] = ""
-        
+
         if len(vars.get("infoMsg", [])) > 0 :
             vars["infoMsg"] = WInfoMessage().getHTML(vars)
@@ -163 +163 @@
         from MaKaC.webinterface.rh.base import RH
         self._rh = RH._currentRH
-        if self.tplId == None:            
+        if self.tplId == None:
             self.tplId = self.__class__.__name__[1:]
         self._setTPLFile()
@@ -185 +185 @@
             except exceptions.IOError:
                 pass
-        
+
         vars = self.getVars()
         vars['__rh__'] = self._rh
         vars['self'] = self
-                
+
         tempHTML = TemplateExec.executeTemplate( text, vars, self.tplId )
 
-        if helpText == None:            
+        if helpText == None:
             return tempHTML
         else:
@@ -202 +202 @@
                 else:
                     raise e
-            
+
 
     def htmlText(param):
@@ -220 +220 @@
     textToHTML = staticmethod( textToHTML )
 
-    def _escapeChars(self, text):        
+    def _escapeChars(self, text):
         return text.replace('%','%%')
 
 class WHTMLHeader(WTemplated):
-    
-    
-    
+
+
+
     def __init__(self, tpl_name = None):
         WTemplated.__init__(self)
-        
-    def getVars( self ):
-        vars = WTemplated.getVars( self )
-                
+
+    def getVars( self ):
+        vars = WTemplated.getVars( self )
+
         if DBMgr.getInstance().isConnected():
-            vars['stylesheet'] = Config.getInstance().getCssStylesheetName() 
+            vars['stylesheet'] = Config.getInstance().getCssStylesheetName()
         else:
             vars['stylesheet'] = 'Default.css'
@@ -251 +251 @@
         self.__isFrontPage = isFrontPage
         self.__currentCategory = currentCategory
-   
+
     """
         Returns the current active timezone.
@@ -262 +262 @@
 
         return tz
-    
+
     """
         Returns timezone string that is show to the user.
@@ -276 +276 @@
 
     def getVars( self ):
-        vars = WTemplated.getVars( self )        
+        vars = WTemplated.getVars( self )
         #urlHandlers.UHUserDetails.getURL(self._currentuser)
         vars["logMeAs"] = ""
@@ -283 +283 @@
             vars["userInfo"] = """<font size="-1"><a class="topbar" href="%s" target="_blank">%s</a> - <a href="%s">logout</a></font>"""%(urlHandlers.UHUserDetails.getURL(self._currentuser), self._currentuser.getFullName(), vars["logoutURL"])
             vars["userDetails"] = """class="topbar" href="%s" target="_blank\""""%urlHandlers.UHUserDetails.getURL(self._currentuser)
-            
+
             if self._currentuser.isAdmin():
                 vars["logMeAs"] = vars["loginAsURL"]
@@ -290 +290 @@
             vars["userDetails"] = ""
         # *****************
-       
+
         vars["currentUser"] = self._currentuser
-       
+
         imgLogo=Configuration.Config.getInstance().getSystemIconURL( "logoIndico" )
         imgLogin=Configuration.Config.getInstance().getSystemIconURL( "login" )
@@ -299 +299 @@
 ##
 #        if Configuration.Config.getInstance().getLoginURL().startswith("https"):
-#            
+#
 #            # Set proper PROTOCOL for images requested via SSL
 #            imgLogo=imgLogo.replace("http://", "https://")
 #            imgLogin=imgLogin.replace("http://", "https://")
-#            
+#
 #            # Set proper PORT for images requested via SSL
 #            imgLogo = urlHandlers.setSSLPort( imgLogo )
-#            imgLogin = urlHandlers.setSSLPort( imgLogin ) 
-#            
+#            imgLogin = urlHandlers.setSSLPort( imgLogin )
+#
         vars["imgLogo"] = imgLogo
         vars["imgLogin"] = imgLogin
         vars["isFrontPage"] = self.__isFrontPage
         vars["currentCategory"] = self.__currentCategory
-        
+
         if self._aw.getSession():
             selLang = self._aw.getSession().getLang()
@@ -318 +318 @@
             minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
             selLang = minfo.getLang()
-        
+
         #language list related
         languages = {}
@@ -329 +329 @@
 
         vars["SelectedLanguage"] = selLang;
-        
+
         vars["ActiveTimezone"] = self._getActiveTimezone();
         """
@@ -339 +339 @@
         """
         vars["ActiveTimezoneDisplay"] = self._getTimezoneDisplay(vars["ActiveTimezone"])
-        
+
         if DBMgr.getInstance().isConnected():
             vars["title"] = info.HelperMaKaCInfo.getMaKaCInfoInstance().getTitle()
@@ -346 +346 @@
             vars["title"] = "Indico"
             vars["organization"] = ""
-        
-        
+
+
         # Search box, in case search is active
         if Config.getInstance().getIndicoSearchServer() != '' :
-            vars['searchBox'] = WCategorySearchBox().getHTML()
+            categId = 0
+            if self.__currentCategory:
+                categId = self.__currentCategory.getId()
+            vars['searchBox'] = WCategorySearchBox(categId=categId).getHTML()
         else:
             vars['searchBox'] = ""
-        
+
         # Check if room booking module is active
         minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
         vars['roomBooking'] = minfo.getRoomBookingModuleActive()
-        
+
         #Build a list of items for the administration menu
         adminList = AdminList.getInstance()
@@ -370 +373 @@
             if webcast.HelperWebcastManager.getWebcastManagerInstance().isManager(self._currentuser):
                 adminItemList.append({'url': urlHandlers.UHWebcast.getURL(), 'text': _("Webcast Admin")})
-            
-            
+
+
         vars["adminItemList"] = adminItemList
-        
+
         return vars
 
 
 class WStaticWebHeader( WTemplated ):
-    """Templating web component for generating the HTML header for 
+    """Templating web component for generating the HTML header for
         the static web interface when generating a DVD.
     """
@@ -384 +387 @@
         vars = WTemplated.getVars( self )
         return vars
-    
+
 class WManagementHeader( WHeader ):
-    """Templating web component for generating the HTML header for 
+    """Templating web component for generating the HTML header for
         the management web interface.
     """
@@ -392 +395 @@
 
 class WHelpHeader( WHeader ):
-    """Templating web component for generating the HTML header for 
+    """Templating web component for generating the HTML header for
         the help web interface.
     """
     pass
-    
+
 class WRoomBookingHeader( WHeader ):
-    """Templating web component for generating the HTML header for 
+    """Templating web component for generating the HTML header for
         the (standalone) room booking web interface.
     """
@@ -404 +407 @@
 
 class WConferenceHeader( WHeader ):
-    """Templating web component for generating the HTML header for 
+    """Templating web component for generating the HTML header for
         the conferences' web interface.
     """
@@ -414 +417 @@
         tzUtil = DisplayTZ(self._aw,self._conf)
         self._locTZ = tzUtil.getDisplayTZ()
-     
+
     def getVars( self ):
         vars = WHeader.getVars( self )
         vars["categurl"] = urlHandlers.UHCategoryDisplay.getURL(self._conf.getOwnerList()[0])
-        
+
         vars["conf"] = self._conf;
-        
+
         vars["imgLogo"] = Configuration.Config.getInstance().getSystemIconURL( "miniLogo" )
         vars["MaKaCHomeURL"] = urlHandlers.UHCategoryDisplay.getURL(self._conf.getOwnerList()[0])
-        
+
         #moved here from WHeader in order to be able to use DisplayTZ with self._conf (in some pages WHeader has no self._conf).
         #TODO: Is this needed?
         #vars["Timezones"] = Config.getInstance().getTimezoneList()
- 
- 
+
+
 #        if self._conf.getModifKey() != '':
 #            url = urlHandlers.UHConfEnterModifKey.getURL(self._conf)
@@ -463 +466 @@
         styleMgr = info.HelperMaKaCInfo.getMaKaCInfoInstance().getStyleManager()
         stylesheets = styleMgr.getStylesheetListForEventType(vars["type"])
-       
+
         # View Menu
         viewoptions = []
@@ -525 +528 @@
         # Save to session
         vars["hideContributions"] = hideContributions;
-        
+
         if self._conf.getType() == "meeting" and self._conf.getParticipation().isAllowedForApplying() and self._conf.getStartDate() > nowutc():
             vars["applyForParticipation"] = _("""<a href="%s">_("Apply for participation")</a>""")%urlHandlers.UHConfParticipantsNewPending.getURL(self._conf)
@@ -559 +562 @@
             vars["searchBox"] = ""
 
-        
+
         return vars
 
 class WMenuMeetingHeader( WConferenceHeader ):
-    """Templating web component for generating the HTML header for 
+    """Templating web component for generating the HTML header for
         the meetings web interface with a menu
     """
@@ -573 +576 @@
         tzUtil = DisplayTZ(self._aw,self._conf)
         self._locTZ = tzUtil.getDisplayTZ()
-       
+
 
     def getVars( self ):
         vars = WConferenceHeader.getVars( self )
-        
+
         vars["categurl"] = urlHandlers.UHCategoryDisplay.getURL(self._conf.getOwnerList()[0])
         #vars["confModif"] =  _("""<a href=%s> _("manage")</a>""")%quoteattr(str(urlHandlers.UHConfEnterModifKey.getURL(self._conf)))
@@ -598 +601 @@
         vars["showExportToPDF"] = True
         vars["showMore"] = True
-                
+
         # Dates Menu
         tz = DisplayTZ(self._aw,self._conf,useServerTZ=1).getDisplayTZ()
@@ -620 +623 @@
             sdate = sdate + timedelta(days=1)
         vars["datesMenu"] = "".join(dates);
-        
+
         # Sessions Menu
         sessions = []
@@ -641 +644 @@
             sessions.append(""" <option value="%s" %s>%s</option> """%(id, selected, title))
         vars["sessionsMenu"] = "".join(sessions);
-        
+
         # Handle hide/show contributions option
         hideContributions = None;
@@ -651 +654 @@
                     hideContributions = ""
         vars["hideContributions"] = hideContributions;
-        
+
         if Config.getInstance().getIndicoSearchServer() != '' :
-            vars["searchBox"] = WCategorySearchBox(optionsClass='meetingHeaderSearchBox').getHTML()            
+            vars["searchBox"] = WCategorySearchBox(optionsClass='meetingHeaderSearchBox').getHTML()
         else:
             vars["searchBox"] = ""
-        
+
         urlCustPrint = urlHandlers.UHConferenceOtherViews.getURL(self._conf)
         urlCustPrint.addParam("showDate", vars.get("selectedDate", "all"))
@@ -664 +667 @@
         urlCustPrint.addParam("view", vars["currentView"])
         vars["printURL"]=str(urlCustPrint)
-        
+
 
         urlCustPDF=urlHandlers.UHConfTimeTableCustomizePDF.getURL(self._conf)
@@ -671 +674 @@
         vars["pdfURL"]=str(urlCustPDF)
 
-        
+
         return vars
 
 class WMenuSimpleEventHeader( WMenuMeetingHeader ):
-    """Templating web component for generating the HTML header for 
+    """Templating web component for generating the HTML header for
         the simple event' web interface with a menu
     """
-    
+
     def getVars( self ):
         vars = WMenuMeetingHeader.getVars( self )
@@ -693 +696 @@
         vars["viewoptions"] = viewoptions
         vars["SelectedStyle"] = styleMgr.getStylesheetName(vars["currentView"])
-        
+
         vars["showFilterButton"] = False
         vars["showExportToPDF"] = False
         vars["showMore"] = True
-            
+
         vars["accessWrapper"] = self._aw
         return vars
 
 
-    
+
 class WFooter(WTemplated):
-    """Templating web component for generating a common HTML footer for the 
+    """Templating web component for generating a common HTML footer for the
         web interface.
     """
-    
+
     def __init__(self, tpl_name = None, isFrontPage = False):
         WTemplated.__init__(self, tpl_name)
         self.__isFrontPage = isFrontPage
-        
-    def getVars( self ):
-        vars = WTemplated.getVars( self )
-        
+
+    def getVars( self ):
+        vars = WTemplated.getVars( self )
+
         vars["isFrontPage"] = self.__isFrontPage;
-        
+
         if not vars.has_key("modificationDate"):
             vars["modificationDate"] = ""
-        
+
         if not vars.has_key("shortURL"):
             vars["shortURL"] = ""
-        
-        return vars
-    
+
+        return vars
+
 class WNavigationDrawer(WTemplated):
 
@@ -732 +735 @@
         self._track = pars.get("track", None) #for abstracts viewed inside a track
         self._bgColor = bgColor
-        
+
         """
             The appendPath is an array with dictionaries: {"url": x, "title": x}.
-            Each of these links are added in the end of the breadcrumb 
+            Each of these links are added in the end of the breadcrumb
         """
         self._appendPath = appendPath
@@ -747 +750 @@
         vars["appendPath"] = self._appendPath
         return vars
-    
+
     def getHTML(self, params=None):
         return WTemplated.getHTML(self, params)
 
 class WSimpleNavigationDrawer(WTemplated):
-    
+
     def __init__( self, title, handler = None, bgColor = None, **pars  ):
         self._urlHandler = handler
@@ -758 +761 @@
         self._title = title
         self._bgColor = bgColor
-        
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -766 +769 @@
         vars["bgColor"] = self._bgColor
         return vars
-    
+
     def getHTML(self, params=None):
         return WTemplated.getHTML(self, params)
-    
+
 class WBannerModif(WTemplated):
-    
+
     def __init__( self, path = [], itemType = "", title = "" ):
         WTemplated.__init__( self, "BannerModif" )
@@ -777 +780 @@
         self._title = title
         self._type = itemType
-        
+
     def getHTML(self):
         """ Retrieves the HTML of the banner of the modification interface
@@ -785 +788 @@
             of the breadcrumb showed in the banner.
         """
-        
+
         return WTemplated.getHTML(self, {"type" : self._type, "path": self._path, "title": self._title})
 
@@ -800 +803 @@
         title = target.getTitle()
         WBannerModif.__init__(self, path, itemType, title)
-        
+
     def _getOwnerBasePath(self, target):
         path = []
@@ -815 +818 @@
 
 class WContribListBannerModif(WTimetableBannerModif):
-    
+
     def __init__(self, target ):
         ## PATH
@@ -826 +829 @@
         title = target.getTitle()
         WBannerModif.__init__(self, path, itemType, title)
-    
+
 
 class WNotifTplBannerModif(WBannerModif):
-    
+
     def __init__( self, target ):
         path = [{"url": urlHandlers.UHConfModifCFA.getURL(target), "title":_("Call for abstracts setup")}]
@@ -837 +840 @@
 
 class WAbstractBannerModif(WBannerModif):
-    
+
     def __init__( self, target ):
         path = [{"url": urlHandlers.UHConfAbstractManagment.getURL(target), "title":_("Abstracts list")}]
@@ -843 +846 @@
         title=target.getTitle()
         WBannerModif.__init__(self, path, itemType, title)
-        
+
 class WTrackBannerModif(WBannerModif):
-    
+
     def __init__( self, track, abstract=None ):
         path = []
@@ -858 +861 @@
         title=target.getTitle()
         WBannerModif.__init__(self, path, itemType, title)
-        
+
 class WCategoryBannerModif(WBannerModif):
-    
+
     def __init__( self, target ):
         itemType="Category"
@@ -867 +870 @@
 
 class WRegFormBannerModif(WBannerModif):
-    
+
     def __init__( self, registrant ):
         path=[{"url": urlHandlers.UHConfModifRegistrantList.getURL(registrant.getConference()), "title":_("Registrants list")}]
-        
+
         itemType="Registrant"
         title=registrant.getFullName()
@@ -876 +879 @@
 
 class WRegFormSectionBannerModif(WBannerModif):
-    
+
     def __init__( self, target, conf ):
         path=[{"url": urlHandlers.UHConfModifRegForm.getURL(conf), "title":_("Registration form setup")}]
-        
+
         itemType="Registration form Section"
         title=target.getTitle()
@@ -885 +888 @@
 
 class WEpaymentBannerModif(WBannerModif):
-    
+
     def __init__( self, target, conf ):
         path=[{"url": urlHandlers.UHConfModifEPayment.getURL(conf), "title":_("Epayment setup")}]
-        
+
         itemType="Epayment plugin"
         title=target.getTitle()
@@ -894 +897 @@
 
 class WListingsBannerModif(WBannerModif):
-    
+
     def __init__( self, conf ):
         path=[{"url": urlHandlers.UHConfModifListings.getURL(conf), "title":_("All listings")}]
-        
+
         itemType="Pending queues"
         title=""
@@ -903 +906 @@
 
 class WParticipantsBannerModif(WBannerModif):
-    
+
     def __init__( self, conf ):
         path=[{"url": urlHandlers.UHConfModifParticipants.getURL(conf), "title":_("Participants list")}]
-        
+
         itemType="Pending participants"
         title=""
@@ -913 +916 @@
 
 class WConfLogsBannerModif(WBannerModif):
-    
+
     def __init__( self, conf ):
         path=[{"url": urlHandlers.UHConfModifLog.getURL(conf), "title":_("Logs")}]
-        
+
         itemType="Log item"
         title=""
@@ -922 +925 @@
 
 class WCategModifHeader(WTemplated):
-    
+
     def __init__(self, targetConf ):
         self._conf = targetConf
-        
+
     def _getSingleCategHTML( self, categ, URLGen ):
-      
+
         return """<a href="%s">%s</a>"""%(URLGen( categ ), categ.getName())
- 
+
     def _getMultipleCategHTML( self, categList, URLGen ):
         l = []
@@ -939 +942 @@
                         <input type="submit" class="btn" value="_("go")">
                     </form>""")%(URLGen(), "".join(l))
-   
-    def getVars( self ):
-        
+
+    def getVars( self ):
+
         vars = WTemplated.getVars( self )
         #raise "%s"%(type(self._conf))
@@ -950 +953 @@
         #raise "%s"%ol
         URLGen = vars.get("categDisplayURLGen", urlHandlers.UHCategoryDisplay.getURL )
-        
+
         try:
             if len(ol)>1:
@@ -960 +963 @@
             vars["categ"] = self._getSingleCategHTML( ol, URLGen)
             vars["viewImageURL"] = Configuration.Config.getInstance().getSystemIconURL( "view" )
-        
+
         return vars
 
 
 class WCategoryModificationHeader(WTemplated):
-    
-    
+
+
     def __init__( self, category ):
         self._categ = category
@@ -972 +975 @@
     def getVars( self ):
         vars = WTemplated.getVars( self )
-        
+
         vars["confTitle"] = self._categ.getName()
         vars["title"] = self._categ.getName()
@@ -981 +984 @@
         vars["eventCaption"]= "Category"
         return vars
-        
+
     def getIntermediateVTabPixels( self ):
         return 0
-        
+
     def getTitleTabPixels( self ):
         return 260
 
 class WConfModifHeader(WTemplated):
-    
+
     def __init__( self, conf, aw ):
         self._conf = conf
@@ -1017 +1020 @@
             type = "lecture"
         vars["eventCaption"]=type.capitalize()#"Event"
-        
-        
+
+
         return vars
 
 
 class WSessionModifHeader(WTemplated):
-    
+
     def __init__( self, session, aw ):
         self._session = session
@@ -1042 +1045 @@
 
 class WBreakModifHeader(WTemplated):
-    
+
     def __init__( self, breakSlot, aw ):
         self._break = breakSlot
@@ -1058 +1061 @@
 
 class WContribModifHeader(WTemplated):
-    
+
     def __init__( self, contrib, aw):
         self._contrib = contrib
@@ -1075 +1078 @@
         vars = WTemplated.getVars( self )
         vars["imgGestionGrey"] = Configuration.Config.getInstance().getSystemIconURL( "gestionGrey" )
-        vars["title"] = escape(self._contrib.getTitle())        
+        vars["title"] = escape(self._contrib.getTitle())
         urlGen = vars.get( "contribDisplayURLGen", urlHandlers.UHContributionDisplay.getURL )
         vars["contribDisplayURL"] = urlGen(self._contrib)
@@ -1084 +1087 @@
 
 class WContribModifTool(WTemplated):
-    
+
     def __init__( self, contrib ):
         self._contrib = contrib
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -1094 +1097 @@
         vars["writeIconURL"] = Configuration.Config.getInstance().getSystemIconURL("write_minutes")
         return vars
-        
+
 
 
 class WContributionDeletion(object):
-    
+
     def __init__( self, contribList ):
         self._contribList = contribList
@@ -1121 +1124 @@
                 </ul>
                 </td></tr>
-            </table> 
+            </table>
               """)%("".join(l))
         wc = WConfirmation()
@@ -1138 +1141 @@
 
 class WContribModifSC(WTemplated):
-    
+
     def __init__( self, contrib ):
         self._contrib = contrib
         self._conf = self._contrib.getConference()
-        
+
 
     def getSubContItems(self,SCModifURL):
@@ -1170 +1173 @@
                 </table>"""%"".join( temp )
         return html
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -1178 +1181 @@
         vars["contribId"] = self._contrib.getId()
         vars["deleteItemsURL"] = vars["moveSubContribURL"]
-        
+
         return vars
 ###ness##################################################################################
@@ -1209 +1212 @@
 
 class WMaterialModifHeader(WTemplated):
-    
+
     def __init__( self, material, aw ):
         self._mat = material
@@ -1237 +1240 @@
         return vars
 
-    
+
 class WConferenceModifFrame(WTemplated):
-    
+
     def __init__( self, conference, aw,):
         self.__conf = conference
@@ -1246 +1249 @@
     def getHTML( self, body, **params ):
         params["body"] = body
-        return WTemplated.getHTML( self, params ) 
+        return WTemplated.getHTML( self, params )
 
     def getVars( self ):
@@ -1255 +1258 @@
 
         return vars
-    
+
 class WCategoryModifFrame(WTemplated):
-    
+
     def __init__( self, conference):
         self.__conf = conference
-        
+
 
     def getHTML( self, body, **params ):
         params["body"] = body
-        return WTemplated.getHTML( self, params ) 
+        return WTemplated.getHTML( self, params )
 
     def getVars( self ):
@@ -1279 +1282 @@
         return vars
 
-    
+
     def getIntermediateVTabPixels( self ):
         return 0
-        
+
     def getTitleTabPixels( self ):
         return 260
-    
+
     def getCloseHeaderTags( self ):
         return ""
 
 class WNotifTPLModifFrame(WTemplated):
-    
+
     def __init__(self, notifTpl, aw):
         self._notifTpl = notifTpl
         self._aw = aw
-    
+
     def getHTML( self, body, **params ):
         params["body"] = body
         return WTemplated.getHTML( self, params )
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -1313 +1316 @@
         wc = WConferenceModifFrame(owner, self._aw)
         return wc
-        
+
     def getIntermediateVTabPixels( self ):
         wc = self.getOwnerComponent()
         return 7 + wc.getIntermediateVTabPixels()
-        
+
     def getTitleTabPixels( self ):
         wc = self.getOwnerComponent()
         return wc.getTitleTabPixels() - 7
-    
+
     def getCloseHeaderTags( self ):
         wc = self.getOwnerComponent()
@@ -1328 +1331 @@
 
 class WScheduleContributionModifFrame(WTemplated):
-    
+
     def __init__( self, contribution, aw, days, handler=urlHandlers.UHContributionModification):
         self._contrib = contribution
@@ -1336 +1339 @@
         self._handler = handler
 
-    def getHTML( self, body, **params ):        
-        
+    def getHTML( self, body, **params ):
+
         params["body"] = body
-        
+
         dateList = [d.getDate() for d in self._days]
-        
+
         # Keep contributions that happen in the selected day(s)
 
@@ -1350 +1353 @@
 
         ###
-            
+
         l = []
         for contrib in self._conf.getContributionList():
@@ -1357 +1360 @@
         params["contribList"] = l
         params["handler"] = self._handler
-        
+
         return WTemplated.getHTML( self, params )
 
 class WContributionModifFrame(WTemplated):
-    
+
     def __init__( self, contribution, aw):
         self._contrib = contribution
@@ -1377 +1380 @@
 
 class WMaterialModifFrame(WTemplated):
-    
+
     def __init__( self, material, aw):
         self._material = material
@@ -1395 +1398 @@
         elif isinstance(owner, conference.Session):
             wc = WSessionModifHeader( owner, self._aw )
-        elif isinstance(owner, conference.SubContribution):         
+        elif isinstance(owner, conference.SubContribution):
             wc = WSubContribModifHeader( owner, self._aw )
         elif isinstance(owner, conference.Category) :
-            wc = WCategoryModificationHeader(owner)  
-        else:       
+            wc = WCategoryModificationHeader(owner)
+        else:
             wc = WConfModifHeader( owner, self._aw )
         vars["context"] = wc.getHTML( vars )
@@ -1408 +1411 @@
         vars["materialDisplayURL"] = vars["materialDisplayURLGen"]( self._material )
         return vars
-        
+
     def getOwnerComponent( self ):
         owner = self._material.getOwner()
@@ -1417 +1420 @@
         elif isinstance(owner, conference.SubContribution):
             wc = WSubContributionModifFrame(owner, self._aw)
-        
+
         else:
             wc = WConferenceModifFrame(owner, self._aw)
         return wc
-        
+
     def getIntermediateVTabPixels( self ):
         wc = self.getOwnerComponent()
         return 7 + wc.getIntermediateVTabPixels()
-        
+
     def getTitleTabPixels( self ):
         wc = self.getOwnerComponent()
         return wc.getTitleTabPixels() - 7
-    
+
     def getCloseHeaderTags( self ):
         wc = self.getOwnerComponent()
@@ -1436 +1439 @@
 
 class WResourceModifFrame(WTemplated):
-    
+
     def __init__( self, resource, aw):
         self._resource = resource
@@ -1454 +1457 @@
         vars["closeHeaderTags"] = self.getCloseHeaderTags()
         return vars
-        
+
     def getOwnerComponent( self ):
         owner = self._resource.getOwner()
         wc = WMaterialModifFrame(owner, self._aw)
         return wc
-        
+
     def getIntermediateVTabPixels( self ):
         wc = self.getOwnerComponent()
         return 7 + wc.getIntermediateVTabPixels()
-        
+
     def getTitleTabPixels( self ):
         wc = self.getOwnerComponent()
         return wc.getTitleTabPixels() - 7
-    
+
     def getCloseHeaderTags( self ):
         wc = self.getOwnerComponent()
@@ -1483 +1486 @@
 
 class ModifFrameFactory:
-    
+
     def getFrameClass( cls, target ):
         if isinstance(target, conference.Conference):
@@ -1501 +1504 @@
         return None
     getFrameClass = classmethod( getFrameClass )
-        
+
     def getModifFrame( target ):
         f = ModifFrameFactory.getFrameClass( target )
@@ -1511 +1514 @@
 
 class WSubContributionDisplay:
-    
+
     def __init__(self, aw, subContrib):
         self._aw = aw
@@ -1526 +1529 @@
 
 class WSubContributionDisplayBase(WTemplated):
-    
+
     def __init__(self, aw, subContrib):
         self._aw = aw
@@ -1576 +1579 @@
 
 class WMaterialDisplayItem(WTemplated):
-    
+
     def getHTML( self, aw, material, URL="", icon=Configuration.Config.getInstance().getSystemIconURL( "material" ) ):
         if material.canView( aw ):
-            
+
             return """<a href=%s>%s</a>"""%(quoteattr( str( URL ) ), WTemplated.htmlText( material.getTitle() ) )
         return ""
@@ -1585 +1588 @@
 
 class WBreakDataModification(WTemplated):
-    
+
     def __init__(self,sch,breakEntry=None,targetDay=None,conf=None):
         self._break=breakEntry
@@ -1661 +1664 @@
             vars["ownerRoom"] = ownerRoom.getName()
         vars["roomName"] = quoteattr(str(roomName))
-            
+
         vars["WPtitle"]=wpTitle
         vars["title"]=quoteattr(str(title))
@@ -1706 +1709 @@
         vars['rbActive'] = info.HelperMaKaCInfo.getMaKaCInfoInstance().getRoomBookingModuleActive()
         return vars
- 
+
 
 class WMaterialTable( WTemplated ):
     # Deprecated - used in old file management scheme
-    
+
     def __init__(self, matOwner, registry = None ):
         self._owner = matOwner
         self._fr = registry
-    
+
     def _getAdditionalMaterialItems( self ):
         l = []
@@ -1740 +1743 @@
         return "".join(l)
 
-    def _getSpecialMaterialItems( self ): 
+    def _getSpecialMaterialItems( self ):
         if not self._fr:
             return ""
@@ -1776 +1779 @@
 
         hiddenParams = self._owner.getLocator().getWebForm()
-            
+
         return WTemplated.getHTML( self, params )
 
@@ -1795 +1798 @@
 
 class WAccessControlFrame(WTemplated):
-        
+
     def getHTML( self, target, setVisibilityURL, addAllowedURL, removeAllowedURL):
         self.__target = target
@@ -1825 +1828 @@
 
         return vars
-    
+
 
 class WConfAccessControlFrame(WTemplated):
-    
+
     def getHTML( self, target, setVisibilityURL, addAllowedURL, removeAllowedURL,  setAccessKeyURL):
         self.__target = target
@@ -1838 +1841 @@
 
     def getVars( self ):
-        vars = WTemplated.getVars( self )        
+        vars = WTemplated.getVars( self )
         if self.__target.getAccessProtectionLevel() == -1:
             vars["privacy"] = "ABSOLUTELY PUBLIC%s" % WInlineContextHelp('The object will stay public regardless of the protection of its parent (no more inheritance)').getHTML()
@@ -1859 +1862 @@
             vars["changePrivacy"] = """make it <input type="submit" class="btn" name="visibility" value="PRIVATE"> by itself<br/>"""
             vars["changePrivacy"] += """make it <input type="submit" class="btn" name="visibility" value="ABSOLUTELY PUBLIC">%s""" % WInlineContextHelp('The object will stay public regardless of the protection of its parent').getHTML()
-            
+
         vars["locator"] = self.__target.getLocator().getWebForm()
         vars["userTable"] = WPrincipalTable().getHTML( self.__target.getAllowedToAccessList(),
@@ -1919 +1922 @@
 
 class WGroupTableItem(WTemplated):
-    
+
     def __init__(self, multi=True):
         self._multi = multi
-    
+
     def getHTML( self, group, selected=False, selectable=True ):
         self.__group = group
@@ -1946 +1949 @@
 
 class WGroupNICETableItem(WTemplated):
-    
+
     def __init__(self, multi=True):
         self._multi = multi
-    
+
     def getHTML( self, group, selected=False, selectable=True ):
         self.__group = group
@@ -1972 +1975 @@
 
 class WAuthorTableItem(WTemplated):
-    
+
     def __init__(self, multi=False):
         self._multi = multi
-    
+
     def getHTML( self, author, selected=False ):
         self.__author = author
@@ -1997 +2000 @@
 
 class WPrincipalTable(WTemplated):
-    
+
     def getHTML( self, principalList, target, addPrincipalsURL, removePrincipalsURL, pendings=[], selectable=True ):
         self.__principalList = principalList
@@ -2030 +2033 @@
 
 class WModificationControlFrame(WTemplated):
-    
+
     def getHTML( self, target, addManagersURL, removeManagersURL ):
         self.__target = target
@@ -2040 +2043 @@
         vars = WTemplated.getVars( self )
         vars["locator"] = self.__target.getLocator().getWebForm()
-        vars["principalTable"] = WPrincipalTable().getHTML( self.__target.getManagerList(), 
+        vars["principalTable"] = WPrincipalTable().getHTML( self.__target.getManagerList(),
                                                             self.__target,vars["addManagersURL"],
                                                             vars["removeManagersURL"],
                                                             pendings=self.__target.getAccessController().getModificationEmail(),
                                                             selectable=False)
-        
+
         return vars
 
 
 class WConfModificationControlFrame(WTemplated):
-    
+
     def getHTML( self, target, addManagersURL, removeManagersURL, setModifKeyURL ):
         self.__target = target
@@ -2061 +2064 @@
         vars = WTemplated.getVars( self )
         vars["locator"] = self.__target.getLocator().getWebForm()
-        vars["principalTable"] = WPrincipalTable().getHTML( self.__target.getManagerList(), 
+        vars["principalTable"] = WPrincipalTable().getHTML( self.__target.getManagerList(),
                                                             self.__target, vars["addManagersURL"],
                                                             vars["removeManagersURL"],
@@ -2070 +2073 @@
 
 class WConfRegistrarsControlFrame(WTemplated):
-    
+
     def getHTML(self, target, addRegistrarURL, removeRegistrarURL):
         self.__target = target
@@ -2086 +2089 @@
 
 class WAlarmFrame(WTemplated):
-    
+
     def getHTML( self, target, addAlarmURL, deleteAlarmURL, modifyAlarmURL ):
         self.__target = target
@@ -2093 +2096 @@
         params = { "addAlarmURL": addAlarmURL, \
                    "deleteAlarmURL": deleteAlarmURL, \
-                   "modifyAlarmURL": modifyAlarmURL                   
+                   "modifyAlarmURL": modifyAlarmURL
                    }
         return  WTemplated.getHTML( self, params )
@@ -2107 +2110 @@
             for user in al.getToUserList():
                 addr = addr + user.getEmail() + " <br> "
-            
+
             if al.getToAllParticipants() :
                 addr = "to all participants"
@@ -2151 +2154 @@
 
 class WDomainControlFrame(WTemplated):
-    
+
     def __init__( self, target ):
         self._target = target
@@ -2169 +2172 @@
         for dom in domain.DomainHolder().getList():
             if dom not in self._target.getDomainList():
-                l.append("""<option value="%s">%s</option>"""%(dom.getId(), dom.getName())) 
+                l.append("""<option value="%s">%s</option>"""%(dom.getId(), dom.getName()))
         vars["domainsToAdd"] = "".join(l)
         vars["removeURL"] = self._removeURL
@@ -2175 +2178 @@
         vars["locator"] = self._target.getLocator().getWebForm()
         return vars
-    
-    
+
+
 class WMaterialDataModificationBase(WTemplated):
-    
+
     def __init__( self, material ):
         self._material = material
         self._owner = material.getOwner()
-    
+
     def _setMaterialValues( self, material, materialData ):
         material.setTitle( materialData["title"] )
@@ -2188 +2191 @@
         if "type" in materialData:
             material.setType( materialData["type"] )
-    
+
     def _getTypesSelectItems( self, default = "misc" ):
         definedTypes = ["misc"]
@@ -2202 +2205 @@
 
 class WMaterialCreation(WMaterialDataModificationBase):
-    
+
     def __init__( self, owner):
         self._owner = owner
 
-    
+
     def getVars( self ):
         vars = WMaterialDataModificationBase.getVars( self )
@@ -2214 +2217 @@
         vars["locator"] = self._owner.getLocator().getWebForm()
         return vars
-    
+
     def create( self, materialData ):
         m = conference.Material()
@@ -2220 +2223 @@
         self._owner.addMaterial( m )
         return m
-    
+
 class WInlineContextHelp(WTemplated):
 
@@ -2231 +2234 @@
         vars["imgSrc"] = Config.getInstance().getSystemIconURL( "help" )
         return vars
-        
+
 #class WPaperDataModification( WMaterialDataModification ):
 #    pass
 
 #class WMaterialModification( WTemplated ):
-#    
+#
 #    def __init__( self, material ):
 #        self._material = material
@@ -2242 +2245 @@
 #        self.__session = material.getSession()
 #        self.__contrib = material.getContribution()
-#    
+#
 #    def getVars( self ):
 #        vars = WTemplated.getVars( self )
@@ -2293 +2296 @@
 #            self._matParent = self._contrib
 #        if materialId != None and materialId != "":
-#            self._material = self._matParent.getMaterialById( materialId ) 
+#            self._material = self._matParent.getMaterialById( materialId )
 #
 #    def getHTML( self, confId, sessionId, contribId, materialId, params ):
@@ -2311 +2314 @@
 
 #class WFileSubmission(WTemplated):
-#    
+#
 #    def __init__(self, material):
 #        self.__material = material
@@ -2337 +2340 @@
 
 #class WLinkSubmission(WResourceSubmission):
-#    
+#
 #    def __init__(self, material):
 #        self.__material = material
@@ -2362 +2365 @@
 
 class WResourceModification(WTemplated):
-    
+
     def __init__( self, resource ):
         self._resource = resource
@@ -2369 +2372 @@
         self._contrib = resource.getContribution()
         self._material = resource.getOwner()
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -2390 +2393 @@
                                                     vars["setModifKeyURL"] )
         return vars
-    
+
 
 class WResourceDataModification(WResourceModification):
-    
+
     def getHTML(self, params):
         str = """
@@ -2403 +2406 @@
                    self._resource.getLocator().getWebForm(),\
                    WTemplated.getHTML( self, params ) )
-        return str    
+        return str
 
     def getVars( self ):
@@ -2413 +2416 @@
 
 class WUserRegistration(WTemplated):
-    
+
     def __init__( self, av = None ):
         self._avatar = av
@@ -2455 +2458 @@
             vars = self.__defineExistingUserVars( vars )
             vars["locator"] = self._avatar.getLocator().getWebForm()
-        
+
         #note: there's a reason this line is TitlesRegistry() and not just TitlesRegistry
         #methods in TitlesRegistry cannot be classmethods because _items cannot be a class
@@ -2475 +2478 @@
 
 class WUserCreated(WTemplated):
-    
+
     def __init__( self, av = None ):
         self._avatar = av
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -2491 +2494 @@
 
 class WUserSendIdentity(WTemplated):
-    
+
     def __init__( self, av = None ):
         self._avatar = av
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -2509 +2512 @@
 
 class WUserSearchResultsTable( WTemplated ):
-    
+
     def __init__(self, multi=True):
         self._multi = multi
@@ -2523 +2526 @@
             return WAuthorTableItem
         return None
-    
+
     def getHTML( self, resultList ):
         self.__resultList = resultList
@@ -2544 +2547 @@
         return vars
 
-    
+
 class WSignIn(WTemplated):
 
@@ -2570 +2573 @@
 
 class WConfirmation(WTemplated):
-    
+
     def getHTML( self, message, postURL, passingArgs, **opts):
         params = {}
@@ -2588 +2591 @@
 
 class WDisplayConfirmation(WTemplated):
-    
+
     def getHTML( self, message, postURL, passingArgs, **opts):
         params = {}
@@ -2612 +2615 @@
         self._sections = []
         self._userStatus = userStatus
-       
-    def addSection(self, section, top=False):    
+
+    def addSection(self, section, top=False):
         if top:
             self._sections.insert(0, section)
         else:
             self._sections.append(section)
-        
+
     def getSections(self):
         return self._sections
-        
+
 class ManagementSideMenu(SideMenu):
-        
+
     def getHTML(self):
         return WSideMenu(self, self._userStatus, type="management").getHTML()
-    
+
 class BasicSideMenu(SideMenu):
-    
+
     def getHTML(self):
         return WSideMenu(self, self._userStatus, type="basic").getHTML()
 
 class SideMenuSection:
-    """ class coment 
+    """ class coment
     """
-    
+
     def __init__(self, title=None, active=False, currentPage = None, visible=True):
         """ -title is the words that will be displayed int he side menu.
@@ -2653 +2656 @@
     def getItems(self):
         return self._items
-    
+
     def addItem(self, item):
         self._items.append(item)
         item.setSection(self)
-    
+
     def isActive(self):
         return self._active
-        
+
     def setActive(self, val):
         self._active = val
-        
+
     def checkActive(self):
-        
+
         self._active = False
-        
+
         for item in self._items:
             if item.isActive():
                 self._active = True
                 break
-     
+
     def getCurrentPage(self):
         return self._currentPage
-     
+
     def setCurrentPage(self, currentPage):
         self._currentPage = currentPage
-        
+
     def isVisible(self):
         return self._visible
-    
+
     def setVisible(self, visible):
         self._visible = visible
-        
+
     def hasVisibleItems(self):
         for item in self._items:
@@ -2690 +2693 @@
                 return True
         return False
-   
+
 class SideMenuItem:
-    
+
     def __init__(self, title, url, active=False, enabled=True, errorMessage = "msgNoPermissions", visible=True):
         """ errorMessage: one of the error messages in SideMenu.wohl
@@ -2702 +2705 @@
         self._errorMessage = errorMessage
         self._visible = visible
-    
+
     def getTitle(self):
         return self._title;
-    
+
     def setSection(self, section):
         self._section = section
-    
+
     def getURL(self):
         return self._url
-    
+
     def setURL(self, url):
         self._url = url
-    
+
     def isActive(self):
         return self._active
-    
+
     def isEnabled(self):
         return self._enabled
-    
+
     def getErrorMessage(self):
         return self._errorMessage
-    
+
     def setActive(self, val=True):
         self._active = val
         self._section.checkActive()
-        
+
     def setEnabled(self, val):
         self._enabled = val
-        
+
     def setErrorMessage(self, val):
         self._errorMessage = val
-            
+
     def isVisible(self):
         return self._visible
-    
+
     def setVisible(self, visible):
         self._visible = visible
 
 class WSideMenu(WTemplated):
-    
+
     def __init__(self, menu, loggedIn, type="basic"):
         """
@@ -2748 +2751 @@
         self._menu = menu
         self._type = type
-        
+
         # is the user logged in? used for changing some tooltips
         self._loggedIn = loggedIn
-    
+
     def getVars(self):
         vars = WTemplated.getVars(self)
-        
+
         vars['menu'] = self._menu
         vars['loggedIn'] = self._loggedIn
@@ -2789 +2792 @@
     def setCurrentItem( self, item ):
         self.currentItem = item
-        
+
     def isFirstItem( self, item):
         return self.items[0] == item
-        
+
     def isLastItem( self, item ):
         return self.items[len(self.items)-1] == item
-        
+
     def getHTML( self ):
         return WTBDrawer(self).getHTML()
@@ -2801 +2804 @@
 
 class WTBItem:
-    
+
     def __init__( self, caption, **args):
         self.owner = None
@@ -2837 +2840 @@
     def isEnabled( self ):
         return self.enabled
-        
+
     def hasIcon( self ):
-        return self.icon != ""    
+        return self.icon != ""
 
     def addItem( self, newItem ):
@@ -2845 +2848 @@
             self.subItems.append( newItem )
             newItem.setOwner( self.owner )
-    
+
     def removeItem( self, item ):
         if item in self.subItems:
@@ -2852 +2855 @@
     def getItemList( self ):
         return self.subItems
-        
+
     def isFirstItem( self, item):
         return self.subItems[0] == item
-        
+
     def isLastItem( self, item ):
         i = len(self.subItems)-1
@@ -2863 +2866 @@
 
     def setOwner( self, owner ):
-        self.owner = owner 
+        self.owner = owner
         for item in self.getItemList():
             item.setOwner( self.owner )
@@ -2869 +2872 @@
 
 class WTBSeparator(WTBItem):
-    
+
     def __init__( self ):
         WTBItem.__init__(self, "")
 
     def setCurrent( self ):
-        return 
+        return
 
 class WTBGroup( WTBItem ):
-    
+
     def __init__( self, caption, **args ):
         WTBItem.__init__( self, caption, **args )
@@ -2886 +2889 @@
             self.items.append( newItem )
             newItem.setOwner( self.owner )
-    
+
     def removeItem( self, item ):
         if item in self.items:
@@ -2893 +2896 @@
     def getItemList( self ):
         return self.items
-        
+
     def isFirstItem( self, item):
         return self.items[0] == item
-        
+
     def isLastItem( self, item ):
         i = len(self.items)-1
@@ -2902 +2905 @@
             i -= 1
         return self.items[i] == item
-    
+
     def setOwner( self, owner ):
-        self.owner = owner 
+        self.owner = owner
         for item in self.getItemList():
             item.setOwner( self.owner )
 
 class WTBSection( WTBItem ):
-    
+
     def __init__( self, caption, **args ):
         WTBItem.__init__( self, caption, **args )
@@ -2919 +2922 @@
             self.items.append( newItem )
             newItem.setOwner( self.owner )
-    
+
     def removeItem( self, item ):
         if item in self.items:
@@ -2926 +2929 @@
     def getItemList( self ):
         return self.items
-        
+
     def isFirstItem( self, item):
         return self.items[0] == item
-        
+
     def isLastItem( self, item ):
         i = len(self.items)-1
@@ -2935 +2938 @@
             i -= 1
         return self.items[i] == item
-    
+
     def setOwner( self, owner ):
-        self.owner = owner 
+        self.owner = owner
         for item in self.getItemList():
             item.setOwner( self.owner )
-    
+
     def setDrawer( self, d ):
         self.drawer = d(self)
-        
+
     def getDrawer( self ):
         return self.drawer
-        
+
     def hasDrawer( self ):
         return self.drawer != None
@@ -2953 +2956 @@
     def __init__( self, toolbar ):
         self.toolbar = toolbar
-    
+
     def getHTML( self ):
         l = []
@@ -2967 +2970 @@
             l.append(drawer.getHTML())
         return "".join(l)
-        
+
 class WStdTBDrawer(WTemplated):
 
     def __init__( self, item ):
         self.item = item
-        
+
     def _getTBItemCaption( self, item):
         return """<tr>
@@ -2989 +2992 @@
          style="vertical-align:middle" alt=""></td>"""%(style,\
                          Configuration.Config.getInstance().getSystemIconURL("arrowLeft"))
-    
+
     def _getIconHTML( self, item, style ):
         return """<td class="%s">&nbsp;<img src="%s" alt="" hspace="3" vspace="2">
@@ -3034 +3037 @@
         vars = WTemplated.getVars( self )
         l = []
-        
+
         if self.item != None:
             for tbItem in self.item.getItemList():
@@ -3058 +3061 @@
         vars["items"] = "".join(l)
         return vars
-    
+
 
 class WStdSectionDrawer(WStdTBDrawer):
@@ -3118 +3121 @@
                                             item.getCaption())
         return str
-        
+
     def _getCurrentIconForItem( self, item, style ):
         if item.hasIcon():
             return self._getIconHTML(item, style)
         return ""
-        
+
     def _getStyleForItem( self):
         return "menuadd"
@@ -3150 +3153 @@
 
 class WConferenceListEvents(WTemplated):
-    
+
     def __init__( self, items, aw):
         self._items = items
         self._aw = aw
-        
-    def getVars( self ):
-        vars = WTemplated.getVars( self )
-        vars["items"] = self._items        
+
+    def getVars( self ):
+        vars = WTemplated.getVars( self )
+        vars["items"] = self._items
         vars["conferenceDisplayURLGen"] = urlHandlers.UHConferenceDisplay.getURL
         vars["aw"] = self._aw
@@ -3164 +3167 @@
 
 class WConferenceList(WTemplated):
-    
+
     def __init__( self, category, wfReg ):
         self._categ = category
@@ -3175 +3178 @@
     @staticmethod
     def sortEvents(list):
-        
+
         # populate a year -> month -> day -> event (4 level) tree in O(N) time
         # each node is a dictionary, so that O(1) is reached for lookup of leaves
-        
+
         def __addLeaf(map, path, leaf):
-            
+
             # stop condition
             if path == []:
                 map[leaf.getId()] = leaf
                 return;
-            
+
             if not map.has_key(path[0]):
                 map[path[0]] = {} # virgin node
-                
+
             # this reminds me of Prolog... beautiful...
             __addLeaf(map[path[0]], path[1:], leaf)
-           
+
         fList = {}
         listByMonth = {}
@@ -3200 +3203 @@
             listByMonth.setdefault(startDate.year,{}).setdefault(startDate.month,[]).append(conf)
         return fList, listByMonth
-    
+
     def getPresentPastFutureEvents(self, allEvents, eventsByMonth, numEvents):
         """
         @param allEvents: is a dictionary with the format expected by the template ConferenceListItem
         @param eventsByMonth: is a dictionary with all the events by year and month. E.g. eventsByMonth[2009][1] == [conf1, conf2,...]
-        @return:  
+        @return:
             - a dictionary with the same format as allEvents but just with the events to display
             - a dictionary with the same format as allEvents but just with the future events
@@ -3212 +3215 @@
             - the oldest date of the events that are shown by default
         """
-        
+
         def getPrevMonth(d):
             year = d.year
@@ -3220 +3223 @@
                 year -= 1
             return date(year, prevMonth, 1)
-                
-        
+
+
         def getNextMonth(d):
             year = d.year
@@ -3230 +3233 @@
                 year += 1
             return date(year, nextMonth, 1)
-        
+
         MAX_NUMBER_OF_EVENTS_SHOWN = 10
         if numEvents < MAX_NUMBER_OF_EVENTS_SHOWN:
             MAX_NUMBER_OF_EVENTS_SHOWN = numEvents
         todayDate = nowutc().date()
-        previousMonthDate, nextMonthDate, newerDateUsed, olderDateUsed = todayDate, todayDate, todayDate, todayDate 
+        previousMonthDate, nextMonthDate, newerDateUsed, olderDateUsed = todayDate, todayDate, todayDate, todayDate
         nextMonthDate = todayDate
-        
+
         ## CREATE Present Events dict
         presentEvents = {}
@@ -3246 +3249 @@
             presentCounter = len(eventsByMonth[todayDate.year][todayDate.month])
         while presentCounter < MAX_NUMBER_OF_EVENTS_SHOWN:
-            previousMonthDate = getPrevMonth(previousMonthDate) 
+            previousMonthDate = getPrevMonth(previousMonthDate)
             nextMonthDate = getNextMonth(nextMonthDate)
             # add nextMonth
@@ -3260 +3263 @@
                 presentCounter += len(eventsByMonth[previousMonthDate.year][previousMonthDate.month])
                 olderDateUsed = previousMonthDate
-            
+
         ## CREATE future events dict and future/past counter
         futureEvents = {}
@@ -3280 +3283 @@
                     elif olderDateUsed.year == year and month < olderDateUsed.month:
                         pastCounter += len(eventsByMonth[year][month])
-        
+
         return presentEvents, futureEvents, futureCounter, pastCounter, olderDateUsed
 
@@ -3286 +3289 @@
         vars = WTemplated.getVars( self )
         allEvents, eventsByMonth = WConferenceList.sortEvents(self._list)
-        #vars["items"], vars["futureItems"], vars["numOfEventsInTheFuture"], vars["numOfEventsInThePast"] = allEvents, allEvents, 0, 0 
+        #vars["items"], vars["futureItems"], vars["numOfEventsInTheFuture"], vars["numOfEventsInThePast"] = allEvents, allEvents, 0, 0
         vars["presentItems"], vars["futureItems"], vars["numOfEventsInTheFuture"], vars["numOfEventsInThePast"], vars["oldestMonthDate"] =  self.getPresentPastFutureEvents(allEvents, eventsByMonth, len(self._list))
         vars["categ"] = self._categ
@@ -3295 +3298 @@
 
 class WCategoryList(WTemplated):
-        
+
     def __init__( self, categ ):
         self._categ = categ
@@ -3305 +3308 @@
 
     def getVars( self ):
-        
-        vars = WTemplated.getVars( self )           
+
+        vars = WTemplated.getVars( self )
         vars["items"] = self._list
         vars["categ"] = self._categ;
-        
+
         return vars
 
@@ -3333 +3336 @@
 
 class WCategoryStatisticsList(WTemplated):
-    
+
     def __init__( self, statsName, stats ):
         self._stats = stats
@@ -3369 +3372 @@
 
 class WConfCreationControlFrame(WTemplated):
-    
+
     def __init__( self, categ ):
         self._categ = categ
@@ -3388 +3391 @@
 
 class WWriteMinutes(WTemplated):
-    
+
     def __init__( self, target ):
         self._target = target
@@ -3408 +3411 @@
 
 class WMinutesDisplay(WTemplated):
-    
+
     def __init__( self, target ):
         self._target = target
@@ -3418 +3421 @@
 
 class TabControl:
-    
+
     def __init__( self, parent=None, child=None ):
         self._tabs = []
@@ -3452 +3455 @@
         if tab in self._tabs:
             self._active = tab
-    
+
     def getActiveTab( self ):
         return self._active
@@ -3475 +3478 @@
         # retrieve child TabControl
         return self._child
-    
+
     def getLevel( self ):
         tmp = self.getParent()
@@ -3483 +3486 @@
             tmp = tmp.getParent()
         return level
-   
+
 class Tab:
-    
+
     def __init__( self, owner, id, caption, URL, hidden = False ):
         self._owner = owner
@@ -3512 +3515 @@
     def isDefault( self ):
         return self._owner.getDefaultTab() == self
-    
+
     def isActive( self ):
         return self._owner.getActiveTab() == self
@@ -3544 +3547 @@
         if not self._subtabControl:
             self._subtabControl = TabControl(parent=self._owner)
-            
+
         tab=self._subtabControl.newTab( id, caption, url )
         return tab
 
 class WConfModifAC:
-    
+
     def __init__( self, conference ):
         self.__conf = conference
@@ -3569 +3572 @@
 
 #class WTrackModifSubTrack( WTemplated ):
-#    
+#
 #    def __init__( self, track ):
 #        self.__track = track
@@ -3588 +3591 @@
 
 #class WSubTrackDataModification(WTemplated):
-#    
+#
 #    def __init__( self, subTrack ):
 #        self.__subTrack = subTrack
 #        self.__track = subTrack.getTrack()
-#    
+#
 #    def getVars( self ):
 #        vars = WTemplated.getVars(self)
-#        
+#
 #        vars["title"] = self.__subTrack.getTitle()
 #        vars["description"] = self.__subTrack.getDescription()
-#        
+#
 #        vars["locator"] = self.__subTrack.getLocator().getWebForm()
-#        
+#
 #        return vars
 
 #class WCFAModifFrame(WTemplated):
-#    
+#
 #    def __init__( self, conf, aw):
 #        self.__conf = conf
@@ -3615 +3618 @@
 #    def getVars( self ):
 #        vars = WTemplated.getVars( self )
-#        
+#
 #        vars["context"] = WConfModifHeader( self.__conf, self._aw ).getHTML(vars)
-#       
-#        
+#
+#
 #        return vars
 
 #class WCFAModifMain(WTemplated):
-#    
+#
 #    def __init__( self, conf ):
 #        self.__conf = conf
-#    
+#
 #    def getVars( self ):
 #        vars = WTemplated.getVars( self )
 #        abMgr = self.__conf.getAbstractMgr()
-#        
+#
 #        vars["startDate"] = abMgr.getStartSubmissionDate().strftime("%A %d %B %Y")
 #        vars["endDate"] = abMgr.getEndSubmissionDate().strftime("%A %d %B %Y")
-#        
+#
 #        typeList = ""
 #        for type in self._conf.getContribTypeList():
 #            typeList += "<input type=\"checkbox\" name=\"types\" value=\"%s\">%s<br>\n"%(type.getId(), type.getName())
 #        vars["typeList"] = typeList
-#        
+#
 #        return vars
 
 #class WCFARefereeList(WTemplated):
-#    
+#
 #    def __init__( self, conf ):
 #        self.__conf = conf
-#    
+#
 #    def getVars( self ):
 #        vars = WTemplated.getVars(self)
@@ -3653 +3656 @@
     _unSelTabCls="Unselected"
     _selTabCls="Selected"
-    
+
     def __init__( self, ctrl, accessWrapper, **params ):
         self._tabCtrl = ctrl
@@ -3668 +3671 @@
 
         html = []
-  
+
         # Which css class prefix to use
         tabClassPrefix = ""
@@ -3698 +3701 @@
                 continue
             cls=self.__class__._unSelTabCls
-                
+
             # Don't add the right border if in sub level and if last elemnt
             borderRight = ""
@@ -3710 +3713 @@
                 self._activeTab = tab
                 cls=self.__class__._selTabCls
-                    
+
                 if tab.getSubTabControl():
                     self._getTabsHTML(tab.getSubTabControl(), maxtabs)
@@ -3716 +3719 @@
             if (tab.isHidden()):
                 hasHiddenOptions = True
-                
+
                 hiddenClass = ' hiddenTab'
             else:
@@ -3726 +3729 @@
             if addGradientDiv:
                 gradientDiv = """<div class="tabGradient"><div class="tabBorderGradient" style="float: left;"></div><div class="tabBorderGradient" style="float: right;"></div></div>"""
- 
+
             cssClass = ""
             if tabCtrl.getLevel() == 0:
@@ -3734 +3737 @@
 
             self._tabsBars.append("".join(html))
-            
+
             return True
 
@@ -3749 +3752 @@
         self._body = body
         return WTemplated.getHTML( self )
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -3759 +3762 @@
 
 #class WAbstractFilterCtrl( WTemplated ):
-#    
+#
 #    def __init__(self, conf, filter, sorter):
 #        self._filter = filter
 #        self._conf = conf
 #        self._sorter = sorter
-#    
+#
 #    def getVars( self ):
 #        vars = WTemplated.getVars(self)
 #        abMgr = self._conf.getAbstractMgr()
-#        
+#
 #        trackFilter = "<option value=\"\">No filter</option>\n"
 #        for track in self._conf.getTrackList():
@@ -3776 +3779 @@
 #            trackFilter += "<option value=\"%s\" %s>%s</option>\n"%(track.getId(), selected, track.getTitle())
 #        vars["trackFilter"] = trackFilter
-#        
+#
 #        typeFilter = "<option value=\"\">No filter</option>\n"
 #        for type in self._conf.getContribTypeList():
@@ -3784 +3787 @@
 #            typeFilter += "<option value=\"%s\" %s>%s</option>\n"%(type.getId(), selected, type)
 #        vars["typeFilter"] = typeFilter
-#        
+#
 #        statusFilter = "<option value=\"\">No filter</option>\n"
 #        for name in StatusName().getNameList():
@@ -3792 +3795 @@
 #            statusFilter += "<option value=\"%s\" %s>%s</option>\n"%(name, selected, name)
 #        vars["statusFilter"] = statusFilter
-#        
+#
 #        fDay = "<option value=\"\"> </option>\n"
 #        for i in range(1,32):
@@ -3801 +3804 @@
 #            fDay += "<option value=\"%s\" %s>%s</option>\n"%(i, selected, i)
 #        vars["fDay"] = fDay
-#        
+#
 #        fMonth = "<option value=\"\"> </option>\n"
 #        month = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
@@ -3811 +3814 @@
 #            fMonth += "<option value=\"%s\" %s>%s</option>\n"%(i, selected, month[i-1])
 #        vars["fMonth"] = fMonth
-#        
+#
 #        fYear = "<option value=\"\"> </option>\n"
 #        for i in range(2000,2011):
@@ -3820 +3823 @@
 #            fYear += "<option value=\"%s\" %s>%s</option>\n"%(i, selected, i)
 #        vars["fYear"] = fYear
-#        
-#        
-#        
+#
+#
+#
 #        tDay = "<option value=\"\"> </option>\n"
 #        for i in range(1,32):
@@ -3831 +3834 @@
 #            tDay += "<option value=\"%s\" %s>%s</option>\n"%(i, selected, i)
 #        vars["tDay"] = tDay
-#        
+#
 #        tMonth = "<option value=\"\"> </option>\n"
 #        for i in range(1,13):
@@ -3840 +3843 @@
 #            tMonth += "<option value=\"%s\" %s>%s</option>\n"%(i, selected, month[i-1])
 #        vars["tMonth"] = tMonth
-#        
+#
 #        tYear = "<option value=\"\"> </option>\n"
 #        for i in range(2000,2011):
@@ -3849 +3852 @@
 #            tYear += "<option value=\"%s\" %s>%s</option>\n"%(i, selected, i)
 #        vars["tYear"] = tYear
-#        
-#        
-#        
+#
+#
+#
 #        #sortList = ["title", "type", "modification date"]
 #        selected = ""
@@ -3870 +3873 @@
 #        sortBy += "<option value=\"status\" %s>Status</option>\n"%selected
 #        selected = ""
-#        
+#
 #        if self._sorter["direction"] == "desc":
 #            vars["ascChecked"] = ""
@@ -3877 +3880 @@
 #            vars["ascChecked"] = "checked"
 #            vars["descChecked"] = ""
-#        
+#
 #        vars["sortBy"] = sortBy
-#       
-#        
+#
+#
 #        return vars
 #
 #class WSubTrackCreation( WTemplated ):
-#    
+#
 #    def __init__( self, track ):
 #        self.__track = track
-#    
+#
 #    def getVars( self ):
 #        vars = WTemplated.getVars(self)
@@ -3895 +3898 @@
 
 #class WSetLogo( WTemplated ):
-#    
+#
 #    def __init__( self, conference ):
 #        self.__conf = conference
-#    
+#
 #    def getVars( self ):
 #        vars = WTemplated.getVars( self )
 #        vars["confTitle"] = self.__conf.getTitle()
-#        
+#
 #        return vars
 
 class WSelectionBox(WTemplated):
-    
+
     def getVars(self):
         vars=WTemplated.getVars(self)
@@ -3916 +3919 @@
             vars["table_width"]=""
         return vars
-    
+
 class WSelectionBoxAuthors:
-    
+
     def getHTML(self):
         wc=WSelectionBox()
@@ -3931 +3934 @@
 
 class WMSelectionBoxAuthors:
-    
+
     def getHTML(self):
         wc=WSelectionBox()
@@ -3943 +3946 @@
 
 class WSelectionBoxSubmitter:
-    
+
     def getHTML(self):
         wc=WSelectionBox()
@@ -3991 +3994 @@
 
 class WUserSelection(WTemplated):
-    
+
 
     def __init__( self, searchURL, multi=True, addTo=0, forceWithoutExtAuth=False):
@@ -4004 +4007 @@
         #addTo=4: show selection box to add submitter as speaker. This is just for meetings
         self._addTo=addTo
-    
+
     def _performSearch( self, criteria, exact=0 ):
         ah = user.AvatarHolder()
@@ -4038 +4041 @@
         #a.setOrganisation( params["organisation"] )
         #user.AvatarHolder().add( a )
-    
+
     def _normaliseListParam( self, param ):
         if not isinstance(param, list):
                 return [ param ]
-        return param 
+        return param
 
     def getHTML( self, params ):
@@ -4073 +4076 @@
         vars["searchResultsTable"] = ""
         res=[]
-        
+
         if self._action == _("search").strip():
             criteria = { "name": vars["firstName"], \
@@ -4126 +4129 @@
         WUserSelection.__init__(self, searchURL, multi, addTo, forceWithoutExtAuth=forceWithoutExtAuth)
         self._conf = conf
-        
+
 
     def _performSearch( self, criteria, exact=0  ):
@@ -4147 +4150 @@
 class WPrincipalSelection(WUserSelection):
 
-    
+
     def _performSearch( self, criteria, exact=0 ):
         #this should go in the PrincipalHolder match method
@@ -4172 +4175 @@
 
 class WComplexSelection(WUserSelection):
-    
-    
+
+
     def __init__(self, target, searchAction, forceWithoutExtAuth=False):
         _title = _("Search for users")
@@ -4182 +4185 @@
             self._conf = None
         self._target = target
-        
+
     def _performSearch( self, criteria, exact=0 ):
         #this should go in the PrincipalHolder match method
@@ -4201 +4204 @@
                 l.append(author)
         return l
-        
+
     def getVars(self):
         vars = WUserSelection.getVars( self )
@@ -4209 +4212 @@
 class WCategoryComplexSelection(WComplexSelection):
 
-    
+
     def __init__(self, category, searchAction, forceWithoutExtAuth=False):
         WComplexSelection.__init__(self, None, searchAction,forceWithoutExtAuth=forceWithoutExtAuth)
         self._category = category
-        
+
     def _performSearch( self, criteria, exact=0 ):
         #this should go in the PrincipalHolder match method
@@ -4219 +4222 @@
         resUsers = ah.match(criteria, exact=exact, forceWithoutExtAuth=self._forceWithoutExtAuth)
         return resUsers
-        
+
 
 class WNewPerson(WTemplated):
-      
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -4228 +4231 @@
         titles = []
         titleValue = vars.get("titleValue", " ")
-        
+
         for o in options :
             selected = ""
@@ -4237 +4240 @@
         vars["titles"] = """
                         """.join(titles)
-                        
+
         if vars.get("disabledTitle", False) :
             vars["titles"] = """<input type="hidden" name="title" value="%s"></input>%s"""%(titleValue,titleValue)
@@ -4246 +4249 @@
             </select>
             """%vars["titles"]
-        
+
         if vars.get("disabledSurName", False) :
             vars["surName"] = """<input type="hidden" name="surName" value="%s"></input>%s"""%(vars["surNameValue"],vars["surNameValue"])
         else :
             vars["surName"] = """<input type="text" size="50" name="surName" value="%s" >"""%vars["surNameValue"]
-        
+
         if vars.get("disabledName", False) :
             vars["name"] = """<input type="hidden" name="name" value="%s"></input>%s"""%(vars["nameValue"],vars["nameValue"])
         else :
             vars["name"] = """<input type="text" size="50" name="name" value="%s" >"""%vars["nameValue"]
-        
+
         if vars.get("disabledAffiliation", False) :
             vars["affiliation"] = """<input type="hidden" name="affiliation" value="%s"></input>%s"""%(vars["affiliationValue"],vars["affiliationValue"])
         else :
             vars["affiliation"] = """<input type="text" size="50" name="affiliation" value="%s" >"""%vars["affiliationValue"]
-            
+
         if vars.get("disabledEmail", False) :
             vars["email"] = """<input type="hidden" name="email" value="%s"></input>%s"""%(vars["emailValue"],vars["emailValue"])
@@ -4274 +4277 @@
         else :
             vars["address"] = """<textarea name="address" rows="5" cols="38" value="%s"></textarea>"""%vars["emailValue"]
-        
+
         if vars.get("disabledPhone", False) :
             vars["phone"] = """<input type="hidden" name="phone" value="%s"></input>%s"""%(vars["phoneValue"],vars["phoneValue"])
         else :
             vars["phone"] = """<input type="text" size="50" name="phone" value="%s" >"""%vars["phoneValue"]
-        
+
         if vars.get("disabledPhone", False) :
             vars["phone"] = """<input type="hidden" name="phone" value="%s"></input>%s"""%(vars["phoneValue"],vars["phoneValue"])
         else :
             vars["phone"] = """<input type="text" size="50" name="phone" value="%s" >"""%vars["phoneValue"]
-        
+
         if vars.get("disabledFax", False) :
             vars["fax"] = """<input type="hidden" name="fax" value="%s"></input>%s"""%(vars["faxValue"],vars["faxValue"])
@@ -4292 +4295 @@
             vars["role"] = ""
         else :
-            vars["role"] = """        
+            vars["role"] = """
         <tr>
             <td nowrap class="titleCellTD"><span class="titleCellFormat">%s</span></td>
             <td bgcolor="white" width="100%%" valign="top" class="blacktext">%s</td>
         </tr>"""%(vars["roleDescription"], vars["roleValue"])
-                
+
         if vars.get("disabledNotice", True) :
             vars["notice"] = ""
@@ -4306 +4309 @@
             <td bgcolor="white" width="100%%" valign="top" class="blacktext">%s</td>
         </tr>"""%vars["noticeValue"]
-        
+
         if vars.get("msg","")!="":
             vars["msg"]=  _("""<table bgcolor="gray"><tr><td bgcolor="white">
@@ -4318 +4321 @@
 
 class WAddPersonModule(WTemplated):
-    
+
     def __addBasketPeople(self, peopleList):
-        
+
         basket = self._rh._getUser().getPersonalInfo().getBasket().getUsers()
-        
+
         peopleList += """<option value=""></option>"""
-        
+
         for userId in basket:
             peopleList += """<option class="favoriteItem" value="%s">%s</option>"""%(userId,basket[userId].getStraightFullName())
-        
+
         return peopleList
-    
+
     def __init__(self,personType, displayName=""):
         self._personType = personType
         self._displayName = displayName
-        
-    def getVars( self ):
-        vars = WTemplated.getVars( self )         
+
+    def getVars( self ):
+        vars = WTemplated.getVars( self )
         if self._personType is None or self._personType == "" :
             raise MaKaCError( _("'personType' must be set to use the Add Person Module"))
             return
-            
+
         if self._displayName != "":
             vars["personName"] = self._displayName
         else:
             vars["personName"] = string.capwords("%s"%self._personType)
-        
-        # Add people from the users basket        
-        vars["personOptions"] = self.__addBasketPeople("")    
-        
-        vars["personOptions"] += vars["%sOptions"%self._personType]        
-        
+
+        # Add people from the users basket
+        vars["personOptions"] = self.__addBasketPeople("")
+
+        vars["personOptions"] += vars["%sOptions"%self._personType]
+
         vars["personChosen"] = "%sChosen"%self._personType
-        
+
         vars["personDefined"] = vars["%sDefined"%self._personType]
-        
+
         if vars["personOptions"] == """<option value=""> </option>""":
             vars["disabledAdd"] = "disabled"
@@ -4360 +4363 @@
 
         vars["personType"] = self._personType
-        
+
         if vars.get("submission",None) is not None :
             vars["submissionButtons"] =  _("""
@@ -4367 +4370 @@
             </tr>
             <tr>
-                <td colspan="4"><input type="submit" class="btn" value="_("Withdraw submission")" onClick="setAction(this.form,'Withdraw submission');"></td>                                    
+                <td colspan="4"><input type="submit" class="btn" value="_("Withdraw submission")" onClick="setAction(this.form,'Withdraw submission');"></td>
             </tr>""")
         else :
             vars["submissionButtons"] = ""
         return vars
-    
+
 
 class WAccountAlreadyActivated(WTemplated):
-    
+
     def __init__(self, av):
         self._av = av
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -4385 +4388 @@
 
 class WAccountActivated(WTemplated):
-    
+
     def __init__(self, av):
         self._av = av
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -4395 +4398 @@
 
 class WAccountDisabled(WTemplated):
-    
+
     def __init__(self, av):
         self._av = av
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -4405 +4408 @@
 
 class WUnactivatedAccount(WTemplated):
-    
+
     def __init__(self, av):
         self._av = av
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -4417 +4420 @@
 
 class WAbstractModIntCommentEdit(WTemplated):
-    
+
     def __init__(self,comment):
         self._comment=comment
@@ -4428 +4431 @@
 
 class WAbstractModNewIntComment(WTemplated):
-    
+
     def __init__(self,aw,abstract):
         self._aw=aw
@@ -4452 +4455 @@
             comment = _("No Session Comment Entered")
             self._session.setComments("")
-        
+
         modifButton=""
         if self._conf.canModify(self._aw):
-            
+
             modifButton =  _("""<form action=%s method="POST">
                     <td align="center">
@@ -4472 +4475 @@
             </td>
         </tr>
-        <tr>                      
+        <tr>
             %s
         </tr>
@@ -4485 +4488 @@
 
 class WSessionModifCommEdit(WTemplated):
-    
+
     def __init__(self,comment):
         self._comment=comment
@@ -4493 +4496 @@
         vars["comment"]=self.htmlText(self._comment)
         return vars
-    
+
 class WAbstractModIntComments(WTemplated):
-    
+
     def __init__(self,aw,abstract):
         self._aw=aw
@@ -4552 +4555 @@
 
 class WAbstractModMarkAsDup(WTemplated):
-        
+
     def __init__(self,abstract):
         self._abstract=abstract
@@ -4584 +4587 @@
 
 class WAbstractModUnMarkAsDup(WTemplated):
-        
+
     def __init__(self,abstract):
         self._abstract=abstract
@@ -4597 +4600 @@
 
 class WConfModAbstractEditData(WTemplated):
-    
+
     def __init__(self,conference,abstractData):
         self._ad=abstractData
@@ -4611 +4614 @@
     #        res.append("""<option value=%s%s>%s</option>"""%(quoteattr(t),sel,self.htmlText(t)))
     #    return "".join(res)
-        
+
     def _getContribTypeItemsHTML(self):
         res=[ _("""<option value="">--_("not specified")--</option>""")]
@@ -4647 +4650 @@
                             <input type="hidden" name="auth_prim_id" value=%s>
                         </td>
-                        <td style="border-top:1px solid #777777;" width="100%%"> 
+                        <td style="border-top:1px solid #777777;" width="100%%">
                             <table width="95%%" cellpadding="0" cellspacing="0">
                                 <tr>
@@ -4693 +4696 @@
             res.append(tmp)
         return "".join(res)
-        
+
     def _getCoAuthorsHTML(self):
         res=[]
@@ -4720 +4723 @@
                             <input type="hidden" name="auth_co_id" value=%s>
                         </td>
-                         <td style="border-top:1px solid #777777;"> 
+                         <td style="border-top:1px solid #777777;">
                             <table color="gray">
                                 <tr>
@@ -4816 +4819 @@
 
 class WScheduleAddContributions(WTemplated):
-    
+
     def __init__(self,selectList,targetDay=None):
         self._contribList=selectList
@@ -4848 +4851 @@
                             spksCaption))
         return "".join(res)
-            
+
 
     def getVars(self):
@@ -4857 +4860 @@
             vars["targetDay"]="""<input type="hidden" name="targetDay" value=%s>"""%(quoteattr(str(self._targetDay.strftime("%Y-%m-%d"))))
         return vars
-        
+
 
 class WSchEditContrib(WTemplated):
-    
+
     def __init__(self,contrib):
         self._contrib=contrib
@@ -4917 +4920 @@
 
 class WConfModParticipEdit(WTemplated):
-    
+
     def __init__(self,title="",part=None):
         self._part=part
@@ -4950 +4953 @@
 
 class WSessionModEditDataCode(WTemplated):
-    
+
     def __init__(self):
         pass
-        
-    def getVars( self ):
-        vars=WTemplated.getVars(self) 
+
+    def getVars( self ):
+        vars=WTemplated.getVars(self)
         vars["code"]=quoteattr(str(vars.get("code","")))
         return vars
 
 class WSessionModEditDataType(WTemplated):
-    
+
     def __init__(self):
         pass
-        
-    def getVars( self ):
-        vars=WTemplated.getVars(self) 
+
+    def getVars( self ):
+        vars=WTemplated.getVars(self)
         l=[]
         currentTTType=vars.get("tt_type",conference.SlotSchTypeFactory.getDefaultId())
@@ -4978 +4981 @@
 
 class WSessionModEditDataColors(WTemplated):
-    
+
     def __init__(self):
         pass
-        
-    def getVars( self ):
-        vars=WTemplated.getVars(self) 
-        return vars
-        
+
+    def getVars( self ):
+        vars=WTemplated.getVars(self)
+        return vars
+
 class WSessionModEditData(WTemplated):
-    
+
     def __init__(self,targetConf,aw,pageTitle="",targetDay=None):
         self._conf=targetConf
@@ -5011 +5014 @@
         else:
             return ""
-    
+
     def getVars( self ):
         vars=WTemplated.getVars(self)
@@ -5050 +5053 @@
         vars["defaultInheritPlace"]="checked"
         vars["defaultDefinePlace"]=""
-        
+
         if vars.get("convenerDefined",None) is None :
             sessionId = vars["sessionId"]
             session = self._conf.getSessionById(sessionId)
-            html = []            
+            html = []
             for convener in session.getConvenerList() :
                 text = """
@@ -5061 +5064 @@
                      <td>&nbsp;%s</td>
                  </tr>"""%("convener",convener.getId(),convener.getFullName())
-                html.append(text)                
+                html.append(text)
             vars["definedConveners"] = """
-                                         """.join(html)            
+                                         """.join(html)
         if vars.get("locationAction","")=="define":
             vars["defaultInheritPlace"]=""
@@ -5089 +5092 @@
             roomName = ""
 
-        
+
         vars["confRoom"]=""
         rx=[]
@@ -5131 +5134 @@
             vars["code"]=""
         return vars
-    
+
 #--------------------------------------------------------------------------------------
 
 class WConfModMoveContribsToSessionConfirmation(WTemplated):
-    
+
     def __init__(self,conf,contribIdList=[],targetSession=None):
         self._conf=conf
@@ -5196 +5199 @@
 
 class WConfTBDrawer:
-    
+
     def __init__(self,tb):
         self._tb=tb
@@ -5221 +5224 @@
                     """%("".join(res))
         return ""
-        
+
 class WErrorMessage :
-    
+
     def getHTML( self, vars ):
-                
+
         if vars.get("errorMsg", None) is None :
             return ""
@@ -5232 +5235 @@
         for i in range(0,len(vars["errorMsg"])) :
             vars["errorMsg"][i] = """<span style="color: red;">"""+vars["errorMsg"][i]+"""</span>"""
-        
+
         errorMsg = """
         """.join(vars["errorMsg"])
-        
-        html = """                    
+
+        html = """
                 <div class="errorMsgBox">
                     %s
                 </div>
                """%errorMsg
-        
+
         return html
-    
+
 class WInfoMessage :
-    
+
     def getHTML( self, vars ):
         if vars.get("infoMsg", None) is None :
-            return "" 
+            return ""
         if type(vars["infoMsg"]) != list:
             vars["infoMsg"]=[vars["infoMsg"]]
         for i in range(0,len(vars["infoMsg"])) :
             vars["infoMsg"][i] = """<span style="color: green;">"""+vars["infoMsg"][i]+"""</span>"""
-        
+
         infoMsg = """
         """.join(vars["infoMsg"])
-        
-        html = """                    
+
+        html = """
                 <div class="errorMsgBox">
                     %s
                 </div>
         """%infoMsg
-        
+
         return html
 
 class WConfTickerTapeDrawer(WTemplated):
-    
+
     def __init__(self,conf, tz=None):
         self._conf=conf
@@ -5278 +5281 @@
 
         html = WTemplated.getHTML( self, params )
-        
+
         if html == "":
             return None
 
         return html
-    
+
     def getSimpleText( self ):
         if not self._tickerTape.isSimpleTextEnabled() or \
@@ -5293 +5296 @@
     def getVars(self):
         vars = WTemplated.getVars( self )
-    
+
         vars["nowHappeningArray"] = None
         if self._tickerTape.isNowHappeningEnabled():
@@ -5299 +5302 @@
 
         return vars
-    
+
     def _getNowHappening( self ):
         # This will contain a string formated for use in the template
@@ -5388 +5391 @@
             vars["linkValue"] = ""
         return vars
- 
+
 class WSubmitMaterialFile(WTemplated):
 
@@ -5427 +5430 @@
         vars["fileNewName"] = "FileNewName%s" % self._filenb
         return vars
-    
+
 class WMaterialListFile(WTemplated):
 
@@ -5466 +5469 @@
             vars["fileAccessURL"]=quoteattr(str(urlHandlers.UHFileAccess.getURL(self._target)))
         return vars
-    
+
 class WMaterialListItem(WTemplated):
 
@@ -5474 +5477 @@
 
     def getVars(self):
-        vars=WTemplated.getVars(self)   
-        deleteURL = None  
+        vars=WTemplated.getVars(self)
+        deleteURL = None
         mf = None
         from MaKaC.webinterface.materialFactories import ConfMFRegistry,SessionMFRegistry,ContribMFRegistry
@@ -5506 +5509 @@
         vars["fileList"]=""
         for resource in self._target.getResourceList():
-            vars["fileList"] += WMaterialListFile(resource).getHTML(vars) 
+            vars["fileList"] += WMaterialListFile(resource).getHTML(vars)
         if mf is None:
             vars["materialIcon"]=quoteattr(str(Config.getInstance().getSystemIconURL("material")))
@@ -5515 +5518 @@
 
 class WShowExistingMaterial(WTemplated):
-    
+
     def __init__(self,target):
         self._target=target
@@ -5522 +5525 @@
     def getVars(self):
         vars=WTemplated.getVars(self)
-        
+
         vars["materialModifHandler"] = vars.get("materialModifHandler", None)
         vars["materialProtectHandler"] = vars.get("materialProtectHandler", None)
@@ -5533 +5536 @@
 
 class WAddNewMaterial(WTemplated):
-    
+
     def __init__(self,target,availMF):
         self._target=target
@@ -5612 +5615 @@
 
 class WSubmitMaterial(WTemplated):
-    
+
     def __init__(self,target,availMF):
         self._target=target
@@ -5713 +5716 @@
         vars = WTemplated.getVars(self)
         return vars
-        
-    
+
+
 class WSchRelocate(WTemplated):
-    
+
     def __init__(self, entry):
         self._entry=entry
@@ -5752 +5755 @@
                 html.append("</table></td></tr>")
         return "".join(html)
-                    
+
 
     def getVars(self):
@@ -5770 +5773 @@
         self._target=target
         self._type=type
-    
+
     def _getCurrentItems(self):
         html=[]
         rns = self._target.getReportNumberHolder().listReportNumbers()
         id = 0
-        
+
         reportCodes = []
-        
+
         for rn in rns:
             key = rn[0]
@@ -5798 +5801 @@
                         """%(system, rnsystems[system]["name"] ) )
         return "".join(html)
-    
+
     def getVars(self):
         vars = WTemplated.getVars(self)
@@ -5837 +5840 @@
         return vars
 
-    
+
 class WHTMLEditorWrapper(WTemplated):
 
@@ -5901 +5904 @@
 
 class WRoomBookingWelcome( WTemplated ):
-    
+
     def __init__(self):
         self.__adminList = AdminList.getInstance()
-    
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -5910 +5913 @@
 
 class WRoomBookingRoomSelectList( WTemplated ):
-    
+
     def __init__( self, rh ):
         self._rh = rh
-    
-    def getVars( self ):
-        vars = WTemplated.getVars( self )
-        
+
+    def getVars( self ):
+        vars = WTemplated.getVars( self )
+
         vars['roomList'] = self._rh._roomList
         vars['locationRoom'] = self._rh._locationRoom
-        
-        return vars
-        
+
+        return vars
+
 class WRoomBookingRoomSelectList4SubEvents( WTemplated ):
-    
+
     def __init__( self, rh ):
         self._rh = rh
-    
-    def getVars( self ):
-        vars = WTemplated.getVars( self )
-        
+
+    def getVars( self ):
+        vars = WTemplated.getVars( self )
+
         vars['roomList'] = self._rh._roomList
         vars['locationRoom'] = self._rh._locationRoom
-        
+
         return vars
 
@@ -5943 +5946 @@
 
 class WRoomBookingChooseEvent( WTemplated ):
-    
+
     def __init__( self, rh ):
         self._rh = rh
@@ -5952 +5955 @@
         vars["conference"] = self._rh._conf
         vars["contributions"] = list( [ c for c in self._rh._conf.getContributionList() if c.getStartDate() ] )
-      
+
         return vars
 
@@ -5958 +5961 @@
 
 class WRoomBookingSearch4Rooms( WTemplated ):
-    
+
     def __init__( self, rh, standalone = False ):
         self._standalone = standalone
@@ -5975 +5978 @@
         vars["forNewBooking"] = self._rh._forNewBooking
         vars["eventRoomName"] = self._rh._eventRoomName
-        
+
         vars["preview"] = False
 
@@ -5994 +5997 @@
             vars["detailsUH"] = urlHandlers.UHConfModifRoomBookingRoomDetails
             vars["bookingFormUH"] =  urlHandlers.UHConfModifRoomBookingBookingForm
-        
+
         vars['youCannot'] = "javascript:alert( 'You cannot book this room' );"
-        
+
         return vars
 
 class WRoomBookingSearch4Bookings( WTemplated ):
-    
+
     def __init__( self, rh ):
         self._rh = rh
@@ -6014 +6017 @@
 
         vars["roomBookingBookingListURL"] = urlHandlers.UHRoomBookingBookingList.getURL( None )
-        
+
         return vars
 
@@ -6020 +6023 @@
 
 class WRoomBookingRoomList( WTemplated ):
-    
+
     def __init__( self, rh, standalone = False ):
         self._rh = rh
         self._standalone = standalone
         self._title = None
-        try: self._title = self._rh._title; 
+        try: self._title = self._rh._title;
         except: pass
 
@@ -6043 +6046 @@
             vars["detailsUH"] = urlHandlers.UHConfModifRoomBookingRoomDetails
             vars["bookingFormUH"] = urlHandlers.UHConfModifRoomBookingBookingForm
-        
+
         return vars
 
 class WRoomBookingList( WTemplated ):
-    
+
     def __init__( self, rh, standalone = False ):
         self._standalone = standalone
@@ -6053 +6056 @@
         if not standalone:
             self._conf = rh._conf
-        
+
     def getVars( self ):
         vars=WTemplated.getVars( self )
@@ -6061 +6064 @@
         dm = datetime.now() - timedelta( 1 )
         vars["yesterday"] = dm #datetime( dm.year, dm.month, dm.day, 0, 0, 1 )
-        
+
         if self._standalone:
             vars["bookingDetailsUH"] = urlHandlers.UHRoomBookingBookingDetails
@@ -6071 +6074 @@
 
 class WRoomBookingBookingList( WTemplated ): # Standalone version
-    
+
     def __init__( self, rh ):
         self._rh = rh
         self._title = None
-        try: self._title = self._rh._title; 
+        try: self._title = self._rh._title;
         except: pass
-        
+
     def _isOn(self, boolVal):
         if boolVal:
@@ -6083 +6086 @@
         else:
             return ""
-    
-    def getVars( self ):        
-        vars = WTemplated.getVars( self )
-        rh = self._rh        
+
+    def getVars( self ):
+        vars = WTemplated.getVars( self )
+        rh = self._rh
 
         vars["reservations"] = rh._resvs
-                
+
         #vars["smallPhotoUH"] = urlHandlers.UHSendRoomPhoto
         vars["bookingDetailsUH"] = urlHandlers.UHRoomBookingBookingDetails
@@ -6095 +6098 @@
         vars["title"] = self._title
         vars["showRejectAllButton"] = rh._showRejectAllButton
-        
+
         vars["prebookingsRejected"] = rh._prebookingsRejected
         vars["subtitle"] = rh._subtitle
@@ -6105 +6108 @@
 
         ed = None
-        sd = rh._resvEx.startDT.date()                        
+        sd = rh._resvEx.startDT.date()
         if rh._resvEx.endDT:
-            ed = rh._resvEx.endDT.date()      
-        
+            ed = rh._resvEx.endDT.date()
+
         # autoCriteria - dates are calculated based on the next reservation
         if rh._autoCriteria:
@@ -6115 +6118 @@
                 tmp = tmp.getNextRepeating( afterDT = yesterday )
                 if tmp and tmp.startDT.date() > sd:
-                    sd = tmp.startDT                
-            if not ed: 
+                    sd = tmp.startDT
+            if not ed:
                 # one month of time span
                 ed = sd + timedelta( 30 )
@@ -6125 +6128 @@
 
         from MaKaC.rb_tools import formatDate
-        
+
         if  calendarStartDT.date() == calendarEndDT.date():
             vars["periodName"] = "day"
@@ -6133 +6136 @@
             vars["verbosePeriod"] = "%s -> %s" % ( formatDate(calendarStartDT), formatDate(calendarEndDT) )
         vars["startD"] = formatDate(calendarStartDT)
-        vars["endD"] = formatDate(calendarEndDT)        
-        
+        vars["endD"] = formatDate(calendarEndDT)
+
         # Data for previous/next URLs (it's about periods, not paging)
         newParams4Previous = rh._reqParams.copy()
@@ -6145 +6148 @@
             del newParams4Next['day']
 
-        
+
         startD = calendarStartDT.date()
         endD = calendarEndDT.date()
-        
+
         if endD != startD:
             period = endD - startD
-            
+
             prevStartD = startD - period
             prevEndD = startD - timedelta(1)
-            
+
             nextStartD = endD + timedelta(1)
             nextEndD = endD + period
         else:
             prevStartD = prevEndD = startD - timedelta(1)
-            nextStartD = nextEndD = endD + timedelta(1) 
-        
+            nextStartD = nextEndD = endD + timedelta(1)
+
         newParams4Previous['sDay'] = prevStartD.day
         newParams4Previous['sMonth'] = prevStartD.month
@@ -6167 +6170 @@
         newParams4Previous['eMonth'] = prevEndD.month
         newParams4Previous['eYear'] = prevEndD.year
-        
+
         newParams4Next['sDay'] = nextStartD.day
         newParams4Next['sMonth'] = nextStartD.month
@@ -6174 +6177 @@
         newParams4Next['eMonth'] = nextEndD.month
         newParams4Next['eYear'] = nextEndD.year
-        
-        vars["withPrevNext"] = True               
+
+        vars["withPrevNext"] = True
         vars["prevURL"] = urlHandlers.UHRoomBookingBookingList.getURL( newParams = newParams4Previous )
         vars["nextURL"] = urlHandlers.UHRoomBookingBookingList.getURL( newParams = newParams4Next )
@@ -6186 +6189 @@
                           not self._rh._search
         showEmptyRooms = showEmptyDays
-        
-                
+
+
         # Calendar related stuff ==========
-        
+
         bars = []
         collisionsOfResvs = []
-        
+
         # there's at least one reservation
         if len( rh._resvs ) > 0 and not overload:
-                       
-            
-            # Prepare the list of Collisions 
+
+
+            # Prepare the list of Collisions
             # (collision is just a helper object, it's not the best notion here)
-            
+
             for r in rh._resvs:
                 for p in r.splitToPeriods(endDT=calendarEndDT):
                     if p.startDT >= calendarStartDT and p.endDT <= calendarEndDT:
                         collisionsOfResvs.append( Collision( ( p.startDT, p.endDT ), r ) )
-            
+
             if len( collisionsOfResvs ) > 500:
                 overload = True
             else:
-            
-                # Translate collisions to Bars                
+
+                # Translate collisions to Bars
                 for c in collisionsOfResvs:
                     if c.withReservation.isConfirmed:
@@ -6215 +6218 @@
                     else:
                         bars.append( Bar( c, Bar.PREBOOKED ) )
-                
+
                 bars = barsList2Dictionary( bars )
                 bars = addOverlappingPrebookings( bars )
                 bars = sortBarsByImportance( bars, calendarStartDT, calendarEndDT )
-                
+
                 rooms = []
                 for r in rh._resvs:
                     rooms.append(r.room)
-                
+
                 #rooms = {}
                 #for r in rh._resvs:
                 #    rooms[r.room] = None
                 #rooms = rooms.keys()
-                
+
                 #CrossLocationQueries.getRooms( location = self.location )
                 if not self._rh._onlyMy:
                     rooms = self._rh._rooms
-                
+
                 bars = introduceRooms( rooms, bars, calendarStartDT, calendarEndDT, showEmptyDays = showEmptyDays, showEmptyRooms = showEmptyRooms )
-                                                
+
                 vars["Bar"] = Bar
-                
-                self.__sortUsingCriterion(rh._order, collisionsOfResvs)                
-        
+
+                self.__sortUsingCriterion(rh._order, collisionsOfResvs)
+
         # we want to display every room, with or without reservation
         elif not overload:
-            # initialize collision bars 
-            bars = {}            
+            # initialize collision bars
+            bars = {}
             bars = sortBarsByImportance( bars, calendarStartDT, calendarEndDT )
 
@@ -6250 +6253 @@
             else:
                     rooms = []
-                
-            bars = introduceRooms( rooms, bars, calendarStartDT, calendarEndDT, showEmptyDays = showEmptyDays, showEmptyRooms = showEmptyRooms )                            
-            
-        
+
+            bars = introduceRooms( rooms, bars, calendarStartDT, calendarEndDT, showEmptyDays = showEmptyDays, showEmptyRooms = showEmptyRooms )
+
+
         vars["unrolledReservations"] = collisionsOfResvs
         vars["bars"] = bars
@@ -6276 +6279 @@
 
         return vars
-            
-
-    def __sortUsingCriterion(self, order, uresvs):            
-        
+
+
+    def __sortUsingCriterion(self, order, uresvs):
+
         if order == "" or order =="room":
-            # standard sorting order (by room, and then date) 
+            # standard sorting order (by room, and then date)
             uresvs.sort(lambda r1,r2: cmp(r1.withReservation.room.name,r2.withReservation.room.name))
         else:
-            if order == 'date':              
-                uresvs.sort(lambda r1, r2: cmp(r1.startDT, r2.startDT))                
+            if order == 'date':
+                uresvs.sort(lambda r1, r2: cmp(r1.startDT, r2.startDT))
             elif order == 'reason':
                 uresvs.sort(lambda r1, r2: cmp(r1.withReservation.reason.lower(), r2.withReservation.reason.lower()))
@@ -6297 +6300 @@
 
 def barsList2Dictionary( bars ):
-    """ 
+    """
     Converts:
     list of bars => dictionary of bars, key = datetime, value = list of bars
@@ -6308 +6311 @@
         else:
             h[d] = [bar]
-    return h 
+    return h
 
 def addOverlappingPrebookings( bars ):
@@ -6315 +6318 @@
     Returns new bars dictionary.
     """
-    
+
     # For each day
     for dt in bars.keys():
         dayBars = bars[dt]
-        
+
         # For each (prebooked) bar i
         for i in xrange( 0, len( dayBars ) ):
@@ -6329 +6332 @@
                     collCand = dayBars[j]
                     if collCand.type == Bar.PREBOOKED:
-                        
+
                         # If there is an overlap, add PRECONCURRENT bar
                         over = overlap( bar.startDT, bar.endDT, collCand.startDT, collCand.endDT )
@@ -6337 +6340 @@
 
         bars[dt] = dayBars # With added concurrent prebooking bars
-    
+
     return bars
 
 def sortBarsByImportance( bars, calendarStartDT, calendarEndDT ):
-    """ 
-    Moves conflict bars to the end of the list, 
+    """
+    Moves conflict bars to the end of the list,
     so they will be drawn last and therefore be visible.
-    
+
     Returns sorted bars.
     """
@@ -6351 +6354 @@
         dayBars.sort()
         bars[dt] = dayBars
-        
+
     for day in iterdays( calendarStartDT, calendarEndDT ):
         if not bars.has_key( day.date() ):
             bars[day.date()] = []
-    
+
     return bars
 
@@ -6368 +6371 @@
 
 def introduceRooms( rooms, dayBarsDic, calendarStartDT, calendarEndDT, showEmptyDays=True, showEmptyRooms=True ):
-    # Input: 
+    # Input:
     # dayBarsDic is a dictionary date => [bar1, bar2, bar3, ...]
     #
@@ -6377 +6380 @@
     cleanRoomBarsList = getRoomBarsList( rooms )
     newDayBarsDic = {}
-    
+
     s = ""
     for day in iterdays( calendarStartDT, calendarEndDT ):
@@ -6386 +6389 @@
             if not roomBarsDic.has_key( room ):
                 roomBarsDic[room] = []
-            # Bars order should be preserved            
+            # Bars order should be preserved
             roomBarsDic[room].append( bar )
-        
-        if showEmptyRooms: 
+
+        if showEmptyRooms:
             dayRoomBarsList = getRoomBarsList( rooms ) #copy.copy( cleanRoomBarsList )
-        
+
             for roomBar in dayRoomBarsList:
                 roomBar.bars = roomBarsDic.get( roomBar.room, [] )
@@ -6398 +6401 @@
             for room in roomBarsDic.keys():
                 dayRoomBarsList.append(RoomBars(room,roomBarsDic[room]))
-        
+
         if showEmptyDays or len(dayBars) > 0:
             newDayBarsDic[day.date()] = dayRoomBarsList
-    
+
     return newDayBarsDic
-        
+
 
 class WRoomBookingRoomStats( WTemplated ):
@@ -6417 +6420 @@
         vars["period"] = self._rh._period
         vars["kpiAverageOccupation"] = str( int( round( self._rh._kpiAverageOccupation * 100 ) ) ) + "%"
-        # Bookings    
+        # Bookings
         vars["kbiTotalBookings"] = self._rh._totalBookings
         # Next 9 KPIs
@@ -6423 +6426 @@
         vars["statsURL"] = urlHandlers.UHRoomBookingRoomStats.getURL()
         return vars
-   
+
 
 class WRoomBookingRoomDetails( WTemplated ):
-    
+
     def __init__( self, rh, standalone = False ):
         self._rh = rh
@@ -6445 +6448 @@
         vars["actionSucceeded"] = self._rh._afterActionSucceeded
         vars["deletionFailed"] = self._rh._afterDeletionFailed
-        
+
         vars["roomStatsUH"] = urlHandlers.UHRoomBookingRoomStats
 
@@ -6477 +6480 @@
         resvEx.repeatability = RepeatabilityEnum.daily
         resvEx.room = self._rh._room
-        resvEx.isConfirmed = None # to include not also confirmed 
-        
+        resvEx.isConfirmed = None # to include not also confirmed
+
         # Bars: Existing reservations
         collisionsOfResvs = resvEx.getCollisions()
@@ -6506 +6509 @@
         vars["Bar"] = Bar
         vars["withConflicts"] = False
-        
+
         return vars
 
 class WRoomBookingDetails( WTemplated ):
-    
+
     def __init__( self, rh, standalone = False ):
         self._rh = rh
@@ -6527 +6530 @@
             vars["title"] = self._rh._title
             vars["description"] = self._rh._description
-        
+
         if self._standalone:
             vars["roomDetailsUH"] = urlHandlers.UHRoomBookingRoomDetails
@@ -6542 +6545 @@
 
 class WRoomBookingBookingForm( WTemplated ):
-    
+
     def __init__( self, rh, standalone = False ):
         self._rh = rh
@@ -6576 +6579 @@
         vars["skipConflicting"] = self._rh._skipConflicting
 
-        if self._rh._formMode == FormMode.MODIF: 
-            vars["allowPast"] = "true" 
-        else: 
-            vars["allowPast"] = "false" 
-        vars["formMode"] = self._rh._formMode 
+        if self._rh._formMode == FormMode.MODIF:
+            vars["allowPast"] = "true"
+        else:
+            vars["allowPast"] = "false"
+        vars["formMode"] = self._rh._formMode
         vars["FormMode"] = FormMode
-        
+
         # [Book] or [PRE-Book] ?
         bookingMessage = "Book"
@@ -6595 +6598 @@
         else:
             bText = "Save"
-        
+
         vars["roomBookingRoomCalendar"] = WRoomBookingRoomCalendar( self._rh, self._standalone, buttonText=bText).getHTML( {} )
-        
+
         return vars
 
 class WRoomBookingConfirmBooking( WRoomBookingBookingForm ):
-    
-    def getVars( self ):
-        vars = WTemplated.getVars( self )
-        
+
+    def getVars( self ):
+        vars = WTemplated.getVars( self )
+
         vars["candResv"] = self._candResv
-        
+
         vars["standalone"] = self._standalone
         vars["formMode"] = self._rh._formMode
         vars["FormMode"] = FormMode
         vars["collisions"] = self._rh._collisions
-        
+
         bookingMessage = "Book"
         room = self._candResv.room
@@ -6618 +6621 @@
             bookingMessage = "PRE-Book"
         vars["bookingMessage"] = bookingMessage
-               
+
         if self._standalone:
              vars["conf"] = None
@@ -6626 +6629 @@
              vars["conf"] = self._rh._conf
              vars["saveBookingUH"] = urlHandlers.UHConfModifRoomBookingSaveBooking
-             vars["roomDetailsUH"] = urlHandlers.UHConfModifRoomBookingRoomDetails             
-        return vars
-        
+             vars["roomDetailsUH"] = urlHandlers.UHConfModifRoomBookingRoomDetails
+        return vars
+
 class WRoomBookingRoomForm( WTemplated ):
-    
+
     def __init__( self, rh ):
         self._rh = rh
@@ -6636 +6639 @@
     def getVars( self ):
         vars = WTemplated.getVars( self )
-        
+
         candRoom = self._rh._candRoom
         goodFactory = Location.parse( candRoom.locationName ).factory
-        
+
         vars["Location"] = Location
         vars["room"] = candRoom
@@ -6646 +6649 @@
         vars["config"] = Config.getInstance()
         vars["possibleEquipment"] = goodFactory.getEquipmentManager().getPossibleEquipment( location = candRoom.locationName )
-        
+
         vars["showErrors"] = self._rh._showErrors
         vars["errors"] = self._rh._errors
@@ -6657 +6660 @@
         else:
             vars["responsibleName"] = ""
-        
+
         return vars
 
@@ -6668 +6671 @@
         self._standalone = standalone
         self._buttonText = buttonText
-        
+
     def getVars( self ):
         vars = WTemplated.getVars( self )
@@ -6683 +6686 @@
         now = datetime.now()
         if candResv != None: #.startDT != None and candResv.endDT != None:
-            calendarStartDT = datetime( candResv.startDT.year, candResv.startDT.month, candResv.startDT.day, 0, 0, 1 )  # Potential performance problem 
+            calendarStartDT = datetime( candResv.startDT.year, candResv.startDT.month, candResv.startDT.day, 0, 0, 1 )  # Potential performance problem
             calendarEndDT =  datetime( candResv.endDT.year, candResv.endDT.month, candResv.endDT.day, 23, 59 )     # with very long reservation periods
         else:
@@ -6696 +6699 @@
         resvEx.room = room
         resvEx.isConfirmed = None # To include both confirmed and not confirmed
-        
+
         # Bars: Existing reservations
         collisionsOfResvs = resvEx.getCollisions()
@@ -6712 +6715 @@
 
         # Bars: Conflicts all vs candidate
-        candResvIsConfirmed = candResv.isConfirmed;   
+        candResvIsConfirmed = candResv.isConfirmed;
         candResv.isConfirmed = None
         allCollisions = candResv.getCollisions()
@@ -6726 +6729 @@
             else:
                 bars.append( Bar( c, Bar.PRECONFLICT ) )
-        
+
         if not candResv.isRejected and not candResv.isCancelled:
             vars["thereAreConflicts"] = len( collisions ) > 0
@@ -6732 +6735 @@
             vars["thereAreConflicts"] = False
         vars["conflictsNumber"] = len( collisions )
-        
+
         bars = barsList2Dictionary( bars )
         bars = addOverlappingPrebookings( bars )
@@ -6789 +6792 @@
         vars["possibleEquipment"] = self._location.factory.getEquipmentManager().getPossibleEquipment(location = self._location.friendlyName)
         vars["AttsManager"] = self._location.factory.getCustomAttributesManager()
-        
+
         # Rooms
         rooms = self._location.factory.newRoom().getRooms(location = self._location.friendlyName)
         rooms.sort(key = lambda r: r.getFullName())
-        
+
         vars["Rooms"] = rooms
-        
+
         rh = self._rh
-        
+
         vars["withKPI"] = rh._withKPI
-        
+
         if rh._withKPI:
             vars["kpiAverageOccupation"] = str( int( round( rh._kpiAverageOccupation * 100 ) ) ) + "%"
-            
+
             vars["kpiTotalRooms"] = rh._kpiTotalRooms
             vars["kpiActiveRooms"] = rh._kpiActiveRooms
             vars["kpiReservableRooms"] = rh._kpiReservableRooms
-    
+
             vars["kpiReservableCapacity"] = rh._kpiReservableCapacity
             vars["kpiReservableSurface"] = rh._kpiReservableSurface
-            
+
             # Bookings
-            
+
             vars["kbiTotalBookings"] = rh._totalBookings
-    
+
             # Next 9 KPIs
             vars["stats"] = rh._booking_stats
-        
-        return vars
-    
-class WBaseSearchBox(WTemplated):     
-    
+
+        return vars
+
+class WBaseSearchBox(WTemplated):
+
     def __init__(self, template='SearchBox', targetId=0):
         # overload the template
         WTemplated.__init__(self,template)
         self._targetId = targetId
-        
+
     def getVars(self):
-        vars = WTemplated.getVars( self )        
+        vars = WTemplated.getVars( self )
         vars["searchAction"] = urlHandlers.UHSearch.getURL();
         vars['targetId'] = self._targetId
         vars['searchImg'] =  imgLogo=Configuration.Config.getInstance().getSystemIconURL( "search" )
+        vars['categId'] = 0
         return vars
 
 class WMiniSearchBox(WBaseSearchBox):
-   
+
     def __init__(self, confId):
         WBaseSearchBox.__init__(self, template='MiniSearchBox',targetId = confId)
-   
+
     def getVars(self):
         vars = WBaseSearchBox.getVars( self )
-        return vars    
+        return vars
 
 class WMicroSearchBox(WBaseSearchBox):
-   
+
     def __init__(self, confId):
         WBaseSearchBox.__init__(self, template='MicroSearchBox',targetId = confId)
         self._confId = confId
-   
+
     def getVars(self):
-        vars = WBaseSearchBox.getVars( self )       
+        vars = WBaseSearchBox.getVars( self )
         vars["innerBox"] = WMiniSearchBox(self._confId).getHTML().replace('"', '\\"').replace("'", "\\'").replace("\n"," ")
         vars["closeIcon"] = quoteattr(str(Configuration.Config.getInstance().getSystemIconURL("remove")));
-        return vars    
+        return vars
 
 class WCategorySearchBox(WBaseSearchBox):
-   
+
     def __init__(self, categId = 0, optionsClass='arrowExpandIcon'):
         WBaseSearchBox.__init__(self, targetId = categId)
+        self._categId = categId
         self._moreOptionsClass = optionsClass
-        
+
     def getVars(self):
         vars = WBaseSearchBox.getVars( self )
+        vars["categId"] = self._categId
         vars['moreOptionsClass'] = self._moreOptionsClass
         return vars
-      
+
 class WRootSearchBox(WBaseSearchBox):
-    
+
     def __init__(self):
         # overload the template
         WBaseSearchBox.__init__(self,'RootSearchBox')
-        
+
     def getVars(self):
-        vars = WBaseSearchBox.getVars( self )        
-        vars["innerBox"] = WBaseSearchBox().getHTML()   
-        return vars
-    
+        vars = WBaseSearchBox.getVars( self )
+        vars["innerBox"] = WBaseSearchBox().getHTML()
+        return vars
+
 class WUtils:
     """A interface for creating easily some HTML elements..."""
-    
+
     def createImg(cls, imgId, imgInfo="", imgText="", **attributes):
         """ returns an HTML image with optional text on the right.
@@ -6890 +6896 @@
         return """<img src="%s" alt="%s" %s /> %s"""%(Config.getInstance().getSystemIconURL(imgId),imgInfo,attr,imgText)
     createImg = classmethod(createImg)
-    
+
     def createImgButton(cls, url, imgId, imgInfo="", imgText="", **attributes):
         """ returns an HTML image link with optional text on the right.
@@ -6905 +6911 @@
           </a>"""%(url, attr, Config.getInstance().getSystemIconURL(imgId), imgInfo, imgText)
     createImgButton = classmethod(createImgButton)
-    
+
     def createChangingImgButton(cls, url, imgID, imgOverId, imgInfo="", imgText="", **attributes):
         """ returns a changing HTML image link
             (i.e. the image changes depending on mouseOver/mouseOut)
             with optional text on the right.
-        
+
             Params:
                 url -- link of target.
@@ -6924 +6930 @@
         return """<a href="%s" %s>
               <img src="%s" alt="%s" onmouseover="javascript:this.src='%s'" onMouseOut="javascript:this.src='%s'"/> %s
-          </a>"""%(url, attr, iconUrl, imgInfo, iconOverUrl, iconUrl, imgText)           
+          </a>"""%(url, attr, iconUrl, imgInfo, iconOverUrl, iconUrl, imgText)
     createChangingImgButton = classmethod(createChangingImgButton)
-    
+
     def createTextarea(cls, content="", **attributes):
         """ returns an HTML textarea with optional text.
@@ -6940 +6946 @@
         return """<textarea rows="5" cols="15" %s>%s</textarea>"""%(attr,content)
     createTextarea = classmethod(createTextarea)
-    
+
     def createInput(cls, text="", **attributes):
         """ returns an HTML input with optional text.
@@ -6954 +6960 @@
         return """<input %s/>%s"""%(attr,text)
     createInput = classmethod(createInput)
-    
+
     def createSelect(cls, emptyOption, options, selected="", **attributes):
         """ returns an HTML select field.
@@ -6979 +6985 @@
         return """<select %s>%s</select>"""%(attr,optionsHTML)
     createSelect = classmethod(createSelect)
-    
+
     def appendNewLine(cls, htmlContent):
         """ appends a new line <br/> to the given html element.
@@ -6989 +6995 @@
 
 class WBeautifulHTMLList(WTemplated):
-    
+
     def __init__(self, listObject, classNames, level):
         """ classNames: a dictionary such as {'UlClassName' : 'optionList'}. See the getVars for more class names.
@@ -6997 +7003 @@
         self.__classNames = classNames
         self.__level = level
-        
+
     def getVars(self):
         vars = WTemplated.getVars( self )
@@ -7006 +7012 @@
         vars["Level"] = self.__level
         return vars
-    
+
 class WBeautifulHTMLDict(WTemplated):
-    
+
     def __init__(self, dictObject, classNames, level):
         """ classNames: a dictionary such as {'UlClassName' : 'optionList'}. See the getVars for more class names.
@@ -7016 +7022 @@
         self.__classNames = classNames
         self.__level = level
-        
+
     def getVars(self):
         vars = WTemplated.getVars( self )