Changeset 11008

Timestamp:

30 Jan 2014, 10:40:40 (11 years ago)

Author:

Henrik Bettermann

Message:

Set flash types.

Finalize datacenter adjustments.

Location:

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

Files:

• pages.py (modified) (40 diffs)
• templates/datacenterimport2page.pt (modified) (2 diffs)
• templates/datacenterimport3page.pt (modified) (4 diffs)
• templates/datacenterimport4page.pt (modified) (1 diff)

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

@@ -85 +85 @@
     user = view.request.form.get('user', None)
     if user is None or localrole is None:
-        view.flash('No user selected.')
+        view.flash('No user selected.', type='danger')
         view.redirect(view.url(view.context, '@@manage')+'#tab%s' % tab)
         return
@@ -100 +100 @@
     child_ids = view.request.form.get('role_id', None)
     if child_ids is None:
-        view.flash(_('No local role selected.'))
+        view.flash(_('No local role selected.'), type='danger')
         view.redirect(view.url(view.context, '@@manage')+'#tab%s' % tab)
         return
@@ -117 +117 @@
         except:
             view.flash('Could not remove %s: %s: %s' % (
-                    child_id, sys.exc_info()[0], sys.exc_info()[1]))
+                    child_id, sys.exc_info()[0], sys.exc_info()[1]),
+                    type='danger')
     if len(deleted):
         view.flash(
@@ -133 +134 @@
         child_id = form['val_id']
     else:
-        view.flash(_('No item selected.'))
+        view.flash(_('No item selected.'), type='danger')
         if tab:
             view.redirect(view.url(view.context, redirect)+'#tab%s' % tab)
@@ -152 +153 @@
         except:
             view.flash('Could not delete %s: %s: %s' % (
-                    id, sys.exc_info()[0], sys.exc_info()[1]))
+                    id, sys.exc_info()[0], sys.exc_info()[1]), type='danger')
     if len(deleted):
         view.flash(_('Successfully removed: ${a}',
@@ -282 +283 @@
                             self.request.principal.id)
                         self.flash(
-                          _('Your personal data record is outdated. Please update.'))
+                          _('Your personal data record is outdated. Please update.'),
+                          type='warning')
                     self.redirect(self.application_url() + rel_link)
                     return
@@ -327 +329 @@
                                    type='warning')
                     return
-            self.flash(_('You entered invalid credentials.'))
+            self.flash(_('You entered invalid credentials.'), type='danger')
             return
 
@@ -443 +445 @@
             self.flash(_('Your message has been sent.'))
         else:
-            self.flash(_('A smtp server error occurred.'))
+            self.flash(_('A smtp server error occurred.'), type='danger')
         return
 
@@ -589 +591 @@
             errors = validator.validate_password(password, password_ctl)
             if errors:
-                self.flash( ' '.join(errors))
+                self.flash( ' '.join(errors), type='danger')
                 return
         try:
@@ -602 +604 @@
         except KeyError:
             self.status = self.flash('The userid chosen already exists '
-                                  'in the database.')
+                                  'in the database.', type='danger')
             return
         self.redirect(self.url(self.context))
@@ -633 +635 @@
             errors = validator.validate_password(password, password_ctl)
             if errors:
-                self.flash( ' '.join(errors))
+                self.flash( ' '.join(errors), type='danger')
                 return
         changed_fields = self.applyData(self.context, **data)
@@ -852 +854 @@
                 ob_class, sessionconfiguration.academic_session))
         except KeyError:
-            self.flash(_('The session chosen already exists.'))
+            self.flash(_('The session chosen already exists.'), type='danger')
             return
         self.redirect(self.url(self.context, '@@index')+'#tab2')
@@ -909 +911 @@
             child_id = form['val_id']
         else:
-            self.flash(_('No item selected.'))
+            self.flash(_('No item selected.'), type='danger')
             return
         if not isinstance(child_id, list):
@@ -920 +922 @@
                 deleted.append(id)
             except OSError:
-                self.flash(_('OSError: The file could not be deleted.'))
+                self.flash(_('OSError: The file could not be deleted.'),
+                           type='danger')
                 return
         if len(deleted):
@@ -1024 +1027 @@
                     _('All import managers have been notified by email.'))
             else:
-                self.flash(_('An smtp server error occurred.'))
+                self.flash(_('An smtp server error occurred.'), type='danger')
             return
 
@@ -1032 +1035 @@
         if number_of_pendings > self.max_files:
             self.flash(
-                _('Maximum number of files in the data center exceeded.'))
+                _('Maximum number of files in the data center exceeded.'),
+                  type='danger')
             self.redirect(self.url(self.context))
             return
@@ -1043 +1047 @@
             filename = uploadfile.filename
             #if 'pending' in filename:
-            #    self.flash(_("You can't re-upload pending data files."))
+            #    self.flash(_("You can't re-upload pending data files."), type='danger')
             #    return
             if not filename.endswith('.csv'):
