Changeset bbd65a in indico

Timestamp:

12/16/09 10:17:36 (4 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, 4287315ec967a3da168d83963c14001db8487d53

Children:

dea818, f3d0f4

Parents:

385d02

Message:

[FIXED] Showing material and sort styles

• Displaying material at meeting level for Staff Association style
• Sorting out the list of styles in the menu More > Layout.

Location:

indico/MaKaC/webinterface

Files:

• stylesheets/sa.xsl (modified) (1 diff)
• wcomponents.py (modified) (2 diffs)

indico/MaKaC/webinterface/stylesheets/sa.xsl

@@ -83 +83 @@
 
 <font size="+1" face="Times">
-<xsl:value-of select="./title" disable-output-escaping="yes"/><br/>
-</font>
-
+<xsl:value-of select="./title" disable-output-escaping="yes"/>
+</font>
+<xsl:if test="count(child::material) != 0">
+    <font face="Times" size="+1"><xsl:for-each select="material">
+        <a href="{./displayURL}">&#160;&#160;<xsl:value-of select="./title" disable-output-escaping="yes"/></a>
+    </xsl:for-each></font>
+</xsl:if>
+<br/>
 <font size="+1" face="Times">
 <xsl:if test="count(child::location) != 0">

indico/MaKaC/webinterface/wcomponents.py

@@ -590 +590 @@
         viewoptions = []
         if len(stylesheets) != 0:
-            stylesheets.sort()
+            stylesheets.sort(key=styleMgr.getStylesheetName)
             for stylesheet in stylesheets:
                 viewoptions.append({"id": stylesheet, "name": styleMgr.getStylesheetName(stylesheet) })
@@ -688 +688 @@
         viewoptions = []
         if len(stylesheets) != 0:
-            stylesheets.sort()
+            stylesheets.sort(key=styleMgr.getStylesheetName)
             for stylesheet in stylesheets:
                 viewoptions.append({"id": stylesheet, "name": styleMgr.getStylesheetName(stylesheet) })