Changeset 11016 for main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/hostels

Timestamp:

31 Jan 2014, 09:14:41 (11 years ago)

Author:

Henrik Bettermann

Message:

Remove resources and theming completely.

File:

• main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/hostels/browser.py (modified) (12 diffs)

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

@@ -26 +26 @@
     NullValidator)
 from waeup.kofa.browser.breadcrumbs import Breadcrumb
-from waeup.kofa.browser.resources import datepicker, datatable, tabs, warning
 from waeup.kofa.browser.layout import default_primary_nav_template
 from waeup.kofa.browser.pages import delSubobjects
@@ -134 +133 @@
         _('Clear all hostels'),
         _('Remove selected')]
-
-    def update(self):
-        tabs.need()
-        self.tab1 = self.tab2 = self.tab3 = self.tab4 = ''
-        qs = self.request.get('QUERY_STRING', '')
-        if not qs:
-            qs = 'tab1'
-        setattr(self, qs, 'active')
-        warning.need()
-        datatable.need()
-        return super(HostelsContainerManagePage, self).update()
 
     # It's quite dangerous to remove entire hostels with its content (beds).
@@ -167 +155 @@
         return
 
-    @jsaction(_('Clear all hostels'))
+    @jsaction(_('Clear all hostels'), style='danger')
     def clearHostels(self, **data):
         self.context.clearAllHostels()
         self.flash(_('All hostels cleared.'))
         write_log_message(self, 'all hostels cleared')
-        self.redirect(self.url(self.context, '@@manage')+'?tab2')
+        self.redirect(self.url(self.context, '@@manage')+'#tab2')
         return
 
@@ -201 +189 @@
             self.context.addHostel(hostel)
         except KeyError:
-            self.flash(_('The hostel already exists.'))
+            self.flash(_('The hostel already exists.'), type='warning')
             return
         self.flash(_('Hostel created.'))
@@ -251 +239 @@
         return self.url(grok.getSite(),'students')
 
-    def update(self):
-        datepicker.need() # Enable jQuery datepicker in date fields.
-        tabs.need()
-        datatable.need()
-        warning.need()
-        self.tab1 = self.tab2 = ''
-        qs = self.request.get('QUERY_STRING', '')
-        if not qs:
-            qs = 'tab1'
-        setattr(self, qs, 'active')
-        super(HostelManageFormPage, self).update()
-        return
-
-    @action(_('Save'))
+    @action(_('Save'), style='primary')
     def save(self, **data):
         msave(self, **data)
         return
 
-    @action(_('Update all beds'))
+    @action(_('Update all beds'), style='primary')
     def updateBeds(self, **data):
         removed, added, modified, modified_beds = self.context.updateBeds()
@@ -280 +255 @@
         self.flash(flash_message)
         write_log_message(self, message)
-        self.redirect(self.url(self.context, '@@manage')+'?tab2')
+        self.redirect(self.url(self.context, '@@manage')+'#tab2')
         return
 
@@ -289 +264 @@
             child_id = form['val_id']
         else:
-            self.flash(_('No item selected.'))
-            self.redirect(self.url(self.context, '@@manage')+'?tab2')
+            self.flash(_('No item selected.'), type='warning')
+            self.redirect(self.url(self.context, '@@manage')+'#tab2')
             return
         if not isinstance(child_id, list):
@@ -310 +285 @@
                 mapping = {'a':m_translated}))
             write_log_message(self, 'switched: %s' % message)
-            self.redirect(self.url(self.context, '@@manage')+'?tab2')
+            self.redirect(self.url(self.context, '@@manage')+'#tab2')
         return
 
@@ -319 +294 @@
             child_id = form['val_id']
         else:
-            self.flash(_('No item selected.'))
-            self.redirect(self.url(self.context, '@@manage')+'?tab2')
+            self.flash(_('No item selected.'), type='warning')
+            self.redirect(self.url(self.context, '@@manage')+'#tab2')
             return
         if not isinstance(child_id, list):
@@ -334 +309 @@
                 mapping = {'a':message}))
             write_log_message(self, 'released: %s' % message)
-            self.redirect(self.url(self.context, '@@manage')+'?tab2')
+            self.redirect(self.url(self.context, '@@manage')+'#tab2')
         else:
-            self.flash(_('No allocated bed selected.'))
-            self.redirect(self.url(self.context, '@@manage')+'?tab2')
-        return
-
-    @jsaction(_('Clear hostel'))
+            self.flash(_('No allocated bed selected.'), type='warning')
+            self.redirect(self.url(self.context, '@@manage')+'#tab2')
+        return
+
+    @jsaction(_('Clear hostel'), style='danger')
     def clearHostel(self, **data):
         self.context.clearHostel()
         self.flash(_('Hostel cleared.'))
         write_log_message(self, 'cleared')
-        self.redirect(self.url(self.context, '@@manage')+'?tab2')
+        self.redirect(self.url(self.context, '@@manage')+'#tab2')
         return
 
@@ -362 +337 @@
     def save(self, **data):
         if data['owner'] == NOT_OCCUPIED:
-            self.flash(_('No valid student id.'))
+            self.flash(_('No valid student id.'), type='warning')
             self.redirect(self.url(self.context))
             return
         msave(self, **data)
-        self.redirect(self.url(self.context.__parent__, '@@manage')+'?tab2')
+        self.redirect(self.url(self.context.__parent__, '@@manage')+'#tab2')
         return
 
@@ -374 +349 @@
             # Beds must be released first before they can be allocated to
             # other students.
-            self.redirect(self.url(self.context.__parent__, '@@manage')+'?tab2')
-        return
+            self.redirect(self.url(self.context.__parent__, '@@manage')+'#tab2')
+        return