Changeset 11254 for main/waeup.kofa/trunk/src/waeup/kofa/browser/layout.py

Timestamp:

22 Feb 2014, 15:46:03 (11 years ago)

Author:

uli

Message:

Merge changes from uli-diazo-themed back into trunk. If this works, then a miracle happened.

Location:

main/waeup.kofa/trunk

Files:

• . (modified) (1 prop)
• src/waeup/kofa (modified) (1 prop)
• src/waeup/kofa/browser/layout.py (modified) (11 diffs)

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

@@ -26 +26 @@
 from zope.i18n import translate
 from zope.i18nmessageid import Message
-from hurry.resource import mode
 from megrok.layout import Page, Layout, Form, EditForm, DisplayForm, AddForm
 from z3c.flashmessage.interfaces import IMessageSource, IMessageReceiver
@@ -37 +36 @@
 from waeup.kofa.utils.helpers import to_timezone
 from waeup.kofa.browser.interfaces import (
-    ITheme, IStudentNavigationBase, IApplicantBase)
-from waeup.kofa.browser.theming import get_all_themes, KofaThemeBase
+    IStudentNavigationBase, IApplicantBase)
 from waeup.kofa.authentication import get_principal_role_manager
 
@@ -74 +72 @@
         super(KofaAction, self).__init__(label, **options)
         self.style = style
+        if style == '':
+            self.style = 'default'
+        
 
     def render(self):
@@ -82 +83 @@
             label = translate(self.label, context=self.form.request)
         return ('<input type="submit" id="%s" name="%s" value="%s"'
-                ' class="btn %s"/>' %
+                ' class="btn btn-%s"/>' %
                 (self.__name__, self.__name__, escape(label, quote=True),
                 self.style))
@@ -96 +97 @@
 
     msg = _('\'Are you sure?\'')
+
+    def __init__(self, label, style='', **options):
+        super(JSAction, self).__init__(label, **options)
+        self.style = style
+        if style == '':
+            self.style = 'default'
 
     def render(self):
@@ -105 +112 @@
         msg = translate(self.msg, context=self.form.request)
         return ('<input type="submit" id="%s" name="%s" value="%s"'
-                ' class="btn" onclick="return confirmPost(%s)" />' %
-                (self.__name__, self.__name__, escape(label, quote=True), msg)
+                ' class="btn btn-%s" onclick="return window.confirm(%s)" />' %
+                (self.__name__, self.__name__, escape(label, quote=True),
+                 self.style, msg)
                 )
 
@@ -151 +159 @@
         return self.url(site, name)
 
-    def flash(self, message, type='alert-message warning'):
+    def flash(self, message, type='success'):
         """Send a short message to the user.
         """
+        cssClass = 'alert alert-%s' % type
         source = queryUtility(IMessageSource, name='session')
         if source is None:
             return None
-        source.send(message, type)
+        source.send(message, cssClass)
         return True
 
@@ -174 +183 @@
         # Width parameters will be overridden by Bootstrap
         # so we have to set the css class
-        if self.widgets.get('subject'):
-            self.widgets['subject'].cssClass = 'span9'
         if self.widgets.get('body'):
             self.widgets['body'].height = 10
-        if self.widgets.get('body'):
-            self.widgets['body'].cssClass = 'span9'
 
 class KofaPage(UtilityView,Page):
@@ -202 +207 @@
         super(KofaEditFormPage,self).setUpWidgets(ignore_request)
         for widget in self.widgets:
-            if widget.__class__.__name__ == 'TextWidget':
-                widget.cssClass = 'span8'
-            elif widget.__class__.__name__ == 'IntWidget':
-                widget.cssClass = 'span2'
             if 'address' in widget.name or \
                 'comment' in widget.name or \
                 'notice' in widget.name:
-                widget.cssClass = 'span8'
                 widget.height = 6
-        if self.widgets.get('title'):
-            self.widgets['title'].cssClass = 'span12'
-        if self.widgets.get('frontpage'):
-            self.widgets['frontpage'].cssClass = 'span12'
-        if self.widgets.get('phone'):
-            self.widgets['phone'].cssClass = 'span4'
         if self.widgets.get('transcript_comment'):
-            self.widgets['transcript_comment'].cssClass = 'span12'
             self.widgets['transcript_comment'].height = 12
         if self.widgets.get('jamb_subjects'):
-            self.widgets['jamb_subjects'].cssClass = 'span8'
             self.widgets['jamb_subjects'].height = 6
-        if self.widgets.get('description'):
-            self.widgets['description'].cssClass = 'span12'
 
 class KofaAddFormPage(UtilityView,AddForm):
@@ -238 +228 @@
 
     #: An instance of the default theme to use for the site layout
-    default_theme = KofaThemeBase()
     stafftemp = grok.PageTemplateFile('templates/staffsitelayout.pt')
     studenttemp = grok.PageTemplateFile('templates/studentsitelayout.pt')
@@ -318 +307 @@
             return None          
 
-    def update(self):
-        """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.kofa sense consists of a list of
-        CSS/JavaScript resources defined in the
-        :mod:`waeup.kofa.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.
-        """
-        mode('minified')
-        theme_name = getattr(grok.getSite()['configuration'], 'skin', '')
-        theme = queryUtility(ITheme, name=theme_name,
-                             default=self.default_theme)
-        for resource in theme.getResources():
-            resource.need()
-        return
-
     def render(self):
         if self.isStudent() or self.isApplicant() or not self.isAuthenticated():