Changeset 7450 for main/waeup.sirp/branches/henrik-bootstrap/src

Timestamp:

11 Jan 2012, 22:51:42 (13 years ago)

Author:

Henrik Bettermann

Message:

Backup today's work (mainly student navigation).

Location:

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp

Files:

• browser/layout.py (modified) (1 diff)
• browser/resources.py (modified) (1 diff)
• browser/static/bootstrap-dropdown.js (added)
• browser/static/bootstrap.min.css (modified) (1 diff)
• browser/static/mobile.css (modified) (1 diff)
• browser/static/waeup-base.css (modified) (2 diffs)
• browser/templates/actionbutton.pt (modified) (1 diff)
• browser/templates/certificatepage.pt (modified) (1 diff)
• browser/templates/removesubobjectspage.pt (deleted)
• browser/templates/staffsitelayout.pt (modified) (1 diff)
• browser/templates/studentsitelayout.pt (modified) (2 diffs)
• students/browser_templates/mydatadropdowntabs.pt (added)
• students/browser_templates/studycoursepage.pt (modified) (2 diffs)
• students/viewlets.py (modified) (4 diffs)

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/layout.py

@@ -52 +52 @@
 default_primary_nav_template.__grok_name__ = 'default_primary_nav'
 
-
 class action(grok.action):
 

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/resources.py

@@ -252 +252 @@
     waeup_sirp, 'bootstrap.min.css')
 
+dropdown = ResourceInclusion(
+    waeup_sirp, 'bootstrap-dropdown.js',
+    depends=[jquery])
+
 #: Register basic SIRP CSS (which is based on ``bootstrap.min.css`` and ``base``
 #: as a resource.
 waeup_base_css = ResourceInclusion(
     waeup_sirp, 'waeup-base.css',
-    depends=[bootstrap_min, base])
+    depends=[dropdown,bootstrap_min, base])
 
 #: The red SIRP theme registered as a resource.

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/static/bootstrap.min.css

@@ -1335 +1335 @@
   height: 0;
   display: inline-block;
-  content: "↓
-  ";
+  content: "↓";
   text-indent: -99999px;
   vertical-align: top;

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/static/mobile.css

@@ -1 +1 @@
 .container {
-  width: 420px;
+  width: 480px;
 }
 
 body {
-  padding-top: 120px;
+  padding-top: 60px;
 }
+
+select {
+  width: 60px;
+}
+
+.dataTables_length {
+    float: left;
+    width: 40%;
+}
+
+.dataTables_filter {
+    float: right;
+    text-align: right;
+    width: 60%;
+}

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/static/waeup-base.css

@@ -9 +9 @@
 body {
   padding-top: 60px;
+  background-color: #EEEEEE;
+}
+
+.content {
+    background-color: #FFFFFF;
+    margin-left: -20px;
+    margin-right: -20px;
+    padding-bottom: 20px;
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-top: 20px;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+}
+
+.well {
+    background-color: #FFFFFF;
+}
+
+.breadcrumb {
+    background-color: #FFFFFF;
+    background-image: None;
+    border: 0px;
 }
 
@@ -40 +63 @@
 }
 