-                self.flash(_("Only csv files are allowed."))
+                self.flash(_("Only csv files are allowed."), type='danger')
                 return
             normalized_filename = self.getNormalizedFileName(filename)
@@ -1054 +1058 @@
                 self.context.storage, 'unfinished', normalized_filename)
             if os.path.exists(finished_file) or os.path.exists(unfinished_file):
-                self.flash(_("File with same name was uploaded earlier."))
+                self.flash(_("File with same name was uploaded earlier."),
+                           type='danger')
                 return
             target = os.path.join(self.context.storage, normalized_filename)
@@ -1068 +1073 @@
                     "has invalid CSV format. "
                     "First problematic line detected: line %s. "
-                    "Please replace." % invalid_line))
+                    "Please replace." % invalid_line), type='danger')
                 logger.info('%s - invalid file uploaded: %s' %
                             (ob_class, target))
@@ -1080 +1085 @@
 
         except IOError:
-            self.flash('Error while uploading file. Please retry.')
-            self.flash('I/O error: %s' % sys.exc_info()[1])
+            self.flash('Error while uploading file. Please retry.', type='danger')
+            self.flash('I/O error: %s' % sys.exc_info()[1], type='danger')
             return
         self.redirect(self.url(self.context))
@@ -1273 +1278 @@
             return
         if cancel is not None:
-            self.flash(_('Import aborted.'))
+            self.flash(_('Import aborted.'), type='warning')
             self.redirect(self.url(self.context))
             return
@@ -1285 +1290 @@
         if self.importer and 'update' in self.importer:
             if self.mode != 'update':
-                self.flash(_('Update mode only!'))
+                self.flash(_('Update mode only!'), type='warning')
                 self.mode_locked = True
                 self.mode = 'update'
@@ -1299 +1304 @@
         else:
             self.reader = ()
-            self.flash(warnings)
+            self.flash(warnings, type='warning')
 
 class DatacenterImportStep3(KofaPage):
@@ -1396 +1401 @@
             return
         if cancel is not None:
-            self.flash(_('Import aborted.'))
+            self.flash(_('Import aborted.'), type='warning')
             self.redirect(self.url(self.context))
             return
@@ -1411 +1416 @@
         warnings = self.getWarnings()
         if warnings:
-            self.flash(warnings)
+            self.flash(warnings, type='warning')
 
 class DatacenterImportStep4(KofaPage):
@@ -1473 +1478 @@
         if self.warn_num:
             self.flash(_('Processing of ${a} rows failed.',
-                mapping = {'a':self.warn_num}))
+                mapping = {'a':self.warn_num}), type='warning')
         self.flash(_('Successfully processed ${a} rows.',
             mapping = {'a':linenum - self.warn_num}))
@@ -1511 +1516 @@
             self.flash(
                 _('Log files can only be searched ' +
-                  'on Unix-based operating systems.'))
+                  'on Unix-based operating systems.'), type='danger')
             self.redirect(self.url(self.context, '@@logs'))
             return
@@ -1525 +1530 @@
                 self.context.queryLogfiles(logname, query))
         except ValueError:
-            self.flash(_('Invalid search expression.'))
+            self.flash(_('Invalid search expression.'), type='danger')
             return
         if not self.result:
-            self.flash(_('No search results found.'))
+            self.flash(_('No search results found.'), type='warning')
         return
 
