Changeset 3cc806 in indico

Timestamp:

02/04/10 18:55:27 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

prov-dual-interface

Children:

cdec77

Parents:

8577c6 (diff), 0d29a2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'v0.97-series' into prov-dual-interface

Location:

indico

Files:

• MaKaC/conference.py (modified) (5 diffs)
• MaKaC/webinterface/materialFactories.py (modified) (4 diffs)
• MaKaC/webinterface/rh/base.py (modified) (2 diffs)
• MaKaC/webinterface/rh/conferenceBase.py (modified) (1 diff)
• MaKaC/webinterface/rh/switchInterface.py (added)
• MaKaC/webinterface/stylesheets/include/indico.xsl (modified) (2 diffs)
• MaKaC/webinterface/tpls/HTMLHeader.tpl (modified) (2 diffs)
• MaKaC/webinterface/tpls/Header.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/InterfaceSwitcher.tpl (added)
• MaKaC/webinterface/urlHandlers.py (modified) (1 diff)
• htdocs/switchInterface.py (added)

indico/MaKaC/conference.py

@@ -401 +401 @@
         recMat.recover()
         self.notifyModification()
+
+    def getMaterialRegistry(self):
+        """
+        Return the correct material registry for this type
+        """
+        from MaKaC.webinterface.materialFactories import CategoryMFRegistry
+        return CategoryMFRegistry
 
     def getMaterialById( self, matId ):
@@ -4045 +4052 @@
         self.notifyModification()
 
+    def getMaterialRegistry(self):
+        """
+        Return the correct material registry for this type
+        """
+        from MaKaC.webinterface.materialFactories import ConfMFRegistry
+        return ConfMFRegistry
+
     def getMaterialById( self, matId ):
         if matId.lower() == 'paper':
@@ -6485 +6499 @@
         self.notifyModification()
 
+    def getMaterialRegistry(self):
+        """
+        Return the correct material registry for this type
+        """
+        from MaKaC.webinterface.materialFactories import SessionMFRegistry
+        return SessionMFRegistry
+
     def getMaterialById( self, matId ):
         if matId.lower() == 'minutes':
@@ -9216 +9237 @@
         self.notifyModification()
 
+    def getMaterialRegistry(self):
+        """
+        Return the correct material registry for this type
+        """
+        from MaKaC.webinterface.materialFactories import ContribMFRegistry
+        return ContribMFRegistry
+
     def getMaterialById( self, matId ):
         if matId.lower() == 'paper':
@@ -10483 +10511 @@
         self.notifyModification()
 
+    def getMaterialRegistry(self):
+        """
+        Return the correct material registry for this type
+        """
+        from MaKaC.webinterface.materialFactories import SubContributionMFRegistry
+        return SubContributionMFRegistry
+
     def getMaterialById( self, matId ):
         if matId.lower() == 'paper':

indico/MaKaC/webinterface/materialFactories.py

@@ -20 +20 @@
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
+import MaKaC.conference as conference
 import MaKaC.webinterface.urlHandlers as urlHandlers
 import MaKaC.webinterface.wcomponents as wcomponents
-import MaKaC.conference as conference
 from MaKaC.common.Configuration import Config
 from MaKaC.i18n import _
@@ -399 +399 @@
         for factory in cls._registry.values():
             if factory.appliesToMaterial(mat):
-                return factory            
+                return factory
 
 
@@ -409 +409 @@
                   VideoFactory._id: VideoFactory, \
                   PosterFactory._id: PosterFactory }
-
 
 class SessionMFRegistry( MaterialFactoryRegistry ):
@@ -422 +421 @@
                   PosterFactory._id: PosterFactory }
 
-
+class CategoryMFRegistry( ContribMFRegistry ):
+    pass
+
+class SubContributionMFRegistry( ContribMFRegistry ):
+    pass

indico/MaKaC/webinterface/rh/base.py

@@ -407 +407 @@
         return p.display()
 
+    ### SWITCHER
+    def _checkInterfaceSwitchNeeded(self):
+
+        from MaKaC.webinterface.session.base import RequestWrapper
+
+        interface = RequestWrapper(self._req).cookies.get("INDICO_INTERFACE")
+        if interface == 'past':
+            current_url = self._req.construct_url(self._req.unparsed_uri)
+            self._redirect(current_url.replace('indicobeta.cern.ch','indico.cern.ch'))
+    ### ***
+
     def process( self, params ):
         """
@@ -442 +453 @@
                         self._setSessionUser()
                         self._setLang()
+
+                        ### SWITCHER
+                        self._checkInterfaceSwitchNeeded();
+                        ### ***
 
                         if self._getUser():

indico/MaKaC/webinterface/rh/conferenceBase.py

@@ -282 +282 @@
         """
         
-        mf = materialFactories.ContribMFRegistry.getById(self._materialId)
+        mf = self._target.getMaterialRegistry().getById(self._materialId)
 
         material = mf.get(self._target)

indico/MaKaC/webinterface/stylesheets/include/indico.xsl

@@ -277 +277 @@
             </em>
           </xsl:if>
+
+          <xsl:if
+            test="count(./location) != 0 and normalize-space(string(../location)) != normalize-space(string(./location))"
+            >
+            <span style="margin-left: 15px;">(
+            <xsl:apply-templates select="./location">
+              <xsl:with-param name="span"/>
+            </xsl:apply-templates>)</span>
+          </xsl:if>
+
+
       </span>
 
@@ -325 +336 @@
             </tr>
           </xsl:if>
-
-          <xsl:if
-            test="count(./location) != 0 and normalize-space(string(../location)) != normalize-space(string(./location))"
-            > (<xsl:apply-templates select="./location">
-              <xsl:with-param name="span"/>
-            </xsl:apply-templates>) </xsl:if>
 
         </tbody>

indico/MaKaC/webinterface/tpls/HTMLHeader.tpl

@@ -1 +1 @@
 <% declareTemplate(newTemplateStyle=True) %>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+            "http://www.w3.org/TR/html4/loose.dtd">
 <html>
     <head>
         <title><%= page._getTitle() %><%= area %></title>
+        <meta http-equiv="X-UA-Compatible" content="IE=8" />
+
         <link rel="shortcut icon" type="image/x-icon" href="<%= systemIcon('addressBarIcon') %>">
         <link rel="stylesheet" type="text/css" href="<%= baseurl %>/css/<%= stylesheet %>">
@@ -10 +13 @@
 
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=8" />
 
         <script type="text/javascript">

indico/MaKaC/webinterface/tpls/Header.tpl

@@ -1 +1 @@
 <% declareTemplate(newTemplateStyle = True) %>
 
+<% includeTpl('InterfaceSwitcher') %>
 <% includeTpl('Announcement') %>
 

indico/MaKaC/webinterface/urlHandlers.py

@@ -4503 +4503 @@
         return cls.displayUHs.get("%s%s"%(klazz.__name__, type), None)
 
-# Testing helloworld
-class UHHelloWorld(URLHandler):
-    _relativeURL = "helloWorld.py"
-
-    @classmethod
-    def getURL( cls, name=None ):
+class UHSwitchInterface( URLHandler ):
+    _relativeURL = "switchInterface.py"
+
+    def getURL( cls, whereTo, returnURL="" ):
+        """
+        whereTo - 'future' or 'past'
+        """
         url = cls._getURL()
-        if name != None:
-            url.addParam("name", name)
+        if str(returnURL).strip() == "":
+            url.addParam( "returnURL", UHWelcome.getURL())
+        else:
+            url.addParam( "returnURL", returnURL )
+        url.addParam("to", whereTo)
         return url
+