← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/help/toc.html

  • Committer: Matt Giuca
  • Date: 2009-04-25 14:37:42 UTC
  • mfrom: (1195.1.19 marks-fix)
  • Revision ID: matt.giuca@gmail.com-20090425143742-741mh2plk0cgib3e
Merged branch marks-fix. Fixes Google Code issue 144.

bin/ivle-marks: Completely rewritten. (Was hopelessly out-of-date, and didn't
    work at all. Now works on the current database model, and has new features
    to boot - able to select the semester and cutoff date).

ivle.worksheet.utils: Added calculate_mark, which is from the duplicated code
    in both bin/ivle-marks and ivle.webapp.tutorial.OfferingView.populate.
    Also added some extra optional arguments for calculating
    exercise/worksheet scores from a particular date.

ivle.webapp.tutorial: Call ivle.worksheet.utils.calculate_mark instead of
    manually calculating (avoid code duplication).

ivle.database: A few new methods on the Subject class, for retrieving
    offerings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/help/toc.html
6
6
  <body>
7
7
    <h1>Help</h1>
8
8
    <div id="ivle_padding">
9
 
      <py:def function="show_toc(helptree)">
10
 
        <py:for each="item in helptree.values()">
11
 
          <py:if test="isinstance(item, HelpTree)">
12
 
            <li><strong>${item.name}</strong>
 
9
      <py:def function="show_toc(toc_part, path)">
 
10
        <py:for each="part in toc_part">
 
11
          <py:if test="isinstance(toc_part[part], dict)">
 
12
            <li><strong>${part}</strong>
13
13
              <ul>
14
 
                ${show_toc(item)}
 
14
                ${show_toc(toc_part[part], path + '/' + part)}
15
15
              </ul>
16
16
            </li>
17
17
          </py:if>
18
 
          <py:if test="isinstance(item, HelpEntry)">
19
 
            <li><a href="${req.publisher.generate(item)}">${item.name}</a></li>
 
18
          <py:if test="isinstance(toc_part[part], basestring)">
 
19
            <li><a href="${path + '/' + part}">${part}</a></li>
20
20
          </py:if>
21
21
        </py:for>
22
22
      </py:def>
23
23
      <ul>
24
 
        ${show_toc(context)}
 
24
        ${show_toc(toc, '/+help')}
25
25
        <li><a href="/+tos">Terms of Service</a></li>
26
26
      </ul>
27
27
    </div>