Changeset 11105 for main

Timestamp:

17 Feb 2014, 06:47:07 (11 years ago)

Author:

Henrik Bettermann

Message:

Show proper flash message colors and other minor changes.

Location:

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa

Files:

• browser/pages.py (modified) (4 diffs)
• students/browser_templates/clearanceeditpage.pt (modified) (2 diffs)
• students/viewlets.py (modified) (7 diffs)
• widgets/sequencewidget.pt (modified) (1 diff)

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/pages.py

@@ -1824 +1824 @@
     @action(_('Add local role'), validator=NullValidator)
     def addLocalRole(self, **data):
-        return add_local_role(self, '3', **data)
+        return add_local_role(self,3,**data)
 
     @action(_('Remove selected local roles'))
@@ -2015 +2015 @@
     @action(_('Add local role'), validator=NullValidator)
     def addLocalRole(self, **data):
-        return add_local_role(self, 4, **data)
+        return add_local_role(self,4,**data)
 
     @action(_('Remove selected local roles'))
@@ -2146 +2146 @@
     @action(_('Add local role'), validator=NullValidator)
     def addLocalRole(self, **data):
-        return add_local_role(self, 2, **data)
+        return add_local_role(self,2,**data)
 
     @action(_('Remove selected local roles'))
@@ -2217 +2217 @@
     @action(_('Add local role'), validator=NullValidator)
     def addLocalRole(self, **data):
-        return add_local_role(self, 3, **data)
+        return add_local_role(self,3,**data)
 
     @action(_('Remove selected local roles'))

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/browser_templates/clearanceeditpage.pt

@@ -16 +16 @@
   <div class="tab-content">
     <div id="tab1" class="active tab-pane">
+      <br />
       <table class="form-table">
         <tbody>
@@ -30 +31 @@
 
     <div id="tab2" class="tab-pane">
+      <br />
       <table class="form-table">
         <tbody>

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/viewlets.py

@@ -825 +825 @@
     size = file_size(upload)
     if size > max_size:
-        view.flash(_('Uploaded file is too big.'))
+        view.flash(_('Uploaded file is too big.'), type="danger")
         return False
     upload.seek(0) # file pointer moved when determining size
@@ -831 +831 @@
     upload.seek(0) # same here
     if file_format is None:
-        view.flash(_('Could not determine file type.'))
+        view.flash(_('Could not determine file type.'), type="danger")
         return False
     basename, expected_ext = os.path.splitext(download_name)
@@ -837 +837 @@
         if '.' + file_format != expected_ext:
             view.flash(_('${a} file extension expected.',
-                mapping = {'a':expected_ext[1:]}))
+                mapping = {'a':expected_ext[1:]}), type="danger")
             return False
     else:
@@ -843 +843 @@
             view.flash(
                 _('Only the following extensions are allowed: ${a}',
-                mapping = {'a':', '.join(ALLOWED_FILE_EXTENSIONS)}))
+                mapping = {'a':', '.join(ALLOWED_FILE_EXTENSIONS)}),
+                type="danger")
             return False
         download_name += '.' + file_format
@@ -891 +892 @@
     template = default_fileupload_template
     grok.require('waeup.uploadStudentFile')
-    tab_redirect = '#tab2'
+    tab_redirect = '#tab2-top'
     mus = 1024 * 150
     upload_button =_('Upload new file')
@@ -931 +932 @@
                         self.context, self.view.__name__) + self.tab_redirect)
             else:
-                self.view.flash(_('No local file selected.'))
+                self.view.flash(_('No local file selected.'), type="danger")
                 self.view.redirect(
                     self.view.url(
@@ -986 +987 @@
     mus = 1024 * 150
     download_name = u'birth_certificate'
-    tab_redirect = '#tab2'
+    tab_redirect = '#tab2-top'
 
 class Image(grok.View):

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/widgets/sequencewidget.pt

@@ -1 @@
-<table border="0" class="sequencewidget"
-  i18n:domain="waeup.kofa">
+<table i18n:domain="waeup.kofa">
   <tr tal:repeat="widget view/widgets">
     <td>