@@ -1557 +1562 @@
             for name in not_copied:
                 self.flash(_('File already existed (not copied): ${a}',
-                    mapping = {'a':name}))
+                    mapping = {'a':name}), type='danger')
         except:
             self.flash(_('Given storage path cannot be used. ${a}',
@@ -1725 +1730 @@
     def delFaculties(self, **data):
         if not checkPermission('waeup.managePortal', self.context):
-            self.flash(_('You are not allowed to remove entire faculties.'))
+            self.flash(_('You are not allowed to remove entire faculties.'),
+                       type='warning')
             return
         delSubobjects(self, redirect='@@manage', tab='1')
@@ -1758 +1764 @@
             self.context.addFaculty(faculty)
         except KeyError:
-            self.flash(_('The faculty code chosen already exists.'))
+            self.flash(_('The faculty code chosen already exists.'),
+                       type='danger')
             return
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
@@ -1813 +1820 @@
     def delDepartments(self, **data):
         if not checkPermission('waeup.managePortal', self.context):
-            self.flash(_('You are not allowed to remove entire departments.'))
+            self.flash(_('You are not allowed to remove entire departments.'),
+                       type='danger')
             return
         delSubobjects(self, redirect='@@manage', tab='2')
@@ -1881 +1889 @@
         else:
             if 'search' in form:
-                self.flash(_('Empty search string'))
+                self.flash(_('Empty search string'), type='warning')
             return
         self.hitlist = self._find_students(query=self.searchterm,
             searchtype=self.searchtype, view=self)
         if not self.hitlist:
-            self.flash(_('No student found.'))
+            self.flash(_('No student found.'), type='warning')
         return
 
@@ -1906 +1914 @@
             self.context.addDepartment(department)
         except KeyError:
-            self.flash(_('The code chosen already exists in this faculty.'))
+            self.flash(_('The code chosen already exists in this faculty.'),
+                       type='danger')
             return
         self.status = self.flash(
@@ -2005 +2014 @@
     def delCertificates(self, **data):
         if not checkPermission('waeup.managePortal', self.context):
-            self.flash(_('You are not allowed to remove certificates.'))
+            self.flash(_('You are not allowed to remove certificates.'),
+                       type='warning')
             return
         delSubobjects(
@@ -2059 +2069 @@
                 message += '<a href="%s">%s</a>' % (
                     self.url(entry), getattr(entry, '__name__', u'Unnamed'))
-                self.flash(message)
+                self.flash(message, type='warning')
             self.redirect(self.url(self.context, u'@@addcourse'))
             return
@@ -2100 +2110 @@
                 message += '<a href="%s">%s</a>' % (
                     self.url(entry), getattr(entry, '__name__', u'Unnamed'))
-                self.flash(message)
+                self.flash(message, type='warning')
             self.redirect(self.url(self.context, u'@@addcertificate'))
             return
@@ -2261 +2271 @@
         except KeyError:
             self.status = self.flash(_('The chosen certificate course is already '
-                                  'part of this certificate.'))
+                                  'part of this certificate.'), type='warning')
             return
         self.status = self.flash(
@@ -2389 +2399 @@
         user = self._searchUser(identifier, email)
         if user is None:
-            self.flash(_('No record found.'))
+            self.flash(_('No record found.'), type='warning')
             return
         # Change password
@@ -2410 +2420 @@
                 'has been sent to ${a}.', mapping = {'a':email}))
         else:
-            self.flash(_('An smtp server error occurred.'))
+            self.flash(_('An smtp server error occurred.'), type='danger')
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
         self.context.logger.info(

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/datacenterimport2page.pt

@@ -9 +9 @@
     Please select a file-processor and a processing-mode from the selections below.
   </p>
-  <div>
-    <table tal:define="prev_table view/getPreviewTable;">
+  <div class="table-responsive">
+    <table tal:define="prev_table view/getPreviewTable;" class="table table-condensed">
       <thead>
         <tr>
@@ -55 +55 @@
     </p>
   </div>
-  <input class="btn" type="submit" name="cancel" tal:attributes="value view/cancel_button" />
-  <input class="btn danger" type="submit" name="back1" tal:attributes="value view/back_button" />
-  <input class="btn primary"
+  <input class="btn btn-default" type="submit" name="cancel" tal:attributes="value view/cancel_button" />
+  <input class="btn btn-danger" type="submit" name="back1" tal:attributes="value view/back_button" />
+  <input class="btn btn-primary"
     tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''; value view/proceed_button"
     type="submit" name="proceed" />

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/datacenterimport3page.pt

@@ -1 +1 @@
 <div i18n:domain="waeup.kofa" i18n:translate=""
-  class="alert-message success" tal:condition="not: view/getWarnings">
+  class="alert alert-success" tal:condition="not: view/getWarnings">
   Header fields OK
 </div>
@@ -29 +29 @@
 
   <div>
-
-
     <table tal:define="prev_table view/getPreviewTable;
-                       headers view/headerfields;">
+                       headers view/headerfields;"
+            class="table">
       <thead>
         <tr>
@@ -45 +44 @@
           </td>
           <td>
-            <select class="span4" name="headerfield">
+            <select name="headerfield">
               <option tal:repeat="opt view/getPossibleHeaders"
                 tal:attributes="value opt/value;
@@ -62 +61 @@
   </div>
 
-  <input class="btn" type="submit" name="cancel"
+  <input class="btn btn-default" type="submit" name="cancel"
     tal:attributes="value view/cancel_button" />
-  <input class="btn" type="reset" name="reset"
+  <input class="btn btn-default" type="reset" name="reset"
     tal:attributes="value view/reset_button" />
-  <input class="btn" type="submit" name="update"
+  <input class="btn btn-default" type="submit" name="update"
     tal:attributes="value view/update_button" />
   <br /><br />
-  <input class="btn danger" type="submit" name="back2"
+  <input class="btn btn-danger" type="submit" name="back2"
     tal:attributes="value view/back_button" />
-  <input class="btn primary"
+  <input class="btn btn-primary"
     tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''; value view/proceed_button"
     type="submit" name="proceed"/>

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/datacenterimport4page.pt

@@ -15 +15 @@
 </p>
 <form method="POST" i18n:domain="waeup.kofa">
-  <input class="btn primary" type="submit" name="finish"
+  <input class="btn btn-primary" type="submit" name="finish"
     tal:attributes="value view/back_button" />
 </form>