Changeset 12912


Ignore:
Timestamp:
8 May 2015, 07:03:44 (10 years ago)
Author:
Henrik Bettermann
Message:
 
Location:
main/waeup.kofa/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/trunk/CHANGES.txt

    r12901 r12912  
    441.3.2.dev0 (unreleased)
    55=======================
     6
     7* Rename 'Portal Users' 'Officers'.
    68
    79* Add link 'Kofa Docs for this page' at the end of the content box

  • main/waeup.kofa/trunk/docs/source/userdocs/academics.rst

    r12910 r12912  
    2727:ref:`treelike storage of objects <object_database>`.
    2828
     29.. note::
     30
     31  In the user handbook we do not describe how to browse the user
     32  interface of Kofa. The menu navigation should be
     33  self-explanatory and it's quite easy to follow the menu
     34  prompts. However, in the beginning of the development of Kofa,
     35  we used extensive doc tests which describe the navigation very
     36  well. Thus navigating through the academic section and other
     37  parts of Kofa with a test browser is perfectly described in
     38  :ref:`browser.txt <browser_txt>`.
     39
    2940Faculties
    3041=========
    … …  
    4354
    4455  .. autoattribute:: waeup.kofa.university.faculty.Faculty.local_roles
     56
    4557
    4658Departments
    … …  
    6274
    6375  .. autoattribute:: waeup.kofa.university.department.Department.local_roles
     76
    6477
    6578Courses
    … …  
    98111   :noindex:
    99112
     113
    100114Certificates
    101115============
    … …  
    127141  programme.
    128142
     143
    129144Certificate Courses
    130145===================
    … …  
    143158
    144159No local role can be assigned at certificate course tree level.
    145 
    146 

  • main/waeup.kofa/trunk/docs/source/userdocs/index.rst

    r12863 r12912  
    1717   reports
    1818   configuration
     19   testing
    1920   buildingdocs

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/breadcrumbs.py

    r10655 r12912  
    150150    """
    151151    grok.context(IUsersContainer)
    152     title = _(u'Portal Users')
     152    title = _(u'Officers')
    153153    parent_viewname = 'administration'
    154154

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/breadcrumbs.txt

    r7811 r12912  
    9292    >>> blist3 = getBreadcrumbListForView(page)
    9393    >>> [x.title for x in blist3]
    94     [u'Home', u'Administration', u'Portal Users']
     94    [u'Home', u'Administration', u'Officers']
    9595
    9696..note:: This works only for views created with grokcore.component
    … …  
    112112    >>> mybccontainer = IBreadcrumbContainer(page)
    113113    >>> [x.title for x in mybccontainer]
    114     [u'Home', u'Administration', u'Portal Users']
     114    [u'Home', u'Administration', u'Officers']
    115115
    116116It is, however, not a real Python list but only an iterable

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/browser.txt

    r11794 r12912  
    22*************
    33
    4 Here we visit all parts of a Kofa portal using a browser.
     4Here we visit parts of a Kofa portal using a browser.
    55
    66University
    … …  
    3939
    4040We can change to German::
     41
    4142  >>> browser.getLink('de').click()
    4243  >>> print browser.contents
    … …  
    4748And then change back to English by clicking on the third link containing 'en'
    4849behind 'Anfragen' and 'Einloggen'::
     50
    4951  >>> browser.getLink('en', index=2).click()
    5052  >>> print browser.contents
    … …  
    165167
    166168
    167 Portal Users
    168 ============
     169Officers
     170========
    169171
    170172  >>> browser.open('http://localhost/myuniversity')
    171   >>> browser.getLink('Portal Users').click()
    172   >>> print browser.contents
    173   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    174   ...Portal Users...
    175   ...
    176 
    177 We can add users:
     173  >>> browser.getLink('Officers').click()
     174  >>> print browser.contents
     175  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
     176  ...Officers...
     177  ...
     178
     179We can add officers:
    178180
    179181  >>> browser.getLink("Add user").click()
    … …  
    213215  ...
    214216
    215 Users can't be added twice:
     217Officers can't be added twice:
    216218
    217219  >>> browser.open('http://localhost/myuniversity/users/add')
    … …  
    228230  True
    229231
    230 Users can be deleted:
     232Officers can be deleted:
    231233
    232234  >>> browser.open('http://localhost/myuniversity/users')
    … …  
    366368  ...
    367369
    368 On the portal user page the new local role is displayed:
    369 
    370   >>> browser.getLink("Portal Users").click()
     370On the officers page the new local role is displayed:
     371
     372  >>> browser.getLink("Officers").click()
    371373  >>> print browser.contents
    372374  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    … …  
    583585instances.
    584586
    585 To ease the life of users we do not require to browse the
     587To ease the life of officers we do not require to browse the
    586588coursescontainers (which have a rather flat user interface), but
    587589provide adding of courses in department views.
    … …  
    735737On the portal user page the new local role is displayed:
    736738
    737   >>> browser.getLink("Portal Users").click()
     739  >>> browser.getLink("Officers").click()
    738740  >>> print browser.contents
    739741  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    … …  
    826828:class:`waeup.kofa.university.department.Department` instances.
    827829
    828 To ease the life of users we do not require to browse the
     830To ease the life of officers we do not require to browse the
    829831certificatescontainers (which have in fact no user interface), but
    830832provide adding of certificates in department views.

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

    r12910 r12912  
    532532    grok.context(IUsersContainer)
    533533    grok.name('index')
    534     label = _('Portal Users')
     534    label = _('Officers')
    535535    manage_button = _(u'Manage')
    536536    delete_button = _(u'Remove')
    … …  
    23792379                    result.reg_number == identifier:
    23802380                    return result
    2381         # Search portal user
     2381        # Search officer
    23822382        user = grok.getSite()['users'].get(identifier, None)
    23832383        if user is not None and user.email == email:

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/viewlets.py

    r12900 r12912  
    329329
    330330    link = u'users'
    331     text = _(u'Portal Users')
     331    text = _(u'Officers')
    332332
    333333class ManageDataCenter(ManageLink):
    … …  
    756756    grok.require('waeup.manageUsers')
    757757
    758     link_title = _('Portal Users')
     758    link_title = _('Officers')
    759759    target_viewname = 'users'
    760760   
Note: See TracChangeset for help on using the changeset viewer.