Changeset 11254 for main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.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/students/viewlets.py (modified) (8 diffs)

main/waeup.kofa/trunk/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(
@@ -959 +960 @@
     mus = 1024 * 50
     download_name = u'passport.jpg'
-    tab_redirect = '?tab2'
+    tab_redirect = '#tab2'
 
 class PassportUploadEdit(PassportUploadManage):
@@ -986 +987 @@
     mus = 1024 * 150
     download_name = u'birth_certificate'
-    tab_redirect = '?tab2'
+    tab_redirect = '#tab2-top'
 
 class Image(grok.View):