Changeset 7451 for main


Ignore:
Timestamp:
12 Jan 2012, 08:34:09 (13 years ago)
Author:
Henrik Bettermann
Message:

Backup of local changes. The branch can now serve as basis for discussion today.

Location:
main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r7449 r7451  
    3838from waeup.sirp.browser.interfaces import ICaptchaManager
    3939from waeup.sirp.browser.breadcrumbs import Breadcrumb
    40 from waeup.sirp.browser.layout import NullValidator, jsaction, action
     40from waeup.sirp.browser.layout import (
     41    NullValidator, jsaction, action, UtilityView)
    4142from waeup.sirp.browser.pages import add_local_role, del_local_roles
    4243from waeup.sirp.browser.resources import datepicker, tabs, datatable, warning
    … …  
    409410        'applicant_id', 'firstname', 'lastname','email', 'course1')
    410411
    411 class CreateStudentPage(grok.View):
     412class CreateStudentPage(UtilityView, grok.View):
    412413    """Create a student object from applicatnt data
    413414    and copy applicant object.
    … …  
    426427        return
    427428
    428 class AcceptanceFeePaymentAddPage(grok.View):
     429class AcceptanceFeePaymentAddPage(UtilityView, grok.View):
    429430    """ Page to add an online payment ticket
    430431    """
    … …  
    493494            self.context.__parent__.display_fullname,self.context.p_id)
    494495
    495 class OnlinePaymentCallbackPage(grok.View):
     496class OnlinePaymentCallbackPage(UtilityView, grok.View):
    496497    """ Callback view
    497498    """
    … …  
    525526        return
    526527
    527 class ExportPDFPaymentSlipPage(grok.View):
     528class ExportPDFPaymentSlipPage(UtilityView, grok.View):
    528529    """Deliver a PDF slip of the context.
    529530    """
    … …  
    552553            self.context.__parent__, applicantview)
    553554
    554 class ExportPDFPage(grok.View):
     555class ExportPDFPage(UtilityView, grok.View):
    555556    """Deliver a PDF slip of the context.
    556557    """
    … …  
    763764    form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
    764765    form_fields['phone'].custom_widget = PhoneWidget
     766    form_fields['applicant_id'].for_display = True
    765767    grok.template('applicanteditpage')
    766768    manage_applications = False

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

    r7450 r7451  
    88
    99body {
    10   padding-top: 60px;
     10  padding-top: 56px;
    1111  background-color: #EEEEEE;
    1212}
    1313
    14 .content {
    15     background-color: #FFFFFF;
    16     margin-left: -20px;
    17     margin-right: -20px;
    18     padding-bottom: 20px;
    19     padding-left: 20px;
    20     padding-right: 20px;
    21     padding-top: 20px;
    22     border-top-left-radius: 4px;
    23     border-top-right-radius: 4px;
     14.container-fluid>.sidebar {
     15  width: 165px;
     16}
     17
     18.container-fluid > .content {
     19  margin-left: 180px;
    2420}
    2521
    2622.well {
    27     background-color: #FFFFFF;
     23  border: 0px;
     24  background-color: #FFFFFF;
     25  padding-bottom: 12px;
     26  padding-left: 12px;
     27  padding-right: 12px;
     28  padding-top: 12px;
    2829}
    2930
    30 .breadcrumb {
    31     background-color: #FFFFFF;
    32     background-image: None;
    33     border: 0px;
     31.content {
     32  background-color: #FFFFFF;
     33  margin-left: -20px;
     34  margin-right: -20px;
     35  padding-bottom: 16px;
     36  padding-left: 20px;
     37  padding-right: 20px;
     38  padding-top: 16px;
     39  border-top-left-radius: 3px;
     40  border-top-right-radius: 3px;
    3441}
    3542
    … …  
    4148  margin-left: 20px;
    4249  margin-right: 20px;
    43   min-width: 940px;
     50  margin-bottom: 14px;
     51  padding-left: 20px;
     52  padding-right: 20px;
     53  width: 940px;
     54  background-color: #FFFFFF;
     55  background-image: None;
     56  border: 0px;
     57  border-top-left-radius: 3px;
     58  border-top-right-radius: 3px;
    4459}
    4560
    … …  
    7489
    7590.actionbar {
    76   margin-bottom: 20px;
     91  margin-bottom: 16px;
    7792}
    7893

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

    r7450 r7451  
    6464        </div>
    6565      </div>
    66       <div class="span12 content">
     66      <div class="span13 content">
    6767        <div
    6868            tal:define="message context/@@messages"

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

    r7447 r7451  
    4141from waeup.sirp.browser.viewlets import (
    4242    ManageActionButton, AddActionButton)
    43 from waeup.sirp.browser.layout import jsaction, action
     43from waeup.sirp.browser.layout import jsaction, action, UtilityView
    4444from waeup.sirp.interfaces import (
    4545    ISIRPObject, IUserAccount, IExtFileStore, IPasswordValidator, IContactForm,
    … …  
    293293            if not self.hitlist:
    294294                self.flash('No student found.')
     295            if 'remove' in form:
     296                self.flash('No item selected.')
    295297            return
    296298        entries = form['entries']
    … …  
    581583        return
    582584
    583 class StudentClearPage(grok.View):
     585class StudentClearPage(UtilityView, grok.View):
    584586    """ Clear student by clearance officer
    585587    """
    … …  
    600602        return
    601603
    602 class StudentRejectClearancePage(grok.View):
     604class StudentRejectClearancePage(UtilityView, grok.View):
    603605    """ Reject clearance by clearance officers
    604606    """
    … …  
    822824    target = 'course_registration.pdf'
    823825
    824 class ExportPDFCourseRegistrationSlipPage(grok.View):
     826class ExportPDFCourseRegistrationSlipPage(UtilityView, grok.View):
    825827    """Deliver a PDF slip of the context.
    826828    """
    … …  
    955957        return
    956958
    957 class ValidateCoursesPage(grok.View):
     959class ValidateCoursesPage(UtilityView, grok.View):
    958960    """ Validate course list by course adviser
    959961    """
    … …  
    976978        return
    977979
    978 class RejectCoursesPage(grok.View):
     980class RejectCoursesPage(UtilityView, grok.View):
    979981    """ Reject course list by course adviser
    980982    """
    … …  
    12971299        return self.view.url(self.view.context, self.target)
    12981300
    1299 class OnlinePaymentCallbackPage(grok.View):
     1301class OnlinePaymentCallbackPage(UtilityView, grok.View):
    13001302    """ Callback view
    13011303    """
    … …  
    13461348        return
    13471349
    1348 class ExportPDFPaymentSlipPage(grok.View):
     1350class ExportPDFPaymentSlipPage(UtilityView, grok.View):
    13491351    """Deliver a PDF slip of the context.
    13501352    """
    … …  
    15771579    target = 'bed_allocation.pdf'
    15781580
    1579 class ExportPDFBedTicketSlipPage(grok.View):
     1581class ExportPDFBedTicketSlipPage(UtilityView, grok.View):
    15801582    """Deliver a PDF slip of the context.
    15811583    """
    … …  
    16091611    target = 'relocate'
    16101612
    1611 class BedTicketRelocationPage(grok.View):
     1613class BedTicketRelocationPage(UtilityView, grok.View):
    16121614    """ Callback view
    16131615    """

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

    r7447 r7451  
    4848    </table>
    4949   
    50     <div class="actionButtons">
    51         <input type="submit" name="remove" value="Remove selected"
    52                onclick="return confirmPost('Are you sure?')"/>
    53     </div>
     50    <input type="submit" name="remove" value="Remove selected" class="btn"
     51           onclick="return confirmPost('Are you sure?')"/>
    5452
    5553  </div>

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

    r7450 r7451  
    104104    grok.require('waeup.handleAccommodation')
    105105    link = 'accommodation'
    106     text = u'Accommodation Data'
     106    text = u'Accommodation'
    107107
    108108class StudentManageHistoryLink(StudentManageLink):
Note: See TracChangeset for help on using the changeset viewer.