-table.display {
-    margin-top: 25px;
+.dataTables_filter {
+  margin-bottom: 20px;
 }
 
  /* SIRP stuff */
+
+.container {
+  width: 700px;
+}
+
+.actionbar {
+  margin-bottom: 20px;
+}
 
 .error {

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/templates/actionbutton.pt

@@ -1 @@
-<a class="btn" tal:condition="viewlet/target_url"
+<a class="btn actionbar" tal:condition="viewlet/target_url"
    tal:attributes="href viewlet/target_url">
   <img src="" alt="edit"

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/templates/certificatepage.pt

@@ -31 +31 @@
 </thead>
 <tbody>
-  <tr tal:repeat="cc context/values">
+  <tr tal:repeat="cc context/values" class="gradeC">
      <td>
       <span tal:content="cc/level">

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/templates/staffsitelayout.pt

@@ -71 +71 @@
           </div>
         </div>
-        <div class="span12" tal:condition="provider:actionbar">
-          <span tal:replace="structure provider:actionbar" />
-          <br /><br />
-        </div>
+        <span tal:replace="structure provider:actionbar" />
         <div tal:content="structure view/content"> THE CONTENT
         </div>

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/templates/studentsitelayout.pt

@@ -10 +10 @@
     <meta name="viewport" content="width=320, initial-scale=1, maximum-scale=1"/>
     <link rel="stylesheet" media="only screen and (max-device-width: 480px)"
-        tal:attributes="href python: view.url(layout.site, '@@/waeup.sirp.browser/mobile.css')" type="text/css" />
+        tal:attributes="href python: view.url(layout.site, '@@/waeup.sirp.browser/mobile.css')"
+        type="text/css" />
     <link rel="shortcut icon" tal:attributes="href static/favicon.ico" type="image/x-icon" />
     <link rel="alternate" type="application/rss+xml" title="RSS"
@@ -52 +53 @@
           </div>
         </div>
-        <div tal:condition="provider:actionbar">
-          <span tal:replace="structure provider:actionbar" />
-          <br /><br />
-        </div>
+        <span tal:replace="structure provider:actionbar" />
         <div tal:content="structure view/content"> THE CONTENT
         </div>

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/students/browser_templates/studycoursepage.pt

@@ -55 +55 @@
 
 
-<table class="zebra">
+<table>
   <thead>
     <tr>
@@ -63 +63 @@
   </thead>
   <tbody>
-    <tr tal:repeat="value context/values">
+    <tr class="gradeC" tal:repeat="value context/values">
       <td> <a tal:attributes="href value/__name__">
       <span tal:content="value/level">CODE</span></a></td>

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/students/viewlets.py

@@ -60 +60 @@
                 url, self.text)
 
-class StudentManageBaseLink(StudentManageLink):
-    grok.order(1)
-    link = 'index'
-    text = u'Base Data'
-
 class StudentManageApplicationLink(StudentManageLink):
-    grok.order(2)
+    grok.order(1)
     link = 'application_slip'
     text = u'Application Slip'
@@ -75 +70 @@
         if slip:
             url = self.view.url(self.context,self.link)
-            return u'<li"><a href="%s">%s</a></li>' % (
+            return u'<li><a href="%s">%s</a></li>' % (
                     url, self.text)
         return ''
+
+class StudentManageBaseLink(StudentManageLink):
+    grok.order(2)
+    link = 'index'
+    text = u'Base Data'
 
 class StudentManageClearanceLink(StudentManageLink):
@@ -111 +111 @@
     text = u'History'
 
-
-class StudentMenu(grok.ViewletManager):
-    grok.name('top_student')
-
-class StudentLink(PlainActionButton):
-    """A link displayed in the student box which shows up for StudentNavigation
-    objects.
-
-    """
-    grok.baseclass()
-    grok.viewletmanager(StudentMenu)
-    grok.context(ISIRPObject)
-    grok.view(Interface)
-    grok.order(5)
-    grok.require('waeup.viewStudent')
-
-    link = 'index'
-    text = u'Base Data'
-
-    @property
-    def target_url(self):
-        """Get a URL to the target...
-        """
-        return self.view.url(self.context.getStudent(), self.link)
-
-class StudentBaseLink(StudentLink):
-    grok.order(1)
-    link = 'index'
-    text = u'Base Data'
-
-class ApplicationSlipLink(StudentLink):
-    grok.order(2)
-    link = 'application_slip'
-    text = u'Application Slip'
-
-    @property
-    def target_url(self):
-        slip = getUtility(IExtFileStore).getFileByContext(
-            self.context.getStudent(), attr=self.link)
-        if slip:
-            return self.view.url(self.context,self.link)
-        return
-
-class StudentClearanceLink(StudentLink):
-    grok.order(3)
-    link = 'view_clearance'
-    text = u'Clearance Data'
-
-class StudentPersonalLink(StudentLink):
-    grok.order(4)
-    link = 'view_personal'
-    text = u'Personal Data'
-
-class StudentStudyCourseLink(StudentLink):
-    grok.order(5)
-    link = 'studycourse'
-    text = u'Study Course'
-
-class StudentPaymentsLink(StudentLink):
-    grok.order(6)
-    link = 'payments'
-    text = u'Payments'
-
-class StudentAccommodationLink(StudentLink):
-    grok.order(7)
-    link = 'accommodation'
-    text = u'Accommodation'
-
-class StudentHistoryLink(StudentLink):
-    grok.order(8)
-    link = 'history'
-    text = u'History'
-
 class StudentsTab(PrimaryNavTab):
     """Students tab in primary navigation.
@@ -227 +154 @@
 
 class MyStudentDataTab(PrimaryStudentNavTab):
-    """MyData-tab in primary navigation.
+    """MyData dropdown tab in primary navigation.
     """
     grok.order(3)
     grok.require('waeup.viewMyStudentDataTab')
+    grok.template('mydatadropdowntabs')
     pnav = 4
     tab_title = u'My Data'
 
     @property
-    def link_target(self):
-        rel_link = '/students/%s' % self.request.principal.id
-        return self.view.application_url() + rel_link
+    def active(self):
+        view_pnav = getattr(self.view, 'pnav', 0)
+        if view_pnav == self.pnav:
+            return 'active dropdown'
+        return 'dropdown'
+
+    @property
+    def targets(self):
+        student_url = self.view.application_url() + (
+            '/students/%s' % self.request.principal.id)
+        #app_slip = getUtility(IExtFileStore).getFileByContext(
+        #    self.context.getStudent(), 'application_slip')
+        targets = []
+        #if app_slip:
+        #    targets = [{'url':student_url + '/application_slip', 'title':'Application Slip'},]
+        targets += [
+            {'url':student_url + '/index', 'title':'Base Data'},
+            {'url':student_url + '/view_clearance', 'title':'Clearance Data'},
+            {'url':student_url + '/view_personal', 'title':'Personal Data'},
+            {'url':student_url + '/studycourse', 'title':'Study Course'},
+            {'url':student_url + '/payments', 'title':'Payments'},
+            {'url':student_url + '/accommodation', 'title':'Accommodation Data'},
+            {'url':student_url + '/history', 'title':'History'},
+            ]
+        return targets
 
 def handle_file_delete(context, view, download_name):