Changeset 5966

Timestamp:

22 Apr 2011, 11:26:35 (14 years ago)

Author:

uli

Message:

Use a default theme if the name set on a University instance cannot be found.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py

@@ -14 +14 @@
 from waeup.sirp.interfaces import IWAeUPObject
 from waeup.sirp.browser.interfaces import ITheme
-from waeup.sirp.browser.theming import get_all_themes
+from waeup.sirp.browser.theming import get_all_themes, WAeUPThemeGray1
 
 grok.templatedir('templates')
@@ -99 +99 @@
     grok.context(IWAeUPObject)
 
+    #: An instance of the default theme to use for the site layout
+    default_theme = WAeUPThemeGray1()
+
     @property
     def site(self):
@@ -127 +130 @@
 
     def update(self):
-        theme_name = getattr(grok.getSite(), 'skin', 'gray waeup theme')
-        theme = getUtility(ITheme, name=theme_name)
+        """Include the resources required by the chosen skin/theme.
+
+        University instances provide a 'skin' attribute, that should
+        hold the internal name of a theme.
+
+        A theme in the waeup.sirp sense consists of a list of
+        CSS/JavaScript resources defined in the
+        :mod:`waeup.sirp.browser.resources` module.
+
+        If the context University object has no such attribute or the
+        set value is not a valid theme name, we pick 'gray waeup
+        theme' as default.
+        """
+        theme_name = getattr(grok.getSite(), 'skin', '')
+        theme = queryUtility(ITheme, name=theme_name,
+                             default=self.default_theme)
         for resource in theme.getResources():
             resource.need()