Changeset 7465


Ignore:
Timestamp:
13 Jan 2012, 07:50:34 (13 years ago)
Author:
Henrik Bettermann
Message:

Page titles are deprecated. We only have labels.

Location:
main/waeup.sirp/trunk/src/waeup/sirp/browser
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

    r7461 r7465  
    146146    grok.context(ISIRPObject)
    147147    grok.require('waeup.Public')
    148     title = u'Login'
    149     label = title
     148    label = u'Login'
    150149    camefrom = None
    151150
    … …  
    205204        return grok.getSite()['configuration']
    206205
    207     def title(self):
     206    def label(self):
    208207        return u'Contact %s' % self.config.name_admin
    209 
    210     def label(self):
    211         return self.title()
    212208
    213209    @property
    … …  
    271267
    272268    @property
    273     def title(self):
    274         return "Welcome"
    275 
    276     @property
    277269    def label(self):
    278270        return self.context['configuration'].title
    … …  
    291283    grok.context(IUniversity)
    292284    grok.require('waeup.manageUniversity')
    293     title = u'Administration'
     285    label = u'Administration'
    294286    pnav = 0
    295287
    … …  
    338330    grok.context(IUsersContainer)
    339331    grok.name('index')
    340     title = 'Portal Users'
     332    label = 'Portal Users'
    341333
    342334    def update(self, userid=None, adduser=None, manage=None, delete=None):
    … …  
    376368    form_fields = grok.AutoFields(IUserAccount)
    377369    label = 'Add user'
    378     title = 'Portal Users'
    379370
    380371    @action('Add user', style='primary')
    … …  
    416407    form_fields = grok.AutoFields(IUserAccount).omit('name')
    417408
    418     title = "Portal Users"
    419 
    420409    def label(self):
    421410        return "Edit user %s" % self.context.__name__
    … …  
    456445    pnav = 0
    457446    form_fields = grok.AutoFields(IContactForm).select('body')
    458     title = u'Contact'
    459447
    460448    def label(self):
    … …  
    494482        self.widgets['title'].displayWidth = 30
    495483
    496     def title(self):
    497         return "%s (%s)" % (self.context.title, self.context.__name__)
    498 
    499484class MyRolesPage(SIRPPage):
    500485    """Display site roles and local roles assigned to officers.
    … …  
    504489    grok.context(IUserAccount)
    505490    grok.template('myrolespage')
    506     title = 'Portal Users'
    507491    label = u"My Roles"
    508 
    509     def title(self):
    510         return "%s (%s)" % (self.context.title, self.context.__name__)
    511492
    512493    @property
    … …  
    540521    grok.template('searchpage')
    541522    grok.require('waeup.manageUniversity')
    542     title = u"Academics"
    543523    label = u"Search Academic Section"
    544524    pnav = 1
    … …  
    568548    pnav = 0
    569549    label = u'View portal configuration'
    570     title = u'Portal Configuration'
    571550    form_fields = grok.AutoFields(IConfigurationContainer)
    572551    form_fields['frontpage'].custom_widget = ReSTDisplayWidget
    … …  
    582561    pnav = 0
    583562    label = u'Edit portal configuration'
    584     title = u'Portal Configuration'
    585563    taboneactions = ['Save', 'Update plugins']
    586564    tabtwoactions = [
    … …  
    634612    grok.require('waeup.managePortalConfiguration')
    635613    label = 'Add session configuration'
    636     title = 'Configuration'
    637614    form_fields = grok.AutoFields(ISessionConfigurationAdd)
    638615    pnav = 0
    … …  
    665642
    666643    @property
    667     def title(self):
    668         session_string = self.context.getSessionString()
    669         return 'Academic Session %s Configuration' % session_string
    670 
    671     @property
    672644    def label(self):
    673645        session_string = self.context.getSessionString()
    … …  
    694666    grok.name('index')
    695667    grok.require('waeup.manageUniversity')
    696     title = u'Data Center'
     668    label = u'Data Center'
    697669    pnav = 0
    698670
    … …  
    701673    grok.name('upload')
    702674    grok.require('waeup.manageUniversity')
    703     title = u'Data Center'
    704675    label = u'Upload file'
    705676    pnav = 0
    … …  
    748719    grok.template('datacenterimport1page')
    749720    grok.require('waeup.manageUniversity')
    750     title = u'Data Center'
    751721    label = u'Process CSV file'
    752722    pnav = 0
    … …  
    778748    grok.template('datacenterimport2page')
    779749    grok.require('waeup.manageUniversity')
    780     title = u'Data Center'
    781750    label = u'Process CSV file'
    782751    pnav = 0
    … …  
    896865    grok.template('datacenterimport3page')
    897866    grok.require('waeup.manageUniversity')
    898     title = u'Data Center'
    899867    label = u'Process CSV file'
    900868    pnav = 0
    … …  
    1000968    grok.template('datacenterimport4page')
    1001969    grok.require('waeup.manageUniversity')
    1002     title = u'Data Center'
    1003970    label = u'Process CSV file'
    1004971    pnav = 0
    … …  
    10551022    grok.template('datacenterlogspage')
    10561023    grok.require('waeup.manageUniversity')
    1057     title = u'Data Center'
    10581024    label = u'Show logfiles'
    10591025    pnav = 0
    … …  
    10781044    title = u'Data Center'
    10791045    pnav = 0
     1046
     1047    def label(self):
     1048        return "Logfile %s" % self.filename
    10801049
    10811050    def update(self, show=None, remove=None, back=None):
    … …  
    10951064    grok.template('datacentermanagepage')
    10961065    grok.require('waeup.manageUniversity')
    1097     title = u'Data Center'
    10981066    label = 'Edit data center settings'
    10991067    pnav = 0
    … …  
    11791147    grok.require('waeup.viewAcademics')
    11801148    grok.name('index')
    1181     title = 'Academics'
    11821149    label = 'Academic Section'
    11831150    pnav = 1
    … …  
    11941161    taboneactions = ['Add faculty', 'Remove selected','Cancel']
    11951162    subunits = 'Faculties'
    1196     title = 'Academics'
    11971163
    11981164    @property
    … …  
    12281194    grok.name('add')
    12291195    label = 'Add faculty'
    1230     title = 'Academics'
    12311196    form_fields = grok.AutoFields(IFacultyAdd)
    12321197    pnav = 1
    … …  
    12591224
    12601225    @property
    1261     def title(self):
    1262         return self.context.longtitle()
    1263 
    1264     @property
    12651226    def label(self):
    12661227        return 'Departments'
    … …  
    12851246    def label(self):
    12861247        return 'Manage faculty'
    1287 
    1288     @property
    1289     def title(self):
    1290         return self.context.longtitle()
    12911248
    12921249    def update(self):
    … …  
    13471304    form_fields = grok.AutoFields(IDepartmentAdd)
    13481305    pnav = 1
    1349 
    1350     @property
    1351     def title(self):
    1352         return self.context.longtitle()
    13531306
    13541307    @action('Add department', style='primary')
    … …  
    13801333    label = 'Courses and Certificates'
    13811334
    1382     @property
    1383     def title(self):
    1384         return self.context.longtitle()
    1385 
    13861335    def update(self):
    13871336        tabs.need()
    … …  
    14131362    pnav = 1
    14141363    label = 'Students'
    1415 
    1416     @property
    1417     def title(self):
    1418         return self.context.longtitle()
    14191364
    14201365    @property
    … …  
    14641409        return 'Manage department'
    14651410
    1466     @property
    1467     def title(self):
    1468         return self.context.longtitle()
    1469 
    14701411    def getCourses(self):
    14711412        """Get a list of all stored courses.
    … …  
    15521493    form_fields = grok.AutoFields(ICourseAdd)
    15531494    pnav = 1
    1554 
    1555     @property
    1556     def title(self):
    1557         return self.context.longtitle()
    15581495
    15591496    @action('Add course')
    … …  
    15941531    pnav = 1
    15951532
    1596     @property
    1597     def title(self):
    1598         return self.context.longtitle()
    1599 
    16001533    @action('Add certificate')
    16011534    def addCertificate(self, **data):
    … …  
    16391572
    16401573    @property
    1641     def title(self):
    1642         return 'Course: %s (%s)' % (self.context.title, self.context.code)
     1574    def label(self):
     1575        return '%s (%s)' % (self.context.title, self.context.code)
    16431576
    16441577class CourseManageFormPage(SIRPEditFormPage):
    … …  
    16521585
    16531586    form_fields = grok.AutoFields(ICourse)
    1654 
    1655     @property
    1656     def title(self):
    1657         return 'Course: %s (%s)' % (self.context.title, self.context.code)
    16581587
    16591588    @action('Save', style='primary')
    … …  
    16871616
    16881617    @property
    1689     def title(self):
    1690         return "Certificate: %s (%s)" % (self.context.title, self.context.code)
     1618    def label(self):
     1619        return "%s (%s)" % (self.context.title, self.context.code)
    16911620
    16921621    def update(self):
    … …  
    17191648        return 'Manage certificate'
    17201649
    1721     @property
    1722     def title(self):
    1723         return "Certificate: %s (%s)" % (self.context.title, self.context.code)
    1724 
    17251650    def update(self):
    17261651        tabs.need()
    … …  
    17831708    pnav = 1
    17841709    label = 'Add course referrer'
    1785 
    1786     @property
    1787     def title(self):
    1788         return "Certificate: %s (%s)" % (self.context.title, self.context.code)
    17891710
    17901711    @action('Add course referrer')
    … …  
    18171738
    18181739    @property
    1819     def title(self):
    1820         return 'Course Referrer: %s' % (self.context.longtitle())
     1740    def label(self):
     1741        return '%s' % (self.context.longtitle())
    18211742
    18221743    @property
    … …  
    18331754    label = 'Edit course referrer'
    18341755    pnav = 1
    1835 
    1836     @property
    1837     def title(self):
    1838         return 'Course Referrer: %s' % (self.context.__name__)
    18391756
    18401757    @action('Save and return')

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/static/mobile.css

    r7459 r7465  
    11.container {
    2   width: 480px;
     2  width: 300px;
    33}
    44
    55body {
    6   padding-top: 60px;
     6  padding-top: 70px;
    77}
    88

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css

    r7459 r7465  
    6969  width: 180px;
    7070}
     71
     72h1 {
     73  font-size: 26px;
     74}
     75h2 {
     76  font-size: 22px;
     77}
     78h3 {
     79  font-size: 16px;
     80}
     81h4 {
     82  font-size: 14px;
     83}
     84h5 {
     85  font-size: 13px;
     86}
     87h6 {
     88  font-size: 12px;
     89}
     90
     91
    7192
    7293 /* IE doesn't like the footer tag*/

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/administrationpage.pt

    r6907 r7465  
    1 <h2>Administration</h2>
    2 
    31<p>
    42  You can manage the following tasks:

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatecoursepage.pt

    r7459 r7465  
    1 <h2 tal:content="context/longtitle">TITLE</h2>
    2 
    31<table class="form-table">
    42  <thead>

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatepage.pt

    r7459 r7465  
    1 <h2 tal:content="context/longtitle">TITLE</h2>
    2 
    31<table class="form-table">
    42<thead>

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/coursepage.pt

    r7459 r7465  
    1 <h2 tal:content="context/title">TITLE</h2>
    2 
    31<table class="form-table">
    42  <thead>

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogsshowfilepage.pt

    r7459 r7465  
    1 <h2>
    2   Logfile <span tal:replace="view/filename">file.csv</span>
    3 </h2>
    4 
    51<form method="POST">
    62  <input class="btn primary" type="submit" name="back" value="Back" />

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterpage.pt

    r7459 r7465  
    1 <h2>Data Center</h2>
    2 
    31<p>
    42The data center helps you to manage portal data. You can upload CSV

  • main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/userscontainerpage.pt

    r7459 r7465  
    1 <h2>Portal Users</h2>
    2 
    31<table>
    42  <thead>
Note: See TracChangeset for help on using the changeset viewer.