← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/base/ivle-headings.html

Replaced Python config files (conf.py) with new config files system, using
    configobj (INI-file style config files).

setup.py config now produces ./etc/ivle.conf, a new-style config file.
ivle/conf/conf.py is now part of the IVLE source code. It reads the new config
file and provides the same legacy interface, so all of IVLE still functions,
including setup.py config.

Added /etc to the source tree (config files will be stored here).
Added configobj as a dependency in doc/setup/install_proc.txt.

setup.py install copies ./etc/ivle.conf into /etc/ivle/ivle.conf.

Removed boilerplate code generation from setup/configure.py (that code is now
part of ivle/conf/conf.py which is now in the source tree).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/base/ivle-headings.html
10
10
 
11
11
      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
12
12
 
13
 
      <script py:if="not publicmode and write_javascript_settings" type="text/javascript">
 
13
      <script py:if="write_javascript_settings" type="text/javascript">
14
14
        root_dir = "${root_dir}";
15
15
        public_host = "${public_host}";
16
16
        username = "${login}";
18
18
 
19
19
      <link py:if="favicon" rel="shortcut icon" href="${favicon}" />
20
20
 
21
 
      <py:for each="style in styles">
 
21
      <link rel="stylesheet" type="text/css" href="/media/common/ivle.css" />
 
22
 
 
23
      <script type="text/javascript" src="/media/common/util.js"></script>
 
24
      <script type="text/javascript" src="/media/common/json2.js"></script>
 
25
      <script type="text/javascript" src="/media/common/md5.js"></script>
 
26
      <script type="text/javascript" src="/media/common/tos.js"></script>
 
27
 
 
28
      <!-- Plugin style sheets and JavaScript -->
 
29
      <py:for each="style in app_styles">
22
30
        <link rel="stylesheet" type="text/css" href="${style}" />
23
31
      </py:for>
24
32
 
47
55
            <span id="usernick">${nick}</span>
48
56
            (<span class="username">${login}</span>) |
49
57
            <a href="/~${login}/+settings">Settings</a> |
50
 
            <py:choose>
51
 
              <a py:when="defined('help_path')" href="/+help/${help_path}">Help</a>
52
 
              <a py:otherwise="" href="/+help/">Help</a>
53
 
            |</py:choose>
54
 
            <a href="/+logout">Sign out</a>
 
58
            <a href="/help">Help</a> |
 
59
            <a href="/logout">Sign out</a>
55
60
          </p>
56
61
          <p py:otherwise="" class="userhello">Not logged in.</p>
57
62
        </py:choose>
58
63
      </div>
59
 
      <div py:if="logged_in" id="ivleheader_tabs">
 
64
      <div id="ivleheader_tabs">
60
65
        <ul id="apptabs">
61
66
          <py:for each="app in apps_in_tabs">
62
67
            <li py:if="app['this_app']" class="thisapp"><py:if test="app['has_icon']"><img src="${app['icon_url']}" alt="" /> </py:if><a href="${app['path']}" title="${app['desc']}">${app['name']}</a></li>
65
70
        </ul>
66
71
      </div>
67
72
      <div id="ivlebody">
68
 
        <div id="ivleview">
69
 
          ${select('*')}
70
 
        </div>
71
 
        <div id="ivleoverlays">
72
 
          <py:for each="overlay in overlays">
73
 
            ${overlay}
74
 
          </py:for>
75
 
        </div>     
 
73
        ${select('*')}
76
74
      </div>
 
75
      <div id="ivleoverlays">
 
76
        <py:for each="overlay in overlays">
 
77
          ${overlay}
 
78
        </py:for>
 
79
      </div>     
77
80
    </body>
78
81
  </py:match>
79
82
  ${app_template}