Changeset 7666

Timestamp:

19 Feb 2012, 08:21:39 (13 years ago)

Author:

Henrik Bettermann

Message:

setup.py: Add zope.app.undo.

fix_import_file.py: rename core_or_elective

Some minor changes in rst files.

Location:

main/waeup.sirp/trunk

Files:

• docs/source/_templates/mainpage.template (modified) (3 diffs)
• docs/source/conf.py (modified) (1 diff)
• docs/source/contents.rst (modified) (2 diffs)
• docs/source/developerdocs/developernotes.rst (modified) (3 diffs)
• setup.py (modified) (1 diff)
• tools/fix_import_file.py (modified) (2 diffs)

main/waeup.sirp/trunk/docs/source/_templates/mainpage.template

@@ -20 +20 @@
     <p class="biglink">
       <a class="biglink" 
-         href="{{ pathto("userdocs/index") }}">User documentation</a><br />
+         href="{{ pathto("userdocs/index") }}">User Documentation</a><br />
     <span class="linkdescr">
       Documentation for users and admins using waeup.sirp.
@@ -34 +34 @@
     <p class="biglink">
       <a class="biglink" 
-         href="{{ pathto("developerdocs/index") }}">Developer documentation</a><br />
+         href="{{ pathto("developerdocs/index") }}">Developer Documentation</a><br />
       <span class="linkdescr">
         <a href="{{ pathto("developerdocs/api/index") }}">API</a> and other pieces
@@ -68 +68 @@
     <p class="biglink">
       <a class="biglink" 
-         href="{{ pathto("bugs") }}">Reporting bugs</a><br />
+         href="{{ pathto("bugs") }}">Reporting Bugs</a><br />
     </p>
 
     <p class="biglink">
       <a class="biglink" 
-         href="{{ pathto("documentation") }}">About the documentation</a><br />
+         href="{{ pathto("documentation") }}">About the Documentation</a><br />
     </p>
 

main/waeup.sirp/trunk/docs/source/conf.py

@@ -48 +48 @@
 
 # General information about the project.
-project = u'WAeUP SIRP'
+project = u'WAeUP.SIRP'
 copyright = u'2011, WAeUP Team'
 

main/waeup.sirp/trunk/docs/source/contents.rst

@@ -1 +1 @@
 .. _contents:
 
-`waeup.sirp` documentation contents
-===================================
+WAeUP.SIRP Documentation Contents
+=================================
 
 .. toctree::
@@ -17 +17 @@
    documentation
 
-Indices and tables
+Indices and Tables
 ==================
 

main/waeup.sirp/trunk/docs/source/developerdocs/developernotes.rst

@@ -2 +2 @@
 ***************
 
-How to setup a developer instance of the WAeUP SIRP, handle tests, docs
+How to setup a developer instance of the WAeUP.SIRP, handle tests, docs
 etc.
 
-The new WAeUP SIRP is based on `Grok <http://grok.zope.org/>`_.
+The new WAeUP.SIRP is based on `Grok <http://grok.zope.org/>`_.
 
 Installing a developer copy
@@ -15 +15 @@
 --------------------
 
-To create a working copy of the WAeUP SIRP we recommend use of
+To create a working copy of the WAeUP.SIRP we recommend use of
 `virtualenv`. You, however, need also some basic libraries, a C
 compiler and some things more.
@@ -127 +127 @@
 In the sandbox (or anywhere else) we now create our real working
 environment. To do this, we change to the sandbox and checkout the
-sources of the WAeUP SIRP from the subversion server::
+sources of the WAeUP.SIRP from the subversion server::
 
   $ cd mysandbox/

main/waeup.sirp/trunk/setup.py

@@ -27 +27 @@
     'zope.app.file',
     'zope.app.testing',        # XXX: test_permissions needs this
+    'zope.app.undo',
     'zope.file',
     'zope.interface >= 3.6.0',

main/waeup.sirp/trunk/tools/fix_import_file.py

@@ -65 +65 @@
 # Mapping input file colnames --> output file colnames
 COLNAME_MAPPING = {
-    # base date
+    # base data
     'jamb_reg_no': 'reg_number',
     'matric_no': 'matric_number',
@@ -77 +77 @@
     # course ticket
     'level_id': 'level',
+    'core_or_elective': 'mandatory',
     # payment ticket
     'order_id': 'p_id',