Ignore:
Timestamp:
21 Jun 2011, 11:09:33 (14 years ago)
Author:
Henrik Bettermann
Message:

Implement search function for academic section. The courses_catalog and the certcourses_catalog are searched.

Remove search pages for students. Student search will be done in the upcoming student package.

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

Legend:

Unmodified
Added
Removed

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

    r6368 r6447  
    3131    ICertificateAdd, ICertificateCourse, ICertificateCourseAdd)
    3232from waeup.sirp.browser.resources import warning, datepicker, tabs, datatable
    33 from waeup.sirp.catalog import search_context
    3433from waeup.sirp.interfaces import(
    3534    IWAeUPObject, IUserContainer, IUserAccount, IDataCenter,
    … …  
    332331# Search pages...
    333332#
    334 class SearchStudentPage(WAeUPPage):
    335     grok.context(IUniversity)
    336     grok.name('searchstudent')
    337     grok.template('searchstudentpage')
    338     grok.require('waeup.viewStudents')
    339     title = u"Student Search"
    340     pnav = 2
    341 
    342     def update(self, query=None):
    343         self.search_result = []
    344         if query is not None:
    345             self.search_result = search_context(query)
    346             print "RESULT: ", list(self.search_result)
    347 
    348333
    349334class SearchPage(WAeUPPage):
    350     grok.context(IUniversity)
     335    """General search page for the academics section.
     336    """
     337    grok.context(IFacultyContainer)
    351338    grok.name('search')
    352339    grok.template('searchpage')
    353340    grok.require('waeup.manageUniversity')
    354     title = u"Site Search"
    355     pnav = 2
     341    title = u"Academics"
     342    label = u"Search Academic Section"
     343    pnav = 1
    356344
    357345    def update(self, *args, **kw):
     346        datatable.need()
    358347        form = self.request.form
    359348        self.hitlist = []

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

    r6341 r6447  
    5252}
    5353
     54.block .bd {
     55    padding-bottom: 3em;
     56}
     57
    5458/* Define different styles for headlines in rendered restructured text */
    5559
    … …  
    9195.dataTables_wrapper {
    9296  min-height: 100px;
     97}
     98
     99.dataTables_info {
     100  padding-top: 10px;
     101}
     102
     103.dataTables_paginate {
     104  padding-top: 10px;
    93105}
    94106

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

    r4789 r6447  
    1 <h3>Search the site</h3>
     1<h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
    22<form method="post">
    33  <input type="text" name="query"
    44         tal:attributes="value view/query" />
    5     <input type="submit" name="SUBMIT" value="search..." />
     5    <input type="submit" name="SUBMIT" value="Search" />
    66</form>
    7 <div tal:condition="view/hitlist">
    8   <h4>Results (<span tal:replace="python: len(view.hitlist)" />):</h4>
    9   <div tal:repeat="item view/hitlist">
    10     <a href=""
    11        tal:attributes="href item/url"
    12        tal:content="item/title">Search Item Title</a>
    13     <div tal:content="item/description">
    14       Longer description of item...
    15     </div>
    16   </div>
    17 </div>
     7<br />
     8<span tal:condition="view/hitlist">
     9    <h3>Results:</h3>
     10    <table class="display dataTable">
     11        <thead>
     12            <tr>
     13                <th>Code</th>
     14                <th>Title</th>
     15                <th>Type</th>
     16            </tr>
     17        </thead>
     18        <tbody>
     19            <tr tal:repeat="item view/hitlist"  class="gradeB">
     20            <td>
     21                <a href="" tal:attributes="href item/url"
     22                           tal:content="item/code">Code</a>
     23            </td>
     24            <td tal:content="item/title">
     25                Title
     26            </td>
     27            <td tal:content="item/type">
     28                Type
     29            </td>
     30            </tr>
     31        </tbody>
     32    </table>
     33</span>

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

    r6212 r6447  
    2020manager_pages = [
    2121    # The pages that should only be accessible by manager...
    22     '/@@manage', '/@@administration', '/@@searchstudent', '/@@search',
     22    '/@@manage', '/@@administration', '/faculties/@@search',
    2323    '/users/@@index', '/users/@@add', '/users/alice/@@index',
    2424    '/datacenter/@@index', '/datacenter/@@upload', '/datacenter/@@import1',

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

    r6396 r6447  
    346346    grok.view(FacultyContainerPage)
    347347    text = 'Manage academic section'
     348
     349class SearchFacultyContainerActionButton(ManageActionButton):
     350    """ 'Manage settings' button for faculties.
     351    """
     352    grok.context(IFacultyContainer)
     353    grok.view(FacultyContainerPage)
     354    text = 'Search academic section'
     355    icon = 'actionicon_search.png'
     356    target = '@@search'
    348357   
    349358class ManageFacultyActionButton(ManageActionButton):
Note: See TracChangeset for help on using the changeset viewer.