Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/CHANGES.txt
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/CHANGES.txt	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/CHANGES.txt	(revision 11116)
@@ -0,0 +1,47 @@
+Changes
+*******
+
+0.2 (unreleased)
+================
+
+Feature changes
+---------------
+
+* Started switch to groktoolkit (grok 1.1) based
+  application. `waeup.kofa` is not compatible with grok 1.0 anymore.
+
+* Added first rudimentary support for application plugins. Plugins are
+  looked up by the main app on creation time and created afterwards.
+
+* Added first rudimentary support for RSS2.0 feeds.
+
+* Generated filenames now have a filename extension that indicates
+  mode of processing. So fred.csv becomes fred.create.pending.csv when
+  being batch processed and something fails.
+
+* Coverage reports are now generated in ``coverage-report`` subdir of
+  build-directory.
+
+Bug fixes
+---------
+
+* Removed all references to stuff in university submodule into the
+  module itself or replaced it with proper code. This way the
+  university submodule could be factored out of the waeup.kofa
+  package. Fixed bug #23.
+
+* Fixed default obj updater in batchprocessing. Fixed bug #17.
+
+* Fixed handling of pending file names, fixed bug #16.
+
+* Removed quick importer and all related components.
+
+* Removed TestData folder. It was too heavy and test data can be
+  created on-the-fly.
+
+
+0.1 (2010-01-31)
+================
+
+Initial version. (Incomplete) rewrite from the former CPS-based
+application.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/LICENSE
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/LICENSE	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/LICENSE	(revision 11116)
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/README-zeo.txt
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/README-zeo.txt	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/README-zeo.txt	(revision 11116)
@@ -0,0 +1,156 @@
+Deploying waeup.kwarapoly as ZEO-install
+*************************************
+
+Each ZEO install consists of at least one ZEO server and normally two
+or more ZEO clients. While the ZEO server is meant to manage the ZODB
+database for clients, the clients connect to the outside world, listen
+for request and do the real dataprocessing.
+
+We prepared a `buildout` configuration that sets up one server
+configuration and two client configs. This configuration is in
+``buildout-zeo.cfg``.
+
+Generating the ZEO setup
+========================
+
+To install waeup.kwarapoly ZEO-based you can run `buildout` with the given
+(or your own) configuration file like this::
+
+  $ ./bin/buildout -c buildout-zeo.cfg
+
+This should generate all scripts necessary to run servers, clients,
+etc.
+
+Starting ZEO servers and clients
+================================
+
+First start the server::
+
+  $ ./bin/zeo_server start
+
+Clients can be started by doing::
+
+  $ ./bin/zeo_client1 start
+  $ ./bin/zeo_client2 start
+
+This will start both clients in daemon mode.
+
+Instead of ``start`` you can, as usually, start an instance in
+foreground (``fg``), etc. You know the drill.
+
+Manually starting ZEO clients
+-----------------------------
+
+This is normally not neccessary.
+
+``zeo_clientN`` scripts are basically wrappers around calls to
+``bin/paster``. You can bypass this wrapper and start a client
+'manually' like this::
+
+  $ ./bin/paster serve --pid-file var/zeo1.pid --daemon \
+        pars/etc/zeo1.ini
+
+It is important to give a pid-file as paster otherwise can not start
+different clients (they would all refer to the same pid file
+`paster.pid` and refuse to start after the first client was started).
+
+
+Setup (paramters, ports, etc.)
+==============================
+
+By default the server will listen on port 8100 for requests from
+localhost (not: from the outside world).
+
+You can change ZEO server settings in the ``[zeo_server]`` section
+of ``buildout-zeo.conf``. Run `buildout` afterwards.
+
+The clients will listen on port 8081 and 8082. You can change settings
+in ``etc/zeo1.ini.in`` and ``etc/zeo2.ini.in`` respectively. Run
+buildout after any change.
+
+If you want to change the paster wrapper for any zeo client, you can
+edit ``etc/zeo1.conf`` and/or ``etc/zeo2.conf``. Run buildout
+afterwards.
+
+Creating new clients
+====================
+
+You want more clients to be created by buildout? Easy. Three steps are
+neccessary.
+
+1. Create config files in etc/
+------------------------------
+
+Each client needs two configuration files:
+
+  - ``etc/zeoN.conf``
+       configuring the paster wrapper
+
+  - ``etc/zeoN.ini``
+       configuring the runtime config, ports, etc.
+
+Just copy over these files from the already existing zeo1/zeo2 files
+and replace ``zeo1`` or ``zeo2`` with your new name.
+
+2. Update buildout-zeo.cfg
+--------------------------
+
+Here, inside ``buildourt-zeo.cfg`` also three steps are needed.
+
+* 2.1. Create new .ini and .conf entries
+
+  The .conf and .ini files in etc/ are only templates that have to be
+  generated in their really used final location. In buildout-zeo.cfg
+  you can care for this by creating a new ``[zeoN_ini]`` and
+  ``[zeoN_conf]`` option (replacing ``N`` with a number, of course).
+
+  Just copy over existing entries and replace the mentions of ``zeo1``
+  or ``zeo2`` by your ``zeoN``.
+
+* 2.2. Create a new ``zeo_clientN`` entry
+
+  Then you have to create an entry that will generate the
+  ``zeo_clientN`` script. Again, just copy over an existing
+  ``[zeo_client1]`` entry and replace ``1`` withg your client number.
+
+* 2.3. Register the new sections in ``[buildout]`` section
+
+  When done with the above: add the new section in ``[buildout]``::
+
+    [buildout]
+      ...
+      <old entries...>
+      ...
+      zope_conf_zeo_5
+      zeo5_ini
+      zeo_client5
+
+  depending on how you named your new sections.
+
+3. Rerun ``buildout``
+---------------------
+
+When adding or removing client/server instances, make sure to stop all
+running servers/clients before rerunning buildout.
+
+To activate the new setup, rerun buildout::
+
+  $ bin/buildout -c buildout-zeo.cfg
+
+This should generate any new clients and remove older ones or just
+update configuration files.
+
+
+Considerations
+==============
+
+There are some things in the current buildout-zeo.cfg we might do not
+want. It extends the regular ``buildout.cfg`` so that we do not have
+to repeat most sections but the ``parts`` in ``[buildout]`` have to be
+listed.
+
+We need, however, not everything with a ZEO-deploy that is listed in a
+default buildout. We might do not need docs, no profiling, etc. Also a
+regular non-ZEO kofactl might not make to much sense. Therefore all
+this might be subject to changes.
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/README.txt
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/README.txt	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/README.txt	(revision 11116)
@@ -0,0 +1,10 @@
+What is `waeup.kofa`?
+*********************
+
+The WAeUP Student Information and Registration Portal. `waeup.kofa` is
+a web-based management tool for managing universities and schools.
+
+The package was created as an effort of the WAeUP group. See
+http://www.waeup.org to learn more about WAeUP.
+
+Installation instructions can be found in the User Documentation (docs folder in the file system).
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/bootstrap.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/bootstrap.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/bootstrap.py	(revision 11116)
@@ -0,0 +1,165 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+"""
+
+import os, shutil, sys, tempfile
+from optparse import OptionParser
+
+tmpeggs = tempfile.mkdtemp()
+
+usage = '''\
+[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
+
+Bootstraps a buildout-based project.
+
+Simply run this script in a directory containing a buildout.cfg, using the
+Python that you want bin/buildout to use.
+
+Note that by using --setup-source and --download-base to point to
+local resources, you can keep this script from going over the network.
+'''
+
+parser = OptionParser(usage=usage)
+parser.add_option("-v", "--version", help="use a specific zc.buildout version")
+
+parser.add_option("-t", "--accept-buildout-test-releases",
+                  dest='accept_buildout_test_releases',
+                  action="store_true", default=False,
+                  help=("Normally, if you do not specify a --version, the "
+                        "bootstrap script and buildout gets the newest "
+                        "*final* versions of zc.buildout and its recipes and "
+                        "extensions for you.  If you use this flag, "
+                        "bootstrap and buildout will get the newest releases "
+                        "even if they are alphas or betas."))
+parser.add_option("-c", "--config-file",
+                   help=("Specify the path to the buildout configuration "
+                         "file to be used."))
+parser.add_option("-f", "--find-links",
+                   help=("Specify a URL to search for buildout releases"))
+
+
+options, args = parser.parse_args()
+
+######################################################################
+# load/install distribute
+
+to_reload = False
+try:
+    import pkg_resources, setuptools
+    if not hasattr(pkg_resources, '_distribute'):
+        to_reload = True
+        raise ImportError
+except ImportError:
+    ez = {}
+
+    try:
+        from urllib.request import urlopen
+    except ImportError:
+        from urllib2 import urlopen
+
+    exec(urlopen('http://python-distribute.org/distribute_setup.py').read(), ez)
+    setup_args = dict(to_dir=tmpeggs, download_delay=0, no_fake=True)
+    ez['use_setuptools'](**setup_args)
+
+    if to_reload:
+        reload(pkg_resources)
+    import pkg_resources
+    # This does not (always?) update the default working set.  We will
+    # do it.
+    for path in sys.path:
+        if path not in pkg_resources.working_set.entries:
+            pkg_resources.working_set.add_entry(path)
+
+######################################################################
+# Install buildout
+
+ws  = pkg_resources.working_set
+
+cmd = [sys.executable, '-c',
+       'from setuptools.command.easy_install import main; main()',
+       '-mZqNxd', tmpeggs]
+
+find_links = os.environ.get(
+    'bootstrap-testing-find-links',
+    options.find_links or
+    ('http://downloads.buildout.org/'
+     if options.accept_buildout_test_releases else None)
+    )
+if find_links:
+    cmd.extend(['-f', find_links])
+
+distribute_path = ws.find(
+    pkg_resources.Requirement.parse('distribute')).location
+
+requirement = 'zc.buildout'
+version = options.version
+if version is None and not options.accept_buildout_test_releases:
+    # Figure out the most recent final version of zc.buildout.
+    import setuptools.package_index
+    _final_parts = '*final-', '*final'
+    def _final_version(parsed_version):
+        for part in parsed_version:
+            if (part[:1] == '*') and (part not in _final_parts):
+                return False
+        return True
+    index = setuptools.package_index.PackageIndex(
+        search_path=[distribute_path])
+    if find_links:
+        index.add_find_links((find_links,))
+    req = pkg_resources.Requirement.parse(requirement)
+    if index.obtain(req) is not None:
+        best = []
+        bestv = None
+        for dist in index[req.project_name]:
+            distv = dist.parsed_version
+            if _final_version(distv):
+                if bestv is None or distv > bestv:
+                    best = [dist]
+                    bestv = distv
+                elif distv == bestv:
+                    best.append(dist)
+        if best:
+            best.sort()
+            version = best[-1].version
+if version:
+    requirement = '=='.join((requirement, version))
+cmd.append(requirement)
+
+import subprocess
+if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=distribute_path)) != 0:
+    raise Exception(
+        "Failed to execute command:\n%s",
+        repr(cmd)[1:-1])
+
+######################################################################
+# Import and run buildout
+
+ws.add_entry(tmpeggs)
+ws.require(requirement)
+import zc.buildout.buildout
+
+if not [a for a in args if '=' not in a]:
+    args.append('bootstrap')
+
+# if -c was provided, we push it back into args for buildout' main function
+if options.config_file is not None:
+    args[0:0] = ['-c', options.config_file]
+
+zc.buildout.buildout.main(args)
+shutil.rmtree(tmpeggs)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/buildout-windows.cfg
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/buildout-windows.cfg	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/buildout-windows.cfg	(revision 11116)
@@ -0,0 +1,87 @@
+[buildout]
+develop = .
+parts =
+    eggbasket
+    app
+    mkdirs
+    zope_conf
+    site_zcml
+    zdaemon_conf
+    deploy_ini
+    debug_ini
+# For backward compatibility, telling buildout not to throw away
+# the data and log subdirectories from the parts directory.
+    data
+    log
+# newest = false
+
+extends = versions.cfg
+
+# eggs will be installed in the default buildout location
+# (see .buildout/default.cfg in your home directory)
+# unless you specify an eggs-directory option here.
+
+[app]
+# This creates only the paster script in bin/.
+recipe = zc.recipe.egg
+eggs = waeup.kwarapoly
+       z3c.evalexception>=2.0
+       Paste
+       PasteScript
+       PasteDeploy
+interpreter = python-console
+scripts = paster=paster
+
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
+    ${buildout:directory}/var/datacenter/media
+
+[zope_conf]
+recipe = collective.recipe.template
+input = etc/zope.conf.in
+output = ${buildout:parts-directory}/etc/zope.conf
+filestorage = ${buildout:directory}/var/filestorage
+blobstorage = ${buildout:directory}/var/blobstorage
+logfiles = ${buildout:directory}/var/log
+extra =
+# extra = <grokwarnings>True</grokwarnings>
+# 'extra' is copied verbatim. Use it for product config sections and so.
+
+# The [data] and [log] parts are still in here to instruct buildout to not
+# unintentionally throw away the parts/data and parts/log subdirectories
+# that contain the Data.fs and the log files. These files should be
+# copied to the new locations. See the upgrade notes for more information.
+[data]
+recipe = zc.recipe.filestorage
+
+[log]
+recipe = zc.recipe.filestorage
+
+[site_zcml]
+recipe = collective.recipe.template
+input = etc/site.zcml.in
+output = ${buildout:parts-directory}/etc/site.zcml
+
+[zdaemon_conf]
+recipe = collective.recipe.template
+input = etc/zdaemon.conf.in
+output = ${buildout:parts-directory}/etc/zdaemon.conf
+
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+
+[eggbasket]
+recipe = z3c.recipe.eggbasket
+eggs = grok
+url = http://grok.zope.org/releaseinfo/grok-eggs-1.1.tgz
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/buildout-zeo.cfg
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/buildout-zeo.cfg	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/buildout-zeo.cfg	(revision 11116)
@@ -0,0 +1,130 @@
+# A buildout configuration for a ZEO server and two ZEO clients.
+#
+[buildout]
+extends = buildout.cfg
+parts =
+    eggbasket
+    app
+    i18n
+    test
+    mkdirs
+    zpasswd
+    zope_conf
+    site_zcml
+    zdaemon_conf
+    deploy_ini
+    debug_ini
+    profile_ini
+    zeo1_ini
+    zeo2_ini
+    waeupdocs
+    coverage-detect
+    coverage-report
+# kofactl creation must be _after_ app!
+    kofactl
+# For backward compatibility, telling buildout not to throw away
+# the data and log subdirectories from the parts directory.
+    data
+    log
+
+    zeo_server
+    zope_conf_zeo_1
+    zope_conf_zeo_2
+    zeo1_ini
+    zeo2_ini
+    zeo1_conf
+    zeo2_conf
+    zeo_client1
+    zeo_client2
+
+[zeo_server]
+recipe = zc.zodbrecipes:server
+zeo.conf =
+  <zeo>
+    address ${kofa_params:server_port}
+  </zeo>
+
+  <blobstorage 1>
+    blob-dir ${zope_conf:blobstorage}
+    <filestorage 1>
+      path ${zope_conf:filestorage}/Data.fs
+    </filestorage>
+  </blobstorage>
+
+  <filestorage async>
+    path ${zope_conf:filestorage}/Data.async.fs
+  </filestorage>
+
+  <eventlog>
+    # This sets up logging to a file.
+    # The "path" setting can be a relative or absolute
+    # filesystem path.
+    <logfile>
+      path ${zope_conf:logfiles}/z3.log
+      formatter zope.exceptions.log.Formatter
+    </logfile>
+    # This sets up logging to to standard output.
+    # The "path" setting can be the tokens STDOUT or STDERR
+    #  <logfile>
+    #    path STDOUT
+    #    formatter zope.exceptions.log.Formatter
+    #  </logfile>
+  </eventlog>
+
+[zope_conf_zeo_1]
+recipe = collective.recipe.template
+input = etc/zope_zeo1.conf.in
+output = ${buildout:parts-directory}/etc/zope_zeo1.conf
+filestorage = ${buildout:directory}/var/filestorage
+blobstorage = ${buildout:directory}/var/blobstorage
+logfiles = ${buildout:directory}/var/log
+extra =
+# extra = <grokwarnings>True</grokwarnings>
+# 'extra' is copied verbatim. Use it for product config sections and so.
+
+[zope_conf_zeo_2]
+recipe = collective.recipe.template
+input = etc/zope_zeo2.conf.in
+output = ${buildout:parts-directory}/etc/zope_zeo2.conf
+filestorage = ${buildout:directory}/var/filestorage
+blobstorage = ${buildout:directory}/var/blobstorage
+logfiles = ${buildout:directory}/var/log
+extra =
+# extra = <grokwarnings>True</grokwarnings>
+# 'extra' is copied verbatim. Use it for product config sections and so.
+
+[zeo1_ini]
+recipe = collective.recipe.template
+input = etc/zeo1.ini.in
+output = ${buildout:parts-directory}/etc/zeo1.ini
+
+[zeo2_ini]
+recipe = collective.recipe.template
+input = etc/zeo2.ini.in
+output = ${buildout:parts-directory}/etc/zeo2.ini
+
+[zeo1_conf]
+recipe = collective.recipe.template
+input = etc/zeo1.conf.in
+output = ${buildout:parts-directory}/etc/zeo1.conf
+
+[zeo2_conf]
+recipe = collective.recipe.template
+input = etc/zeo2.conf.in
+output = ${buildout:parts-directory}/etc/zeo2.conf
+
+
+[zeo_client1]
+# See http://pypi.python.org/pypi/zc.recipe.egg for details...
+recipe = zc.recipe.egg
+eggs = waeup.kwarapoly [beaker]
+arguments = "${buildout:parts-directory}/etc/zeo1.conf"
+scripts = kofactl=zeo_client1
+
+[zeo_client2]
+# See http://pypi.python.org/pypi/zc.recipe.egg for details...
+recipe = zc.recipe.egg
+eggs = waeup.kwarapoly [beaker]
+arguments = "${buildout:parts-directory}/etc/zeo2.conf"
+scripts = kofactl=zeo_client2
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/buildout.cfg
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/buildout.cfg	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/buildout.cfg	(revision 11116)
@@ -0,0 +1,187 @@
+[buildout]
+# See http://pypi.python.org/pypi/mr.developer for details
+extensions = mr.developer
+auto-checkout = waeup.kofa kofacustom.nigeria
+# We cannot use 'src' (the default) as the checked out projects won't
+# work properly with paster (paster looks up any upper directory
+# egg-info dirs and then complains about not-available packages).
+sources-dir = sources
+develop = .
+parts =
+    eggbasket
+    app
+    i18n
+    test
+    mkdirs
+    zpasswd
+    zope_conf
+    site_zcml
+    zdaemon_conf
+    deploy_ini
+    debug_ini
+    profile_ini
+    waeupdocs
+    coverage-detect
+    coverage-report
+# kofactl creation must be _after_ app!
+    kofactl
+# For backward compatibility, telling buildout not to throw away
+# the data and log subdirectories from the parts directory.
+    data
+    log
+# newest = false
+
+extends = versions.cfg
+show-picked-versions = true
+update-versions-file = versions.cfg
+
+# eggs will be installed in the default buildout location
+# (see .buildout/default.cfg in your home directory)
+# unless you specify an eggs-directory option here.
+
+[sources]
+waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/trunk
+kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk
+
+[kofa_params]
+## Basic parameters for deployment.
+# default is 127.0.0.1
+host = 0.0.0.0
+# default is 8080
+base_port = 7051
+zeo1_port = 7051
+zeo2_port = 7052
+zeo3_port = 7053
+server_port = 7050
+# default 7. Number of pre-opened ZODB threads/client
+pool_size = 7
+# default 20MB. Cache size of each client (ZEO only)
+client_cache = 20MB
+# default 5000. Number of objects cached.
+object_cache = 5000
+# number of preopened paster threads, default 10
+threadpool_workers = 10
+
+[app]
+# This creates all scripts in bin/. The kofactl created here is 'faulty'.
+recipe = zc.recipe.egg
+eggs = waeup.kwarapoly [beaker]
+       z3c.evalexception>=2.0
+       Paste
+       PasteScript
+       PasteDeploy
+       repoze.profile
+       ZODB3
+interpreter = python-console
+
+[kofactl]
+# See http://pypi.python.org/pypi/zc.recipe.egg for details...
+# Here we create the kofactl script again, this time with a
+# fixed path to zdaemon.conf as argument.
+recipe = zc.recipe.egg
+eggs = waeup.kwarapoly [beaker]
+arguments = "${buildout:parts-directory}/etc/zdaemon.conf"
+scripts = kofactl=kofactl
+
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
+    ${buildout:directory}/var/datacenter/media
+    ${buildout:directory}/parts/test/datacenter
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = waeup.kwarapoly [beaker, test]
+defaults = ['--tests-pattern', '^f?tests$', '-v']
+
+# This section named so that the i18n scripts are called bin/i18n...
+[i18n]
+recipe = z3c.recipe.i18n:i18n
+packages = waeup.kwarapoly
+eggs = waeup.kwarapoly
+domain = waeup.kwarapoly
+output = src/waeup/kwarapoly/locales
+zcml =
+
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.dev:script
+eggs = waeup.kwarapoly
+module = zope.app.server.zpasswd
+method = main
+
+[zope_conf]
+recipe = collective.recipe.template
+input = etc/zope.conf.in
+output = ${buildout:parts-directory}/etc/zope.conf
+filestorage = ${buildout:directory}/var/filestorage
+blobstorage = ${buildout:directory}/var/blobstorage
+logfiles = ${buildout:directory}/var/log
+extra =
+# extra = <grokwarnings>True</grokwarnings>
+# 'extra' is copied verbatim. Use it for product config sections and so.
+
+# The [data] and [log] parts are still in here to instruct buildout to not
+# unintentionally throw away the parts/data and parts/log subdirectories
+# that contain the Data.fs and the log files. These files should be
+# copied to the new locations. See the upgrade notes for more information.
+[data]
+recipe = zc.recipe.filestorage
+
+[log]
+recipe = zc.recipe.filestorage
+
+[site_zcml]
+recipe = collective.recipe.template
+input = etc/site.zcml.in
+output = ${buildout:parts-directory}/etc/site.zcml
+
+[zdaemon_conf]
+recipe = collective.recipe.template
+input = etc/zdaemon.conf.in
+output = ${buildout:parts-directory}/etc/zdaemon.conf
+
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+
+[profile_ini]
+recipe = collective.recipe.template
+input = etc/profile.ini.in
+output = ${buildout:parts-directory}/etc/profile.ini
+
+[eggbasket]
+recipe = z3c.recipe.eggbasket
+eggs = grok
+url = http://grok.zope.org/releaseinfo/grok-eggs-1.1.tgz
+
+[waeupdocs]
+recipe = collective.recipe.sphinxbuilder
+eggs = waeup.kwarapoly[docs]
+source = ${buildout:directory}/docs/source
+build = ${buildout:directory}/docs/build
+
+# Collect test coverage data.
+[coverage-detect]
+recipe = zc.recipe.testrunner
+eggs = waeup.kwarapoly[beaker]
+defaults = ['--tests-pattern', '^f?tests$', '-v', '--coverage', 'coverage']
+
+# Create a coverage report.
+# Make sure to run bin/coverage-detect to collect the data for the report
+# first!
+[coverage-report]
+recipe = zc.recipe.egg
+eggs = z3c.coverage
+scripts = coveragereport
+arguments = ('${buildout:parts-directory}/coverage-detect/working-directory/coverage', '${buildout:directory}/coverage-report')
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/INSTALL.txt
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/INSTALL.txt	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/INSTALL.txt	(revision 11116)
@@ -0,0 +1,84 @@
+Installation on Linux production system
+***************************************
+
+.. note:: `waeup.kofa` might not work with Python > 2.6
+          currently. Use of Python 2.6 is recommended.
+
+Prerequisites
+=============
+
+The `waeup.kofa` package is based on `Grok`_, which is a Python
+framework for agile webapplication development. Grok itself is based
+on `Zope`_.
+
+.. _Grok: http://grok.zope.org/
+
+.. _Zope: http://www.zope.org/
+
+Both, Grok and Zope, are written in Python (with parts written in
+C). You therefore need `Python`_ installed.
+
+.. _Python: http://www.python.org/
+
+Note, that you also need the Python header files and a compiler to
+compile the parts written in C.
+
+To deploy `waeup.kofa` most easily, we use `zc.buildout`_
+
+.. _zc.buildout: http://cheeseshop.python.org/pypi/zc.buildout
+
+You may have setuptools already installed for your system Python. In
+that case, you may need to upgrade it first because buildout requires
+a very recent version::
+
+    $ sudo easy_install -U setuptools
+
+If this command fails because easy_install is not available, there is
+a good chance you do not have setuptools available for your system
+Python. If so, there is no problem because setuptools will be
+installed locally by buildout.
+
+Bootstrap the buildout environment::
+
+    $ python2.6 bootstrap/bootstrap.py
+
+and run the buildout command::
+
+    $ bin/buildout
+    [lots of stuff will be downloaded and installed here]
+
+Note that if you have more than one sandbox for a Zope-based web
+application, it will probably make sense to share the eggs between the
+different sandboxes.  You can tell ``zc.buildout`` to use a central
+eggs directory by creating ``~/.buildout/default.cfg`` with the
+following contents::
+
+    [buildout]
+    eggs-directory = /home/bruno/buildout-eggs
+
+Running the `waeup.kofa` application
+======================================
+
+You can start Zope with the with the following command::
+
+    $ bin/kofactl fg
+    
+Alternatively you can do:
+
+    $ bin/paster serve parts/etc/deploy.ini    
+
+If you now connect to port 8080 and log in with username 'grok',
+password 'grok', you should be able to add the grok-based applications
+(such as ``University``) from the menu.
+
+Add an instance of ``University`` and click on the link next to the
+then visible entry in the list of installed applications.
+
+Running the tests
+=================
+
+The tests are easily run by executing the test runner that's
+installed in the ``bin`` directory::
+
+    $ bin/test
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/INSTALLWIN.txt
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/INSTALLWIN.txt	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/INSTALLWIN.txt	(revision 11116)
@@ -0,0 +1,87 @@
+Installation on Windows (XP, 2000, Vista, 7)
+********************************************
+
+.. note:: `waeup.kofa` has been developed to run on Linux servers,
+          preferarbly with an Ubuntu OS. The installation on Windows computers
+          is for demonstration purposes only.
+
+Install Python
+==============
+
+**Step 1.** Install Python. Currently, version 2.6.x is supported.
+Note that these links point to installers for the ordinary x86 processor architecture.
+We recommend to download the follwoing software and install into ``C:\Python26``:
+
+| http://www.python.org/ftp/python/2.6.0/python-2.6.0.msi
+| http://sourceforge.net/project/downloading.php?group_id=78018&filename=pywin32-213.win32-py2.6.exe
+| http://pypi.python.org/packages/2.6/s/setuptools/setuptools-0.6c11.win32-py2.6.exe
+
+**Step 2**. Add ``C:\Python26\Scripts\`` to your system path:
+
+- Right-click on the My Computer icon. (Under Windows XP, Vista, or Windows 7, the My Computer Icon may be located in the start menu.)
+
+- Choose Properties from the context menu. Alternatively, you can double-click on the System icon in the Control Panel.
+
+- Click the Advanced tab or "Advanced system settings" on Windows Vista or Windows 7
+
+- Click the Environment Variables button.
+
+- Click on the variable called 'Path' and then click on Edit. Now add ``C:\Python26\Scripts\`` to the value of the variable, using a semi-colon as a separator.
+
+- Reboot Windows
+
+Install a Virtual Python Environment
+====================================
+
+**Step 3**. Open up a command window and change to the folder where you want to place the sandbox
+that will contain your Kofa project. In this HowTo we will assume and recommend this folder is ``C:\`` ::
+
+  C:\[any_path]> cd c:\
+
+**Step 4**. Install virtualenv by using the command::
+
+ C:\> easy_install virtualenv
+
+**Step 5**. Create an isolated environment (sandbox) using the command::
+
+ C:\> virtualenv winkofa
+
+**Step 6**. Activate the environment::
+
+ C:\> cd winkofa
+ C:\winkofa> Scripts\activate
+
+Note that the system prompt has changed.
+
+Run Kofa
+========
+
+**Step 7**. Copy the ``waeup.kofa`` folder into ``C:\winkofa``.
+
+**Step 8**. Run the bootstrap script::
+
+ (winkofa) C:\winkofa\waeup.kofa> cd waeup.kofa
+ (winkofa) C:\winkofa\waeup.kofa> python bootstrap\bootstrap.py -c buildout-windows.cfg
+
+**Step 9**. Run buildout (this takes a while)::
+
+ C:\winkofa\waeup.kofa> bin\buildout.exe -c buildout-windows.cfg
+
+**Step 10**. You can deactivate your environment again::
+
+ (winkofa) C:\winkofa\waeup.kofa> ..\Scripts\deactivate
+
+**Step 11**. Start your Kofa::
+
+ C:\winkofa\waeup.kofa> bin\paster serve parts\etc\deploy.ini
+
+or from anywhere in your system::
+
+ C:\[any_path]> C:\winkofa\trunk\bin\paster serve C:\winkofa\trunk\parts\etc\deploy.ini
+
+**Step 12**. Visit the Kofa website and create your university instance:
+
+| http://localhost:8080
+| user name: grok
+| password: grok
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/Makefile
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/Makefile	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/Makefile	(revision 11116)
@@ -0,0 +1,89 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html      to make standalone HTML files"
+	@echo "  dirhtml   to make HTML files named index.html in directories"
+	@echo "  pickle    to make pickle files"
+	@echo "  json      to make JSON files"
+	@echo "  htmlhelp  to make HTML files and a HTML help project"
+	@echo "  qthelp    to make HTML files and a qthelp project"
+	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  changes   to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck to check all external links for integrity"
+	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/WAeUPStudentInformationandRegistrationPortalKofa.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/WAeUPStudentInformationandRegistrationPortalKofa.qhc"
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+	      "run these through (pdf)latex."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/make.bat
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/make.bat	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/make.bat	(revision 11116)
@@ -0,0 +1,113 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+set SPHINXBUILD=sphinx-build
+set BUILDDIR=build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html      to make standalone HTML files
+	echo.  dirhtml   to make HTML files named index.html in directories
+	echo.  pickle    to make pickle files
+	echo.  json      to make JSON files
+	echo.  htmlhelp  to make HTML files and a HTML help project
+	echo.  qthelp    to make HTML files and a qthelp project
+	echo.  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  changes   to make an overview over all changed/added/deprecated items
+	echo.  linkcheck to check all external links for integrity
+	echo.  doctest   to run all doctests embedded in the documentation if enabled
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\WAeUPStudentInformationandRegistrationPortalKofa.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\WAeUPStudentInformationandRegistrationPortalKofa.ghc
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+:end
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/_templates/mainpage.template
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/_templates/mainpage.template	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/_templates/mainpage.template	(revision 11116)
@@ -0,0 +1,94 @@
+{% extends "layout.html" %}
+{% set title = 'Overview' %}
+{% block body %}
+
+<h1>{{ docstitle }}</h1>
+<p>
+  This is official documentation for waeup.sirp {{ release }}.
+  {% if last_updated %}Last modifed on {{ last_updated }}.{% endif %}
+</p>
+
+<p><strong>Sections</strong></p>
+<table class="contentstable" align="center"><tr>
+  <td width="50%">
+    <p class="biglink">
+      <a class="biglink" 
+         href="{{ pathto("intro") }}">Introduction</a><br />
+      <span class="linkdescr">Get started with waeup.sirp.</span>
+    </p>
+      
+    <p class="biglink">
+      <a class="biglink" 
+         href="{{ pathto("userdocs/index") }}">User documentation</a><br />
+    <span class="linkdescr">
+      Documentation for users and admins using waeup.sirp.
+    </span></p>
+
+    </td><td width="50%">
+    <p class="biglink">
+      <a class="biglink" 
+         href="{{ pathto("changes") }}">What's new?</a><br />
+      <span class="linkdescr">Changes made in each release.</span>
+    </p>
+
+    <p class="biglink">
+      <a class="biglink" 
+         href="{{ pathto("developerdocs/index") }}">Developer documentation</a><br />
+      <span class="linkdescr">
+        <a href="{{ pathto("developerdocs/api/index") }}">API</a> and other pieces
+        relevant for developers.
+      </span>
+    </p>
+          
+  </td></tr>
+</table>
+
+<p><strong>Indices and tables</strong></p>
+<table class="contentstable" align="center"><tr>
+  <td width="50%">
+    <p class="biglink">
+      <a class="biglink" 
+         href="{{ pathto("contents") }}">Table of Contents</a><br />
+      <span class="linkdescr">Lists all sections and subsections.</span>
+    </p>
+    </td><td width="50%">
+
+    <p class="biglink">
+      <a class="biglink" 
+         href="{{ pathto("genindex") }}">Index</a><br />
+      <span class="linkdescr">All functions, classes, terms.</span>
+    </p>
+  </td></tr>
+</table>
+
+<p><strong>Further information</strong></p>
+<table class="contentstable" align="center"><tr>
+  <td width="50%">
+
+    <p class="biglink">
+      <a class="biglink" 
+         href="{{ pathto("bugs") }}">Reporting bugs</a><br />
+    </p>
+
+    <p class="biglink">
+      <a class="biglink" 
+         href="{{ pathto("documentation") }}">About the documentation</a><br />
+    </p>
+
+    </td><td width="50%">
+              
+    <p class="biglink">
+      <a class="biglink" 
+         href="{{ pathto("license") }}">License</a><br />
+    </p>
+
+    <p class="biglink">
+      <a class="biglink" 
+         href="{{ pathto("copyright") }}">Copyright</a><br />
+    </p>
+
+    </td></tr>
+</table>
+
+
+{% endblock %}
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/bugs.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/bugs.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/bugs.rst	(revision 11116)
@@ -0,0 +1,18 @@
+.. _reporting-bugs:
+
+Reporting Bugs in `waeup.kofa`
+******************************
+
+The developers would like to know of any deficiencies you find in
+`waeup.kofa`.
+
+Also telling about errors and shortcomings in the documentation are
+welcome. Please write to ``henrik at waeup dot org`` if you find any.
+
+.. seealso::
+
+   `How to Report Bugs Effectively
+   <http://www.chiark.greenend.org.uk/~sgtatham/bugs.html>`_ Article
+   which goes into some detail about how to create a useful bug
+   report. This describes what kind of information is useful and why
+   it is useful.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/changes.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/changes.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/changes.rst	(revision 11116)
@@ -0,0 +1,1 @@
+.. include:: ../../CHANGES.txt
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/conf.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/conf.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/conf.py	(revision 11116)
@@ -0,0 +1,213 @@
+# -*- coding: utf-8 -*-
+#
+# WAeUP Student Information and Registration Portal (Kofa) documentation build configuration file, created by
+# sphinx-quickstart on Thu Jul 29 10:41:59 2010.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+import pkg_resources
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.append(os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.doctest',
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.todo',
+    'sphinx.ext.coverage',
+    'sphinx.ext.ifconfig',
+    'sphinx.ext.viewcode',
+    'repoze.sphinx.autointerface'
+    ]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'WAeUP Kofa'
+copyright = u'2011, WAeUP Team'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = pkg_resources.get_distribution('waeup.kofa').version
+#version = '0.2dev'
+# The full version, including alpha/beta/rc tags.
+#release = '0.2dev'
+release = version
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of documents that shouldn't be included in the build.
+#unused_docs = []
+
+# List of directories, relative to source directory, that shouldn't be searched
+# for source files.
+exclude_trees = []
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  Major themes that come with
+# Sphinx are currently 'default' and 'sphinxdoc'.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+html_favicon = "favicon.ico"
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+#html_additional_pages = {
+#    'index': os.path.join(os.path.dirname(__file__), 'docindex.template')}
+html_additional_pages = { 'index': 'mainpage.template'}
+# If false, no module index is generated.
+#html_use_modindex = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = ''
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'WAeUPStudentInformationandRegistrationPortalKofadoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'WAeUPStudentInformationandRegistrationPortalKofa.tex', u'WAeUP Student Information and Registration Portal (Kofa) Documentation',
+   u'WAeUP Team', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_use_modindex = True
+
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'http://docs.python.org/': None}
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/contents.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/contents.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/contents.rst	(revision 11116)
@@ -0,0 +1,25 @@
+.. _contents:
+
+`waeup.kofa` documentation contents
+===================================
+
+.. toctree::
+   :maxdepth: 2
+
+   intro
+   userdocs/index
+   developerdocs/index
+   changes
+   license
+   copyright
+   glossary
+   bugs
+   documentation
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+* :ref:`glossary`
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/copyright.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/copyright.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/copyright.rst	(revision 11116)
@@ -0,0 +1,10 @@
+Copyright
+*********
+
+`waeup.kofa` and this documentation is:
+
+Copyright © 2009-2010 The WAeUP Group. All rights reserved.
+
+----------
+
+See :ref:`license` for complete license and permissions information.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_accesscode.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_accesscode.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_accesscode.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`accesscodes.accesscode` -- AC Components
+*****************************************
+
+.. automodule:: waeup.sirp.accesscodes.accesscode
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_browser.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_browser.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_browser.rst	(revision 11116)
@@ -0,0 +1,12 @@
+`accesscodes.browser` -- AC UI Components
+*****************************************
+
+Probably due to a bug in Sphinx autodoc couldn't import/find some classes and
+reported error: "grokcore, please check your spelling and sys.path".
+Thus, automodule has been temporarily disabled.
+
+
+..
+  .. automodule:: waeup.sirp.accesscodes.browser
+     :members:
+     :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_catalog.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_catalog.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_catalog.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`accesscodes.catalog` -- AC Catalog Components
+**********************************************
+
+.. automodule:: waeup.sirp.accesscodes.catalog
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_interfaces.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_interfaces.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_interfaces.rst	(revision 11116)
@@ -0,0 +1,14 @@
+`accesscodes.interfaces` -- AC Interfaces
+*****************************************
+
+.. automodule:: waeup.sirp.accesscodes.interfaces
+   :members:
+   :undoc-members:
+
+
+   .. autointerface:: IAccessCode
+      :members:
+   .. autointerface:: IAccessCodeBatch
+      :members:
+   .. autointerface:: IAccessCodeBatchContainer
+      :members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_workflow.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_workflow.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/accesscodes/api_workflow.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`accesscodes.workflow` - AC Workflow Components
+***********************************************
+
+.. automodule:: waeup.sirp.accesscodes.workflow
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_accesscodes.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_accesscodes.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_accesscodes.rst	(revision 11116)
@@ -0,0 +1,24 @@
+`accesscodes` -- Access Codes Package
+*************************************
+
+(see also: :ref:`api-accesscodes-modules`)
+
+.. automodule:: waeup.sirp.accesscodes
+   :members:
+   :undoc-members:
+
+.. _api-accesscodes-modules:
+
+Submodules
+===========
+
+This package contains the following modules:
+
+.. toctree::
+   :maxdepth: 1
+
+   accesscodes/api_accesscode
+   accesscodes/api_browser
+   accesscodes/api_catalog
+   accesscodes/api_interfaces
+   accesscodes/api_workflow
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_app.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_app.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_app.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`app` -- University Root (Site) Module
+**************************************
+
+.. automodule:: waeup.sirp.app
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_applicants.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_applicants.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_applicants.rst	(revision 11116)
@@ -0,0 +1,30 @@
+`applicants` - Application Components Package
+*********************************************
+
+(see also: :ref:`api-applicants-modules`)
+
+.. automodule:: waeup.sirp.applicants
+   :members:
+   :undoc-members:
+
+.. _api-applicants-modules:
+
+Submodules
+----------
+
+This package bundles the following submodules:
+
+.. toctree::
+   :maxdepth: 1
+
+   applicants/api_interfaces
+   applicants/api_root
+   applicants/api_container
+   applicants/api_applicant
+   applicants/api_authentication
+   applicants/api_batching
+   applicants/api_browser
+   applicants/api_permissions
+   applicants/api_vocabularies
+   applicants/api_workflow
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_authentication.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_authentication.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_authentication.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`authentication` -- Authentication Components Module
+****************************************************
+
+.. automodule:: waeup.sirp.authentication
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_browser.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_browser.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_browser.rst	(revision 11116)
@@ -0,0 +1,27 @@
+`browser` -- Viewing Components Package
+***************************************
+
+(see also: :ref:`api-browser-modules`)
+
+.. automodule:: waeup.sirp.browser
+   :members:
+   :undoc-members:
+
+.. _api-browser-modules:
+
+Submodules
+----------
+
+This package bundles the following modules:
+
+.. toctree::
+   :maxdepth: 1
+
+   browser/api_interfaces.rst
+   browser/api_pages.rst
+   browser/api_viewlets.rst
+   browser/api_layout.rst
+   browser/api_breadcrumbs.rst
+   browser/api_theming.rst
+   browser/api_resources.rst
+   browser/api_exceptions.rst
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_catalog.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_catalog.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_catalog.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`catalog` -- Cataloging Components Module
+*****************************************
+
+.. automodule:: waeup.sirp.catalog
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_datacenter.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_datacenter.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_datacenter.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`datacenter` -- Datacenter Module
+*********************************
+
+.. automodule:: waeup.sirp.datacenter
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_interfaces.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_interfaces.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_interfaces.rst	(revision 11116)
@@ -0,0 +1,10 @@
+`interfaces` - Main Interfaces Module
+*************************************
+
+.. automodule:: waeup.sirp.interfaces
+   :members:
+   :undoc-members:
+
+.. autointerface:: waeup.sirp.interfaces.IUniversity
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_permissions.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_permissions.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_permissions.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`permissions` -- Permissions and Roles Components Module
+********************************************************
+
+.. automodule:: waeup.sirp.permissions
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_university.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_university.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_university.rst	(revision 11116)
@@ -0,0 +1,30 @@
+`university` -- University Components Package
+*********************************************
+
+(see also: :ref:`api-university-modules`)
+
+.. automodule:: waeup.sirp.university
+   :members:
+   :undoc-members:
+
+.. _api-university-modules:
+
+Submodules
+----------
+
+This package bundles the following modules:
+
+.. toctree::
+   :maxdepth: 1
+
+   university/api_interfaces
+   university/api_catalog
+   university/api_vocabularies
+   university/api_batching
+   university/api_facultycontainer
+   university/api_faculty
+   university/api_department
+   university/api_certificatecontainer
+   university/api_coursecontainer
+   university/api_course
+   university/api_certificate
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_users.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_users.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_users.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`users` -- Users (Principals) Module
+************************************
+
+.. automodule:: waeup.sirp.users
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_utils.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_utils.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_utils.rst	(revision 11116)
@@ -0,0 +1,19 @@
+`utils` -- Utilities Package
+****************************
+
+(see also: :ref:`api-utils-modules`)
+
+.. automodule:: waeup.sirp.utils
+   :members:
+   :undoc-members:
+
+.. _api-utils-modules:
+
+Submodules
+----------
+
+This package bundles the following modules:
+
+.. toctree::
+   :maxdepth: 1
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_workflow.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_workflow.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/api_workflow.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`workflow` -- Workflow Components Module
+****************************************
+
+.. automodule:: waeup.sirp.workflow
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_applicant.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_applicant.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_applicant.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`applicants.applicant` - Applicant Components
+*********************************************
+
+.. automodule:: waeup.sirp.applicants.applicant
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_authentication.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_authentication.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_authentication.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`applicants.authentication` - Applicants Authentication Components
+******************************************************************
+
+.. automodule:: waeup.sirp.applicants.authentication
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_batching.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_batching.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_batching.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`applicants.batching` - Batch Importer for Applicants
+*****************************************************
+
+.. automodule:: waeup.sirp.applicants.batching
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_browser.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_browser.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_browser.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`applicants.browser` - Applicants UI Components
+***********************************************
+
+.. automodule:: waeup.sirp.applicants.browser
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_container.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_container.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_container.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`applicants.container` - Container for Applicants
+*************************************************
+
+.. automodule:: waeup.sirp.applicants.container
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_interfaces.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_interfaces.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_interfaces.rst	(revision 11116)
@@ -0,0 +1,48 @@
+`applicants.interfaces` - Applicants Related Interfaces
+*******************************************************
+
+.. automodule:: waeup.sirp.applicants.interfaces
+   :members:
+   :undoc-members:
+
+   .. autointerface:: IResultEntry
+      :members:
+
+   .. autointerface:: IApplicantsRoot
+      :members:
+
+   .. autointerface:: IApplicantsContainer
+      :members:
+
+   .. autointerface:: IApplicantsContainerAdd
+      :members:
+
+   .. autointerface:: IApplicantBaseData
+      :members:
+
+   .. autointerface:: IApplicant
+      :members:
+
+   .. autointerface:: IApplicantEdit
+      :members:
+
+   .. autointerface:: IResultEntry
+      :members:
+
+   .. autointerface:: IApplicantPrincipalInfo
+      :members:
+
+   .. autointerface:: IApplicantPrincipal
+      :members:
+
+   .. autointerface:: IApplicantPrincipal
+      :members:
+
+   .. autointerface:: IApplicantsFormChallenger
+      :members:
+
+   .. autointerface:: IApplicantSessionCredentials
+      :members:
+
+   .. autointerface:: IApplicantsContainerProvider
+      :members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_permissions.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_permissions.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_permissions.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`applicants.permissions` - Applicants Permission Components
+***********************************************************
+
+.. automodule:: waeup.sirp.applicants.permissions
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_root.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_root.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_root.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`applicants.root` - Root for Applicants Containers
+**************************************************
+
+.. automodule:: waeup.sirp.applicants.root
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_vocabularies.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_vocabularies.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_vocabularies.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`applicants.vocabularies` - Vocabularies and Sources
+****************************************************
+
+.. automodule:: waeup.sirp.applicants.vocabularies
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_workflow.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_workflow.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/applicants/api_workflow.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`applicants.workflow` - Applicants Workflow Components
+******************************************************
+
+.. automodule:: waeup.sirp.applicants.workflow
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_breadcrumbs.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_breadcrumbs.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_breadcrumbs.rst	(revision 11116)
@@ -0,0 +1,7 @@
+`browser.breadcrumbs` - Browser Breadcrumbs
+*******************************************
+
+.. automodule:: waeup.sirp.browser.breadcrumbs
+   :members:
+   :undoc-members:
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_exceptions.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_exceptions.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_exceptions.rst	(revision 11116)
@@ -0,0 +1,7 @@
+`browser.exceptions` - Browser Exceptions
+*****************************************
+
+.. automodule:: waeup.sirp.browser.exceptions
+   :members:
+   :undoc-members:
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_interfaces.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_interfaces.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_interfaces.rst	(revision 11116)
@@ -0,0 +1,18 @@
+`browser.interfaces` - Browser Interfaces
+*****************************************
+
+.. automodule:: waeup.sirp.browser.interfaces
+   :members:
+   :undoc-members:
+
+   .. autointerface:: IBreadcrumb
+      :members:
+
+   .. autointerface:: IBreadcrumbIgnorable
+      :members:
+
+   .. autointerface:: IBreadcrumbContainer
+      :members:
+
+   .. autointerface:: ITheme
+      :members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_layout.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_layout.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_layout.rst	(revision 11116)
@@ -0,0 +1,7 @@
+`browser.layout` - Browser Layout
+*********************************
+
+.. automodule:: waeup.sirp.browser.layout
+   :members:
+   :undoc-members:
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_pages.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_pages.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_pages.rst	(revision 11116)
@@ -0,0 +1,7 @@
+`browser.pages` - Browser Pages (Views)
+***************************************
+
+.. automodule:: waeup.sirp.browser.pages
+   :members:
+   :undoc-members:
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_resources.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_resources.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_resources.rst	(revision 11116)
@@ -0,0 +1,7 @@
+`browser.resources` - Browser Resources
+***************************************
+
+.. automodule:: waeup.sirp.browser.resources
+   :members:
+   :undoc-members:
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_theming.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_theming.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_theming.rst	(revision 11116)
@@ -0,0 +1,7 @@
+`browser.theming` - Browser Theming
+***********************************
+
+.. automodule:: waeup.sirp.browser.theming
+   :members:
+   :undoc-members:
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_viewlets.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_viewlets.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/browser/api_viewlets.rst	(revision 11116)
@@ -0,0 +1,12 @@
+`browser.viewlets` - Browser Viewlets
+*************************************
+
+Probably due to a bug in Sphinx autodoc couldn't import/find some classes and
+reported error: "grokcore, please check your spelling and sys.path".
+Thus, automodule has been temporarily disabled.
+
+..
+  .. automodule:: waeup.sirp.browser.viewlets
+     :members:
+     :undoc-members:
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/index.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/index.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/index.rst	(revision 11116)
@@ -0,0 +1,28 @@
+API
+***
+
+.. automodule:: waeup.sirp
+   :members:
+
+Modules and Packages
+--------------------
+
+`waeup.sirp` provides the following modules and subpackages:
+
+.. toctree::
+   :maxdepth: 1
+
+   api_app
+   api_interfaces
+   api_authentication
+   api_catalog
+   api_permissions
+   api_datacenter
+   api_users
+   api_workflow
+   api_university
+   api_browser
+   api_applicants
+   api_accesscodes
+   api_utils
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_batching.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_batching.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_batching.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`university.batching` - Importer Components
+*******************************************
+
+.. automodule:: waeup.sirp.university.batching
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_catalog.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_catalog.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_catalog.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`university.catalog` - Cataloging Components
+********************************************
+
+.. automodule:: waeup.sirp.university.catalog
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_certificate.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_certificate.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_certificate.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`university.certificate` - Certificate Components
+*************************************************
+
+.. automodule:: waeup.sirp.university.certificate
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_certificatecontainer.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_certificatecontainer.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_certificatecontainer.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`university.certificatecontainer` - Certificate Container Components
+********************************************************************
+
+.. automodule:: waeup.sirp.university.certificatecontainer
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_course.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_course.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_course.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`university.course` - Course Components
+***************************************
+
+.. automodule:: waeup.sirp.university.course
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_coursecontainer.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_coursecontainer.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_coursecontainer.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`university.coursecontainer` - Course Container Components
+**********************************************************
+
+.. automodule:: waeup.sirp.university.coursecontainer
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_department.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_department.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_department.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`university.department` - Department Components
+***********************************************
+
+.. automodule:: waeup.sirp.university.department
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_faculty.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_faculty.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_faculty.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`university.faculty` - Faculty Components
+*****************************************
+
+.. automodule:: waeup.sirp.university.faculty
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_facultycontainer.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_facultycontainer.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_facultycontainer.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`university.facultycontainer` - Faculty Container Components
+************************************************************
+
+.. automodule:: waeup.sirp.university.facultycontainer
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_interfaces.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_interfaces.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_interfaces.rst	(revision 11116)
@@ -0,0 +1,45 @@
+`university.interfaces` - Interfaces of the University Package
+**************************************************************
+
+.. automodule:: waeup.sirp.university.interfaces
+   :members:
+   :undoc-members:
+
+.. autointerface:: waeup.sirp.university.interfaces.IFaculty
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.IFacultyAdd
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.IFacultyContainer
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.IDepartment
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.IDepartmentAdd
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.ICourseContainer
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.ICourse
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.ICourseAdd
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.ICertificate
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.ICertificateAdd
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.ICertificateContainer
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.ICertificateCourse
+   :members:
+
+.. autointerface:: waeup.sirp.university.interfaces.ICertificateCourseAdd
+   :members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_vocabularies.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_vocabularies.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/api/university/api_vocabularies.rst	(revision 11116)
@@ -0,0 +1,6 @@
+`university.vocabularies` - Vocabularies and Sources
+****************************************************
+
+.. automodule:: waeup.sirp.university.vocabularies
+   :members:
+   :undoc-members:
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/developernotes.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/developernotes.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/developernotes.rst	(revision 11116)
@@ -0,0 +1,344 @@
+Developer Notes
+***************
+
+How to setup a developer instance of the WAeUP Kofa, handle tests, docs
+etc.
+
+The new WAeUP Kofa is based on `Grok <http://grok.zope.org/>`_.
+
+Installing a developer copy
+===========================
+
+The installation is described for Linux-based computers.
+
+Preparing the system
+--------------------
+
+To create a working copy of the WAeUP Kofa we recommend use of
+`virtualenv`. You, however, need also some basic libraries, a C
+compiler and some things more.
+
+What you need (Debian/Ubuntu package names in brackets):
+
+* Python 2.6 (python2.6)
+
+  Currently, also Python2.5 is supported but we want to make use of
+  some of the 2.6 goodies in the future.
+
+
+* Python 2.6 development files (python2.6-dev)
+
+* A C-Compiler (gcc)
+
+* The C library development files (libc6-dev)
+
+* A subversion client (svn)
+
+* enscript (enscript) [optional]
+
+  This is only needed if you want test coverage reports.
+
+All these packages can be installed on Debian systems like this::
+
+  # apt-get install python2.6 python2.6-dev python2.6-dbg \
+                    gcc libc6-dev svn enscript
+
+Afterwards you should be able to enter::
+
+  $ python2.6
+
+at the commandline and get a Python prompt. Quit the interpreter
+pressing <CTRL-D>.
+
+Installing `virtualenv`
+-----------------------
+
+We recommend use of `virtualenv` to create Python sandboxes where you
+can run your code without touching any other installations.
+
+If you don't already have ``easy_install`` available, you can find the
+script to set it up on the `PEAK EasyInstall page`_.
+
+.. _`PEAK EasyInstall page`: http://peak.telecommunity.com/DevCenter/EasyInstall#installing-easy-install
+
+You need to download `ez_setup.py`_. Then, you run it like this to
+install ``easy_install`` into your system Python::
+
+  $ sudo python2.6 ez_setup.py
+
+.. _`ez_setup.py`: http://peak.telecommunity.com/dist/ez_setup.py
+
+This will make ``easy_install`` available to you.
+
+.. note:: Sometimes you have ``easy_install`` installed but you need a
+          newer version of the underlying setuptools infrastructure to
+          make Grok work. You can upgrade setuptools with::
+
+            $ sudo easy_install -U setuptools
+
+Now you can install `virtualenv` by doing (as root)::
+
+  # easy_install-2.6 virtualenv
+
+This step will fetch all needed sources from the internet and install
+`virtualenv` locally in your Python2.6 installation.
+
+
+Creating a sandbox
+------------------
+
+This step is only necessary (and recommended) if you installed
+`virtualenv` before.
+
+As a normal user you now can create a sandbox for your upcoming work
+by::
+
+  $ virtualenv --no-site-packages mysandbox
+
+where ``mysandbox`` is a directory in the filesystem where your
+sandbox will be created. `virtualenv` will also create this directory
+for you.
+
+By passing the ``no-site-packages`` switch we tell `virtualenv` to
+provide us a clean environment without any extra-packages installed
+systemwide.
+
+If you have a look into the freshly created sandbox, you will notice
+that in the ``bin/`` directory there is also 
+
+You now can activate the sandbox by doing::
+
+  $ source mysandbox/bin/activate
+
+You will notice that the input prompt changes.
+
+To deactivate the sandbox at any time, enter::
+
+  $ deactivate
+
+and the prompt will be the same as before the activation.
+
+For the following steps make sure the sandbox is active.
+
+
+Creating a working place
+------------------------
+
+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 Kofa from the subversion server::
+
+  $ cd mysandbox/
+  $ svn co https://svn.waeup.org/repos/main/waeup.kofa/trunk waeup-trunk
+
+where ``waeup-trunk`` is only a name we've chosen here to make clear
+where the sources come from.
+
+This command should fetch the sources of the WAeUP sources for you and
+put it in the directory ``waeup-trunk/``.
+
+Now enter the new directory::
+
+  $ cd waeup-trunk
+
+
+Preparing the build
+-------------------
+
+In the sources directory (``waeup-trunk/``) you have to prepare the
+project to fetch needed components (eggs), compile C-code parts,
+etc. This steip will not touch any external projects::
+
+  $ python2.6 bootstrap.py
+
+This will generate some directories and the ``buildout`` script in
+``bin/`` for us. This step must be executed only once for each
+instance.
+
+Now we can do the real build by triggering::
+
+  $ bin/buildout
+
+If this is your first install of some Grok-related project, this step
+will need some time as lots of sources have to be fetched, many
+components must be compiled, etc.
+
+This step must be redone whenever you change something in
+``buildout.cfg`` or ``setup.py``.
+
+Afterwards we are ready to go.
+
+
+Start the instance
+------------------
+
+You should be able now to start the created instance by doing::
+
+   $ bin/zopectl fg
+
+If you now point a browser to::
+
+   localhost:8080
+
+you should get a login pop-up, where you can login as superuser with
+``grok`` and ``grok`` as username/password.
+
+If you want to change the default credentials, have a look into
+``buildout.cfg`` where the superuser password is determined.
+
+You can stop the instance by pressing <CTRL-C>.
+
+
+
+Documentation
+=============
+
+With the :mod:`waeup.kofa` package we try to reach high standards in
+both, documentation and testing.
+
+:mod:`waeup.kofa` makes extensive use of doctests, which this way also
+become both: executable (i.e. testable) examples and documentation.
+
+Generating documentation
+------------------------
+
+We use the excellent `Sphinx <http://sphinx.pocoo.org/>`_ Python
+documentation generator to generate the docs as HTML pages.
+
+The documentation of the :mod:`waeup.kofa` project can easily be
+created doing::
+
+  $ bin/waeupdocs
+
+This will create a tree of HTML pages in
+``parts/waeupdocs/waeup.kofa/build/waeup.kofa/`` which you can for
+instance browse by pointing your browser to this location.
+
+An 'official' place in internet for the whole docs is about to come
+but not yet available.
+
+
+Writing documentation
+---------------------
+
+means explaining to other developers what your code does and test it
+at the same time. See the many .txt files in the :mod:`waeup.kofa`
+package for examples.
+
+
+Testing
+=======
+
+Tests are most important to the reliability of the :mod:`waeup.kofa`
+package. We don't tell someone that our code works, if we cannot prove
+it. And we prove it by testing.
+
+Running tests
+-------------
+
+You can run all the tests for the package by doing::
+
+  $ bin/test
+
+If you like colored output (can improve readability of failure
+messages), use the ``-c`` switch::
+
+  $ bin/test -c
+
+We have many tests in the :mod:`waeup.kofa` package so that sometimes
+you only want the functional *or* the unit tests to run. This can be
+done like this::
+
+  $ bin/test -c -u
+
+if you want only unit tests or like this::
+
+  $ bin/test -c -f
+
+if you only want functional tests.
+
+
+Writing tests
+-------------
+
+Is a wiiide topic. For now, please see the numerous .txt files in the
+source. Most of the **are** tests.
+
+Generally, we use `z3c.testsetup` for finding and setting up tests.
+
+There are mainly two kinds of tests we use:
+
+* unit- or simple doctests
+
+  These are included in test runs automatically, if they provide a
+  marker like this somewhere (normally near top of file)::
+
+    .. :doctest:
+
+  Most unit tests furthermore declare that they want to be run inside
+  the `WAeUPKofaUnitTestLayer` defined in `waeup.kofa.testing`. This
+  layer groks the whole `waeup.kofa` package, so that all ZCA
+  components are already setup when you start your tests.
+  
+  To declare that a unit test testfile should be run inside this
+  layer, the testfile has to provide the following line::
+
+    .. :layer: waeup.kofa.testing.WAeUPKofaUnitTestLayer
+
+  Use it, if in your tests you make use of registered components like
+  utilities, adapters and the like.
+
+* integration or functional tests
+
+  These provide a full-blown ZODB storage, so that we can emulate
+  browser requests to the whole system. Functional tests are much more
+  expensive in terms of memory and runtime but needed, if you want to
+  test UI components.
+
+  A testfile is registered as functional test on testruns when it
+  provides a line like the following::
+
+    :Test-Layer: functional
+
+
+Code coverage
+-------------
+
+We want to make sure, that all aspects of our software are
+tested. This means, that all parts of the codes should be tested
+somewhere.
+
+To tell how good our test coverage is, we can also use the testrunner
+(``bin/test``)::
+
+  $ bin/test --coverage=coverage
+
+will run the tests but also look, which parts of code were touched by
+them. For releases we want 100% coverage. Beware: running tests with
+the ``--coverage`` switch slows down tests by factor 10 or more.
+
+The command above will output a table with percentages. Furthermore,
+in ``/parts/test/coverage`` you will (after the testrun) find your
+sources preceeded by markers which tell, how often (or none) a certain
+line was used in tests.
+
+To have a more convenient cmdline interface, we also provide some
+shortcuts::
+
+  $ bin/coverage-detect
+
+will run all the tests as shown above and put the results in
+``parts/coverage-detect/coverage``.
+
+After that you can run::
+
+  $ bin/coveragereport
+
+to get a browsable HTML representation of test coverage in
+``coverage-report/`` subdir.
+
+Both, the coverage reports and HTML documentation generated by sphinx
+can be packed and put onto a website as-is.
+
+It is also possible to generate the docs and reports nightly by a
+buildbot or something like this.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/index.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/index.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/developerdocs/index.rst	(revision 11116)
@@ -0,0 +1,8 @@
+Developer Documentation
+***********************
+
+.. toctree::
+   :maxdepth: 2
+   
+   developernotes
+   api/index
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/documentation.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/documentation.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/documentation.rst	(revision 11116)
@@ -0,0 +1,26 @@
+About these documents
+*********************
+
+These documents are generated from `reStructuredText
+<http://docutils.sf.net/rst.html>`_ sources by `Sphinx`_, an excellent
+document processor specifically written for the Python documentation
+by Georg Brandl and contributors.
+
+Development of this documentation is organized by Uli Fouquet (``uli
+at waeup dot org``) and Henrik Bettermann (``henrik at waeup dot
+org``). We're always looking for volunteers wanting to help with the
+docs, so feel free to send a mail there!
+
+Many thanks go to:
+
+* the `docutils <http://docutils.sf.net/>`_ project for creating
+  reStructuredText and the docutils suite;
+* Georg Brandl for his `sphinx` package.
+
+See :ref:`building_documentation` to learn how to create HTML or PDF
+versions of this docs.
+
+See :ref:`reporting-bugs` for information how to report bugs in
+`waeup.kofa` itself.
+
+.. _Sphinx: http://sphinx.org/
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/glossary.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/glossary.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/glossary.rst	(revision 11116)
@@ -0,0 +1,16 @@
+.. _glossary:
+
+Glossary
+********
+
+.. glossary::
+
+   Kofa
+     Student Information and Registration Portal.
+
+   WAeUP
+     West African e-University Project.
+
+   waeup.kofa
+     A Python package explained in this documentation.
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/index.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/index.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/index.rst	(revision 11116)
@@ -0,0 +1,11 @@
+.. WAeUP Student Information and Registration Portal (Kofa) documentation master file, created by
+   sphinx-quickstart on Thu Jul 29 10:41:59 2010.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   contents
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/intro.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/intro.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/intro.rst	(revision 11116)
@@ -0,0 +1,1 @@
+.. include:: ../../README.txt
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/license.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/license.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/license.rst	(revision 11116)
@@ -0,0 +1,11 @@
+.. _license:
+
+***********
+The License
+***********
+
+`waeup.kofa` is covered by the following license. If that license
+does not fit your needs and you need a copy of the software licensed
+differently, please contact ``henrik <at> waeup <dot> org``.
+
+.. literalinclude:: ../../LICENSE
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/buildingdocs.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/buildingdocs.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/buildingdocs.rst	(revision 11116)
@@ -0,0 +1,61 @@
+.. _building_documentation:
+
+Building Documentation (Linux OS only)
+**************************************
+
+To build the documentation for :mod:`waeup.kofa`, please follow these steps:
+
+Prerequisites
+=============
+
+We assume you already installed `waeup.kofa` as explained in
+:ref:`installing_linux`. You ran ``bin/buildout`` and can find a script
+``bin/waeupdocs``.
+
+Building HTML docs
+==================
+
+After successful install go to the root dir, where `waeup.kofa` is
+located.
+
+There run::
+
+   $ ./bin/waeupdocs
+
+This will (re-)generate any needed docs.
+
+The output can be found in ``docs/build/html``.
+
+Actually, ``waeupdocs`` is only a wrapper script around the real main
+script ``sphinx-build``, which should also be located in your ``bin/``
+directory.
+
+You therefore can also run ``bin/sphinx-build`` manually, which will
+give you more options, especially, if you want the output to be
+created in a different location or similar.
+
+Run::
+
+   $ ./bin/sphinx-build --help
+
+to get a list of options available.
+
+Alternatively, you can also go to ``docs/build`` and run::
+
+   $ make html
+
+Other available formats are listed, when you run only::
+
+   $ make
+
+These other formats will include ``latex``, ``doctest``, ``linkcheck``
+and more with a short explanation for each format.
+
+
+Building PDF docs
+=================
+
+We're currently not prepared for PDF, but support is already planned.
+
+Please be aware, that any PDF support will require a full TeX
+installation on your system to work.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/index.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/index.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/index.rst	(revision 11116)
@@ -0,0 +1,9 @@
+User Documentation
+******************
+
+.. toctree::
+   :maxdepth: 2
+
+   install
+   install_on_windows
+   buildingdocs
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/install.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/install.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/install.rst	(revision 11116)
@@ -0,0 +1,3 @@
+.. _installing_linux:
+
+.. include:: ../../INSTALL.txt
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/install_on_windows.rst
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/install_on_windows.rst	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/docs/source/userdocs/install_on_windows.rst	(revision 11116)
@@ -0,0 +1,3 @@
+.. _installing_win:
+
+.. include:: ../../INSTALLWIN.txt
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/README.txt
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/README.txt	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/README.txt	(revision 11116)
@@ -0,0 +1,26 @@
+In this directory you can find templates which are used by
+``zc.buildout`` to create the configuration files in the parts/etc/ subdir
+of your project.
+
+If you modify files in this directory, you have to run::
+
+  $ bin/buildout
+
+afterwards to rebuild the configuration files in parts/etc/.
+
+In the templates you can use placesholders recognized by zc.buildout
+to name local paths, etc. A zc.buildout placeholder looks like this::
+
+  ${buildout:directory}
+
+which gives you the path of the project directory and will be
+substituted with the real path when you run buildout the next
+time. The set of available placeholders depends on your
+buildout.cfg.
+
+You can also modify files in parts/etc directly, but those changes
+will be overwritten after running bin/buildout the next time.
+
+To run your project you can do::
+
+  $ bin/paster serve parts/etc/deploy.ini
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/debug.ini.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/debug.ini.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/debug.ini.in	(revision 11116)
@@ -0,0 +1,68 @@
+# debug.ini
+#
+# Debugging configuration for use with paster/WSGI
+#
+
+[loggers]
+keys = root, wsgi
+
+[handlers]
+keys = console, accesslog
+
+[formatters]
+keys = generic, accesslog
+
+[formatter_generic]
+format = %(asctime)s %(levelname)s [%(name)s] %(message)s
+
+[formatter_accesslog]
+format = %(message)s
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[handler_accesslog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'access.log'),
+        'a')
+level = INFO
+formatter = accesslog
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_wsgi]
+level = INFO
+handlers = accesslog
+qualname = wsgi
+propagate = 0
+
+[filter:translogger]
+use = egg:Paste#translogger
+setup_console_handler = False
+logger_name = wsgi
+
+[filter-app:main]
+# Change the last part from 'ajax' to 'pdb' for a post-mortem debugger
+# on the console:
+use = egg:z3c.evalexception#ajax
+next = zope
+
+[app:zope]
+use = egg:waeup.kwarapoly#debug
+filter-with = translogger
+exempt-exceptions = zope.security.interfaces.IUnauthorized
+
+[server:main]
+use = egg:Paste#http
+host = ${kofa_params:host}
+port = ${kofa_params:base_port}
+
+[DEFAULT]
+# set the name of the zope.conf file
+zope_conf = %(here)s/zope.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/deploy.ini.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/deploy.ini.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/deploy.ini.in	(revision 11116)
@@ -0,0 +1,94 @@
+# deploy.ini
+#
+# Deployment configuration for use with paster/WSGI
+#
+
+[loggers]
+keys = root, wsgi, async, async_trace
+
+[handlers]
+keys = null, console, accesslog, asynclog, async_tracelog
+
+[formatters]
+keys = generic, accesslog
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_wsgi]
+level = INFO
+#handlers = accesslog
+handlers = null
+qualname = wsgi
+propagate = 0
+
+[logger_async]
+level = INFO
+handlers = asynclog
+qualname = zc.async
+propagate = 0
+
+[logger_async_trace]
+level = INFO
+handlers = async_tracelog
+qualname = zc.async.trace
+propagate = 0
+
+[handler_null]
+# you can use 'NullHandler' (w/o the path) if under Python 2.7+
+class = waeup.kofa.utils.helpers.NullHandler
+args = ()
+level = NOTSET
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[handler_accesslog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'access.log'),
+        'a')
+level = INFO
+formatter = accesslog
+
+[handler_asynclog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'async.log'),
+        'a')
+level = INFO
+formatter = generic
+
+[handler_async_tracelog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'async_trace.log'),
+        'a')
+level = INFO
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)s [%(name)s] %(message)s
+
+[formatter_accesslog]
+format = %(message)s
+
+[filter:translogger]
+use = egg:Paste#translogger
+setup_console_handler = False
+logger_name = wsgi
+
+[app:main]
+use = egg:waeup.kwarapoly
+filter-with = translogger
+
+[server:main]
+use = egg:Paste#http
+host = ${kofa_params:host}
+port = ${kofa_params:base_port}
+
+[DEFAULT]
+# set the name of the zope.conf file
+zope_conf = %(here)s/zope.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/profile.ini.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/profile.ini.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/profile.ini.in	(revision 11116)
@@ -0,0 +1,67 @@
+# profile.ini
+#
+# Profiling configuration for use with paster/WSGI
+#
+# Call http://localhost:8080/__profile__ to see the profiler in action
+
+[loggers]
+keys = root, wsgi
+
+[handlers]
+keys = console, accesslog
+
+[formatters]
+keys = generic, accesslog
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_wsgi]
+level = INFO
+handlers = accesslog
+qualname = wsgi
+propagate = 0
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[handler_accesslog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'access.log'),
+        'a')
+level = INFO
+formatter = accesslog
+
+[formatter_generic]
+format = %(asctime)s %(levelname)s [%(name)s] %(message)s
+
+[formatter_accesslog]
+format = %(message)s
+
+[filter:translogger]
+use = egg:Paste#translogger
+setup_console_handler = False
+logger_name = wsgi
+
+[filter:profiler]
+use = egg:repoze.profile#profile
+
+[app:app]
+use = egg:waeup.kwarapoly
+
+[pipeline:main]
+pipeline = translogger profiler app
+
+[server:main]
+use = egg:Paste#http
+host = ${kofa_params:host}
+port = ${kofa_params:base_port}
+
+[DEFAULT]
+# set the name of the zope.conf file
+zope_conf = %(here)s/zope.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/site.zcml.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/site.zcml.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/site.zcml.in	(revision 11116)
@@ -0,0 +1,68 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:kofa="http://namespaces.waeup.org/kofa"
+           i18n_domain="waeup.kwarapoly">
+
+  <include package="waeup.kwarapoly" />
+  <include package="waeup.kwarapoly" file="mail.zcml" />
+  <!-- install job container
+
+       install a job container for asynchronous jobs. Pick one of the
+       two possibilites: 'single' for installation in the one big ZODB
+       or 'multidb' for setup with a dedicated ZODB for job handling.
+  -->
+  <!-- include package="waeup.kofa" file="async_single.zcml" / -->
+  <include package="waeup.kofa" file="async_multidb.zcml" />
+
+  <!-- install dispatcher and other needed async components
+
+       install other needed components for asynchronous jobs. Pick one
+       of the two possibilities: 'basic_dispatcher' for single ZODB
+       setup, 'multidb_dispatcher' for setup with a dedicated ZODB for
+       job handling. Make sure the setting matches the setting picked
+       above. -->
+  <!-- include package="zc.async" file="basic_dispatcher_policy.zcml" / -->
+  <include package="zc.async" file="multidb_dispatcher_policy.zcml" />
+
+  <!-- Where should the datacenter reside by default? -->
+  <kofa:datacenter
+      path="${buildout:directory}/var/datacenter" />
+
+    <configure i18n_domain="waeup.kwarapoly">
+
+
+      <unauthenticatedPrincipal id="zope.anybody"
+                                title="Unauthenticated User" />
+      <unauthenticatedGroup id="zope.Anybody"
+                            title="Unauthenticated Users" />
+      <authenticatedGroup id="zope.Authenticated"
+                        title="Authenticated Users" />
+      <everybodyGroup id="zope.Everybody"
+                      title="All Users" />
+      <principal id="zope.manager"
+                 title="Manager"
+                 login="grok"
+                 password_manager="SSHA"
+                 password="{SSHA}PQQypyPElik2Pi3wM5kO1W78eVCGgdZ8"
+                 />
+
+      <!-- Replace the following directive if you do not want
+           public access -->
+      <grant permission="zope.app.dublincore.view"
+             principal="zope.Anybody" />
+      <grant permission="zope.View"
+             principal="zope.Authenticated" />
+      <grant permission="zope.app.dublincore.view"
+             principal="zope.Authenticated" />
+      <grant permission="waeup.Public"
+             principal="zope.Everybody" />
+      <grant permission="waeup.Anonymous"
+             principal="zope.Anybody" />
+      <grant permission="waeup.Authenticated"
+             principal="zope.Authenticated" />
+
+      <role id="zope.Manager" title="Site Manager" />
+      <grantAll role="zope.Manager" />
+      <grant role="zope.Manager"
+             principal="zope.manager" />
+   </configure>
+</configure>
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zdaemon.conf.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zdaemon.conf.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zdaemon.conf.in	(revision 11116)
@@ -0,0 +1,8 @@
+<runner>
+  program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/deploy.ini
+  daemon on
+  transcript ${zope_conf:logfiles}/zdaemon.log
+  socket-name ${zope_conf:logfiles}/zdaemonsock
+  # Enable this to run the child process as a different user
+  # user kofa
+</runner>
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo1.conf.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo1.conf.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo1.conf.in	(revision 11116)
@@ -0,0 +1,8 @@
+<runner>
+  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/zeo1.ini
+  daemon on
+  transcript ${zope_conf:logfiles}/zdaemon-zeo1.log
+  socket-name ${zope_conf:logfiles}/zeo1.sock
+  # Enable this to run the child process as a different user
+  user kofa
+</runner>
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo1.ini.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo1.ini.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo1.ini.in	(revision 11116)
@@ -0,0 +1,96 @@
+# deploy.ini
+#
+# Deployment configuration for use with paster/WSGI
+#
+
+[loggers]
+keys = root, wsgi, async, async_trace
+
+[handlers]
+keys = null, console, accesslog, asynclog, async_tracelog
+
+[formatters]
+keys = generic, accesslog
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_wsgi]
+level = INFO
+#handlers = accesslog
+handlers = null
+qualname = wsgi
+propagate = 0
+
+[logger_async]
+level = INFO
+handlers = asynclog
+qualname = zc.async
+propagate = 0
+
+[logger_async_trace]
+level = INFO
+handlers = async_tracelog
+qualname = zc.async.trace
+propagate = 0
+
+[handler_null]
+# you can use 'NullHandler' (w/o the path) if under Python 2.7+
+class = waeup.kofa.utils.helpers.NullHandler
+args = ()
+level = NOTSET
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[handler_accesslog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo1.log'),
+        'a')
+level = INFO
+formatter = accesslog
+
+[handler_asynclog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo1_async.log'),
+        'a')
+level = INFO
+formatter = generic
+
+[handler_async_tracelog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo1_async_trace.log'),
+        'a')
+level = INFO
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)s [%(name)s] %(message)s
+
+[formatter_accesslog]
+format = %(message)s
+
+[filter:translogger]
+use = egg:Paste#translogger
+setup_console_handler = False
+logger_name = wsgi
+
+[app:main]
+use = egg:waeup.kwarapoly
+filter-with = translogger
+
+[server:main]
+use = egg:Paste#http
+host = ${kofa_params:host}
+port = ${kofa_params:zeo1_port}
+threadpool_workers = ${kofa_params:threadpool_workers}
+use_threadpool = True
+
+[DEFAULT]
+# set the name of the zope.conf file
+zope_conf = %(here)s/zope_zeo1.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo2.conf.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo2.conf.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo2.conf.in	(revision 11116)
@@ -0,0 +1,8 @@
+<runner>
+  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/zeo2.ini
+  daemon on
+  transcript ${zope_conf:logfiles}/zdaemon-zeo2.log
+  socket-name ${zope_conf:logfiles}/zeo2.sock
+  # Enable this to run the child process as a different user
+  user kofa
+</runner>
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo2.ini.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo2.ini.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zeo2.ini.in	(revision 11116)
@@ -0,0 +1,96 @@
+# deploy.ini
+#
+# Deployment configuration for use with paster/WSGI
+#
+
+[loggers]
+keys = root, wsgi, async, async_trace
+
+[handlers]
+keys = null, console, accesslog, asynclog, async_tracelog
+
+[formatters]
+keys = generic, accesslog
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_wsgi]
+level = INFO
+#handlers = accesslog
+handlers = null
+qualname = wsgi
+propagate = 0
+
+[logger_async]
+level = INFO
+handlers = asynclog
+qualname = zc.async
+propagate = 0
+
+[logger_async_trace]
+level = INFO
+handlers = async_tracelog
+qualname = zc.async.trace
+propagate = 0
+
+[handler_null]
+# you can use 'NullHandler' (w/o the path) if under Python 2.7+
+class = waeup.kofa.utils.helpers.NullHandler
+args = ()
+level = NOTSET
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[handler_accesslog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo2.log'),
+        'a')
+level = INFO
+formatter = accesslog
+
+[handler_asynclog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo2_async.log'),
+        'a')
+level = INFO
+formatter = generic
+
+[handler_async_tracelog]
+class = FileHandler
+args = (os.path.join(r'${zope_conf:logfiles}', 'zeo2_async_trace.log'),
+        'a')
+level = INFO
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)s [%(name)s] %(message)s
+
+[formatter_accesslog]
+format = %(message)s
+
+[filter:translogger]
+use = egg:Paste#translogger
+setup_console_handler = False
+logger_name = wsgi
+
+[app:main]
+use = egg:waeup.kwarapoly
+filter-with = translogger
+
+[server:main]
+use = egg:Paste#http
+host = ${kofa_params:host}
+port = ${kofa_params:zeo2_port}
+threadpool_workers = ${kofa_params:threadpool_workers}
+use_threadpool = True
+
+[DEFAULT]
+# set the name of the zope.conf file
+zope_conf = %(here)s/zope_zeo2.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid2.txt
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zope.conf.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zope.conf.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zope.conf.in	(revision 11116)
@@ -0,0 +1,62 @@
+# Identify the component configuration used to define the site:
+site-definition ${site_zcml:output}
+
+<zodb>
+  # Standard blob storage
+  <blobstorage>
+    blob-dir ${zope_conf:blobstorage}
+    <filestorage>
+      path ${zope_conf:filestorage}/Data.fs
+    </filestorage>
+  </blobstorage>
+
+# Uncomment this if you want a blob-less standard file storage instead:
+#  <filestorage>
+#       path ${zope_conf:filestorage}
+#  </filestorage>
+
+# Uncomment this if you want to connect to a ZEO server instead:
+#  <zeoclient>
+#    server localhost:8100
+#    storage 1
+#    # ZEO client cache, in bytes
+#    cache-size 20MB
+#    # Uncomment to have a persistent disk cache
+#    #client zeo1
+#  </zeoclient>
+
+</zodb>
+
+<zodb async>
+  <filestorage>
+    # create true
+    path ${zope_conf:filestorage}/Data.async.fs
+  </filestorage>
+</zodb>
+
+<eventlog>
+  # This sets up logging to a file.
+  # The "path" setting can be a relative or absolute
+  # filesystem path.
+
+  <logfile>
+    path ${zope_conf:logfiles}/z3.log
+    formatter zope.exceptions.log.Formatter
+  </logfile>
+
+  # This sets up logging to to standard output.
+  # The "path" setting can be the tokens STDOUT or STDERR
+  
+#  <logfile>
+#    path STDOUT
+#    formatter zope.exceptions.log.Formatter
+#  </logfile>
+</eventlog>
+
+# Comment this line to disable developer mode.  This should be done in
+# production
+# devmode on
+
+# Extra configuration lines can be added to zope_conf's extra option. Put for 
+# instance productconf sections in here.
+${zope_conf:extra}
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zope_zeo1.conf.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zope_zeo1.conf.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zope_zeo1.conf.in	(revision 11116)
@@ -0,0 +1,100 @@
+# Identify the component configuration used to define the site:
+site-definition ${site_zcml:output}
+
+<zodb>
+
+  #cache-size
+
+  # num of concurrent pre-opened ZODB threads; default: 7
+  pool-size 25
+
+  # Standard blob storage
+#  <blobstorage>
+#    blob-dir ${zope_conf:blobstorage}
+#    <filestorage>
+#      path ${zope_conf:filestorage}/Data.fs
+#    </filestorage>
+#  </blobstorage>
+
+# Uncomment this if you want a blob-less standard file storage instead:
+#  <filestorage>
+#       path ${zope_conf:filestorage}
+#  </filestorage>
+
+# Uncomment this if you want to connect to a ZEO server instead:
+  <zeoclient>
+    server localhost:7050
+    storage 1
+    # ZEO client cache, in bytes
+    cache-size 20MB
+    # Uncomment to have a persistent disk cache
+    client ${zope_conf_zeo_1:filestorage}/zeo1
+  </zeoclient>
+
+# Uncomment this if you want to run a ZEO server instead:
+#  <zeo>
+#    # required; 'host:port' for TCP/IP, path to a socket file for UDP
+#    address localhost:8090
+#
+#    # optional; 'address' remarks apply
+#    #monitor-address localhost:8091
+#
+#    # optional; keep queue of last N transactions. Speeds up client cache verif.
+#    #invalidation-queue-size 10
+#
+#    # optional; is this a read-only instance? true or false
+#    #read-only false
+#
+#    # optional; seconds to wait for client to commit after acquiring lock
+#    #transaction-timeout 20
+#
+#    # optional; authentication protocol. With ZEO only 'digest' supported
+#    #authentication-protocol digest 
+#
+#    # optional; Path of the database containing authentication credentials.
+#    #authentication-database
+#
+#    # optional; the authentication realm of server
+#    #authentication-realm myrealm
+#  </zeo>
+
+</zodb>
+
+<zodb async>
+  <zeoclient>
+    server localhost:7050
+    storage async
+    name async
+    # ZEO client cache, in bytes
+    cache-size 20MB
+    # Uncomment to have a persistent disk cache
+    client ${zope_conf_zeo_1:filestorage}/zeo1_async
+  </zeoclient>
+</zodb>
+
+<eventlog>
+  # This sets up logging to a file.
+  # The "path" setting can be a relative or absolute
+  # filesystem path.
+
+  <logfile>
+    path ${zope_conf:logfiles}/zeo1_z3.log
+    formatter zope.exceptions.log.Formatter
+  </logfile>
+
+  # This sets up logging to to standard output.
+  # The "path" setting can be the tokens STDOUT or STDERR
+  
+#  <logfile>
+#    path STDOUT
+#    formatter zope.exceptions.log.Formatter
+#  </logfile>
+</eventlog>
+
+# Comment this line to disable developer mode.  This should be done in
+# production
+#devmode on
+
+# Extra configuration lines can be added to zope_conf's extra option. Put for 
+# instance productconf sections in here.
+${zope_conf:extra}
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zope_zeo2.conf.in
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zope_zeo2.conf.in	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/etc/zope_zeo2.conf.in	(revision 11116)
@@ -0,0 +1,100 @@
+# Identify the component configuration used to define the site:
+site-definition ${site_zcml:output}
+
+<zodb>
+
+  #cache-size
+
+  # num of concurrent pre-opened ZODB threads; default: 7
+  pool-size 7
+
+  # Standard blob storage
+#  <blobstorage>
+#    blob-dir ${zope_conf:blobstorage}
+#    <filestorage>
+#      path ${zope_conf:filestorage}/Data.fs
+#    </filestorage>
+#  </blobstorage>
+
+# Uncomment this if you want a blob-less standard file storage instead:
+#  <filestorage>
+#       path ${zope_conf:filestorage}
+#  </filestorage>
+
+# Uncomment this if you want to connect to a ZEO server instead:
+  <zeoclient>
+    server localhost:7050
+    storage 1
+    # ZEO client cache, in bytes
+    cache-size 20MB
+    # Uncomment to have a persistent disk cache
+    client ${zope_conf_zeo_2:filestorage}/zeo2
+  </zeoclient>
+
+# Uncomment this if you want to run a ZEO server instead:
+#  <zeo>
+#    # required; 'host:port' for TCP/IP, path to a socket file for UDP
+#    address localhost:8090
+#
+#    # optional; 'address' remarks apply
+#    #monitor-address localhost:8091
+#
+#    # optional; keep queue of last N transactions. Speeds up client cache verif.
+#    #invalidation-queue-size 10
+#
+#    # optional; is this a read-only instance? true or false
+#    #read-only false
+#
+#    # optional; seconds to wait for client to commit after acquiring lock
+#    #transaction-timeout 20
+#
+#    # optional; authentication protocol. With ZEO only 'digest' supported
+#    #authentication-protocol digest 
+#
+#    # optional; Path of the database containing authentication credentials.
+#    #authentication-database
+#
+#    # optional; the authentication realm of server
+#    #authentication-realm myrealm
+#  </zeo>
+
+</zodb>
+
+<zodb async>
+  <zeoclient>
+    server localhost:7050
+    storage async
+    name async
+    # ZEO client cache, in bytes
+    cache-size 20MB
+    # Uncomment to have a persistent disk cache
+    client ${zope_conf_zeo_2:filestorage}/zeo2_async
+  </zeoclient>
+</zodb>
+
+<eventlog>
+  # This sets up logging to a file.
+  # The "path" setting can be a relative or absolute
+  # filesystem path.
+
+  <logfile>
+    path ${zope_conf:logfiles}/zeo2_z3.log
+    formatter zope.exceptions.log.Formatter
+  </logfile>
+
+  # This sets up logging to to standard output.
+  # The "path" setting can be the tokens STDOUT or STDERR
+  
+#  <logfile>
+#    path STDOUT
+#    formatter zope.exceptions.log.Formatter
+#  </logfile>
+</eventlog>
+
+# Comment this line to disable developer mode.  This should be done in
+# production
+#devmode on
+
+# Extra configuration lines can be added to zope_conf's extra option. Put for 
+# instance productconf sections in here.
+${zope_conf:extra}
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/setup.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/setup.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/setup.py	(revision 11116)
@@ -0,0 +1,100 @@
+import os
+from setuptools import setup, find_packages
+
+version = '0.1dev'
+
+install_requires =[
+    'setuptools',
+    'grok',
+    'grokui.admin',
+    'grokcore.startup',
+    'waeup.kofa',
+    'kofacustom.nigeria',
+    ],
+
+# Having beaker installed additionally is a feature very recommended
+# for production use. The default buildout includes beaker for tests,
+# start scripts, and other parts that can benefit from it. The windows
+# buildout does not include it due to compiling problems with the
+# beaker package.
+beaker_require = [
+    'dolmen.beaker',
+    ]
+
+tests_require = [
+    'z3c.testsetup',
+    'zope.app.testing',
+    'zope.testbrowser',
+    'zope.testing',
+    'unittest2',
+    ]
+
+docs_require = [
+    'Sphinx',
+    'collective.recipe.sphinxbuilder',
+    'docutils',
+    'roman',
+    'repoze.sphinx.autointerface',
+    ]
+
+def read(*rnames):
+    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+
+long_description = (
+    read('README.txt')
+    + '\n\n'
+    + read('src', 'waeup', 'kwarapoly', 'README.txt')
+    + '\n\n'
+    + read('CHANGES.txt')
+    + '\n\n'
+    + 'Download\n'
+    + '********\n'
+    )
+
+setup(name = 'waeup.kwarapoly',
+      version = version,
+      description = "A customized waeup.kofa",
+      long_description = long_description,
+
+      keywords = "portal waeup kofa student university registration grok zope",
+      # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      classifiers = [
+        'Development Status :: 3 - Alpha',
+        'Environment :: Web Environment',
+        'Intended Audience :: Education',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Programming Language :: Python',
+        'Operating System :: POSIX',
+        'Operating System :: POSIX :: Linux',
+        'Framework :: Zope3',
+        'Topic :: Education',
+        'Topic :: Internet :: WWW/HTTP',
+        ],
+      author = "The WAeUP team.",
+      author_email = "",
+      url = "http://www.waeup.org/",
+      license = "GPL",
+      package_dir = {'': 'src'},
+      packages= find_packages('src'),
+      namespace_packages = ['waeup',],
+      include_package_data = True,
+      zip_safe = False,
+      install_requires = install_requires,
+      tests_require = tests_require,
+      extras_require = dict(
+        test = tests_require,
+        docs = docs_require,
+        beaker = beaker_require,
+        ),
+      entry_points="""
+      # Add entry points here
+      [hurry.resource.libraries]
+      waeup_custom = waeup.kwarapoly.browser.resources:waeup_custom
+      [console_scripts]
+      kofa-debug = grokcore.startup:interactive_debug_prompt
+      kofactl = grokcore.startup:zdaemon_controller
+      [paste.app_factory]
+      main = waeup.kofa.startup:env_app_factory
+      debug = waeup.kofa.startup:env_debug_app_factory
+      """,
+      )
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/__init__.py	(revision 11116)
@@ -0,0 +1,23 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError, e:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/README.txt
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/README.txt	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/README.txt	(revision 11116)
@@ -0,0 +1,4 @@
+The waeup.kwarapoly package
+************************
+
+A customized portal software for student registration.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/__init__.py	(revision 11116)
@@ -0,0 +1,1 @@
+# Make this a package.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/__init__.py	(revision 11116)
@@ -0,0 +1,1 @@
+# Make this a package.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/applicant.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/applicant.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/applicant.py	(revision 11116)
@@ -0,0 +1,57 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+
+import grok
+from zope.interface import implementedBy
+from waeup.kofa.applicants.applicant import ApplicantFactory
+from waeup.kofa.utils.helpers import attrs_to_fields
+from kofacustom.nigeria.applicants.applicant import NigeriaApplicant
+from waeup.kwarapoly.applicants.interfaces import(
+    ICustomApplicant, ICustomUGApplicantEdit, ICustomPGApplicantEdit, IPUTMEApplicantEdit)
+
+class CustomApplicant(NigeriaApplicant):
+
+    grok.implements(ICustomApplicant, ICustomUGApplicantEdit,
+        ICustomPGApplicantEdit, IPUTMEApplicantEdit)
+    grok.provides(ICustomApplicant)
+
+    @property
+    def is_nd(self):
+        if self.applicant_id.startswith('nd') \
+            or self.applicant_id.startswith('rmd') \
+            or self.applicant_id.startswith('prend') \
+            or self.applicant_id.startswith('prermd'):
+            return True
+        return False
+
+
+# Set all attributes of CustomApplicant required in ICustomApplicant as field
+# properties. Doing this, we do not have to set initial attributes
+# ourselves and as a bonus we get free validation when an attribute is
+# set.
+CustomApplicant = attrs_to_fields(CustomApplicant)
+
+class CustomApplicantFactory(ApplicantFactory):
+    """A factory for customized applicants.
+    """
+
+    def __call__(self, *args, **kw):
+        return CustomApplicant()
+
+    def getInterfaces(self):
+        return implementedBy(CustomApplicant)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/batching.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/batching.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/batching.py	(revision 11116)
@@ -0,0 +1,35 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""Batch processing for applicants.
+"""
+from kofacustom.nigeria.applicants.batching import NigeriaApplicantProcessor
+from waeup.kwarapoly.applicants.interfaces import ICustomApplicant
+
+class CustomApplicantProcessor(NigeriaApplicantProcessor):
+    """A batch processor for IApplicant objects.
+
+    In create mode container_code is required. If application_number is given
+    an applicant with this number is created in the designated container.
+    If application_number is not given a random application_number is assigned.
+    applicant_id is being determined by the system and can't be imported.
+
+    In update or remove mode container_code and application_number columns
+    must not exist. The applicant object is solely searched by its applicant_id
+    or reg_number.
+    """
+    iface = ICustomApplicant
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/browser.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/browser.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/browser.py	(revision 11116)
@@ -0,0 +1,163 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""UI components for basic applicants and related components.
+"""
+import grok
+from zope.component import getUtility
+from zope.i18n import translate
+from waeup.kofa.widgets.datewidget import FriendlyDatetimeDisplayWidget
+from zope.formlib.textwidgets import BytesDisplayWidget
+from waeup.kofa.applicants.interfaces import (
+    IApplicant, IApplicantEdit, ISpecialApplicant)
+from waeup.kofa.applicants.browser import (ApplicantDisplayFormPage,
+    ApplicantManageFormPage, ApplicantEditFormPage,
+    ApplicantsContainerPage)
+from waeup.kofa.applicants.viewlets import (
+    PaymentReceiptActionButton, PDFActionButton)
+from waeup.kofa.applicants.pdf import PDFApplicationSlip
+from kofacustom.nigeria.applicants.interfaces import (
+    UG_OMIT_DISPLAY_FIELDS,
+    UG_OMIT_PDF_FIELDS,
+    UG_OMIT_MANAGE_FIELDS,
+    UG_OMIT_EDIT_FIELDS
+    )
+from waeup.kwarapoly.applicants.interfaces import (
+    ICustomUGApplicant, ICustomUGApplicantEdit,
+    ND_OMIT_DISPLAY_FIELDS,
+    ND_OMIT_PDF_FIELDS,
+    ND_OMIT_MANAGE_FIELDS,
+    ND_OMIT_EDIT_FIELDS
+    )
+
+UG_OMIT_EDIT_FIELDS = [
+    value for value in UG_OMIT_EDIT_FIELDS
+        if not value in ('jamb_subjects', 'jamb_score')]
+
+PRE_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + [
+    'firstname',
+    'middlename',
+    'lastname',
+    'sex',
+    'jamb_score'
+    ]
+
+class CustomApplicantsContainerPage(ApplicantsContainerPage):
+    """The standard view for regular applicant containers.
+    """
+
+    @property
+    def form_fields(self):
+        form_fields = super(CustomApplicantsContainerPage, self).form_fields
+        if self.request.principal.id == 'zope.anybody':
+            return form_fields.omit('application_fee')
+        return form_fields
+
+class CustomApplicantDisplayFormPage(ApplicantDisplayFormPage):
+    """A display view for applicant data.
+    """
+
+    @property
+    def form_fields(self):
+        if self.context.special:
+            return grok.AutoFields(ISpecialApplicant)
+        form_fields = grok.AutoFields(ICustomUGApplicant)
+        if self.context.is_nd:
+            for field in ND_OMIT_DISPLAY_FIELDS:
+                form_fields = form_fields.omit(field)
+        else:
+            form_fields = grok.AutoFields(ICustomUGApplicant)
+            for field in UG_OMIT_DISPLAY_FIELDS:
+                form_fields = form_fields.omit(field)
+        form_fields['notice'].custom_widget = BytesDisplayWidget
+        form_fields['jamb_subjects'].custom_widget = BytesDisplayWidget
+        if not getattr(self.context, 'student_id'):
+            form_fields = form_fields.omit('student_id')
+        if not getattr(self.context, 'screening_score'):
+            form_fields = form_fields.omit('screening_score')
+        if not getattr(self.context, 'screening_venue'):
+            form_fields = form_fields.omit('screening_venue')
+        if not getattr(self.context, 'screening_date'):
+            form_fields = form_fields.omit('screening_date')
+        return form_fields
+
+class CustomPDFApplicationSlip(PDFApplicationSlip):
+
+    def _reduced_slip(self):
+        return getattr(self.context, 'result_uploaded', False)
+
+    @property
+    def form_fields(self):
+        form_fields = grok.AutoFields(ICustomUGApplicant)
+        if self.context.is_nd:
+            for field in ND_OMIT_PDF_FIELDS:
+                form_fields = form_fields.omit(field)
+        else:
+            form_fields = grok.AutoFields(ICustomUGApplicant)
+            for field in UG_OMIT_PDF_FIELDS:
+                form_fields = form_fields.omit(field)
+        if not getattr(self.context, 'student_id'):
+            form_fields = form_fields.omit('student_id')
+        if not getattr(self.context, 'screening_score'):
+            form_fields = form_fields.omit('screening_score')
+        if not getattr(self.context, 'screening_venue'):
+            form_fields = form_fields.omit('screening_venue')
+        if not getattr(self.context, 'screening_date'):
+            form_fields = form_fields.omit('screening_date')
+        return form_fields
+
+class CustomApplicantManageFormPage(ApplicantManageFormPage):
+    """A full edit view for applicant data.
+    """
+    
+    @property
+    def form_fields(self):
+        if self.context.special:
+            return grok.AutoFields(ISpecialApplicant)
+        form_fields = grok.AutoFields(ICustomUGApplicant)
+        if self.context.is_nd:
+            for field in ND_OMIT_MANAGE_FIELDS:
+                form_fields = form_fields.omit(field)
+        else:
+            for field in UG_OMIT_MANAGE_FIELDS:
+                form_fields = form_fields.omit(field)
+        form_fields['student_id'].for_display = True
+        form_fields['applicant_id'].for_display = True
+        return form_fields
+
+class CustomApplicantEditFormPage(ApplicantEditFormPage):
+    """An applicant-centered edit view for applicant data.
+    """
+
+    @property
+    def form_fields(self):
+
+        if self.context.special:
+            return grok.AutoFields(ISpecialApplicant)
+        form_fields = grok.AutoFields(ICustomUGApplicantEdit)
+        if self.context.is_nd:
+            for field in ND_OMIT_EDIT_FIELDS:
+                form_fields = form_fields.omit(field)
+        elif self.target is not None and self.target.startswith('pre'):
+            for field in PRE_OMIT_EDIT_FIELDS:
+                form_fields = form_fields.omit(field)
+        else:
+            for field in UG_OMIT_EDIT_FIELDS:
+                form_fields = form_fields.omit(field)
+        form_fields['applicant_id'].for_display = True
+        form_fields['reg_number'].for_display = True
+        return form_fields
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/export.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/export.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/export.py	(revision 11116)
@@ -0,0 +1,34 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""Exporters for applicant-related stuff.
+"""
+import grok
+from waeup.kofa.applicants.interfaces import IApplicantBaseData
+from kofacustom.nigeria.applicants.export import NigeriaApplicantsExporter
+from kofacustom.nigeria.applicants.interfaces import INigeriaUGApplicant
+from waeup.kwarapoly.applicants.interfaces import ICustomUGApplicant
+
+class CustomApplicantsExporter(NigeriaApplicantsExporter):
+    """Exporter for Custom Applicants.
+    """
+
+    fields = tuple(sorted(set(
+        ICustomUGApplicant.names() +
+        INigeriaUGApplicant.names() +
+        IApplicantBaseData.names()
+        ))) + ('container_code',)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/interfaces.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/interfaces.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/interfaces.py	(revision 11116)
@@ -0,0 +1,349 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""Customized interfaces of the university application package.
+"""
+
+from zope import schema
+from waeup.kofa.applicants.interfaces import (
+    IApplicantBaseData,
+    AppCatCertificateSource, CertificateSource)
+from waeup.kofa.schoolgrades import ResultEntryField
+from waeup.kofa.interfaces import (
+    SimpleKofaVocabulary, academic_sessions_vocab, validate_email)
+from waeup.kofa.schema import FormattedDate, TextLineChoice, PhoneNumber
+from waeup.kofa.students.vocabularies import nats_vocab, GenderSource
+from waeup.kofa.applicants.interfaces import contextual_reg_num_source
+from kofacustom.nigeria.applicants.interfaces import (
+    LGASource, high_qual, high_grade, exam_types,
+    OMIT_DISPLAY_FIELDS,
+    INigeriaUGApplicant, INigeriaPGApplicant,
+    INigeriaApplicantOnlinePayment,
+    INigeriaUGApplicantEdit, INigeriaPGApplicantEdit,
+    INigeriaApplicantUpdateByRegNo,
+    IPUTMEApplicantEdit,
+    )
+from waeup.kwarapoly.interfaces import MessageFactory as _
+from waeup.kwarapoly.payments.interfaces import ICustomOnlinePayment
+
+ND_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + (
+    'hq_type',
+    'hq_matric_no',
+    'hq_degree',
+    'hq_school',
+    'hq_session',
+    'hq_disc',
+    'hq_type')
+ND_OMIT_PDF_FIELDS = ND_OMIT_DISPLAY_FIELDS + ('phone',)
+ND_OMIT_MANAGE_FIELDS = ('special_application',)
+ND_OMIT_EDIT_FIELDS = ND_OMIT_MANAGE_FIELDS + ND_OMIT_DISPLAY_FIELDS + (
+    'student_id', 'notice',
+    'screening_score',
+    'screening_venue',
+    'screening_date',
+    'jamb_subjects',
+    'jamb_score',
+    'aggregate')
+
+class ICustomUGApplicant(IApplicantBaseData):
+    """An undergraduate applicant.
+
+    This interface defines the least common multiple of all fields
+    in ug application forms. In customized forms, fields can be excluded by
+    adding them to the UG_OMIT* tuples.
+    """
+    sex = schema.Choice(
+        title = _(u'Sex'),
+        source = GenderSource(),
+        required = False,
+        )
+    nationality = schema.Choice(
+        source = nats_vocab,
+        title = _(u'Nationality'),
+        required = False,
+        )
+    lga = schema.Choice(
+        source = LGASource(),
+        title = _(u'State/LGA (Nigerians only)'),
+        required = False,
+        )
+    #perm_address = schema.Text(
+    #    title = _(u'Permanent Address'),
+    #    required = False,
+    #    )
+    next_kin_address = schema.Text(
+        title = _(u'Next of Kin Address'),
+        required = False,
+        )
+    jamb_reg_number = schema.TextLine(
+        title = _(u'JAMB Registration Number'),
+        required = False,
+        )
+    course1 = schema.Choice(
+        title = _(u'1st Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = False,
+        )
+    course2 = schema.Choice(
+        title = _(u'2nd Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = False,
+        )
+    olevel_type = schema.Choice(
+        title = _(u'Qualification Obtained'),
+        required = False,
+        readonly = False,
+        vocabulary = exam_types,
+        )
+    olevel_school = schema.TextLine(
+        title = _(u'Institution Attended'),
+        required = False,
+        readonly = False,
+        )
+    olevel_exam_number = schema.TextLine(
+        title = _(u'Exam Number'),
+        required = False,
+        readonly = False,
+        )
+    olevel_exam_date = FormattedDate(
+        title = _(u'Exam Date'),
+        required = False,
+        readonly = False,
+        show_year = True,
+        )
+    olevel_results = schema.List(
+        title = _(u'Exam Results'),
+        value_type = ResultEntryField(),
+        required = False,
+        readonly = False,
+        default = [],
+        )
+    olevel_type2 = schema.Choice(
+        title = _(u'2nd Qualification Obtained'),
+        required = False,
+        readonly = False,
+        vocabulary = exam_types,
+        )
+    olevel_school2 = schema.TextLine(
+        title = _(u'2nd Institution Attended'),
+        required = False,
+        readonly = False,
+        )
+    olevel_exam_number2 = schema.TextLine(
+        title = _(u'2nd Exam Number'),
+        required = False,
+        readonly = False,
+        )
+    olevel_exam_date2 = FormattedDate(
+        title = _(u'2nd Exam Date'),
+        required = False,
+        readonly = False,
+        show_year = True,
+        )
+    olevel_results2 = schema.List(
+        title = _(u'2nd Exam Results'),
+        value_type = ResultEntryField(),
+        required = False,
+        readonly = False,
+        default = [],
+        )
+    hq_type = schema.Choice(
+        title = _(u'Qualification Obtained'),
+        required = False,
+        readonly = False,
+        vocabulary = high_qual,
+        )
+    hq_matric_no = schema.TextLine(
+        title = _(u'Former Matric Number'),
+        required = False,
+        readonly = False,
+        )
+    hq_degree = schema.Choice(
+        title = _(u'Class of Degree'),
+        required = False,
+        readonly = False,
+        vocabulary = high_grade,
+        )
+    hq_school = schema.TextLine(
+        title = _(u'Institution Attended'),
+        required = False,
+        readonly = False,
+        )
+    hq_session = schema.TextLine(
+        title = _(u'Years Attended'),
+        required = False,
+        readonly = False,
+        )
+    hq_disc = schema.TextLine(
+        title = _(u'Discipline'),
+        required = False,
+        readonly = False,
+        )
+    jamb_subjects = schema.Text(
+        title = _(u'Subjects and Scores'),
+        description = _(u'(one subject with score per line)'),
+        required = False,
+        )
+    jamb_score = schema.Int(
+        title = _(u'Total JAMB Score'),
+        required = False,
+        )
+    notice = schema.Text(
+        title = _(u'Notice'),
+        required = False,
+        )
+    screening_venue = schema.TextLine(
+        title = _(u'Screening Venue'),
+        required = False,
+        )
+    screening_date = schema.TextLine(
+        title = _(u'Screening Date'),
+        required = False,
+        )
+    screening_score = schema.Int(
+        title = _(u'Screening Score (%)'),
+        required = False,
+        )
+    aggregate = schema.Int(
+        title = _(u'Aggregate Score (%)'),
+        description = _(u'(average of relative JAMB and PUTME scores)'),
+        required = False,
+        )
+    result_uploaded = schema.Bool(
+        title = _(u'Result uploaded'),
+        default = False,
+        required = False,
+        )
+    student_id = schema.TextLine(
+        title = _(u'Student Id'),
+        required = False,
+        readonly = False,
+        )
+    course_admitted = schema.Choice(
+        title = _(u'Admitted Course of Study'),
+        source = CertificateSource(),
+        required = False,
+        )
+    locked = schema.Bool(
+        title = _(u'Form locked'),
+        default = False,
+        required = False,
+        )
+
+ICustomUGApplicant[
+    'sex'].order =  IApplicantBaseData['sex'].order
+
+class ICustomPGApplicant(INigeriaPGApplicant):
+    """A postgraduate applicant.
+
+    This interface defines the least common multiple of all fields
+    in pg application forms. In customized forms, fields can be excluded by
+    adding them to the PG_OMIT* tuples.
+    """
+
+class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant):
+    """An interface for both types of applicants.
+
+    Attention: The ICustomPGApplicant field seetings will be overwritten
+    by ICustomPGApplicant field settings. If a field is defined
+    in both interfaces zope.schema validates only against the
+    constraints in ICustomUGApplicant. This does not affect the forms
+    since they are build on either ICustomUGApplicant or ICustomPGApplicant.
+    """
+
+    def writeLogMessage(view, comment):
+        """Adds an INFO message to the log file
+        """
+
+    def createStudent():
+        """Create a student object from applicatnt data
+        and copy applicant object.
+        """
+
+class ICustomUGApplicantEdit(ICustomUGApplicant):
+    """An undergraduate applicant interface for edit forms.
+
+    Here we can repeat the fields from base data and set the
+    `required` and `readonly` attributes to True to further restrict
+    the data access. Or we can allow only certain certificates to be
+    selected by choosing the appropriate source.
+
+    We cannot omit fields here. This has to be done in the
+    respective form page.
+    """
+    email = schema.ASCIILine(
+        title = _(u'Email Address'),
+        required = True,
+        constraint=validate_email,
+        )
+    phone = PhoneNumber(
+        title = _(u'Phone'),
+        description = u'',
+        required = True,
+        )
+    sex = schema.Choice(
+        title = _(u'Sex'),
+        source = GenderSource(),
+        required = True,
+        )
+    course1 = schema.Choice(
+        title = _(u'1st Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = True,
+        )
+    olevel_type = schema.Choice(
+        title = _(u'Qualification Obtained'),
+        required = True,
+        readonly = False,
+        vocabulary = exam_types,
+        )
+    jamb_subjects = schema.Text(
+        title = _(u'Subjects and Scores'),
+        description = _(u'(one subject with score per line)'),
+        required = True,
+        )
+
+ICustomUGApplicantEdit[
+    'email'].order =  ICustomUGApplicant['email'].order
+ICustomUGApplicantEdit[
+    'phone'].order =  ICustomUGApplicant['phone'].order
+ICustomUGApplicantEdit[
+    'course1'].order =  ICustomUGApplicant['course1'].order
+ICustomUGApplicantEdit[
+    'sex'].order =  ICustomUGApplicant['sex'].order
+ICustomUGApplicantEdit[
+    'olevel_type'].order =  ICustomUGApplicant['olevel_type'].order
+ICustomUGApplicantEdit[
+    'jamb_subjects'].order =  ICustomUGApplicant['jamb_subjects'].order
+
+class ICustomPGApplicantEdit(INigeriaPGApplicantEdit):
+    """A postgraduate applicant interface for editing.
+
+    Here we can repeat the fields from base data and set the
+    `required` and `readonly` attributes to True to further restrict
+    the data access. Or we can allow only certain certificates to be
+    selected by choosing the appropriate source.
+
+    We cannot omit fields here. This has to be done in the
+    respective form page.
+    """
+
+class ICustomApplicantOnlinePayment(INigeriaApplicantOnlinePayment):
+    """An applicant payment via payment gateways.
+
+    """
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/payment.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/payment.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/payment.py	(revision 11116)
@@ -0,0 +1,59 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""
+Application fee payment.
+"""
+import grok
+from zope.component.interfaces import IFactory
+from zope.interface import implementedBy
+from waeup.kofa.applicants.payment import ApplicantOnlinePayment
+from waeup.kofa.utils.helpers import attrs_to_fields
+from waeup.kwarapoly.applicants.interfaces import ICustomApplicantOnlinePayment
+
+class CustomApplicantOnlinePayment(ApplicantOnlinePayment):
+    """This is a custom online payment for applicants.
+
+    Since this class inherits from ApplicantOnlinePayment, it automatically
+    implements the interfaces of the parent class which means
+    all viewlets and views meant for StudentOnlinePayment
+    can also be accessed in the customized system.
+    """
+    grok.implements(ICustomApplicantOnlinePayment)
+    grok.provides(ICustomApplicantOnlinePayment)
+
+    def __init__(self):
+        super(CustomApplicantOnlinePayment, self).__init__()
+        return
+
+CustomApplicantOnlinePayment = attrs_to_fields(
+    CustomApplicantOnlinePayment, omit=['display_item'])
+
+# Applicant online payments must be importable. So we might need a factory.
+class CustomApplicantOnlinePaymentFactory(grok.GlobalUtility):
+    """A factory for applicant online payments.
+    """
+    grok.implements(IFactory)
+    grok.name(u'waeup.ApplicantOnlinePayment')
+    title = u"Create a new online payment.",
+    description = u"This factory instantiates new online payment instances."
+
+    def __call__(self, *args, **kw):
+        return CustomApplicantOnlinePayment()
+
+    def getInterfaces(self):
+        return implementedBy(CustomApplicantOnlinePayment)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/tests/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/tests/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/tests/__init__.py	(revision 11116)
@@ -0,0 +1,1 @@
+# Make this a package.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/tests/test_applicant.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/tests/test_applicant.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/tests/test_applicant.py	(revision 11116)
@@ -0,0 +1,79 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""Tests for applicants and related.
+"""
+import grok
+import shutil
+import tempfile
+from StringIO import StringIO
+from zope.component import adapts, queryUtility
+from zope.component.interfaces import IFactory
+from zope.interface import verify, implements
+from zope.location.interfaces import ILocation
+from waeup.kofa.image.interfaces import IKofaImageFile
+from waeup.kofa.imagestorage import DefaultStorage
+from waeup.kofa.interfaces import IFileStoreHandler, IFileStoreNameChooser
+from waeup.kofa.testing import FunctionalTestCase
+from waeup.kwarapoly.applicants.applicant import (
+    CustomApplicant, CustomApplicantFactory,
+    )
+from waeup.kwarapoly.applicants.interfaces import ICustomApplicant
+from waeup.kwarapoly.testing import FunctionalLayer
+
+class CustomApplicantTest(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(CustomApplicantTest, self).setUp()
+        self.applicant = CustomApplicant()
+        return
+
+    def tearDown(self):
+        super(CustomApplicantTest, self).tearDown()
+        return
+
+    def test_interfaces(self):
+        verify.verifyClass(ICustomApplicant, CustomApplicant)
+        verify.verifyObject(ICustomApplicant, self.applicant)
+        return
+
+class CustomApplicantFactoryTest(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(CustomApplicantFactoryTest, self).setUp()
+        self.factory = CustomApplicantFactory()
+        return
+
+    def tearDown(self):
+        super(CustomApplicantFactoryTest, self).tearDown()
+        return
+
+    def test_interfaces(self):
+        verify.verifyClass(IFactory, CustomApplicantFactory)
+        verify.verifyObject(IFactory, self.factory)
+
+    def test_factory(self):
+        obj = self.factory()
+        assert isinstance(obj, CustomApplicant)
+
+    def test_getInterfaces(self):
+        implemented_by = self.factory.getInterfaces()
+        assert implemented_by.isOrExtends(ICustomApplicant)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/tests/test_browser.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/tests/test_browser.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/tests/test_browser.py	(revision 11116)
@@ -0,0 +1,145 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+import shutil
+import tempfile
+import datetime
+import pytz
+from zope.component.hooks import setSite, clearSite
+from zope.component import createObject
+from zope.testbrowser.testing import Browser
+from waeup.kofa.app import University
+from waeup.kofa.university.faculty import Faculty
+from waeup.kofa.university.department import Department
+from waeup.kofa.testing import FunctionalTestCase
+from waeup.kofa.applicants.container import ApplicantsContainer
+from waeup.kwarapoly.testing import FunctionalLayer
+
+session = datetime.datetime.now().year - 2
+ndftcontainer_name = u'ndft%s' % session
+
+class ApplicantUITest(FunctionalTestCase):
+    """Perform some browser tests.
+    """
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(ApplicantUITest, self).setUp()
+        # Setup a sample site for each test
+        app = University()
+        self.dc_root = tempfile.mkdtemp()
+        app['datacenter'].setStoragePath(self.dc_root)
+
+        # Prepopulate the ZODB...
+        self.getRootFolder()['app'] = app
+        # we add the site immediately after creation to the
+        # ZODB. Catalogs and other local utilities are not setup
+        # before that step.
+        self.app = self.getRootFolder()['app']
+        # Set site here. Some of the following setup code might need
+        # to access grok.getSite() and should get our new app then
+        setSite(app)
+
+        # Add ndft applicants container
+        self.ndftcontainer = ApplicantsContainer()
+        self.ndftcontainer.mode = 'create'
+        self.ndftcontainer.code = ndftcontainer_name
+        self.ndftcontainer.prefix = u'ndft'
+        self.ndftcontainer.application_category = u'ndft'
+        self.ndftcontainer.year = session
+        self.ndftcontainer.application_fee = 300.0
+        #self.ndftcontainer.title = u'This is the %s container' % ndftcontainer_name
+        self.app['applicants'][ndftcontainer_name] = self.ndftcontainer
+
+        delta = datetime.timedelta(days=10)
+        self.ndftcontainer.startdate = datetime.datetime.now(pytz.utc) - delta
+        self.ndftcontainer.enddate = datetime.datetime.now(pytz.utc) + delta
+
+        # Populate university
+        self.certificate = createObject('waeup.Certificate')
+        self.certificate.code = 'CERT1'
+        self.certificate.application_category = 'ndft'
+        self.certificate.start_level = 100
+        self.certificate.end_level = 500
+        self.certificate.study_mode = u'nce_ft'
+        self.app['faculties']['fac1'] = Faculty()
+        self.app['faculties']['fac1']['dep1'] = Department()
+        self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
+            self.certificate)
+
+        # Add (customized) applicants
+        ndftapplicant = createObject(u'waeup.Applicant')
+        ndftapplicant.firstname = u'Anna'
+        ndftapplicant.lastname = u'Post'
+        self.app['applicants'][ndftcontainer_name].addApplicant(ndftapplicant)
+        self.ndftapplication_number = ndftapplicant.application_number
+        self.ndftapplicant = self.app['applicants'][ndftcontainer_name][
+            self.ndftapplication_number]
+        self.ndftapplicant_path = ('http://localhost/app/applicants/%s/%s'
+            % (ndftcontainer_name, self.ndftapplication_number))
+
+        self.browser = Browser()
+        self.browser.handleErrors = False
+
+    def tearDown(self):
+        super(ApplicantUITest, self).tearDown()
+        shutil.rmtree(self.dc_root)
+        clearSite()
+        return
+
+    def fill_correct_values(self):
+        self.browser.getControl(name="form.reg_number").value = '1234'
+        self.browser.getControl(name="form.firstname").value = 'John'
+        self.browser.getControl(name="form.lastname").value = 'Tester'
+        self.browser.getControl(name="form.date_of_birth").value = '09/09/1988'
+        self.browser.getControl(name="form.lga").value = ['foreigner']
+        #self.browser.getControl(name="form.nationality").value = ['NG']
+        #self.browser.getControl(name="form.sex").value = ['m']
+        self.browser.getControl(name="form.email").value = 'xx@yy.zz'
+
+    def test_manage_and_view_applicant(self):
+        # Managers can manage ndft applicants.
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.ndftapplicant_path)
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertTrue("'O' Level" in self.browser.contents)
+        self.assertFalse("Higher" in self.browser.contents)
+        self.browser.open(self.ndftapplicant_path + '/manage')
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertTrue("'O' Level" in self.browser.contents)
+        self.assertTrue("Higher" in self.browser.contents)
+        self.browser.open(self.ndftapplicant_path + '/edit')
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertTrue("'O' Level" in self.browser.contents)
+        self.assertFalse("Higher" in self.browser.contents)
+        self.browser.open(self.ndftapplicant_path + '/application_slip.pdf')
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        # Now we turn the ndft applicant into an hndft applicant.
+        self.ndftapplicant.applicant_id = u'hndft_anything'
+        self.browser.open(self.ndftapplicant_path)
+        self.assertTrue("Higher" in self.browser.contents)
+        self.assertTrue("'O' Level" in self.browser.contents)
+        self.browser.open(self.ndftapplicant_path + '/edit')
+        self.assertTrue("Higher" in self.browser.contents)
+        self.assertTrue("'O' Level" in self.browser.contents)
+
+        self.browser.open(self.ndftapplicant_path + '/manage')
+        # Manager can fill and save the form
+        self.fill_correct_values()
+        self.browser.getControl("Save").click()
+        self.assertMatches('...Form has been saved...', self.browser.contents)
+        return
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/utils.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/utils.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/applicants/utils.py	(revision 11116)
@@ -0,0 +1,63 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""General helper functions and utilities for the application section.
+"""
+
+from time import time
+import sys
+import grok
+from kofacustom.nigeria.applicants.utils import NigeriaApplicantsUtils
+from waeup.kwarapoly.interfaces import MessageFactory as _
+
+
+
+class ApplicantsUtils(NigeriaApplicantsUtils):
+    """A collection of parameters and methods subject to customization.
+    """
+
+    APP_TYPES_DICT = {
+        'rmd': ['Remedial Programme', 'RP'],
+        'hndft': ['HND Full-Time Programmes', 'HNDFT'],
+        'hndpt': ['HND Part-Time Programmes', 'HNDPT'],
+        'ndft': ['ND Full-Time Programmes', 'NDFT'],
+        'ndpt': ['ND Part-Time Programmes', 'NDPT'],
+        'putme': ['Post-UTME Screening Exercise', 'PUTME'],
+        'app': ['General Studies', 'APP'],
+        'cest': ['Common Entry Screening Test', 'CEST'],
+        'ct': ['Certificate Programmes', 'CTP'],
+        'pgft': ['Postgraduate Full-Time Programmes', 'PG'],
+        'pgpt': ['Postgraduate Part-Time Programmes', 'PG'],
+        'prermd': ['Pre-Admission Screening: Remedial Forms', 'RP'],
+        'prehndft': ['Pre-Admission Screening: HND Full-Time Forms', 'HNDFT'],
+        'prehndpt': ['Pre-Admission Screening: HND Part-Time Forms', 'HNDPT'],
+        'prendft': ['Pre-Admission Screening: ND Full-Time Forms', 'NDFT'],
+        'prendpt': ['Pre-Admission Screening: ND Part-Time Forms', 'NDPT'],
+        'prejambites': ['Pre-Admission Screening: JAMBITES', 'JMB'],
+        'special': ['Supplementary Payment', 'SP'],
+        }
+
+    SEPARATORS_DICT = {
+        'form.applicant_id': _(u'Base Data'),
+        'form.course1': _(u'Programmes/Courses Desired'),
+        'form.hq_type': _(u'Higher Education Record'),
+        'form.jamb_subjects': _(u'JAMB Data'),
+        'form.notice': _(u'Application Process Information'),
+        'form.pp_school': _(u'Post Primary School Qualification'),
+        'form.presently_inst': _(u'Presently attending a course or programme'),
+        'form.olevel_type': _(u"'O' Level Record"),
+        }
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/__init__.py	(revision 11116)
@@ -0,0 +1,1 @@
+# Make this a package.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/pages.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/pages.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/pages.py	(revision 11116)
@@ -0,0 +1,46 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+import grok
+from waeup.kofa.browser.pages import (
+    SessionConfigurationAddFormPage, SessionConfigurationManageFormPage,
+    CertificatePage, CertificateManageFormPage)
+from waeup.kofa.university.interfaces import ICertificate
+from waeup.kwarapoly.interfaces import (
+    ICustomSessionConfiguration, ICustomSessionConfigurationAdd)
+
+class CustomSessionConfigurationAddFormPage(SessionConfigurationAddFormPage):
+    """Add a session configuration object to configuration container.
+    """
+    form_fields = grok.AutoFields(ICustomSessionConfigurationAdd)
+
+class CustomSessionConfigurationManageFormPage(SessionConfigurationManageFormPage):
+    """Manage session configuration object.
+    """
+    form_fields = grok.AutoFields(ICustomSessionConfiguration)
+
+class CustomCertificatePage(CertificatePage):
+    """Index page for certificates.
+    """
+    form_fields = grok.AutoFields(ICertificate).omit(
+        'school_fee_1', 'school_fee_2', 'school_fee_3', 'school_fee_4')
+
+class CustomCertificateManageFormPage(CertificateManageFormPage):
+    """Manage the properties of a `Certificate` instance.
+    """
+    form_fields = grok.AutoFields(ICertificate).omit(
+        'school_fee_1', 'school_fee_2', 'school_fee_3', 'school_fee_4')
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/pdf.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/pdf.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/pdf.py	(revision 11116)
@@ -0,0 +1,35 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+## 
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+## 
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""
+Reusable components for pdf generation.
+"""
+
+import os
+from waeup.kofa.browser.pdf import PDFCreator
+
+class CustomPDFCreator(PDFCreator):
+    """A utility to help with generating PDF docs.
+    """
+
+    header_logo_path = os.path.join(
+        os.path.dirname(__file__), 'static', 'pdf_logo.png')
+    #watermark_path = os.path.join(
+    #    os.path.dirname(__file__), 'static', 'pdf_watermark.jpg')
+
+    #watermark_pos = [-25, 100]
+    logo_pos = [507, 740, 70]
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/resources.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/resources.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/resources.py	(revision 11116)
@@ -0,0 +1,30 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+import grok
+from waeup.kofa.browser.resources import (
+    Library, ResourceInclusion, waeup_base_css,
+    )
+
+#: All local resources are registered under the name ``waeup_custom``.
+waeup_custom = Library('waeup_custom', 'static')
+
+custom_theme = ResourceInclusion(
+    waeup_custom, 'custom_theme.css',
+    depends = [waeup_base_css])
+
+favicon = ResourceInclusion(waeup_custom, 'favicon.ico')
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/static/custom_theme.css
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/static/custom_theme.css	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/static/custom_theme.css	(revision 11116)
@@ -0,0 +1,89 @@
+/* Original colors, dark blue: #426ab2,light blue: #779ce2 */
+
+.topbar-inner, .topbar .fill {
+  background-color: #109445;
+  background-image: -moz-linear-gradient(center top , #095427, #109445);
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#095427), to(#109445));
+  background-image: -moz-linear-gradient(top, #095427, #109445);
+  background-image: -ms-linear-gradient(top, #095427, #109445);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #095427), color-stop(100%, #109445));
+  background-image: -webkit-linear-gradient(top, #095427, #109445);
+  background-image: -o-linear-gradient(top, #095427, #109445);
+  background-image: linear-gradient(top, #095427, #109445);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#095427', endColorstr='#109445', GradientType=0);
+}
+
+.topbar div > ul .active > a, .nav .active > a {
+  background-color: #109445;
+}
+
+.topbar h3 a:hover, .topbar .brand:hover, .topbar ul .active > a {
+  background-color: #109445;
+}
+
+.topbar div > ul a:hover, .nav a:hover {
+  background-color: #109445;
+}
+
+
+.topbar div > ul .menu-dropdown,
+.nav .menu-dropdown,
+.topbar div > ul .dropdown-menu,
+.nav .dropdown-menu {
+  background-color: #109445;
+}
+
+.topbar div > ul a.menu:hover,
+.nav a.menu:hover,
+.topbar div > ul li.open .menu,
+.nav li.open .menu,
+.topbar div > ul .dropdown-toggle:hover,
+.nav .dropdown-toggle:hover,
+.topbar div > ul .dropdown.open .dropdown-toggle,
+.nav .dropdown.open .dropdown-toggle {
+  background: #109445;
+}
+
+/* Original background color */
+/*
+body {
+  background-color: #F6F6D9;
+}
+*/
+
+body {
+  background-color: #e6e8e7;
+}
+
+.topbar div > ul .menu-dropdown li a:hover,
+.nav .menu-dropdown li a:hover,
+.topbar div > ul .dropdown-menu li a:hover,
+.nav .dropdown-menu li a:hover {
+  background-color: #095427;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#109445), to(#191919));
+  background-image: -moz-linear-gradient(top, #095427, #095427);
+  background-image: -ms-linear-gradient(top, #095427, #095427);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #095427), color-stop(100%, #095427));
+  background-image: -webkit-linear-gradient(top, #095427, #095427);
+  background-image: -o-linear-gradient(top, #095427, #095427);
+  background-image: linear-gradient(top, #095427, #095427);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#095427', endColorstr='#095427', GradientType=0);
+  color: #ffffff;
+}
+
+.topbar div > ul .menu-dropdown li a, .nav .menu-dropdown li a, .topbar div > ul .dropdown-menu li a, .nav .dropdown-menu li a {
+    color: #ffffff;
+}
+
+a {
+  color: #095427;
+}
+
+a:hover {
+  color: #109445;
+}
+
+.topbar a {
+    color: white;
+}
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/tests.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/tests.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/tests.py	(revision 11116)
@@ -0,0 +1,58 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+import tempfile
+import shutil
+from zope.testbrowser.testing import Browser
+from zope.component.hooks import setSite, clearSite
+from zope.security.interfaces import Unauthorized
+from waeup.kofa.testing import FunctionalTestCase
+from waeup.kwarapoly.testing import FunctionalLayer
+from waeup.kofa.app import University
+
+class CustomPackageBrowserTests(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(CustomPackageBrowserTests, self).setUp()
+
+        # Setup a sample site for each test
+        app = University()
+        self.dc_root = tempfile.mkdtemp()
+        app['datacenter'].setStoragePath(self.dc_root)
+
+        # Put the prepopulated site into test ZODB and prepare test
+        # browser
+        self.getRootFolder()['app'] = app
+        setSite(app)
+        self.browser = Browser()
+        self.browser.handleErrors = False
+
+    def tearDown(self):
+        super(CustomPackageBrowserTests, self).tearDown()
+        clearSite()
+        shutil.rmtree(self.dc_root)
+
+    def test_custom_theme(self):
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open('http://localhost/app/configuration')
+        self.assertMatches('...KwaraPoly Theme...', self.browser.contents)
+        self.browser.getControl(name="form.skin").value = ['custom theme']
+        self.browser.getControl("Save").click()
+        self.browser.open('http://localhost/app/configuration')
+        return
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/theming.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/theming.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/browser/theming.py	(revision 11116)
@@ -0,0 +1,33 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+import grok
+from waeup.kofa.browser.interfaces import ITheme
+from waeup.kwarapoly.browser.resources import custom_theme, favicon
+
+from waeup.kwarapoly.interfaces import MessageFactory as _
+
+class CustomTheme(grok.GlobalUtility):
+    """A custom theme based on the Kofa base theme.
+    """
+    grok.implements(ITheme)
+    grok.name('custom theme')
+
+    description = _(u'KwaraPoly Theme')
+
+    def getResources(self):
+        return [custom_theme, favicon]
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/configuration.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/configuration.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/configuration.py	(revision 11116)
@@ -0,0 +1,47 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""
+Containers for session configuration objects.
+"""
+import grok
+from zope.interface import implementedBy
+from waeup.kofa.utils.helpers import attrs_to_fields
+from waeup.kofa.configuration import (
+    SessionConfigurationFactory, SessionConfiguration)
+from waeup.kwarapoly.interfaces import (
+    ICustomSessionConfiguration, ICustomSessionConfigurationAdd)
+
+
+class CustomSessionConfiguration(SessionConfiguration):
+    """
+    Customized session configuration model
+    """
+
+    grok.implements(ICustomSessionConfiguration, ICustomSessionConfigurationAdd)
+
+CustomSessionConfiguration = attrs_to_fields(CustomSessionConfiguration)
+
+class CustomSessionConfigurationFactory(SessionConfigurationFactory):
+    """A customized factory for session configuration objects.
+    """
+
+    def __call__(self, *args, **kw):
+        return CustomSessionConfiguration(*args, **kw)
+
+    def getInterfaces(self):
+        return implementedBy(CustomSessionConfiguration)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/configure.zcml
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/configure.zcml	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/configure.zcml	(revision 11116)
@@ -0,0 +1,11 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:grok="http://namespaces.zope.org/grok">
+  <include package="waeup.kwarapoly" file="locales.zcml" />
+
+  <!-- kofacustom.nigeria configures everything we basically need.
+  -->
+  <include package="kofacustom.nigeria" />
+
+  <grok:grok package="." />
+
+</configure>
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/ftesting.zcml
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/ftesting.zcml	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/ftesting.zcml	(revision 11116)
@@ -0,0 +1,67 @@
+<configure
+   xmlns="http://namespaces.zope.org/zope"
+   xmlns:kofa="http://namespaces.waeup.org/kofa"
+   i18n_domain="waeup.kwarapoly"
+   package="waeup.kwarapoly"
+   >
+
+  <include package="waeup.kwarapoly" />
+  <include package="waeup.kwarapoly" file="mail.zcml"/>
+
+  <!-- Where should the datacenter reside by default? -->
+  <kofa:datacenter
+      path="../../../parts/test/datacenter" />
+
+  <!-- Typical functional testing security setup -->
+  <securityPolicy
+      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
+      />
+
+  <unauthenticatedPrincipal
+      id="zope.anybody"
+      title="Unauthenticated User"
+      />
+  <unauthenticatedGroup id="zope.Anybody"
+      title="Unauthenticated Users" />
+  <authenticatedGroup id="zope.Authenticated"
+      title="Authenticated Users" />
+  <everybodyGroup id="zope.Everybody"
+      title="All Users" />
+
+  <!-- grant
+      permission="zope.View"
+      principal="zope.Anybody"
+      / -->
+  <grant
+      permission="zope.app.dublincore.view"
+      principal="zope.Anybody" />
+  <grant
+      permission="zope.View"
+      principal="zope.Authenticated"
+      />
+  <grant
+      permission="zope.app.dublincore.view"
+      principal="zope.Authenticated"
+      />
+  <grant
+      permission="waeup.Public"
+      principal="zope.Everybody"
+      />
+  <grant 
+      permission="waeup.Anonymous"
+      principal="zope.Anybody"
+      />
+
+
+  <principal
+      id="zope.mgr"
+      title="Manager"
+      login="mgr"
+      password="mgrpw"
+      />
+
+  <role id="zope.Manager" title="Site Manager" />
+  <grantAll role="zope.Manager" />
+  <grant role="zope.Manager" principal="zope.mgr" />
+
+</configure>
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interfaces.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interfaces.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interfaces.py	(revision 11116)
@@ -0,0 +1,194 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+
+import zope.i18nmessageid
+from zope import schema
+from zc.sourcefactory.basic import BasicSourceFactory
+from waeup.kofa.interfaces import (SimpleKofaVocabulary,
+    ISessionConfiguration, academic_sessions_vocab)
+
+_ = MessageFactory = zope.i18nmessageid.MessageFactory('waeup.kwarapoly')
+
+# It's recommended to replicate all fields from the base package here.
+class ICustomSessionConfiguration(ISessionConfiguration):
+    """A session configuration object.
+    """
+
+    # Base fees, do not remove.
+
+    school_fee_base = schema.Float(
+        title = _(u'School Fee (ignored)'),
+        default = 0.0,
+        required = False,
+        )
+
+    application_fee = schema.Float(
+        title = _(u'Application Fee (fallback)'),
+        default = 0.0,
+        required = False,
+        )
+
+    clearance_fee = schema.Float(
+        title = _(u'Clearance Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    booking_fee = schema.Float(
+        title = _(u'Booking Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    # Additional fees in custom package
+
+    maint_fee = schema.Float(
+        title = _(u'Maintenance Fee (fallback)'),
+        default = 0.0,
+        required = False,
+        )
+
+    gown_fee = schema.Float(
+        title = _(u'Gown Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    transfer_fee = schema.Float(
+        title = _(u'Transfer Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    certificate_fee = schema.Float(
+        title = _(u' Certificate Fee'),
+        default = 0.0,
+        required = False,
+        )
+    state_result_fee = schema.Float(
+        title = _(u'Statement of Result Fee'),
+        default = 0.0,
+        required = False,
+        )
+    transcript_local_fee = schema.Float(
+        title = _(u'Transcript (local) Fee'),
+        default = 0.0,
+        required = False,
+        )
+    transcript_foreign_fee = schema.Float(
+        title = _(u'Transcript (foreign) Fee'),
+        default = 0.0,
+        required = False,
+        )
+    ver_result_fee = schema.Float(
+        title = _(u'Verification of Result Fee'),
+        default = 0.0,
+        required = False,
+        )
+    change_course_fee = schema.Float(
+        title = _(u'Change of Course Fee'),
+        default = 0.0,
+        required = False,
+        )
+    change_inst_fee = schema.Float(
+        title = _(u'Change of Institute Fee'),
+        default = 0.0,
+        required = False,
+        )
+    jamb_reject_fee = schema.Float(
+        title = _(u'JAMB Rejection Form Fee'),
+        default = 0.0,
+        required = False,
+        )
+    cert_of_cert_fee = schema.Float(
+        title = _(u'Certification of Certificate Fee'),
+        default = 0.0,
+        required = False,
+        )
+    ref_let_fee = schema.Float(
+        title = _(u'Recommendation/Reference Letter Fee'),
+        default = 0.0,
+        required = False,
+        )
+    proc_cert_fee = schema.Float(
+        title = _(u'Processing of Certificate by Proxy Fee'),
+        default = 0.0,
+        required = False,
+        )
+    loss_idcard_fee = schema.Float(
+        title = _(u'Loss of ID Card Fee'),
+        default = 0.0,
+        required = False,
+        )
+    loss_examcard_fee = schema.Float(
+        title = _(u'Loss of Exam Card Fee'),
+        default = 0.0,
+        required = False,
+        )
+    loss_result_fee = schema.Float(
+        title = _(u'Loss of Result Fee'),
+        default = 0.0,
+        required = False,
+        )
+    loss_receipt_fee = schema.Float(
+        title = _(u'Loss of Receipt Fee'),
+        default = 0.0,
+        required = False,
+        )
+    loss_clearance_fee = schema.Float(
+        title = _(u'Loss of Clearance Fee'),
+        default = 0.0,
+        required = False,
+        )
+    conv_brochure_fee = schema.Float(
+        title = _(u'Convocation Brochure Fee'),
+        default = 0.0,
+        required = False,
+        )
+    penalty_ug = schema.Float(
+        title = _(u'UG Penalty Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    penalty_pg = schema.Float(
+        title = _(u'PG Penalty Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    def getSessionString():
+        """Returns the session string from the vocabulary.
+        """
+
+
+class ICustomSessionConfigurationAdd(ICustomSessionConfiguration):
+    """A session configuration object in add mode.
+    """
+
+    academic_session = schema.Choice(
+        title = _(u'Academic Session'),
+        source = academic_sessions_vocab,
+        default = None,
+        required = True,
+        readonly = False,
+        )
+
+ICustomSessionConfigurationAdd[
+    'academic_session'].order =  ICustomSessionConfiguration[
+    'academic_session'].order
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/__init__.py	(revision 11116)
@@ -0,0 +1,1 @@
+# Make this a package.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/browser.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/browser.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/browser.py	(revision 11116)
@@ -0,0 +1,475 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+import httplib
+import hashlib
+import grok
+from zope.interface import Interface
+from zope.component import getUtility, queryAdapter
+from kofacustom.nigeria.interswitch.browser import (
+    InterswitchPaymentRequestWebservicePageStudent,
+    InterswitchPaymentRequestWebservicePageApplicant
+    )
+from waeup.kofa.browser.layout import KofaPage, UtilityView
+from waeup.kofa.interfaces import IKofaUtils
+from waeup.kofa.utils.helpers import to_timezone
+from waeup.kwarapoly.students.interfaces import ICustomStudentOnlinePayment
+from waeup.kwarapoly.applicants.interfaces import ICustomApplicantOnlinePayment
+from waeup.kwarapoly.interfaces import MessageFactory as _
+
+PRODUCT_ID = '3930'
+SITE_NAME = 'kwarapoly.waeup.org'
+PROVIDER_ACCT = '1010764827'
+PROVIDER_BANK_ID = '117'
+PROVIDER_ITEM_NAME = 'BT Education'
+INSTITUTION_NAME = 'KwaraPoly'
+CURRENCY = '566'
+GATEWAY_AMT = 300.0
+#QUERY_URL = 'https://webpay.interswitchng.com/paydirect/services/TransactionQueryURL.aspx'
+#QUERY_URL = 'https://testwebpay.interswitchng.com/test_paydirect/services/TransactionQueryURL.aspx'
+
+POST_ACTION = 'https://webpay.interswitchng.com/paydirect/webpay/pay.aspx'
+#POST_ACTION = 'https://testwebpay.interswitchng.com/test_paydirect/webpay/pay.aspx'
+
+HOST = 'webpay.interswitchng.com'
+#HOST = 'testwebpay.interswitchng.com'
+
+URL = '/paydirect/services/TransactionQueryWs.asmx'
+#URL = '/test_paydirect/services/TransactionQueryWs.asmx'
+httplib.HTTPConnection.debuglevel = 0
+
+def interswitch_img_url(view):
+    static = view.static
+    if static is None or static.get(
+        'interswitch_verve_mastercard.gif', None) is None:
+        static = queryAdapter(
+            view.request, Interface, name='waeup.kwarapoly.interswitch')
+    return static['interswitch_verve_mastercard.gif']()
+
+class InterswitchPageStudent(KofaPage):
+    """ View which sends a POST request to the Interswitch
+    CollegePAY payment gateway.
+    """
+    grok.context(ICustomStudentOnlinePayment)
+    grok.name('goto_interswitch')
+    grok.template('student_goto_interswitch')
+    grok.require('waeup.payStudent')
+    label = _('Submit data to CollegePAY (Interswitch Payment Gateway)')
+    submit_button = _('Submit')
+    action = POST_ACTION
+    site_name = SITE_NAME
+    currency = CURRENCY
+    product_id = PRODUCT_ID
+    mac = 'E6BA6CBBA9AF2871EE25C32C8D57C98895B9B001DC5B9CB2C463E2A9BDA44A3F1260C8A364F33789CDF74CB3EE7E6EF5D94F48D3AF7B727E75D97F07618DFA6D'
+
+    def interswitch_img_url(self):
+        return interswitch_img_url(self)
+
+    def update(self):
+        #if self.context.p_state != 'unpaid':
+        if self.context.p_state == 'paid':
+            self.flash(_("Payment ticket can't be re-send to CollegePAY."))
+            self.redirect(self.url(self.context, '@@index'))
+            return
+
+        student = self.student = self.context.student
+        certificate = getattr(student['studycourse'],'certificate',None)
+        self.amount_auth = 100 * self.context.amount_auth
+        xmldict = {}
+        if certificate is not None:
+            xmldict['department'] = certificate.__parent__.__parent__.code
+            xmldict['faculty'] = certificate.__parent__.__parent__.__parent__.code
+        else:
+            xmldict['department'] = None
+            xmldict['faculty'] = None
+        self.category = getUtility(IKofaUtils).PAYMENT_CATEGORIES[self.context.p_category]
+        tz = getUtility(IKofaUtils).tzinfo
+        self.local_date_time = to_timezone(
+            self.context.creation_date, tz).strftime("%Y-%m-%d %H:%M:%S %Z")
+        self.site_redirect_url = self.url(self.context, 'request_webservice')
+        # Provider data
+        xmldict['detail_ref'] = self.context.p_id
+        xmldict['provider_acct'] = PROVIDER_ACCT
+        xmldict['provider_bank_id'] = PROVIDER_BANK_ID
+        xmldict['provider_item_name'] = PROVIDER_ITEM_NAME
+        # Institution data
+        xmldict['institution_acct'] = "0000000000000"
+        xmldict['institution_bank_id'] = '0'
+        xmldict['institution_item_name'] = self.category
+        xmldict['institution_name'] = INSTITUTION_NAME
+        xmldict['institution_amt'] = 0.0
+        dalash_amt = 200.0
+        provider_amt = 300.0
+        gateway_amt = GATEWAY_AMT
+        self.pay_item_id = '000'
+        if self.context.p_category == 'schoolfee':
+            self.pay_item_id = '101'
+            dalash_amt = 1800.0
+            provider_amt = 1200.0
+            if xmldict['faculty'] in ('CPGS',):
+                xmldict['institution_acct'] = "1771180233"
+                xmldict['institution_bank_id'] = '120'
+            elif xmldict['faculty'] in ('IBAS',):
+                xmldict['institution_acct'] = "2013910271"
+                xmldict['institution_bank_id'] = '8'
+                self.pay_item_id = '107'
+            elif xmldict['faculty'] in ('IETS',):
+                xmldict['institution_acct'] = "2013910271"
+                xmldict['institution_bank_id'] = '8'
+                self.pay_item_id = '109'
+            elif xmldict['faculty'] in ('IFMS',):
+                xmldict['institution_acct'] = "0106259811"
+                xmldict['institution_bank_id'] = '10'
+                self.pay_item_id = '106'
+            elif xmldict['faculty'] in ('ITCH',):
+                xmldict['institution_acct'] = "1771180233"
+                xmldict['institution_bank_id'] = '120'
+                self.pay_item_id = '110'
+            elif xmldict['faculty'] in ('IICT',):
+                xmldict['institution_acct'] = "2013910271"
+                xmldict['institution_bank_id'] = '8'
+                self.pay_item_id = '108'
+        elif self.context.p_category == 'certificate':
+            self.pay_item_id = '111'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'state_result':
+            self.pay_item_id = '112'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'transcript_local':
+            self.pay_item_id = '113'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'transcript_foreign':
+            self.pay_item_id = '114'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'ver_result':
+            self.pay_item_id = '115'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'change_course':
+            self.pay_item_id = '116'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'change_inst':
+            self.pay_item_id = '117'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'jamb_reject':
+            self.pay_item_id = '118'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'cert_of_cert':
+            self.pay_item_id = '119'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'ref_let':
+            self.pay_item_id = '120'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'proc_cert':
+            self.pay_item_id = '121'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'loss_idcard':
+            self.pay_item_id = '122'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+            dalash_amt = 6.0
+            xmldict['dalash_amt'] = 100 * dalash_amt
+            provider_amt = 9.0
+            gateway_amt = 15.0
+        elif self.context.p_category == 'loss_examcard':
+            self.pay_item_id = '123'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+            dalash_amt = 3.0
+            xmldict['dalash_amt'] = 100 * dalash_amt
+            provider_amt = 4.5
+            gateway_amt = 7.5
+        elif self.context.p_category == 'loss_result':
+            self.pay_item_id = '124'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'loss_receipt':
+            self.pay_item_id = '125'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'loss_clearance':
+            self.pay_item_id = '126'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif self.context.p_category == 'conv_brochure':
+            self.pay_item_id = '127'
+            xmldict['institution_acct'] = "0131959715"
+            xmldict['institution_bank_id'] = '10'
+        elif 'maintenance' in self.context.p_category:
+            self.pay_item_id = '102'
+            xmldict['institution_acct'] = "0039050937"
+            xmldict['institution_bank_id'] = '31'
+            dalash_amt = 0.0
+            provider_amt = 0.0
+
+
+        xmldict['dalash_amt'] = 100 * dalash_amt
+        xmldict['provider_amt'] = 100 * provider_amt
+        xmldict['institution_amt'] = 100 * (
+                self.context.amount_auth - provider_amt -
+                gateway_amt - dalash_amt)
+
+
+        hashargs = (
+            self.context.p_id +
+            PRODUCT_ID +
+            self.pay_item_id +
+            str(int(self.amount_auth)) +
+            self.site_redirect_url +
+            self.mac)
+        self.hashvalue = hashlib.sha512(hashargs).hexdigest()
+
+        # Interswitch amount is not part of the xml data
+
+        if 'maintenance' in self.context.p_category:
+            xmltext = """<payment_item_detail>
+<item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
+<item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
+</item_details>
+</payment_item_detail>""" % xmldict
+
+        else:
+            xmltext = """<payment_item_detail>
+<item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
+<item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
+<item_detail item_id="2" item_name="Dalash" item_amt="%(dalash_amt)d" bank_id="117" acct_num="1013196791" />
+<item_detail item_id="3" item_name="%(provider_item_name)s" item_amt="%(provider_amt)d" bank_id="%(provider_bank_id)s" acct_num="%(provider_acct)s" />
+</item_details>
+</payment_item_detail>""" % xmldict
+
+        self.xml_data = """<input type="hidden" name="xml_data" value='%s'  />""" % xmltext
+        self.context.provider_amt = provider_amt
+        self.context.gateway_amt = gateway_amt
+        self.context.thirdparty_amt = dalash_amt
+        return
+
+class InterswitchPageApplicant(KofaPage):
+    """ View which sends a POST request to the Interswitch
+    CollegePAY payment gateway.
+    """
+    grok.context(ICustomApplicantOnlinePayment)
+    grok.require('waeup.payApplicant')
+    grok.template('applicant_goto_interswitch')
+    grok.name('goto_interswitch')
+    label = _('Submit data to CollegePAY (Interswitch Payment Gateway)')
+    submit_button = _('Submit')
+    action = POST_ACTION
+    site_name = SITE_NAME
+    currency = CURRENCY
+    pay_item_id = '103'
+    product_id = PRODUCT_ID
+    mac = 'E6BA6CBBA9AF2871EE25C32C8D57C98895B9B001DC5B9CB2C463E2A9BDA44A3F1260C8A364F33789CDF74CB3EE7E6EF5D94F48D3AF7B727E75D97F07618DFA6D'
+
+    def interswitch_img_url(self):
+        return interswitch_img_url(self)
+
+    def update(self):
+        if self.context.p_state != 'unpaid':
+            self.flash(_("Payment ticket can't be re-send to CollegePAY."))
+            self.redirect(self.url(self.context, '@@index'))
+            return
+        if self.context.__parent__.__parent__.expired \
+            and self.context.__parent__.__parent__.strict_deadline:
+            self.flash(_("Payment ticket can't be send to CollegePAY. "
+                         "Application period has expired."))
+            self.redirect(self.url(self.context, '@@index'))
+            return
+        self.applicant = self.context.__parent__
+        self.amount_auth = 100 * self.context.amount_auth
+        xmldict = {}
+        self.category = getUtility(
+            IKofaUtils).PAYMENT_CATEGORIES[self.context.p_category]
+        tz = getUtility(IKofaUtils).tzinfo
+        self.local_date_time = to_timezone(
+            self.context.creation_date, tz).strftime("%Y-%m-%d %H:%M:%S %Z")
+        self.site_redirect_url = self.url(self.context, 'request_webservice')
+        provider_amt = 300.0
+        dalash_amt = 200.0
+        if self.applicant.applicant_id.startswith('hnd'):
+            xmldict['institution_acct'] = '7000016724'
+            xmldict['institution_bank_id'] = '9'
+        elif self.applicant.applicant_id.startswith('nd'):
+            xmldict['institution_acct'] = '2014191363'
+            xmldict['institution_bank_id'] = '8'
+        elif self.applicant.applicant_id.startswith('pgft'):
+            xmldict['institution_acct'] = '7000016724'
+            xmldict['institution_bank_id'] = '9'
+        elif self.applicant.applicant_id.startswith('prejambites'):
+            xmldict['institution_acct'] = '0106259811'
+            xmldict['institution_bank_id'] = '10'
+            self.pay_item_id = '104'
+            provider_amt = 0.0
+            dalash_amt = 0.0
+        elif self.applicant.applicant_id.startswith('pre'):
+            xmldict['institution_acct'] = '2013910271'
+            xmldict['institution_bank_id'] = '8'
+            provider_amt = 0.0
+            dalash_amt = 0.0
+        elif self.applicant.applicant_id.startswith('special'):
+            if self.applicant.special_application == 'certificate':
+                self.pay_item_id = '111'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'state_result':
+                self.pay_item_id = '112'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'transcript_local':
+                self.pay_item_id = '113'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'transcript_foreign':
+                self.pay_item_id = '114'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'ver_result':
+                self.pay_item_id = '115'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'change_course':
+                self.pay_item_id = '116'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'change_inst':
+                self.pay_item_id = '117'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'jamb_reject':
+                self.pay_item_id = '118'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'cert_of_cert':
+                self.pay_item_id = '119'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'ref_let':
+                self.pay_item_id = '120'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'proc_cert':
+                self.pay_item_id = '121'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'loss_idcard':
+                self.pay_item_id = '122'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+                dalash_amt = 6.0
+                xmldict['dalash_amt'] = 100 * dalash_amt
+                provider_amt = 9.0
+                gateway_amt = 15.0
+            elif self.applicant.special_application == 'loss_examcard':
+                self.pay_item_id = '123'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+                dalash_amt = 3.0
+                xmldict['dalash_amt'] = 100 * dalash_amt
+                provider_amt = 4.5
+                gateway_amt = 7.5
+            elif self.applicant.special_application == 'loss_result':
+                self.pay_item_id = '124'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'loss_receipt':
+                self.pay_item_id = '125'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'loss_clearance':
+                self.pay_item_id = '126'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            elif self.applicant.special_application == 'conv_brochure':
+                self.pay_item_id = '127'
+                xmldict['institution_acct'] = "0131959715"
+                xmldict['institution_bank_id'] = '10'
+            else:
+                xmldict['institution_acct'] = '00000000000'
+                xmldict['institution_bank_id'] = '00'
+        else:
+            xmldict['institution_acct'] = '00000000000'
+            xmldict['institution_bank_id'] = '00'
+        xmldict['dalash_amt'] = 100 * dalash_amt
+        xmldict['detail_ref'] = self.context.p_id
+        xmldict['provider_amt'] = 100 * provider_amt
+        xmldict['provider_acct'] = PROVIDER_ACCT
+        xmldict['provider_bank_id'] = PROVIDER_BANK_ID
+        xmldict['provider_item_name'] = PROVIDER_ITEM_NAME
+        xmldict['institution_amt'] = 100 * (
+            self.context.amount_auth - provider_amt - GATEWAY_AMT - dalash_amt)
+        xmldict['institution_item_name'] = self.context.p_category
+        xmldict['institution_name'] = INSTITUTION_NAME
+
+        hashargs = (
+            self.context.p_id +
+            PRODUCT_ID +
+            self.pay_item_id +
+            str(int(self.amount_auth)) +
+            self.site_redirect_url +
+            self.mac)
+        self.hashvalue = hashlib.sha512(hashargs).hexdigest()
+
+        # Interswitch amount is not part of the xml data
+
+        if not self.applicant.applicant_id.startswith('pre'):
+            xmltext = """<payment_item_detail>
+<item_details detail_ref="%(detail_ref)s" college="%(institution_name)s">
+<item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
+<item_detail item_id="2" item_name="Dalash" item_amt="%(dalash_amt)d" bank_id="117" acct_num="1013196791" />
+<item_detail item_id="3" item_name="%(provider_item_name)s" item_amt="%(provider_amt)d" bank_id="%(provider_bank_id)s" acct_num="%(provider_acct)s" />
+</item_details>
+</payment_item_detail>""" % xmldict
+
+        else:
+            xmltext = """<payment_item_detail>
+<item_details detail_ref="%(detail_ref)s" college="%(institution_name)s">
+<item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
+</item_details>
+</payment_item_detail>""" % xmldict
+
+        self.xml_data = """<input type="hidden" name="xml_data" value='%s'  />""" % xmltext
+        self.context.provider_amt = provider_amt
+        self.context.gateway_amt = GATEWAY_AMT
+        self.context.thirdparty_amt = dalash_amt
+        return
+
+class InterswitchPaymentRequestWebservicePageStudent(
+    InterswitchPaymentRequestWebservicePageStudent):
+    """ Request webservice view for the CollegePAY gateway
+    """
+    grok.context(ICustomStudentOnlinePayment)
+    product_id = PRODUCT_ID
+    gateway_host = HOST
+    gateway_url = URL
+
+class InterswitchPaymentRequestWebservicePageApplicant(
+    InterswitchPaymentRequestWebservicePageApplicant):
+    """ Request webservice view for the CollegePAY gateway
+    """
+    grok.context(ICustomApplicantOnlinePayment)
+    product_id = PRODUCT_ID
+    gateway_host = HOST
+    gateway_url = URL
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/browser_templates/applicant_goto_interswitch.pt
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/browser_templates/applicant_goto_interswitch.pt	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/browser_templates/applicant_goto_interswitch.pt	(revision 11116)
@@ -0,0 +1,81 @@
+<form i18n:domain="waeup.kwarapoly"
+  tal:attributes="action view/action" method="POST">
+
+  <p i18n:translate="">
+    These data will be submitted to the CollegePAY payment gateway,
+    please check:
+  </p>
+
+  <table class="form-table" i18n:domain="waeup.kofa">
+    <thead>
+    </thead>
+    <tbody>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Total Amount Authorized:</td>
+        <td>
+          <span tal:replace="view/context/amount_auth">AMOUNT</span>
+        </td>
+      </tr>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Transaction Reference:</td>
+        <td>
+          <span tal:replace="view/context/p_id">TXNREF</span>
+        </td>
+      </tr>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Customer Id:</td>
+        <td>
+          <span tal:replace="view/applicant/applicant_id">CUSTID</span>
+        </td>
+      </tr>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Customer Name:</td>
+        <td>
+          <span tal:replace="view/applicant/display_fullname">CUSTNAME</span>
+        </td>
+      </tr>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Payment Item:</td>
+        <td>
+          <span tal:replace="view/context/display_item">PAYMENTITEM</span>
+        </td>
+      </tr>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Payment Category:</td>
+        <td>
+          <span tal:replace="view/category">PAYMENTCATEGORY</span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+  <input type="hidden" name="product_id" tal:attributes="value view/product_id" />
+  <input type="hidden" name="currency" tal:attributes="value view/currency" />
+  <input type="hidden" name="pay_item_id" tal:attributes="value view/pay_item_id" />
+  <input type="hidden" name="hash" tal:attributes="value view/hashvalue" />
+  <input type="hidden" name="site_redirect_url" tal:attributes="value view/site_redirect_url" />
+  <input type="hidden" name="site_name" tal:attributes="value view/site_name" />
+  <input type="hidden" name="local_date_time" tal:attributes="value view/local_date_time" />
+  <input type="hidden" name="amount" tal:attributes="value view/amount_auth" />
+  <input type="hidden" name="txn_ref" tal:attributes="value view/context/p_id" />
+  <input type="hidden" name="pay_item_name" tal:attributes="value view/context/display_item" />
+  <input type="hidden" name="cust_id_desc" tal:attributes="value view/category" />
+  <input type="hidden" name="cust_id" tal:attributes="value view/applicant/applicant_id" />
+  <input type="hidden" name="cust_name" tal:attributes="value view/applicant/display_fullname" />
+
+  <input type="hidden" name="payment_params" value="college_split" />
+  <span tal:replace="structure view/xml_data"></span>
+
+  <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
+
+  <br /><br />
+
+  <img tal:attributes="src view/interswitch_img_url" />
+
+</form>
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/browser_templates/student_goto_interswitch.pt
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/browser_templates/student_goto_interswitch.pt	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/browser_templates/student_goto_interswitch.pt	(revision 11116)
@@ -0,0 +1,81 @@
+<form i18n:domain="waeup.kwarapoly"
+  tal:attributes="action view/action" method="POST">
+
+  <p i18n:translate="">
+    These data will be submitted to the CollegePAY payment gateway,
+    please check:
+  </p>
+
+  <table class="form-table" i18n:domain="waeup.kofa">
+    <thead>
+    </thead>
+    <tbody>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Total Amount Authorized:</td>
+        <td>
+          <span tal:replace="view/context/amount_auth">AMOUNT</span>
+        </td>
+      </tr>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Transaction Reference:</td>
+        <td>
+          <span tal:replace="view/context/p_id">TXNREF</span>
+        </td>
+      </tr>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Customer Id:</td>
+        <td>
+          <span tal:replace="view/student/student_id">CUSTID</span>
+        </td>
+      </tr>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Customer Name:</td>
+        <td>
+          <span tal:replace="view/student/display_fullname">CUSTNAME</span>
+        </td>
+      </tr>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Payment Item:</td>
+        <td>
+          <span tal:replace="view/context/display_item">PAYMENTITEM</span>
+        </td>
+      </tr>
+      <tr>
+        <td i18n:translate="" class="fieldname">
+          Payment Category:</td>
+        <td>
+          <span tal:replace="view/category">PAYMENTCATEGORY</span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
+  <input type="hidden" name="product_id" tal:attributes="value view/product_id" />
+  <input type="hidden" name="currency" tal:attributes="value view/currency" />
+  <input type="hidden" name="pay_item_id" tal:attributes="value view/pay_item_id" />
+  <input type="hidden" name="hash" tal:attributes="value view/hashvalue" />
+  <input type="hidden" name="site_redirect_url" tal:attributes="value view/site_redirect_url" />
+  <input type="hidden" name="site_name" tal:attributes="value view/site_name" />
+  <input type="hidden" name="local_date_time" tal:attributes="value view/local_date_time" />
+  <input type="hidden" name="amount" tal:attributes="value view/amount_auth" />
+  <input type="hidden" name="txn_ref" tal:attributes="value view/context/p_id" />
+  <input type="hidden" name="pay_item_name" tal:attributes="value view/context/display_item" />
+  <input type="hidden" name="cust_id_desc" tal:attributes="value view/category" />
+  <input type="hidden" name="cust_id" tal:attributes="value view/student/student_id" />
+  <input type="hidden" name="cust_name" tal:attributes="value view/student/display_fullname" />
+
+  <input type="hidden" name="payment_params" value="college_split" />
+  <span tal:replace="structure view/xml_data"></span>
+
+  <input type="submit" class="btn" tal:attributes="value view/submit_button"/>
+
+  <br /><br />
+
+  <img tal:attributes="src view/interswitch_img_url" />
+
+</form>
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/tests.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/tests.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/interswitch/tests.py	(revision 11116)
@@ -0,0 +1,595 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+import os
+import grok
+import pytz
+from datetime import datetime, date, timedelta
+from hurry.workflow.interfaces import IWorkflowState
+from zope.component import createObject, getUtility
+from zope.catalog.interfaces import ICatalog
+from zope.event import notify
+from waeup.kofa.applicants.container import ApplicantsContainer
+from waeup.kofa.university.faculty import Faculty
+from waeup.kofa.university.department import Department
+from waeup.kofa.students.tests.test_browser import StudentsFullSetup
+from waeup.kofa.applicants.tests.test_browser import ApplicantsFullSetup
+from waeup.kofa.configuration import SessionConfiguration
+from waeup.kwarapoly.testing import FunctionalLayer
+from waeup.kwarapoly.students.payments import CustomStudentOnlinePayment
+
+# Also run tests that send requests to external servers?
+#   If you enable this, please make sure the external services
+#   do exist really and are not bothered by being spammed by a test programme.
+EXTERNAL_TESTS = False
+
+def external_test(func):
+    if not EXTERNAL_TESTS:
+        myself = __file__
+        if myself.endswith('.pyc'):
+            myself = myself[:-2]
+        print "WARNING: external tests are skipped!"
+        print "WARNING: edit %s to enable them." % myself
+        return
+    return func
+
+
+class InterswitchTestsStudents(StudentsFullSetup):
+    """Tests for the Interswitch payment gateway.
+    """
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(InterswitchTestsStudents, self).setUp()
+
+        # Create at least one Kwarapoly faculty
+        self.app['faculties']['CPGS'] = Faculty(code='CPGS')
+        self.app['faculties']['CPGS']['dep1'] = Department(code='dep1')
+        self.certificate2 = createObject('waeup.Certificate')
+        self.certificate2.code = u'CERT2'
+        self.certificate2.application_category = 'basic'
+        self.certificate2.study_mode = 'nd_ft'
+        self.certificate2.start_level = 100
+        self.certificate2.end_level = 300
+        self.app['faculties']['CPGS']['dep1'].certificates.addCertificate(
+            self.certificate2)
+        # Set study course attributes of test student
+        self.student['studycourse'].certificate = self.certificate2
+        self.student['studycourse'].current_session = 2004
+        self.student['studycourse'].entry_session = 2004
+        self.student['studycourse'].current_verdict = 'A'
+        self.student['studycourse'].current_level = 100
+        # Set local lga
+        self.student.lga = u'kwara_asa'
+        # Update the catalog
+        notify(grok.ObjectModifiedEvent(self.student))
+
+
+    def test_schoolfee_ticket_creation(self):
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.payments_path)
+        IWorkflowState(self.student).setState('cleared')
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Book and pay for accommodation first...',
+                           self.browser.contents)
+        # We add a fake maint. payment ticket to meet the condition
+        maint_payment = CustomStudentOnlinePayment()
+        self.student['payments']['any_key'] = maint_payment
+        maint_payment.p_category = 'hostel_maintenance'
+        maint_payment.p_state = 'unpaid'
+        maint_payment.p_session = 2004
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Book and pay for accommodation first...',
+                           self.browser.contents)
+        # Ticket must be paid
+        maint_payment.p_state = 'paid'
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        ctrl = self.browser.getControl(name='val_id')
+        self.value = ctrl.options[1]
+        self.browser.getLink(self.value).click()
+        self.assertMatches('...Amount Authorized...',
+                           self.browser.contents)
+        self.assertMatches(
+            '...<span>39400.0</span>...',
+            self.browser.contents)
+        self.payment_url = self.browser.url
+
+
+#    def callback_url(self, payment_url, resp, apprAmt):
+#        return payment_url + (
+#            '/isw_callback?echo=' +
+#            '&resp=%s' +
+#            '&desc=Something went wrong' +
+#            '&txnRef=p1331792385335' +
+#            '&payRef=' + '&retRef=' +
+#            '&cardNum=0' +
+#            '&apprAmt=%s' +
+#            '&url=http://xyz') % (resp, apprAmt)
+
+    def test_interswitch_form(self):
+
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.payments_path)
+        # In KwaraPoly only returning students can create school fee payment
+        # without haveing paid accommodation fee
+        IWorkflowState(self.student).setState('returning')
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2005
+        self.app['configuration'].addSessionConfiguration(configuration)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...', self.browser.contents)
+        ctrl = self.browser.getControl(name='val_id')
+        self.value = ctrl.options[0]
+        self.browser.getLink(self.value).click()
+        self.assertMatches('...Amount Authorized...', self.browser.contents)
+        self.assertMatches(
+            '...<span>29500.0</span>...',
+            self.browser.contents)
+        self.payment_url = self.browser.url
+
+        # Manager can access InterswitchForm
+        self.assertEqual(self.student['payments'][self.value].provider_amt, 0.0)
+        self.assertEqual(self.student['payments'][self.value].gateway_amt, 0.0)
+        self.assertEqual(self.student['payments'][self.value].thirdparty_amt, 0.0)
+        self.browser.getLink("CollegePAY", index=0).click()
+        # Split amounts have been set.
+        self.assertEqual(self.student['payments'][self.value].provider_amt, 1200.0)
+        self.assertEqual(self.student['payments'][self.value].gateway_amt, 300.0)
+        self.assertEqual(self.student['payments'][self.value].thirdparty_amt, 1800.0)
+        self.assertMatches('...Total Amount Authorized:...',
+                           self.browser.contents)
+        self.assertTrue(
+            '<input type="hidden" name="amount" value="2950000.0" />' in
+            self.browser.contents)
+        self.assertTrue(
+            'item_name="School Fee" item_amt="2620000" bank_id="120" acct_num="1771180233"' in
+            self.browser.contents)
+        self.assertTrue(
+            'item_name="Dalash" item_amt="180000" bank_id="117" acct_num="1013196791"' in
+            self.browser.contents)
+        self.assertTrue(
+            'item_name="BT Education" item_amt="120000" bank_id="117" acct_num="1010764827"' in
+            self.browser.contents)
+
+        # Let's do the same for maintenance fee payment
+
+        self.browser.open(self.payments_path)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(
+            name="form.p_category").value = ['hostel_maintenance']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...You have not yet booked accommodation...',
+                           self.browser.contents)
+        # Students have to book bed first
+        self.browser.open(self.acco_path)
+        IWorkflowState(self.student).setState('admitted')
+        self.browser.getLink("Book accommodation").click()
+        self.assertFalse('Activation Code:' in self.browser.contents)
+        self.browser.getControl("Create bed ticket").click()
+        # Bed is randomly selected but, since there is only
+        # one bed for this student, we know that ...
+        self.assertMatches('...Hall 1, Block A, Room 101, Bed A...',
+                           self.browser.contents)
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(
+            name="form.p_category").value = ['hostel_maintenance']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[1]
+        self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...',
+                           self.browser.contents)
+        # Maint fee is taken from the hostel object
+        self.assertMatches(
+            '...<span>876.0</span>...',
+            self.browser.contents)
+        self.payment_url = self.browser.url
+        # Manager can access InterswitchForm
+        self.browser.getLink("CollegePAY", index=0).click()
+        # Split amounts have been set.
+        self.assertEqual(self.student['payments'][value].provider_amt, 0.0)
+        self.assertEqual(self.student['payments'][value].thirdparty_amt, 0.0)
+        self.assertEqual(self.student['payments'][value].gateway_amt, 300.0)
+        # The total amount to be processed by Interswitch
+        # has been reduced by the Interswitch fee of 150 Nairas
+        self.assertMatches('...Total Amount Authorized:...',
+                           self.browser.contents)
+        self.assertMatches(
+            '...<input type="hidden" name="pay_item_id" value="102" />...',
+            self.browser.contents)
+        self.assertMatches(
+            '...<input type="hidden" name="amount" value="87600.0" />...',
+            self.browser.contents)
+        self.assertMatches(
+            '...item_name="Hostel Maintenance Fee" item_amt="57600" bank_id="31" acct_num="0039050937"...',
+            self.browser.contents)
+
+        # Create carryover ticket
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['carryover1']
+        self.browser.getControl("Create ticket").click()
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[2]
+        self.browser.getLink(value).click()
+        self.assertMatches(
+            '...<span>6000.0</span>...',
+            self.browser.contents)
+        # Manager can access InterswitchForm
+        self.browser.getLink("CollegePAY", index=0).click()
+        # Split amounts have been set.
+        self.assertEqual(self.student['payments'][self.value].provider_amt, 1200.0)
+        self.assertEqual(self.student['payments'][self.value].gateway_amt, 300.0)
+        self.assertEqual(self.student['payments'][self.value].thirdparty_amt, 1800.0)
+        self.assertMatches('...<input type="hidden" name="pay_item_id" value="101" />...',
+                           self.browser.contents)
+        self.assertMatches('...Total Amount Authorized:...',
+                           self.browser.contents)
+        self.assertMatches(
+            '...<input type="hidden" name="amount" value="600000.0" />...',
+            self.browser.contents)
+        self.assertMatches(
+            '...item_name="School Fee" item_amt="270000" bank_id="120" acct_num="1771180233"...',
+            self.browser.contents)
+        self.assertMatches(
+            '...item_name="Dalash" item_amt="180000" bank_id="117" acct_num="1013196791"...',
+            self.browser.contents)
+        self.assertMatches(
+            '...item_name="BT Education" item_amt="120000" bank_id="117" acct_num="1010764827"...',
+            self.browser.contents)
+
+    def test_interswitch_form_new_payment_cats(self):
+        # only a few categories covered
+
+        self.app['configuration']['2004'].certificate_fee = 6800.0
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['certificate']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...', self.browser.contents)
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[0]
+        self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...', self.browser.contents)
+        self.assertMatches(
+            '...<span>6800.0</span>...', self.browser.contents)
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertEqual(self.student['payments'][value].amount_auth, 6800.0)
+        self.assertEqual(self.student['payments'][value].provider_amt, 300.0)
+        self.assertEqual(self.student['payments'][value].gateway_amt, 300.0)
+        self.assertEqual(self.student['payments'][value].thirdparty_amt, 200.0)
+
+        self.app['configuration']['2004'].transcript_local_fee = 5000.0
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['transcript_local']
+        self.browser.getControl("Create ticket").click()
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[1]
+        self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...', self.browser.contents)
+        self.assertMatches(
+            '...<span>5000.0</span>...', self.browser.contents)
+        self.payment_url = self.browser.url
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertEqual(self.student['payments'][value].amount_auth, 5000.0)
+        self.assertEqual(self.student['payments'][value].provider_amt, 300.0)
+        self.assertEqual(self.student['payments'][value].gateway_amt, 300.0)
+        self.assertEqual(self.student['payments'][value].thirdparty_amt, 200.0)
+
+        self.app['configuration']['2004'].loss_idcard_fee = 1000.0
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['loss_idcard']
+        self.browser.getControl("Create ticket").click()
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[2]
+        self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...', self.browser.contents)
+        self.assertMatches(
+            '...<span>1000.0</span>...', self.browser.contents)
+        self.payment_url = self.browser.url
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertEqual(self.student['payments'][value].amount_auth, 1000.0)
+        self.assertEqual(self.student['payments'][value].provider_amt, 9.0)
+        self.assertEqual(self.student['payments'][value].gateway_amt, 15.0)
+        self.assertEqual(self.student['payments'][value].thirdparty_amt, 6.0)
+
+        self.app['configuration']['2004'].loss_examcard_fee = 500.0
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['loss_examcard']
+        self.browser.getControl("Create ticket").click()
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[3]
+        self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...', self.browser.contents)
+        self.assertMatches(
+            '...<span>500.0</span>...', self.browser.contents)
+        self.payment_url = self.browser.url
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertEqual(self.student['payments'][value].amount_auth, 500.0)
+        self.assertEqual(self.student['payments'][value].provider_amt, 4.5)
+        self.assertEqual(self.student['payments'][value].gateway_amt, 7.5)
+        self.assertEqual(self.student['payments'][value].thirdparty_amt, 3)
+
+        self.app['configuration']['2004'].change_inst_fee = 6000.0
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['change_inst']
+        self.browser.getControl("Create ticket").click()
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[4]
+        self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...', self.browser.contents)
+        self.assertMatches(
+            '...<span>6000.0</span>...', self.browser.contents)
+        self.payment_url = self.browser.url
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertEqual(self.student['payments'][value].amount_auth, 6000.0)
+        self.assertEqual(self.student['payments'][value].provider_amt, 300.0)
+        self.assertEqual(self.student['payments'][value].gateway_amt, 300.0)
+        self.assertEqual(self.student['payments'][value].thirdparty_amt, 200.0)
+
+        self.app['configuration']['2004'].loss_result_fee = 7000.0
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['loss_result']
+        self.browser.getControl("Create ticket").click()
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[5]
+        self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...', self.browser.contents)
+        self.assertMatches(
+            '...<span>7000.0</span>...', self.browser.contents)
+        self.payment_url = self.browser.url
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertEqual(self.student['payments'][value].amount_auth, 7000.0)
+        self.assertEqual(self.student['payments'][value].provider_amt, 300.0)
+        self.assertEqual(self.student['payments'][value].gateway_amt, 300.0)
+        self.assertEqual(self.student['payments'][value].thirdparty_amt, 200.0)
+
+    @external_test
+    def test_webservice(self):
+        # First we have open InterswitchPageStudent to set provider_amt
+        # and gateway_amt
+        self.browser.open(self.payment_url + '/goto_interswitch')
+        # Now we can call the webservice
+        self.browser.open(self.payment_url + '/request_webservice')
+        self.assertMatches('...Unsuccessful callback...',
+                          self.browser.contents)
+        # The payment is now in state failed ...
+        self.assertMatches('...<span>Failed</span>...',
+                          self.browser.contents)
+        # ... and the catalog has been updated
+        cat = getUtility(ICatalog, name='payments_catalog')
+        results = list(
+            cat.searchResults(p_state=('failed', 'failed')))
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0].p_state, 'failed')
+
+        # Let's replace the p_id with a valid p_id of the Kwarapoly
+        # live system. This is definitely not an appropriate
+        # solution for testing, but we have no choice since
+        # Interswitch doesn't provide any interface
+        # for testing.
+        payment = self.student['payments'][self.value]
+        payment.p_id = 'p3543612043224'
+        self.browser.open(self.payment_url + '/request_webservice')
+        self.assertMatches('...Callback amount does not match...',
+                          self.browser.contents)
+        # The payment is now in state failed ...
+        self.assertMatches('...<span>Failed</span>...',
+                          self.browser.contents)
+        # Let's replace the amount autorized with the amount of the
+        # live system payment
+        payment.amount_auth = payment.r_amount_approved
+        self.browser.open(self.payment_url + '/request_webservice')
+        self.assertMatches('...Successful payment...',
+                          self.browser.contents)
+        # The payment is now in state paid ...
+        self.assertMatches('...<span>Paid</span>...',
+                          self.browser.contents)
+        # ... and the catalog has been updated
+        cat = getUtility(ICatalog, name='payments_catalog')
+        results = list(
+            cat.searchResults(p_state=('paid', 'paid')))
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0].p_state, 'paid')
+        # Approval is logged in students.log ...
+        logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'students.log')
+        logcontent = open(logfile).read()
+        self.assertTrue(
+            'zope.mgr - '
+            'waeup.kwarapoly.interswitch.browser.InterswitchPaymentRequestWebservicePageStudent - '
+            'W1000000 - successful schoolfee payment: p3543612043224\n'
+            in logcontent)
+        # ... and in payments.log
+        logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'payments.log')
+        logcontent = open(logfile).read()
+        self.assertTrue(
+            '"zope.mgr",W1000000,p3543612043224,schoolfee,'
+            '52100.0,00,1200.0,300.0,1800.0,,,\n'
+            in logcontent)
+
+
+class InterswitchTestsApplicants(ApplicantsFullSetup):
+    """Tests for the Interswitch payment gateway.
+    """
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(InterswitchTestsApplicants, self).setUp()
+        configuration = SessionConfiguration()
+        configuration.academic_session = datetime.now().year - 2
+        self.app['configuration'].addSessionConfiguration(configuration)
+        self.configuration = configuration
+        # Create at least one Kwarapoly faculty
+        self.app['faculties']['CPGS'] = Faculty(code='CPGS')
+        self.app['faculties']['CPGS']['dep1'] = Department(code='dep1')
+        self.certificate2 = createObject('waeup.Certificate')
+        self.certificate2.code = u'CERT2'
+        self.certificate2.application_category = 'ndft'
+        self.certificate2.study_mode = 'nd_ft'
+        self.certificate2.start_level = 100
+        self.certificate2.end_level = 300
+        self.app['faculties']['CPGS']['dep1'].certificates.addCertificate(
+            self.certificate2)
+        self.applicantscontainer.application_category = 'ndft'
+        self.applicant.applicant_id = u'nd_anything'
+        
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.manage_path)
+        #IWorkflowState(self.student).setState('started')
+        super(InterswitchTestsApplicants, self).fill_correct_values()
+        self.browser.getControl(name="form.course1").value = ['CERT2']
+        self.applicantscontainer.application_fee = 3333.0
+        self.browser.getControl(name="form.nationality").value = ['NG']
+        self.browser.getControl(name="transition").value = ['start']
+        self.browser.getControl("Save").click()
+        self.browser.getControl("Add online").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        #ctrl = self.browser.getControl(name='val_id')
+        #value = ctrl.options[0]
+        #self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...',
+                           self.browser.contents)
+        self.assertMatches(
+            '...<span>3333.0</span>...',
+            self.browser.contents)
+        self.payment_url = self.browser.url
+
+
+    def test_interswitch_form(self):
+
+        # Manager can access InterswitchForm
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertMatches('...Total Amount Authorized:...',
+                           self.browser.contents)
+        self.assertTrue(
+            '<input type="hidden" name="amount" value="333300.0" />'
+            in self.browser.contents)
+        self.assertTrue(
+            '<item_detail item_id="1" item_name="application" '
+            'item_amt="253300" bank_id="8" acct_num="2014191363" />'
+            in self.browser.contents)
+
+        # hndft fee goes to another account
+        self.applicant.applicant_id = u'hnd_anything'
+        self.browser.open(self.manage_path)
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[0]
+        self.browser.getLink(value).click()
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertTrue(
+            '<item_detail item_id="1" item_name="application" '
+            'item_amt="253300" bank_id="9" acct_num="7000016724" />'
+            in self.browser.contents)
+        # Commission or bribe?
+        self.assertTrue(
+            '<item_detail item_id="2" item_name="Dalash" item_amt="20000" '
+            'bank_id="117" acct_num="1013196791" />'
+            in self.browser.contents)
+        self.assertTrue(
+            '<item_detail item_id="3" item_name="BT Education" '
+            'item_amt="30000" bank_id="117" acct_num="1010764827" />'
+            in self.browser.contents)
+
+        # prehndft fee goes to another account
+        self.applicant.applicant_id = u'prehnd_anything'
+        self.browser.open(self.manage_path)
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[0]
+        self.browser.getLink(value).click()
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertTrue(
+            '<item_detail item_id="1" item_name="application" '
+            'item_amt="303300" bank_id="8" acct_num="2013910271" />'
+            in self.browser.contents)
+        # No 'commission', no provider fee
+        self.assertFalse('Dalash' in self.browser.contents)
+        self.assertFalse('BT Education' in self.browser.contents)
+
+        # prejambites fee goes to another account
+        self.applicant.applicant_id = u'prejambites_anything'
+        self.browser.open(self.manage_path)
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[0]
+        self.browser.getLink(value).click()
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertTrue(
+            '<item_detail item_id="1" item_name="application" '
+            'item_amt="303300" bank_id="10" acct_num="0106259811" />'
+            in self.browser.contents)
+        # No 'commission', no provider fee
+        self.assertFalse('Dalash' in self.browser.contents)
+        self.assertFalse('BT Education' in self.browser.contents)
+
+
+    def prepare_special_container(self):
+        # Add special application container
+        container_name = u'special%s' % (datetime.now().year - 2)
+        applicantscontainer = ApplicantsContainer()
+        applicantscontainer.code = container_name
+        applicantscontainer.prefix = 'special'
+        applicantscontainer.year = datetime.now().year - 2
+        applicantscontainer.title = u'This is a special app container'
+        applicantscontainer.application_category = 'no'
+        applicantscontainer.mode = 'create'
+        delta = timedelta(days=10)
+        applicantscontainer.startdate = datetime.now(pytz.utc) - delta
+        applicantscontainer.enddate = datetime.now(pytz.utc) + delta
+        applicantscontainer.strict_deadline = True
+        self.app['applicants'][container_name] = applicantscontainer
+        # Add an applicant
+        applicant = createObject('waeup.Applicant')
+        # reg_number is the only field which has to be preset here
+        # because managers are allowed to edit this required field
+        applicant.reg_number = u'12345'
+        applicant.firstname = u'Vorname'
+        applicant.lastname = u'Nachname'
+        applicant.email = 'aa@aa.aa'
+        applicant.special_application = u'transcript_local'
+        applicant.applicant_id = u'special_anything'
+        self.app['applicants'][container_name].addApplicant(applicant)
+        self.special_applicant = applicant
+        self.configuration.transcript_local_fee = 5300.0
+        self.special_manage_path = 'http://localhost/app/applicants/%s/%s/%s' % (
+            container_name, applicant.application_number, 'manage')
+
+    def test_interswitch_form_special(self):
+        self.prepare_special_container()
+        self.browser.open(self.special_manage_path)
+        self.browser.getControl("Add online").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertTrue(
+            '<item_detail item_id="1" item_name="transcript_local" '
+            'item_amt="450000" bank_id="10" acct_num="0131959715" />'
+            in self.browser.contents)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales.zcml
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales.zcml	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales.zcml	(revision 11116)
@@ -0,0 +1,8 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:i18n="http://namespaces.zope.org/i18n">
+
+  <include package="zope.i18n" file="meta.zcml" />
+  <i18n:registerTranslations directory="locales" />
+  <include package="waeup.kofa" file="locales.zcml" />
+
+</configure>
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/de/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/de/LC_MESSAGES/waeup.kofa.po	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/de/LC_MESSAGES/waeup.kofa.po	(revision 11116)
@@ -0,0 +1,16 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: waeup/kofa/browser/breadcrumbs.py:116
+#: waeup/kofa/browser/viewlets.py:624
+msgid "Academics"
+msgstr "Universität"
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/de/LC_MESSAGES/waeup.kwarapoly.po
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/de/LC_MESSAGES/waeup.kwarapoly.po	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/de/LC_MESSAGES/waeup.kwarapoly.po	(revision 11116)
@@ -0,0 +1,167 @@
+# #############################################################################
+#
+# Copyright (c) 2003-2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+# #############################################################################
+msgid ""
+msgstr ""
+"Project-Id-Version: WAeUP.Kofa\n"
+"POT-Creation-Date: Mon Sep  3 12:52:46 2012\n"
+"PO-Revision-Date: 2012-10-17 17:48+0100\n"
+"Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
+"Language-Team: WAeUP Germany <henrik@waeup.org>\n"
+"Language: de-DE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: zope/app/locales/extract.py\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-Country: GERMANY\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: waeup/kwarapoly/browser/theming.py:30
+#, fuzzy
+msgid "KwaraPoly Theme"
+msgstr "Benutzerdefiniertes Thema 1"
+
+#: waeup/kwarapoly/interfaces.py:35
+msgid "School Fee (ignored)"
+msgstr "Schulgebühr (wird nicht verwendet)"
+
+#: waeup/kwarapoly/interfaces.py:41
+msgid "Application Fee (fallback)"
+msgstr ""
+
+#: waeup/kwarapoly/interfaces.py:47
+#, fuzzy
+msgid "Clearance Fee"
+msgstr "Einschreibungsgebühr"
+
+#: waeup/kwarapoly/interfaces.py:53
+msgid "Booking Fee"
+msgstr "Buchungsgebühr"
+
+#: waeup/kwarapoly/interfaces.py:61
+#, fuzzy
+msgid "Maintenance Fee (ignored)"
+msgstr "Miete"
+
+#: waeup/kwarapoly/interfaces.py:67
+msgid "Gown Fee"
+msgstr "Talar-Gebühr"
+
+#: waeup/kwarapoly/interfaces.py:73
+msgid "Transfer Fee"
+msgstr "Studienfachwechselgebühr"
+
+#: waeup/kwarapoly/interfaces.py:88
+msgid "Academic Session"
+msgstr "Akademisches Jahr"
+
+#. Default: ""
+#: waeup/kwarapoly/interswitch/browser.py:103
+msgid "Unsuccessful callback: ${a}"
+msgstr ""
+
+#: waeup/kwarapoly/interswitch/browser.py:108
+msgid "Callback amount does not match."
+msgstr ""
+
+#: waeup/kwarapoly/interswitch/browser.py:113
+msgid "Callback transaction id does not match."
+msgstr ""
+
+#: waeup/kwarapoly/interswitch/browser.py:119
+msgid "Successful callback received"
+msgstr ""
+
+#: waeup/kwarapoly/interswitch/browser.py:128
+#: waeup/kwarapoly/interswitch/browser.py:142
+msgid "CollegePAY"
+msgstr "CollegePAY"
+
+#: waeup/kwarapoly/interswitch/browser.py:156
+#: waeup/kwarapoly/interswitch/browser.py:164
+#, fuzzy
+msgid "Requery CollegePAY"
+msgstr "CollegePAY"
+
+#: waeup/kwarapoly/interswitch/browser.py:175
+#: waeup/kwarapoly/interswitch/browser.py:254
+msgid "Submit data to CollegePAY (Interswitch Payment Gateway)"
+msgstr "Daten an CollegePAY (Interswitch Payment Gateway) senden"
+
+#: waeup/kwarapoly/interswitch/browser.py:176
+#: waeup/kwarapoly/interswitch/browser.py:255
+msgid "Submit"
+msgstr "Senden"
+
+#: waeup/kwarapoly/interswitch/browser.py:186
+#: waeup/kwarapoly/interswitch/browser.py:264
+msgid "Payment ticket can't be re-send to CollegePAY."
+msgstr "Bewertete Bezahl-Tickets können nicht erneut gesendet werden."
+
+#: waeup/kwarapoly/interswitch/browser.py:269
+#, fuzzy
+msgid "Payment ticket can't be send to CollegePAY. Application period has expired."
+msgstr "Bewertete Bezahl-Tickets können nicht erneut gesendet werden."
+
+#: waeup/kwarapoly/interswitch/browser.py:315
+#: waeup/kwarapoly/interswitch/browser.py:342
+msgid "This ticket has already been paid."
+msgstr ""
+
+#. Default: ""
+#: waeup/kwarapoly/interswitch/browser.py:94
+msgid "Invalid callback: ${a}"
+msgstr ""
+
+#: waeup/kwarapoly/students/interfaces.py:74
+msgid "Payment Level"
+msgstr ""
+
+#: waeup/kwarapoly/students/utils.py:194
+msgid "Amount could not be determined."
+msgstr "Betrag konnte nicht ermittelt werden."
+
+#: waeup/kwarapoly/students/utils.py:201
+msgid "This type of payment has already been made."
+msgstr ""
+
+#: waeup/kwarapoly/students/utils.py:66
+msgid "Session configuration object is not available."
+msgstr "Session-Konfiguration ist nicht verfügbar."
+
+#: waeup/kwarapoly/students/utils.py:80
+#: waeup/kwarapoly/students/utils.py:86
+msgid "Study course data are incomplete."
+msgstr ""
+
+#~ msgid "Postgraduates"
+#~ msgstr "Postgraduierte"
+
+#~ msgid "handles postgraduate applicants"
+#~ msgstr "für Antragsteller von Postgraduierten-Studiengängen"
+
+#~ msgid "Surcharge Portal Provider"
+#~ msgstr "Gebühr Portal-Provider"
+
+#~ msgid "Surcharge Interswitch"
+#~ msgstr "Gebühr Interswitch"
+
+#~ msgid "Surcharge 3"
+#~ msgstr "Gebühr 3"
+
+#~ msgid "Acceptance Fee"
+#~ msgstr "Zulassungsgebühr"
+
+#~ msgid "Request CollegePAY callback"
+#~ msgstr "CollegePAY Rückruf"
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/en/LC_MESSAGES/waeup.kofa.po
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/en/LC_MESSAGES/waeup.kofa.po	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/en/LC_MESSAGES/waeup.kofa.po	(revision 11116)
@@ -0,0 +1,20 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Upload portrait"
+msgstr "Upload photo"
+
+msgid "No portrait uploaded."
+msgstr "No photo uploaded"
+
+msgid "Change portrait"
+msgstr "Change photo"
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/waeup.kwarapoly.pot
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/waeup.kwarapoly.pot	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/locales/waeup.kwarapoly.pot	(revision 11116)
@@ -0,0 +1,136 @@
+##############################################################################
+#
+# Copyright (c) 2003-2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+msgid ""
+msgstr ""
+"Project-Id-Version: Development/Unknown\n"
+"POT-Creation-Date: Wed Jan  9 10:52:42 2013\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Zope 3 Developers <zope3-dev@zope.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: zope/app/locales/extract.py\n"
+
+#: waeup/kwarapoly/browser/theming.py:30
+msgid "KwaraPoly Theme"
+msgstr ""
+
+#: waeup/kwarapoly/interfaces.py:35
+msgid "School Fee (ignored)"
+msgstr ""
+
+#: waeup/kwarapoly/interfaces.py:41
+msgid "Application Fee (fallback)"
+msgstr ""
+
+#: waeup/kwarapoly/interfaces.py:47
+msgid "Clearance Fee"
+msgstr ""
+
+#: waeup/kwarapoly/interfaces.py:53
+msgid "Booking Fee"
+msgstr ""
+
+#: waeup/kwarapoly/interfaces.py:61
+msgid "Maintenance Fee (ignored)"
+msgstr ""
+
+#: waeup/kwarapoly/interfaces.py:67
+msgid "Gown Fee"
+msgstr ""
+
+#: waeup/kwarapoly/interfaces.py:73
+msgid "Transfer Fee"
+msgstr ""
+
+#: waeup/kwarapoly/interfaces.py:88
+msgid "Academic Session"
+msgstr ""
+
+#: waeup/kwarapoly/interswitch/browser.py:70
+msgid "Submit data to CollegePAY (Interswitch Payment Gateway)"
+msgstr ""
+
+#: waeup/kwarapoly/interswitch/browser.py:71
+msgid "Submit"
+msgstr ""
+
+#: waeup/kwarapoly/interswitch/browser.py:84
+msgid "Payment ticket can't be re-send to CollegePAY."
+msgstr ""
+
+#: waeup/kwarapoly/interswitch/browser_templates/applicant_goto_interswitch.pt:4
+#: waeup/kwarapoly/interswitch/browser_templates/student_goto_interswitch.pt:4
+msgid "These data will be submitted to the CollegePAY payment gateway, please check:"
+msgstr ""
+
+#: waeup/kwarapoly/students/browser.py:66
+msgid "Wrong state"
+msgstr ""
+
+#: waeup/kwarapoly/students/browser.py:70
+msgid "No portrait uploaded."
+msgstr ""
+
+#: waeup/kwarapoly/students/browser.py:74
+msgid "Not all required fields filled."
+msgstr ""
+
+#: waeup/kwarapoly/students/browser.py:80
+msgid "Clearance process has been started."
+msgstr ""
+
+#: waeup/kwarapoly/students/browser.py:95
+msgid "Create bed ticket"
+msgstr ""
+
+#: waeup/kwarapoly/students/browser_templates/bookbed.pt:3
+msgid "You data have been approved. You can book a bed by clicking the button below."
+msgstr ""
+
+#: waeup/kwarapoly/students/browser_templates/startclearance.pt:3
+msgid "You data have been approved. You can start clearance now by clicking the button below."
+msgstr ""
+
+#: waeup/kwarapoly/students/interfaces.py:74
+msgid "Current Session Payment"
+msgstr ""
+
+#: waeup/kwarapoly/students/interfaces.py:80
+msgid "Payment Level"
+msgstr ""
+
+#: waeup/kwarapoly/students/utils.py:138
+msgid "Previous session payment not yet implemented."
+msgstr ""
+
+#: waeup/kwarapoly/students/utils.py:144
+#: waeup/kwarapoly/students/utils.py:171
+msgid "Session configuration object is not available."
+msgstr ""
+
+#: waeup/kwarapoly/students/utils.py:159
+#: waeup/kwarapoly/students/utils.py:165
+msgid "Study course data are incomplete."
+msgstr ""
+
+#: waeup/kwarapoly/students/utils.py:187
+msgid "Amount could not be determined."
+msgstr ""
+
+#: waeup/kwarapoly/students/utils.py:194
+msgid "This type of payment has already been made."
+msgstr ""
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/mail.zcml
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/mail.zcml	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/mail.zcml	(revision 11116)
@@ -0,0 +1,82 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:mail="http://namespaces.zope.org/mail">
+  <!--
+
+   SMTP Settings
+   *************
+
+   In here we define the mailers and mail deliveries we want to be
+   used by the portal.
+
+   They are set here (and not dynamically in the portal) to increase
+   security. Even portal users with all permissions cannot change mail
+   server credentials and related. You need filesystem access to
+   change/override the settings in here.
+
+   In the portal you can pick one of the deliveries for use with all
+   SMTP (aka mail) related functionality.
+
+   Each delivery (direct or queued) is bound to a certain mailer,
+   defined by a 'mail:smtpMailer' directive.
+
+   The smtpMailer directives define real mail hosts (local or remote)
+   where mail from the portal should be processed.
+
+   The 'mail:directDelivery' and 'mail:queuedDelivery' directives send
+   local mail to the mailer set in their 'mailer' attribute. While
+   directDelivery sends mail immediately when a request is finished
+   (see zope.sendmail for more info), queuedDelivery handles mail in a
+   background thread and sends mail independently from requests.
+
+   By default in Kofa we have a fake mailer activated, that does not
+   send real mail to the outside world.
+  -->
+
+  <!-- A mail server on localhost -->
+  <!-- Mail server definitions require the following attributes:
+
+        - name: (string) name to be used by deliveries
+
+       Mail server definitions allow the following additional attribs:
+
+        - hostname   (string) hostname or IP(?) of mail server to use
+                              ('localhost' by default)
+        - port       (int number) port to connect to SMTP mailer
+                              (25 by default)
+        - username   (string) Username to log in to mail server
+        - password   (string) Password to log in to mail server
+
+  -->
+  <mail:smtpMailer
+      name="smtp.mailserver"
+      hostname="localhost"
+      port="25"
+      />
+
+  <!-- The mail deliveries -->
+  <!-- Mail deliveries require the following attributes:
+
+        - name:       (string) this string will appear in portal select
+                               boxes
+        - permission: (string) zope default perms only
+        - mailer:     (string) name of some mailer registered above or
+                               'smtp'
+        - queuePath:  (string) must exist and contain cur/, new/, and
+                               tmp/ dirs. Relative paths are relative
+                               to the directory this files lives in.
+
+   -->
+  <mail:queuedDelivery
+      name="Queued SMTP on mail server"
+      permission="zope.Public"
+      mailer="smtp.mailserver"
+      queuePath="../../../var/mailqueue"
+      />
+
+  <mail:directDelivery
+      name="Direct SMTP on mail server"
+      permission="zope.Public"
+      mailer="smtp.mailserver"
+      />
+
+</configure>
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/meta.zcml
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/meta.zcml	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/meta.zcml	(revision 11116)
@@ -0,0 +1,12 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:meta="http://namespaces.zope.org/meta"
+    xmlns:grok="http://namespaces.zope.org/grok">
+
+  <include package="grok" file="meta.zcml" />
+  <!-- include package="z3c.autoinclude" file="meta.zcml" / -->
+
+  <!-- Load the grokkers -->
+  <grok:grok package=".meta" />
+
+</configure>
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/payments/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/payments/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/payments/__init__.py	(revision 11116)
@@ -0,0 +1,3 @@
+"""This package contains everything regarding payments.
+"""
+# Make this a package.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/payments/interfaces.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/payments/interfaces.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/payments/interfaces.py	(revision 11116)
@@ -0,0 +1,27 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+from zope.interface import Attribute
+from zope import schema
+from kofacustom.nigeria.payments.interfaces import INigeriaOnlinePayment
+from waeup.kwarapoly.interfaces import MessageFactory as _
+
+class ICustomOnlinePayment(INigeriaOnlinePayment):
+    """A payment via payment gateways.
+
+    """
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/permissions.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/permissions.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/permissions.py	(revision 11116)
@@ -0,0 +1,30 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+import grok
+from waeup.kofa.permissions import CCOfficer
+
+
+class CRPUOfficer(CCOfficer):
+    """ Permissions of KwaraPoly staff.
+
+    This is basically a copy of the the PortalManager. We exclude some
+    permissions by commenting them out.
+    """
+
+    grok.name('waeup.CCOfficer')
+    grok.title(u'KwaraPoly Officer')
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/__init__.py	(revision 11116)
@@ -0,0 +1,1 @@
+# Make this a package.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/batching.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/batching.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/batching.py	(revision 11116)
@@ -0,0 +1,44 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""Batch processing components for student objects.
+
+Batch processors eat CSV files to add, update or remove large numbers
+of certain kinds of objects at once.
+
+Here we define the processors for students specific objects like
+students, studycourses, payment tickets and accommodation tickets.
+"""
+from waeup.kwarapoly.students.interfaces import (
+    ICustomStudent, ICustomStudentUpdateByRegNo,
+    ICustomStudentUpdateByMatricNo,
+    ICustomStudentOnlinePayment
+    )
+from waeup.kofa.students.batching import (
+    StudentProcessor, StudentOnlinePaymentProcessor)
+
+class CustomStudentProcessor(StudentProcessor):
+    """A batch processor for ICustomStudent objects.
+    """
+    iface = ICustomStudent
+    iface_byregnumber = ICustomStudentUpdateByRegNo
+    iface_bymatricnumber = ICustomStudentUpdateByMatricNo
+
+class CustomStudentOnlinePaymentProcessor(StudentOnlinePaymentProcessor):
+    """A batch processor for ICustomStudentOnlinePayment objects.
+    """
+    iface = ICustomStudentOnlinePayment
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/browser.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/browser.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/browser.py	(revision 11116)
@@ -0,0 +1,309 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+import grok
+from zope.i18n import translate
+from zope.formlib.textwidgets import BytesDisplayWidget
+from zope.component import getUtility
+from hurry.workflow.interfaces import IWorkflowInfo
+from waeup.kofa.interfaces import ADMITTED, IKofaUtils
+from waeup.kofa.browser.layout import UtilityView
+from waeup.kofa.students.interfaces import IStudentsUtils
+from waeup.kofa.widgets.datewidget import FriendlyDatetimeDisplayWidget
+from waeup.kofa.students.browser import (
+    StartClearancePage, BedTicketAddPage, ExportPDFAdmissionSlipPage,
+    StudentBasePDFFormPage)
+from waeup.kwarapoly.students.interfaces import (
+    ICustomStudent, ICustomStudentBase, ICustomStudentStudyLevel)
+from waeup.kwarapoly.interfaces import MessageFactory as _
+from waeup.kofa.students.workflow import (
+    ADMITTED, PAID, REQUESTED, RETURNING, CLEARED, REGISTERED,
+    VALIDATED, GRADUATED, TRANSCRIPT, CREATED, CLEARANCE)
+from kofacustom.nigeria.students.browser import (
+    NigeriaOnlinePaymentDisplayFormPage,
+    NigeriaOnlinePaymentAddFormPage,
+    NigeriaExportPDFPaymentSlipPage,
+    NigeriaStudentClearanceEditFormPage,
+    NigeriaExportPDFCourseRegistrationSlipPage,
+    NigeriaStudentPersonalDisplayFormPage,
+    NigeriaStudentPersonalEditFormPage,
+    NigeriaStudentPersonalManageFormPage,
+    NigeriaStudentBaseEditFormPage
+    )
+
+from waeup.kwarapoly.students.interfaces import (
+    ICustomStudentOnlinePayment,
+    ICustomStudentPersonal,
+    ICustomStudentPersonalEdit
+    )
+
+class CustomStudentBaseEditFormPage(NigeriaStudentBaseEditFormPage):
+    """ View to edit student base data
+    """
+    form_fields = grok.AutoFields(ICustomStudentBase).select(
+        'email', 'phone', 'sex')
+
+class CustomStudentPersonalDisplayFormPage(NigeriaStudentPersonalDisplayFormPage):
+    """ Page to display student personal data
+    """
+    form_fields = grok.AutoFields(ICustomStudentPersonal)
+    form_fields['perm_address'].custom_widget = BytesDisplayWidget
+    form_fields['next_kin_address'].custom_widget = BytesDisplayWidget
+    form_fields['corr_address'].custom_widget = BytesDisplayWidget
+    form_fields['sponsor_address'].custom_widget = BytesDisplayWidget
+    form_fields[
+        'personal_updated'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+
+class CustomStudentPersonalEditFormPage(NigeriaStudentPersonalEditFormPage):
+    """ Page to edit personal data
+    """
+    form_fields = grok.AutoFields(ICustomStudentPersonalEdit).omit(
+        'personal_updated')
+
+class CustomStudentPersonalManageFormPage(NigeriaStudentPersonalManageFormPage):
+    """ Page to edit personal data
+    """
+    form_fields = grok.AutoFields(ICustomStudentPersonal)
+    form_fields['personal_updated'].for_display = True
+    form_fields[
+        'personal_updated'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+
+class CustomOnlinePaymentDisplayFormPage(NigeriaOnlinePaymentDisplayFormPage):
+    """ Page to view an online payment ticket
+    """
+    grok.context(ICustomStudentOnlinePayment)
+    form_fields = grok.AutoFields(ICustomStudentOnlinePayment).omit(
+        'provider_amt', 'gateway_amt', 'thirdparty_amt', 'p_item')
+    form_fields[
+        'creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+    form_fields[
+        'payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+
+class CustomOnlinePaymentAddFormPage(NigeriaOnlinePaymentAddFormPage):
+    """ Page to add an online payment ticket
+    """
+    form_fields = grok.AutoFields(ICustomStudentOnlinePayment).select(
+        'p_category')
+
+class CustomExportPDFPaymentSlipPage(NigeriaExportPDFPaymentSlipPage):
+    """Deliver a PDF slip of the context.
+    """
+    grok.context(ICustomStudentOnlinePayment)
+    form_fields = grok.AutoFields(ICustomStudentOnlinePayment).omit(
+        'provider_amt', 'gateway_amt', 'thirdparty_amt', 'p_item')
+    form_fields['creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+    form_fields['payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+
+class CustomStartClearancePage(StartClearancePage):
+
+    with_ac = False
+
+class CustomStudentClearanceEditFormPage(NigeriaStudentClearanceEditFormPage):
+    """ View to edit student clearance data by student
+    """
+
+    def dataNotComplete(self):
+        return False
+
+class BedTicketAddPage(BedTicketAddPage):
+    """ Page to add an online payment ticket
+    """
+    buttonname = _('Create bed ticket')
+    notice = ''
+    with_ac = False
+
+class CustomExportPDFAdmissionSlipPage(ExportPDFAdmissionSlipPage):
+    """Deliver a PDF Admission slip.
+    """
+    grok.context(ICustomStudent)
+
+    omit_fields = ('date_of_birth',)
+
+    form_fields = grok.AutoFields(ICustomStudent).select('student_id', 'reg_number')
+
+    def render(self):
+        if self.context.state in (CREATED, ADMITTED,
+                                  CLEARANCE, REQUESTED, CLEARED):
+            self.flash('Not allowed.')
+            self.redirect(self.url(self.context))
+            return
+        students_utils = getUtility(IStudentsUtils)
+        return students_utils.renderPDFAdmissionLetter(self,
+            self.context.student, omit_fields=self.omit_fields)
+
+class ExportPDFAdmissionNotificationPage(UtilityView, grok.View):
+    """Deliver a PDF Admission nostification slip.
+    """
+    grok.context(ICustomStudent)
+    grok.name('admission_notification.pdf')
+    grok.require('waeup.viewStudent')
+    prefix = 'form'
+    label = 'Notification of Provisional Admission'
+
+    omit_fields = ('date_of_birth',)
+
+    form_fields = grok.AutoFields(ICustomStudent).select(
+        'student_id', 'reg_number', 'sex', 'lga')
+
+    def render(self):
+        if self.context.state not in (ADMITTED, CLEARANCE, REQUESTED, CLEARED):
+            self.flash('Not allowed.')
+            self.redirect(self.url(self.context))
+            return
+        students_utils = getUtility(IStudentsUtils)
+        pre_text = ''
+        post_text = post_text_freshers
+        return students_utils.renderPDFAdmissionLetter(self,
+            self.context.student, omit_fields=self.omit_fields,
+            pre_text=pre_text, post_text=post_text)
+
+# copied from waeup.aaue
+class CustomExportPDFCourseRegistrationSlipPage(
+    NigeriaExportPDFCourseRegistrationSlipPage):
+    """Deliver a PDF slip of the context.
+    """
+    grok.context(ICustomStudentStudyLevel)
+    form_fields = grok.AutoFields(ICustomStudentStudyLevel).omit(
+        'level_session', 'level_verdict',
+        'validated_by', 'validation_date', 'gpa')
+
+    omit_fields = ('password', 'suspended', 'suspended_comment',
+        'phone', 'adm_code', 'sex', 'email', 'date_of_birth',
+        'department', 'current_mode')
+
+    @property
+    def title(self):
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        return translate(_('Credits Registered'), 'waeup.kofa',
+            target_language=portal_language)
+
+    def _signatures(self):
+        return (
+            [('I have selected the course on the advise of my Head of '
+             'Department. <br>', _('Student\'s Signature'), '<br>')],
+            [('This student has satisfied the department\'s requirements. '
+             'I recommend to approve the course registration. <br>',
+             _('Head of Department\'s Signature'), '<br>')],
+            [('' , _('Principal Assistant Registrar\'s Signature'), '<br>')],
+            [('', _('Director\'s Signature'))]
+            )
+
+    def render(self):
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        Sem = translate('Sem.', 'waeup.kofa', target_language=portal_language)
+        Code = translate('Code', 'waeup.kofa', target_language=portal_language)
+        Title = translate('Title', 'waeup.kofa', target_language=portal_language)
+        Cred = translate('Cred.', 'waeup.kofa', target_language=portal_language)
+        Score = translate('Score', 'waeup.kofa', target_language=portal_language)
+        Grade = translate('Grade', 'waeup.kofa', target_language=portal_language)
+        Signature = translate(_('HOD\'s Signature'), 'waeup.kwarapoly',
+            target_language=portal_language)
+        studentview = StudentBasePDFFormPage(self.context.student,
+            self.request, self.omit_fields)
+        students_utils = getUtility(IStudentsUtils)
+
+        tabledata = []
+        tableheader = []
+        contenttitle = []
+        for i in range(1,7):
+            tabledata.append(sorted(
+                [value for value in self.context.values() if value.semester == i],
+                key=lambda value: str(value.semester) + value.code))
+            tableheader.append([(Code,'code', 2.0),
+                               (Title,'title', 7),
+                               (Cred, 'credits', 1.5),
+                               (Score, 'score', 1.4),
+                               (Grade, 'grade', 1.4),
+                               (Signature, 'dummy', 3),
+                               ])
+        if len(self.label.split('\n')) == 3:
+            topMargin = 1.9
+        elif len(self.label.split('\n')) == 2:
+            topMargin = 1.7
+        else:
+            topMargin = 1.5
+        return students_utils.renderPDF(
+            self, 'course_registration_slip.pdf',
+            self.context.student, studentview,
+            tableheader=tableheader,
+            tabledata=tabledata,
+            signatures=self._signatures(),
+            topMargin=topMargin,
+            omit_fields=self.omit_fields
+            )
+
+class ExportPDFRegistrationSlipPage(grok.View):
+    """Deliver a PDF slip of the context.
+    """
+    grok.context(ICustomStudent)
+    grok.name('registration_slip.pdf')
+    grok.require('waeup.viewStudent')
+    prefix = 'form'
+    omit_fields = (
+        'suspended', 'phone',
+        'adm_code', 'suspended_comment', 'email',
+        'current_mode', 'matric_number', 'date_of_birth')
+    title = 'Clearance and Personal Data'
+    label = 'Profile Registration Slip'
+
+    form_fields = grok.AutoFields(ICustomStudent).select(
+        'date_of_birth', 'lga', 'nationality',
+        'perm_address', 'corr_address',
+        'marit_stat', 'sponsor_name', 'sponsor_address',
+        )
+
+    def render(self):
+        studentview = StudentBasePDFFormPage(self.context.student,
+            self.request, self.omit_fields)
+        students_utils = getUtility(IStudentsUtils)
+        return students_utils.renderPDF(
+            self, 'registration_slip.pdf',
+            self.context.student, studentview, signatures=([_('Bursar')],),
+            omit_fields=self.omit_fields,
+            note=post_text_registration)
+
+post_text_registration = """<br /><br /><br /><br />
+<strong>IMPORTANTANT NOTICE</strong>
+<br /><br />
+This registration slip must be submitted before attendance of lectures. Note that:<br /><br />
+1. All fees due must be paid in full.<br /><br />
+2. All information required must be available on the Registration Form.<br /><br />
+3. The Signature of all appropriate Polytechnic Authority must be obtained.<br /><br />
+4. The endorsed Registration Form should be returned to the respective Institutes and Administrative Offices.<br /><br />
+5. No student may change his subject or course of study as shown in the signed Registration Form without clearance from Admissions Office and the Director of the appropriate Institute.
+"""
+
+post_text_freshers = """
+<strong>INSTRUCTIONS TO FRESHERS</strong>
+<br /><br />
+You are hereby offered a provisional admission for the 2013/2014 session subject to the conditions that:
+<br /><br />
+1. The information given in your Application Form is correct.<br /><br />
+2. The original of your Credentials are presented for scrutiny.<br /><br />
+3. If at any time the Credentials submitted are found to be false/fake or incorrect, your admission shall be withdrawn.<br /><br />
+4. The name by which you are admitted and registered shall remain same throughout the duration of your programme.<br /><br />
+5. You are to fill and submit the Undertaking Form at the point of registration failure which your admission will be forfeited.<br /><br />
+6. You will dress decently covering your nakedness at all times.<br /><br />
+7. Payment of school fees will be once and in full and should be by Interswitch to the designated Banks. Failure to pay fees by the mode mentioned above by the closing date means you have declined the offer and your place will be given to another eligible candidate immediately.<br /><br />
+8. You present a Certificate of medical fitness from the Polytechnic Clinic.<br /><br />
+9. All indigenes of Kwara State are required to present Certificate of Citizenship.<br /><br />
+10. The Polytechnic reserves the right to withdraw your admission at any stage, if you are found to be a cultist or an expelled individual from any tertiary institution.<br /><br />
+11. You are prepared to take up accommodation provided on the campuses by the authority.<br /><br />
+12. There will be no refund of school fees once paid.<br /><br />
+13. If you accept this offer with above stated conditions, please make a photocopy of this document and return it to the Admission Office immediately.<br /><br />
+14. You possess the entry requirement for the programme you are admitted into before making payment of school fees and registration.<br /><br />
+"""
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/interfaces.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/interfaces.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/interfaces.py	(revision 11116)
@@ -0,0 +1,151 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+
+from zope import schema
+from kofacustom.nigeria.students.interfaces import (
+    INigeriaStudentBase, INigeriaUGStudentClearance, INigeriaPGStudentClearance,
+    INigeriaStudentPersonal, INigeriaStudentStudyLevel,
+    INigeriaStudentStudyCourse, INigeriaCourseTicket,
+    INigeriaStudentUpdateByRegNo, INigeriaStudentUpdateByMatricNo,
+    )
+from waeup.kwarapoly.payments.interfaces import ICustomOnlinePayment
+from waeup.kwarapoly.interfaces import MessageFactory as _
+
+class ICustomStudentBase(INigeriaStudentBase):
+    """Representation of student base data.
+
+    """
+
+class ICustomStudentPersonal(INigeriaStudentPersonal):
+    """Student personal data.
+
+    """
+
+    perm_address = schema.Text(
+        title = _(u'Home Address'),
+        required = False,
+        )
+
+    corr_address = schema.Text(
+        title = _(u'Correspondence Address'),
+        required = False,
+        )
+
+    sponsor_name = schema.TextLine(
+        title = _(u'Sponsor\'s Name'),
+        required = False,
+        readonly = False,
+        )
+
+    sponsor_address = schema.Text(
+        title = _(u'Sponsor\'s Address'),
+        required = False,
+        readonly = False,
+        )
+
+class ICustomStudentPersonalEdit(ICustomStudentPersonal):
+    """Interface for editing personal data by students.
+
+    Here we can repeat the fields from IStudentPersonal and set the
+    `required` if necessary.
+    """
+
+    perm_address = schema.Text(
+        title = _(u'Home Address'),
+        required = True,
+        )
+
+    corr_address = schema.Text(
+        title = _(u'Correspondence Address'),
+        required = True,
+        )
+
+    sponsor_name = schema.TextLine(
+        title = _(u'Sponsor\'s Name'),
+        required = False,
+        readonly = False,
+        )
+
+    sponsor_address = schema.Text(
+        title = _(u'Sponsor\'s Address'),
+        required = False,
+        readonly = False,
+        )
+
+class ICustomUGStudentClearance(INigeriaUGStudentClearance):
+    """Representation of ug student clearance data.
+
+    """
+
+class ICustomPGStudentClearance(INigeriaPGStudentClearance):
+    """Representation of pg student clearance data.
+
+    """
+
+
+class ICustomStudent(ICustomStudentBase,ICustomUGStudentClearance,
+    ICustomPGStudentClearance,ICustomStudentPersonal):
+    """Representation of a student.
+
+    """
+
+class ICustomStudentStudyCourse(INigeriaStudentStudyCourse):
+    """A container for student study levels.
+
+    """
+
+class ICustomStudentStudyLevel(INigeriaStudentStudyLevel):
+    """A container for course tickets.
+
+    """
+
+class ICustomStudentOnlinePayment(ICustomOnlinePayment):
+    """A student payment via payment gateways.
+
+    This Interface does not inherit from IStudentOnlinePayment.
+    Thus all fields from IStudentOnlinePayment have to be repeated here.
+    """
+
+    p_current = schema.Bool(
+        title = _(u'Current Session Payment'),
+        default = True,
+        required = False,
+        )
+
+    p_level = schema.Int(
+        title = _(u'Payment Level'),
+        required = False,
+        )
+
+ICustomStudentOnlinePayment['p_level'].order = ICustomStudentOnlinePayment[
+    'p_session'].order
+
+class ICustomCourseTicket(INigeriaCourseTicket):
+    """A course ticket.
+
+    """
+
+class ICustomStudentUpdateByRegNo(INigeriaStudentUpdateByRegNo):
+    """Representation of a student. Skip regular reg_number validation.
+
+    """
+
+class ICustomStudentUpdateByMatricNo(INigeriaStudentUpdateByMatricNo):
+    """Representation of a student. Skip regular matric_number validation.
+
+    """
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/payments.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/payments.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/payments.py	(revision 11116)
@@ -0,0 +1,60 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""
+Student payment components.
+"""
+import grok
+from zope.component.interfaces import IFactory
+from zope.interface import implementedBy
+from waeup.kofa.students.interfaces import IStudentNavigation
+from waeup.kofa.students.payments import (
+    StudentOnlinePayment, StudentOnlinePaymentFactory)
+from waeup.kofa.utils.helpers import attrs_to_fields
+from waeup.kwarapoly.students.interfaces import ICustomStudentOnlinePayment
+
+class CustomStudentOnlinePayment(StudentOnlinePayment):
+    """This is a custom online payment for students.
+
+    Since this class inherits from StudentOnlinePayment, it automatically
+    implements the interfaces of the parent class which means
+    all viewlets and views meant for StudentOnlinePayment
+    can also be accessed in the customized system.
+    """
+    grok.implements(ICustomStudentOnlinePayment, IStudentNavigation)
+    grok.provides(ICustomStudentOnlinePayment)
+
+    def __init__(self):
+        super(CustomStudentOnlinePayment, self).__init__()
+        return
+
+    @property
+    def student(self):
+        return self.__parent__.__parent__
+
+CustomStudentOnlinePayment = attrs_to_fields(
+    CustomStudentOnlinePayment, omit=['display_item'])
+
+class CustomStudentOnlinePaymentFactory(StudentOnlinePaymentFactory):
+    """A factory for student online payments.
+    """
+
+    def __call__(self, *args, **kw):
+        return CustomStudentOnlinePayment()
+
+    def getInterfaces(self):
+        return implementedBy(CustomStudentOnlinePayment)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/student.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/student.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/student.py	(revision 11116)
@@ -0,0 +1,53 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""
+Container for the various objects owned by students.
+"""
+import grok
+from zope.interface import implementedBy
+from waeup.kofa.utils.helpers import attrs_to_fields
+from waeup.kofa.students.student import StudentFactory
+from waeup.kofa.students.interfaces import IStudentNavigation
+from kofacustom.nigeria.students.student import NigeriaStudent
+from waeup.kwarapoly.students.interfaces import (
+    ICustomStudent, ICustomStudentPersonalEdit)
+
+class CustomStudent(NigeriaStudent):
+    """This is a student container for the various objects
+    owned by students.
+    """
+    grok.implements(ICustomStudent,
+        ICustomStudentPersonalEdit, IStudentNavigation)
+    grok.provides(ICustomStudent)
+
+
+# Set all attributes of Student required in IStudent as field
+# properties. Doing this, we do not have to set initial attributes
+# ourselves and as a bonus we get free validation when an attribute is
+# set.
+CustomStudent = attrs_to_fields(CustomStudent)
+
+class CustomStudentFactory(StudentFactory):
+    """A factory for students.
+    """
+
+    def __call__(self, *args, **kw):
+        return CustomStudent()
+
+    def getInterfaces(self):
+        return implementedBy(CustomStudent)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/studycourse.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/studycourse.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/studycourse.py	(revision 11116)
@@ -0,0 +1,47 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""
+Container which holds the data of the student study courses
+and contains the (student) study level objects.
+"""
+import grok
+from zope.interface import implementedBy
+from waeup.kofa.students.studycourse import StudentStudyCourseFactory
+from waeup.kofa.utils.helpers import attrs_to_fields
+from waeup.kofa.students.interfaces import IStudentNavigation
+from waeup.kofa.students.workflow import CLEARED, RETURNING, PAID
+from kofacustom.nigeria.students.studycourse import NigeriaStudentStudyCourse
+from waeup.kwarapoly.students.interfaces import ICustomStudentStudyCourse
+
+class CustomStudentStudyCourse(NigeriaStudentStudyCourse):
+    """This is a container for study levels.
+    """
+    grok.implements(ICustomStudentStudyCourse, IStudentNavigation)
+    grok.provides(ICustomStudentStudyCourse)
+
+CustomStudentStudyCourse = attrs_to_fields(CustomStudentStudyCourse)
+
+class CustomStudentStudyCourseFactory(StudentStudyCourseFactory):
+    """A factory for student study courses.
+    """
+
+    def __call__(self, *args, **kw):
+        return CustomStudentStudyCourse()
+
+    def getInterfaces(self):
+        return implementedBy(CustomStudentStudyCourse)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/studylevel.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/studylevel.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/studylevel.py	(revision 11116)
@@ -0,0 +1,76 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""
+Container which holds the data of a student study level
+and contains the course tickets.
+"""
+import grok
+from zope.component.interfaces import IFactory
+from zope.interface import implementedBy
+from waeup.kofa.utils.helpers import attrs_to_fields
+from waeup.kofa.students.studylevel import (
+    StudentStudyLevel, CourseTicket,
+    CourseTicketFactory, StudentStudyLevelFactory)
+from waeup.kofa.students.interfaces import IStudentNavigation
+from waeup.kwarapoly.students.interfaces import (
+    ICustomStudentStudyLevel, ICustomCourseTicket)
+
+
+class CustomStudentStudyLevel(StudentStudyLevel):
+    """This is a container for course tickets.
+    """
+    grok.implements(ICustomStudentStudyLevel, IStudentNavigation)
+    grok.provides(ICustomStudentStudyLevel)
+
+CustomStudentStudyLevel = attrs_to_fields(
+    CustomStudentStudyLevel, omit=['total_credits', 'gpa'])
+
+class CustomStudentStudyLevelFactory(StudentStudyLevelFactory):
+    """A factory for student study levels.
+    """
+
+    def __call__(self, *args, **kw):
+        return CustomStudentStudyLevel()
+
+    def getInterfaces(self):
+        return implementedBy(CustomStudentStudyLevel)
+
+class CustomCourseTicket(CourseTicket):
+    """This is a course ticket which allows the
+    student to attend the course. Lecturers will enter scores and more at
+    the end of the term.
+
+    A course ticket contains a copy of the original course and
+    course referrer data. If the courses and/or their referrers are removed, the
+    corresponding tickets remain unchanged. So we do not need any event
+    triggered actions on course tickets.
+    """
+    grok.implements(ICustomCourseTicket, IStudentNavigation)
+    grok.provides(ICustomCourseTicket)
+
+CustomCourseTicket = attrs_to_fields(CustomCourseTicket)
+
+class CustomCourseTicketFactory(CourseTicketFactory):
+    """A factory for student study levels.
+    """
+
+    def __call__(self, *args, **kw):
+        return CustomCourseTicket()
+
+    def getInterfaces(self):
+        return implementedBy(CustomCourseTicket)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/__init__.py	(revision 11116)
@@ -0,0 +1,1 @@
+# Make this a package.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/sample_student_data.csv
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/sample_student_data.csv	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/sample_student_data.csv	(revision 11116)
@@ -0,0 +1,4 @@
+firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,sex
+Aaren,Pieri,1,,100000,aa@aa.ng,1234,m
+Aaren,Finau,2,,100001,aa@aa.ng,1234,m
+Aaren,Berson,3,,100002,aa@aa.ng,1234,m
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/test_browser.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/test_browser.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/test_browser.py	(revision 11116)
@@ -0,0 +1,465 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+import os
+import shutil
+import tempfile
+from mechanize import LinkNotFoundError
+from StringIO import StringIO
+from hurry.workflow.interfaces import IWorkflowState, IWorkflowInfo
+from zope.component.hooks import setSite, clearSite
+from zope.component import getUtility, createObject
+from zope.interface import verify
+from waeup.kofa.app import University
+from waeup.kofa.students.tests.test_browser import (
+    StudentsFullSetup, SAMPLE_IMAGE)
+from waeup.kofa.students.accommodation import BedTicket
+from waeup.kofa.testing import FunctionalTestCase
+from waeup.kofa.interfaces import (
+    IExtFileStore, IFileStoreNameChooser)
+from waeup.kofa.browser.tests.test_pdf import samples_dir
+from waeup.kofa.students.interfaces import IStudentsUtils
+from waeup.kwarapoly.testing import FunctionalLayer
+from waeup.kwarapoly.students.utils import (
+    local_nonlocal, arts_science, pt_ft)
+
+
+class StudentProcessorTest(FunctionalTestCase):
+    """Perform some batching tests.
+    """
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(StudentProcessorTest, self).setUp()
+        # Setup a sample site for each test
+        app = University()
+        self.dc_root = tempfile.mkdtemp()
+        app['datacenter'].setStoragePath(self.dc_root)
+
+        # Prepopulate the ZODB...
+        self.getRootFolder()['app'] = app
+        # we add the site immediately after creation to the
+        # ZODB. Catalogs and other local utilities are not setup
+        # before that step.
+        self.app = self.getRootFolder()['app']
+        # Set site here. Some of the following setup code might need
+        # to access grok.getSite() and should get our new app then
+        setSite(app)
+
+
+    def tearDown(self):
+        super(StudentProcessorTest, self).tearDown()
+        shutil.rmtree(self.workdir)
+        shutil.rmtree(self.dc_root)
+        clearSite()
+        return
+
+class StudentUITests(StudentsFullSetup):
+    """Tests for customized student class views and pages
+    """
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(StudentUITests, self).setUp()
+        self.certificate.study_mode = 'hnd_ft'
+        bedticket = BedTicket()
+        bedticket.booking_session = 2004
+        bedticket.bed_type = u'any bed type'
+        bedticket.bed = self.app['hostels']['hall-1']['hall-1_A_101_A']
+        bedticket.bed_coordinates = u'My bed coordinates'
+        self.student['accommodation'].addBedTicket(bedticket)
+
+        self.app['configuration']['2004'].gown_fee = 150.0
+        self.app['configuration']['2004'].transfer_fee = 90.0
+        self.app['configuration']['2004'].clearance_fee = 120.0
+        self.app['configuration']['2004'].booking_fee = 150.0
+        self.app['configuration']['2004'].maint_fee = 180.0
+        self.app['configuration']['2004'].certificate_fee = 444.0
+
+    def test_manage_payments(self):
+        # Managers can add online payment tickets
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.payments_path)
+        self.browser.getLink("Add current session payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Amount could not be determined...',
+                           self.browser.contents)
+        IWorkflowState(self.student).setState('cleared')
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Book and pay for accommodation first...',
+                           self.browser.contents)
+
+        # In KwaraPoly only returning students can create school fee payment
+        # without haveing paid accommodation fee
+        IWorkflowState(self.student).setState('returning')
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2005
+        self.app['configuration'].addSessionConfiguration(configuration)
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[0]
+        self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...',
+                           self.browser.contents)
+        # Managers can open payment slip
+        self.browser.getLink("Download payment slip").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
+        # Set ticket paid
+        ticket = self.student['payments'].items()[0][1]
+        ticket.p_state = 'paid'
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...This type of payment has already been made...',
+                           self.browser.contents)
+        # Remove all payments so that we can add a school fee payment again
+        keys = [i for i in self.student['payments'].keys()]
+        for payment in keys:
+            del self.student['payments'][payment]
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['carryover1']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['carryover2']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['carryover3']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(
+            name="form.p_category").value = ['hostel_maintenance']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        # In state admitted school fee can't be determined
+        IWorkflowState(self.student).setState('admitted')
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Amount could not be determined...',
+                           self.browser.contents)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['certificate']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+
+    def test_student_payments(self):
+        # Login
+        IWorkflowState(self.student).setState('returning')
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        self.browser.open(self.student_path + '/payments')
+        self.assertTrue(
+          'Add current session payment ticket' in self.browser.contents)
+        self.assertFalse(
+          'Add previous session payment ticket' in self.browser.contents)
+        return
+
+    def test_get_returning_data(self):
+        # Student is in level 100, session 2004 with verdict A
+        utils = getUtility(IStudentsUtils)
+        self.assertEqual(utils.getReturningData(self.student),(2005, 200))
+        self.student['studycourse'].current_verdict = 'C'
+        self.assertEqual(utils.getReturningData(self.student),(2005, 110))
+        self.student['studycourse'].current_verdict = 'D'
+        self.assertEqual(utils.getReturningData(self.student),(2005, 100))
+        return
+
+    def test_set_payment_details(self):
+        utils = getUtility(IStudentsUtils)
+
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment, None)
+        self.assertEqual(error, u'Amount could not be determined.')
+
+        IWorkflowState(self.student).setState('cleared')
+        self.assertEqual(local_nonlocal(self.student), 'non-local')
+        self.assertEqual(arts_science(self.student), 'science')
+        self.assertEqual(pt_ft(self.student), 'ft')
+
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(error,
+            'Book and pay for accommodation first before making'
+            ' school fee payments.')
+        # We add a fake maint. payment ticket to meet the condition
+        maint_payment = createObject('waeup.StudentOnlinePayment')
+        self.student['payments']['any_key'] = maint_payment
+        maint_payment.p_category = 'hostel_maintenance'
+        maint_payment.p_state = 'paid'
+        maint_payment.p_session = 2004
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 53900.0)
+        self.assertEqual(payment.p_item, u'CERT1')
+        self.assertEqual(error, None)
+
+        IWorkflowState(self.student).setState('returning')
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual('Session configuration object is not available.', error)
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2005
+        self.app['configuration'].addSessionConfiguration(configuration)
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment.p_level, 200)
+        self.assertEqual(payment.p_session, 2005)
+        self.assertEqual(payment.amount_auth, 32090.0)
+        self.assertEqual(payment.p_item, u'CERT1')
+        self.assertEqual(error, None)
+
+        configuration.penalty_ug = 5000.0
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment.amount_auth, 37090.0)
+        self.assertEqual(error, None)
+
+        error, payment = utils.setPaymentDetails('clearance',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 120.0)
+        self.assertEqual(payment.p_item, u'CERT1')
+        self.assertEqual(error, None)
+
+        error, payment = utils.setPaymentDetails('carryover1',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 6000.0)
+        self.assertEqual(payment.p_item, u'1 CarryOver')
+        self.assertEqual(payment.p_category, 'schoolfee')
+        self.assertEqual(error, None)
+
+        error, payment = utils.setPaymentDetails('carryover2',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 7000.0)
+        self.assertEqual(payment.p_item, u'2 CarryOvers')
+        self.assertEqual(payment.p_category, 'schoolfee')
+        self.assertEqual(error, None)
+
+        error, payment = utils.setPaymentDetails('carryover3',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 8000.0)
+        self.assertEqual(payment.p_item, u'3 CarryOvers')
+        self.assertEqual(payment.p_category, 'schoolfee')
+        self.assertEqual(error, None)
+
+        error, payment = utils.setPaymentDetails('hostel_maintenance',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 876.0)
+        self.assertEqual(payment.p_item, u'My bed coordinates')
+        self.assertEqual(error, None)
+
+        self.app['hostels']['hall-1'].maint_fee = 0.0
+        error, payment = utils.setPaymentDetails('hostel_maintenance',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 180.0)
+        self.assertEqual(payment.p_item, u'My bed coordinates')
+        self.assertEqual(error, None)
+
+        error, payment = utils.setPaymentDetails('bed_allocation',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 150.0)
+        self.assertEqual(payment.p_item, u'')
+        self.assertEqual(error, None)
+
+        error, payment = utils.setPaymentDetails('certificate',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 444.0)
+        self.assertEqual(payment.p_item, u'')
+        self.assertEqual(payment.p_category, 'certificate')
+        self.assertEqual(error, None)
+
+        error, payment = utils.setPaymentDetails('schoolfee',self.student, 2004, 100)
+        self.assertEqual(error, u'Previous session payment not yet implemented.')
+        return
+
+    def test_student_start_clearance(self):
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+
+        IWorkflowInfo(self.student).fireTransition('admit')
+        self.browser.open(self.student_path + '/change_portrait')
+        image = open(SAMPLE_IMAGE, 'rb')
+        ctrl = self.browser.getControl(name='passportuploadedit')
+        file_ctrl = ctrl.mech_control
+        file_ctrl.add_file(image, filename='my_photo.jpg')
+        self.browser.getControl(
+            name='upload_passportuploadedit').click()
+        self.browser.open(self.student_path + '/start_clearance')
+        # In KwaraPoly the students can just start clearance without entering
+        # an activation code.
+        self.browser.getControl("Start clearance now").click()
+        self.assertMatches('...Clearance process has been started...',
+                           self.browser.contents)
+
+    def test_change_passport(self):
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+
+        IWorkflowState(self.student).setState('cleared')
+        self.browser.open(self.student_path + '/change_portrait')
+        image = open(SAMPLE_IMAGE, 'rb')
+        ctrl = self.browser.getControl(name='passportuploadedit')
+        file_ctrl = ctrl.mech_control
+        file_ctrl.add_file(image, filename='my_photo.jpg')
+        self.browser.getControl(
+            name='upload_passportuploadedit').click()
+
+
+    def test_student_accommodation(self):
+        del self.student['accommodation']['2004']
+        # Login
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+
+        # Students can book accommodation without AC ...
+        self.browser.open(self.acco_path)
+        IWorkflowInfo(self.student).fireTransition('admit')
+        self.browser.getLink("Book accommodation").click()
+        self.assertFalse('Activation Code:' in self.browser.contents)
+        self.browser.getControl("Create bed ticket").click()
+        # Bed is randomly selected but, since there is only
+        # one bed for this student, we know that
+        self.assertMatches('...Hall 1, Block A, Room 101, Bed A...',
+                           self.browser.contents)
+        return
+
+    def test_no_beds_for_itch(self):
+        self.app['faculties']['fac1'].code = 'ITCH'
+        del self.student['accommodation']['2004']
+        # Login
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+
+        self.browser.open(self.acco_path)
+        IWorkflowInfo(self.student).fireTransition('admit')
+        self.browser.getLink("Book accommodation").click()
+        self.browser.getControl("Create bed ticket").click()
+        self.assertTrue('There is no free bed in your category itch_male_fr.' in
+                           self.browser.contents)
+        return
+
+    def test_admission_pdf_slips(self):
+        # Login
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        # admission slip
+        IWorkflowState(self.student).setState('school fee paid')
+        self.browser.open(self.student_path)
+        self.browser.getLink("Download admission letter").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.headers['Content-Type'],
+                         'application/pdf')
+        path = os.path.join(samples_dir(), 'admission_slip.pdf')
+        open(path, 'wb').write(self.browser.contents)
+        print "Sample PDF admission_slip_slip.pdf written to %s" % path
+        self.browser.open(self.student_path)
+        self.assertRaises(
+            LinkNotFoundError, self.browser.getLink, 'Download admission notification')
+        self.browser.open(self.student_path + '/admission_notification.pdf')
+        self.assertTrue('Not allowed' in self.browser.contents)
+        # admission notification
+        IWorkflowState(self.student).setState('cleared')
+        self.browser.open(self.student_path)
+        self.browser.getLink("Download admission notification").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.headers['Content-Type'],
+                         'application/pdf')
+        path = os.path.join(samples_dir(), 'admission_notification.pdf')
+        open(path, 'wb').write(self.browser.contents)
+        print "Sample PDF admission_notification.pdf written to %s" % path
+        self.browser.open(self.student_path)
+        self.assertRaises(
+            LinkNotFoundError, self.browser.getLink, 'Download admission letter')
+        self.browser.open(self.student_path + '/admission_slip.pdf')
+        self.assertTrue('Not allowed' in self.browser.contents)
+        return
+
+    def test_registration_pdf_slips(self):
+        # Student cant login if their password is not set
+        IWorkflowState(self.student).setState('school fee paid')
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        self.browser.getLink("Study Course").click()
+        self.browser.getLink("Add course list").click()
+        self.assertMatches('...Add current level 100 (Year 1)...',
+                           self.browser.contents)
+        self.browser.getControl("Create course list now").click()
+        # A level with one course ticket was created
+        self.browser.getLink("100").click()
+        self.browser.getLink("Download course registration slip").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.headers['Content-Type'],
+                         'application/pdf')
+        path = os.path.join(samples_dir(), 'course_registration_slip.pdf')
+        open(path, 'wb').write(self.browser.contents)
+        print "Sample PDF course_registration_slip.pdf written to %s" % path
+
+        self.browser.open(self.student_path)
+        self.browser.getLink("Download registration form").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.headers['Content-Type'],
+                         'application/pdf')
+        path = os.path.join(samples_dir(), 'registration_slip.pdf')
+        open(path, 'wb').write(self.browser.contents)
+        print "Sample PDF registration_form.pdf written to %s" % path
+
+        return
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/test_student.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/test_student.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/test_student.py	(revision 11116)
@@ -0,0 +1,127 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""Tests for students and related.
+"""
+from datetime import tzinfo
+from zope.component.interfaces import IFactory
+from zope.interface import verify
+from waeup.kofa.testing import FunctionalTestCase
+from waeup.kwarapoly.students.student import CustomStudent, CustomStudentFactory
+from waeup.kwarapoly.students.studycourse import (
+    CustomStudentStudyCourse, CustomStudentStudyCourseFactory)
+from waeup.kwarapoly.students.studylevel import (
+    CustomStudentStudyLevel, CustomCourseTicket,
+    CustomStudentStudyLevelFactory,
+    CustomCourseTicketFactory)
+from waeup.kwarapoly.students.interfaces import (
+    ICustomStudent, ICustomStudentStudyCourse,
+    ICustomStudentStudyLevel, ICustomCourseTicket)
+from waeup.kwarapoly.testing import FunctionalLayer
+
+
+class CustomStudentFactoryTest(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(CustomStudentFactoryTest, self).setUp()
+        self.factory = CustomStudentFactory()
+
+    def tearDown(self):
+        super(CustomStudentFactoryTest, self).tearDown()
+
+    def test_interfaces(self):
+        verify.verifyClass(IFactory, CustomStudentFactory)
+        verify.verifyObject(IFactory, self.factory)
+
+    def test_factory(self):
+        obj = self.factory()
+        assert isinstance(obj, CustomStudent)
+
+    def test_getInterfaces(self):
+        implemented_by = self.factory.getInterfaces()
+        assert implemented_by.isOrExtends(ICustomStudent)
+
+class CustomStudentStudyCourseFactoryTest(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(CustomStudentStudyCourseFactoryTest, self).setUp()
+        self.factory = CustomStudentStudyCourseFactory()
+
+    def tearDown(self):
+        super(CustomStudentStudyCourseFactoryTest, self).tearDown()
+
+    def test_interfaces(self):
+        verify.verifyClass(IFactory, CustomStudentStudyCourseFactory)
+        verify.verifyObject(IFactory, self.factory)
+
+    def test_factory(self):
+        obj = self.factory()
+        assert isinstance(obj, CustomStudentStudyCourse)
+
+    def test_getInterfaces(self):
+        implemented_by = self.factory.getInterfaces()
+        assert implemented_by.isOrExtends(ICustomStudentStudyCourse)
+
+class CustomStudentStudyLevelFactoryTest(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(CustomStudentStudyLevelFactoryTest, self).setUp()
+        self.factory = CustomStudentStudyLevelFactory()
+
+    def tearDown(self):
+        super(CustomStudentStudyLevelFactoryTest, self).tearDown()
+
+    def test_interfaces(self):
+        verify.verifyClass(IFactory, CustomStudentStudyLevelFactory)
+        verify.verifyObject(IFactory, self.factory)
+
+    def test_factory(self):
+        obj = self.factory()
+        assert isinstance(obj, CustomStudentStudyLevel)
+
+    def test_getInterfaces(self):
+        implemented_by = self.factory.getInterfaces()
+        assert implemented_by.isOrExtends(ICustomStudentStudyLevel)
+
+class CustomCourseTicketFactoryTest(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(CustomCourseTicketFactoryTest, self).setUp()
+        self.factory = CustomCourseTicketFactory()
+
+    def tearDown(self):
+        super(CustomCourseTicketFactoryTest, self).tearDown()
+
+    def test_interfaces(self):
+        verify.verifyClass(IFactory, CustomCourseTicketFactory)
+        verify.verifyObject(IFactory, self.factory)
+
+    def test_factory(self):
+        obj = self.factory()
+        assert isinstance(obj, CustomCourseTicket)
+
+    def test_getInterfaces(self):
+        implemented_by = self.factory.getInterfaces()
+        assert implemented_by.isOrExtends(ICustomCourseTicket)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/test_utils.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/test_utils.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/tests/test_utils.py	(revision 11116)
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+from waeup.kofa.testing import FunctionalTestCase
+from zope.component import getUtility
+from waeup.kofa.students.interfaces import IStudentsUtils
+from waeup.kofa.students.tests.test_browser import StudentsFullSetup
+from waeup.kwarapoly.testing import FunctionalLayer
+
+class BedAllocationTests(StudentsFullSetup):
+
+    layer = FunctionalLayer
+
+    def test_getAccommodationDetails(self):
+        students_utils = getUtility(IStudentsUtils)
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_fr')
+
+        self.student['studycourse'].current_level = 200
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_re')
+
+        self.student['studycourse'].current_level = 210
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_re')
+
+        self.student['studycourse'].current_level = 300
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_fi')
+
+        self.student['studycourse'].current_level = 400
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_fr')
+
+        self.student['studycourse'].current_level = 500
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_re')
+
+        self.student['studycourse'].current_level = 510
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_re')
+
+        self.student['studycourse'].current_level = 600
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_fi')
+        return
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/utils.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/utils.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/utils.py	(revision 11116)
@@ -0,0 +1,310 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+import grok
+import random
+from time import time
+from zope.component import createObject, getUtility
+from zope.catalog.interfaces import ICatalog
+from waeup.kofa.interfaces import CLEARED, RETURNING, PAID
+from kofacustom.nigeria.students.utils import NigeriaStudentsUtils
+from waeup.kofa.accesscodes import create_accesscode
+from waeup.kofa.interfaces import CLEARED, RETURNING, ADMITTED, IKofaUtils
+from waeup.kofa.fees import FeeTable
+from waeup.kofa.hostels.hostel import NOT_OCCUPIED
+from waeup.kwarapoly.interfaces import MessageFactory as _
+
+
+# 10  = PreND (1)
+# 100 = ND1 (2)
+# 110 = ND1R (3)
+# 200 = ND2 (4)
+# 210 = ND2R (5)
+# 300 = ND3 (6)
+# 400 = HND1 (7)
+# 410 = HND1R (8)
+# 500 = HND2 (9)
+# 510 = HND2R (10)
+# 600 = HND3 (11)
+# 999 = PGD (12)
+
+PAYMENT_LEVELS = (10, 100, 110, 200, 210, 300, 400, 410, 500, 510, 600, 999)
+
+FEES_PARAMS = (
+        ('ft', 'pt'),
+        ('local', 'non-local'),
+        ('science','arts'),
+        PAYMENT_LEVELS
+    )
+
+FEES_VALUES = (
+        (
+          ( # 10       100      110      200      210     300    400     410      500      510     600   999
+            (34500.0, 39400.0, 28500.0, 29500.0, 28500.0, 0.0, 40000.0, 29400.0, 31700.0, 29400.0, 0.0, 56600.0), # science
+            (34500.0, 37900.0, 27000.0, 28000.0, 27000.0, 0.0, 38500.0, 27900.0, 30200.0, 27900.0, 0.0, 55100.0)  # arts
+          ), # local
+          ( # 10       100      110      200      210     300    400     410      500      510     600   999
+            (49600.0, 53900.0, 37600.0, 32090.0, 37600.0, 0.0, 56400.0, 39100.0, 34900.0, 39100.0, 0.0, 83250.0), # science
+            (49600.0, 52400.0, 36100.0, 30590.0, 36100.0, 0.0, 54900.0, 37600.0, 33400.0, 37600.0, 0.0, 81750.0)  # arts
+          ), # non-local
+        ), # ft
+	
+#Repeaters fees now included for part-times students to mirror that of full-time students
+        (
+          ( # 10    100      110      200      210      300      400      410      500      510      600    999
+            (0.0, 40700.0, 28500.0, 29900.0, 28500.0, 29900.0, 41100.0, 29400.0, 31050.0, 29400.0, 31050.0, 0.0), # science
+            (0.0, 39200.0, 27000.0, 28400.0, 27000.0, 28400.0, 39600.0, 27900.0, 29550.0, 29400.0, 29550.0, 0.0)  # arts
+          ), # local
+          ( # 10    100      110      200      210      300      400      410      500      510      600    999
+            (0.0, 55400.0, 37600.0, 33850.0, 37600.0, 33850.0, 58300.0, 39100.0, 42350.0, 39100.0, 42350.0, 0.0), # science
+            (0.0, 53900.0, 36100.0, 32350.0, 36100.0, 32350.0, 56800.0, 37600.0, 40850.0, 37600.0, 40850.0, 0.0)  # arts
+          ), # non-local
+        ), # pt
+    )
+
+SCHOOL_FEES = FeeTable(FEES_PARAMS, FEES_VALUES)
+
+def local_nonlocal(student):
+    lga = getattr(student, 'lga')
+    if lga and lga.startswith('kwara'):
+        return 'local'
+    else:
+        return 'non-local'
+
+def arts_science(student):
+    if student.faccode == 'IFMS':
+        return 'arts'
+    else:
+        return 'science'
+
+def pt_ft(student):
+    if student.current_mode.endswith('pt'):
+        return 'pt'
+    else:
+        return 'ft'
+
+class CustomStudentsUtils(NigeriaStudentsUtils):
+    """A collection of customized methods.
+
+    """
+
+
+    def selectBed(self, available_beds):
+        """Randomly select a bed from a list of available beds.
+
+        """
+        return random.choice(available_beds)
+
+    def getReturningData(self, student):
+        """ This method defines what happens after school fee payment
+        of returning students depending on the student's senate verdict.
+        """
+        prev_level = student['studycourse'].current_level
+        cur_verdict = student['studycourse'].current_verdict
+        if cur_verdict in ('A','B','L','M','N','Z',):
+            # Successful student
+            new_level = divmod(int(prev_level),100)[0]*100 + 100
+        elif cur_verdict == 'C':
+            # Student on probation
+            new_level = int(prev_level) + 10
+        else:
+            # Student is somehow in an undefined state.
+            # Level has to be set manually.
+            new_level = prev_level
+        new_session = student['studycourse'].current_session + 1
+        return new_session, new_level
+
+    def _maintPaymentMade(self, student, session):
+        if len(student['payments']):
+            for ticket in student['payments'].values():
+                if ticket.p_category == 'hostel_maintenance' and \
+                    ticket.p_session == session and ticket.p_state == 'paid':
+                        return True
+        return False
+
+    def _bedAvailable(self, student):
+        acc_details  = self.getAccommodationDetails(student)
+        cat = getUtility(ICatalog, name='beds_catalog')
+        entries = cat.searchResults(
+            owner=(student.student_id,student.student_id))
+        if len(entries):
+            # Bed has already been booked.
+            return True
+        entries = cat.searchResults(
+            bed_type=(acc_details['bt'],acc_details['bt']))
+        available_beds = [
+            entry for entry in entries if entry.owner == NOT_OCCUPIED]
+        if available_beds:
+            # Bed has not yet been booked but beds are available.
+            return True
+        return False
+
+    def setPaymentDetails(self, category, student,
+            previous_session=None, previous_level=None):
+        """Create Payment object and set the payment data of a student for
+        the payment category specified.
+
+        """
+        details = {}
+        p_item = u''
+        amount = 0.0
+        error = u''
+        if previous_session:
+            return _('Previous session payment not yet implemented.'), None
+        p_session = student['studycourse'].current_session
+        p_level = student['studycourse'].current_level
+        p_current = True
+        academic_session = self._getSessionConfiguration(p_session)
+        if academic_session == None:
+            return _(u'Session configuration object is not available.'), None
+        # Determine fee.
+        if category == 'transfer':
+            amount = academic_session.transfer_fee
+        elif category == 'gown':
+            amount = academic_session.gown_fee
+        elif category == 'bed_allocation':
+            amount = academic_session.booking_fee
+        elif category == 'hostel_maintenance':
+            amount = 0.0
+            bedticket = student['accommodation'].get(
+                str(student.current_session), None)
+            if bedticket:
+                p_item = bedticket.bed_coordinates
+                if bedticket.bed.__parent__.maint_fee > 0:
+                    amount = bedticket.bed.__parent__.maint_fee
+                else:
+                    # fallback
+                    amount = academic_session.maint_fee
+            else:
+                # Should not happen because this is already checked
+                # in the browser module, but anyway ...
+                portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+                p_item = trans(_('no bed allocated'), portal_language)
+        elif category == 'clearance':
+            amount = academic_session.clearance_fee
+            try:
+                p_item = student['studycourse'].certificate.code
+            except (AttributeError, TypeError):
+                return _('Study course data are incomplete.'), None
+        elif category == 'schoolfee':
+            try:
+                certificate = student['studycourse'].certificate
+                p_item = certificate.code
+            except (AttributeError, TypeError):
+                return _('Study course data are incomplete.'), None
+            if student.state == RETURNING:
+                # Override p_session and p_level
+                p_session, p_level = self.getReturningData(student)
+                academic_session = self._getSessionConfiguration(p_session)
+                if academic_session == None:
+                    return _(u'Session configuration object '
+                              'is not available.'), None
+            if student.state == CLEARED and student.current_mode in (
+                                                            'hnd_ft', 'nd_ft'):
+                # Fresh students must have booked and paid for accommodation.
+                if self._bedAvailable(student):
+                    if not self._maintPaymentMade(student, p_session):
+                        return _('Book and pay for accommodation first '
+                                 'before making school fee payments.'), None
+            if student.state in (RETURNING, CLEARED):
+                if p_level in PAYMENT_LEVELS:
+                    amount = SCHOOL_FEES.get_fee(
+                        (pt_ft(student),
+                         local_nonlocal(student),
+                         arts_science(student),
+                         p_level)
+                        )
+        elif category == 'carryover1':
+            amount = 6000.0
+        elif category == 'carryover2':
+            amount = 7000.0
+        elif category == 'carryover3':
+            amount = 8000.0
+
+        else:
+            fee_name = category + '_fee'
+            amount = getattr(academic_session, fee_name, 0.0)
+        if amount in (0.0, None):
+            return _(u'Amount could not be determined.'), None
+        for key in student['payments'].keys():
+            ticket = student['payments'][key]
+            if ticket.p_state == 'paid' and\
+               ticket.p_category == category and \
+               ticket.p_item == p_item and \
+               ticket.p_session == p_session:
+                  return _('This type of payment has already been made.'), None
+        if category.startswith('carryover'):
+            p_item = getUtility(IKofaUtils).PAYMENT_CATEGORIES[category]
+            p_item = unicode(p_item)
+            # Now we change the category to reduce the number of categories.
+            category = 'schoolfee'
+        # Add session specific penalty fee.
+        if category == 'schoolfee' and student.is_postgrad:
+            amount += academic_session.penalty_pg
+        elif category == 'schoolfee':
+            amount += academic_session.penalty_ug
+        payment = createObject(u'waeup.StudentOnlinePayment')
+        timestamp = ("%d" % int(time()*10000))[1:]
+        payment.p_id = "p%s" % timestamp
+        payment.p_category = category
+        payment.p_item = p_item
+        payment.p_session = p_session
+        payment.p_level = p_level
+        payment.p_current = p_current
+        payment.amount_auth = float(amount)
+        return None, payment
+
+    def getAccommodationDetails(self, student):
+        """Determine the accommodation data of a student.
+        """
+        d = {}
+        d['error'] = u''
+        hostels = grok.getSite()['hostels']
+        d['booking_session'] = hostels.accommodation_session
+        d['allowed_states'] = hostels.accommodation_states
+        d['startdate'] = hostels.startdate
+        d['enddate'] = hostels.enddate
+        d['expired'] = hostels.expired
+        # Determine bed type
+        studycourse = student['studycourse']
+        certificate = getattr(studycourse,'certificate',None)
+        current_level = studycourse.current_level
+        if None in (current_level, certificate):
+            return d
+        end_level = certificate.end_level
+        if current_level == 10:
+            bt = 'pr'
+        elif current_level in (100, 400):
+            bt = 'fr'
+        elif current_level in (300, 600):
+            bt = 'fi'
+        else:
+            bt = 're'
+        if student.sex == 'f':
+            sex = 'female'
+        else:
+            sex = 'male'
+        special_handling = 'regular'
+        if student.faccode == 'ITCH':
+            special_handling = 'itch'
+        d['bt'] = u'%s_%s_%s' % (special_handling,sex,bt)
+        return d
+
+    PWCHANGE_STATES = (ADMITTED, CLEARED, RETURNING)
+
+    # KwaraPoly prefix
+    STUDENT_ID_PREFIX = u'W'
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/viewlets.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/viewlets.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/students/viewlets.py	(revision 11116)
@@ -0,0 +1,86 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+
+import grok
+from waeup.kofa.students.viewlets import (
+    AddPreviousPaymentActionButton, AddBalancePaymentActionButton,
+    ManageActionButton)
+from waeup.kofa.students.interfaces import IStudent
+from waeup.kofa.students.browser import StudentBaseDisplayFormPage
+from waeup.kofa.students.workflow import (
+    ADMITTED, PAID, REQUESTED, RETURNING, CLEARED, REGISTERED,
+    VALIDATED, GRADUATED, TRANSCRIPT, CREATED, CLEARANCE)
+from waeup.kwarapoly.interfaces import MessageFactory as _
+
+class AddPreviousPaymentActionButton(AddPreviousPaymentActionButton):
+
+    @property
+    def target_url(self):
+        return ''
+
+class AddBalancePaymentActionButton(AddBalancePaymentActionButton):
+
+    @property
+    def target_url(self):
+        return ''
+
+class AdmissionNotificationActionButton(ManageActionButton):
+    grok.order(4)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.viewStudent')
+    icon = 'actionicon_pdf.png'
+    text = _('Download admission notification')
+    target = 'admission_notification.pdf'
+
+    @property
+    def target_url(self):
+        if self.context.state not in (ADMITTED, CLEARANCE, REQUESTED, CLEARED):
+            return ''
+        return self.view.url(self.view.context, self.target)
+
+class AdmissionSlipActionButton(ManageActionButton):
+    grok.order(4)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.viewStudent')
+    icon = 'actionicon_pdf.png'
+    text = _('Download admission letter')
+    target = 'admission_slip.pdf'
+
+    @property
+    def target_url(self):
+        if self.context.state in (CREATED, ADMITTED,
+                                  CLEARANCE, REQUESTED, CLEARED):
+            return ''
+        return self.view.url(self.view.context, self.target)
+
+class RegistrationSlipActionButton(ManageActionButton):
+    grok.order(4)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.viewStudent')
+    icon = 'actionicon_pdf.png'
+    text = _('Download registration form')
+    target = 'registration_slip.pdf'
+
+    @property
+    def target_url(self):
+        if self.context.state in (CREATED,):
+            return ''
+        return self.view.url(self.view.context, self.target)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/testing.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/testing.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/testing.py	(revision 11116)
@@ -0,0 +1,27 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""Testing support for custom package.
+"""
+import os.path
+import waeup.kwarapoly
+from zope.app.testing.functional import ZCMLLayer
+
+ftesting_zcml = os.path.join(
+    os.path.dirname(waeup.kwarapoly.__file__), 'ftesting.zcml')
+FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
+                            allow_teardown=True)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/__init__.py	(revision 11116)
@@ -0,0 +1,2 @@
+# This is a package
+
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/test_configuration.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/test_configuration.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/test_configuration.py	(revision 11116)
@@ -0,0 +1,76 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""Tests for configuration containers and related.
+"""
+from zope.component.interfaces import IFactory
+from zope.interface import verify
+from waeup.kofa.testing import FunctionalTestCase
+from waeup.kofa.configuration import ConfigurationContainer
+from waeup.kofa.interfaces import IConfigurationContainer
+from waeup.kofa.tests.test_configuration import (
+    ConfigurationTest, SessionConfigurationFactoryTest)
+from waeup.kwarapoly.configuration import (
+    CustomSessionConfiguration, CustomSessionConfigurationFactory)
+from waeup.kwarapoly.interfaces import(
+    ICustomSessionConfiguration, ICustomSessionConfigurationAdd)
+from waeup.kwarapoly.testing import FunctionalLayer
+
+class ConfigurationTest(ConfigurationTest):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(ConfigurationTest, self).setUp()
+        self.confcontainer = ConfigurationContainer()
+        self.sessionconf = CustomSessionConfiguration()
+        return
+
+    #def tearDown(self):
+    #    super(ConfigurationTest, self).tearDown()
+    #    return
+
+    def test_interfaces(self):
+        #verify.verifyClass(IConfigurationContainer, ConfigurationContainer)
+        #verify.verifyObject(IConfigurationContainer, self.confcontainer)
+        verify.verifyClass(ICustomSessionConfiguration, CustomSessionConfiguration)
+        verify.verifyObject(ICustomSessionConfiguration, self.sessionconf)
+        verify.verifyClass(ICustomSessionConfigurationAdd, CustomSessionConfiguration)
+        verify.verifyObject(ICustomSessionConfigurationAdd, self.sessionconf)
+
+class SessionConfigurationFactoryTest(SessionConfigurationFactoryTest):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(SessionConfigurationFactoryTest, self).setUp()
+        self.factory = CustomSessionConfigurationFactory()
+
+    #def tearDown(self):
+    #    super(SessionConfigurationFactoryTest, self).tearDown()
+
+    def test_interfaces(self):
+        verify.verifyClass(IFactory, CustomSessionConfigurationFactory)
+        verify.verifyObject(IFactory, self.factory)
+
+    def test_factory(self):
+        obj = self.factory()
+        assert isinstance(obj, CustomSessionConfiguration)
+
+    def test_getInterfaces(self):
+        implemented_by = self.factory.getInterfaces()
+        assert implemented_by.isOrExtends(ICustomSessionConfiguration)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/test_datacenter.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/test_datacenter.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/test_datacenter.py	(revision 11116)
@@ -0,0 +1,30 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+from waeup.kofa.datacenter import DataCenter
+from waeup.kofa.testing import FunctionalTestCase
+from waeup.kwarapoly.testing import FunctionalLayer
+
+
+class DatacenterTests(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def test_storage_path(self):
+        mydatacenter = DataCenter()
+        storagepath = mydatacenter.storage
+        self.assertTrue('/parts/test/datacenter' in storagepath)
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/test_smtp.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/test_smtp.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/tests/test_smtp.py	(revision 11116)
@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+# Tests for email-related components
+import base64
+import logging
+import tempfile
+import shutil
+import unittest
+from StringIO import StringIO
+from zope.component import getUtility
+from zope.component.hooks import setSite
+from zope.sendmail.interfaces import IMailDelivery
+from waeup.kofa.app import University
+from waeup.kofa.interfaces import IMailService
+from waeup.kofa.smtp import (
+    encode_header_item, encode_address, encode_body, FakeSMTPDelivery,
+    send_mail)
+from waeup.kofa.testing import FunctionalTestCase
+from waeup.kwarapoly.testing import FunctionalLayer
+
+#
+# SMTP test config
+#
+
+# Also run tests that send mail to external servers?
+#   If you enable this, please make sure the external smtp hosts and receivers
+#   do exist really and are not bothered by being spammed by a test programme.
+EXTERNAL_MAIL_TESTS = False
+
+# Maybe existing receiver of externally sent mail. If this mail account
+# exists really, it might receive mail from the tests!
+EXTERNAL_MAIL_RECEIVER = 'existing_address@waeup.org'
+
+# Names of mail deliveries to use when external mail tests are enabled.
+#   See local mail.zcml for names of available deliveries.
+EXTERNAL_DIRECT_DELIVERY = 'Direct SMTP on mail server'
+EXTERNAL_QUEUED_DELIVERY = 'Queued SMTP on mail server'
+
+#
+# end of SMTP test config
+#
+
+def external_mail_test(func):
+    if not EXTERNAL_MAIL_TESTS:
+        myself = __file__
+        if myself.endswith('.pyc'):
+            myself = myself[:-2]
+        print "WARNING: external mail tests are skipped!"
+        print "WARNING: edit %s to enable them." % myself
+        return
+    return func
+
+class ExternalMailerTests(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def setUp(self):
+        super(ExternalMailerTests, self).setUp()
+        # Setup a sample site for each test
+        app = University()
+        self.dc_root = tempfile.mkdtemp()
+        app['datacenter'].setStoragePath(self.dc_root)
+
+        # Prepopulate the ZODB...
+        self.getRootFolder()['app'] = app
+        self.app = self.getRootFolder()['app']
+        return
+
+    def tearDown(self):
+        super(ExternalMailerTests, self).tearDown()
+        shutil.rmtree(self.dc_root)
+        return
+
+    def test_config_default_mailer(self):
+        # The default mailer set in config is 'no mailer'.
+        self.assertEqual(
+            getattr(self.app.get('configuration', None), 'smtp_mailer'),
+            u'No email service')
+        return
+
+    @external_mail_test
+    def test_send_direct_mail(self):
+        # send mail using direct mail delivery
+        self.app['configuration'].smtp_mailer = EXTERNAL_DIRECT_DELIVERY
+        setSite(self.app)
+        result = send_mail(
+            'test program', 'no-reply@waeup.org',
+            'test mail receiver', EXTERNAL_MAIL_RECEIVER,
+            'Test Mail from WAeUP Kofa',
+            'Hi from test mailer!\n\nRegards,\nTest Programme\n'
+            )
+        import transaction
+        transaction.commit() # The mail is really sent when transactions is
+                             # committed
+        self.assertTrue('@' in result)
+        return
+
+    @external_mail_test
+    def test_send_queued_mail(self):
+        # send mail using queued mail delivery
+        self.app['configuration'].smtp_mailer = EXTERNAL_QUEUED_DELIVERY
+        setSite(self.app)
+        result = send_mail(
+            'test program', 'no-reply@waeup.org',
+            'test mail receiver', EXTERNAL_MAIL_RECEIVER,
+            'Test Mail from WAeUP Kofa',
+            'Hi from test mailer!\n\nRegards,\nTest Programme\n'
+            )
+        import transaction
+        transaction.commit() # The mail is really sent when transactions is
+                             # committed
+        self.assertTrue('@' in result)
+        return
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/university/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/university/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/university/__init__.py	(revision 11116)
@@ -0,0 +1,1 @@
+# Make this a package.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/utils/__init__.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/utils/__init__.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/utils/__init__.py	(revision 11116)
@@ -0,0 +1,1 @@
+# Make this a package.
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/utils/tests.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/utils/tests.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/utils/tests.py	(revision 11116)
@@ -0,0 +1,29 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+from waeup.kofa.testing import FunctionalTestCase
+from waeup.kwarapoly.testing import FunctionalLayer
+
+
+class CustomPackageUtilsTests(FunctionalTestCase):
+
+    layer = FunctionalLayer
+
+    def test_foo(self):
+        '''Test method foo.
+        '''
+        return
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/utils/utils.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/utils/utils.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/utils/utils.py	(revision 11116)
@@ -0,0 +1,129 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+"""Customize general helper utilities for Kofa.
+"""
+from kofacustom.nigeria.utils.utils import NigeriaKofaUtils
+
+class CustomKofaUtils(NigeriaKofaUtils):
+    """A collection of methods subject to customization.
+    """
+
+    PREFERRED_LANGUAGES_DICT = {
+        }
+
+    APP_CATS_DICT = {
+        'basic': 'Basic',
+        'ndft': 'National Diploma Full-Time Programmes',
+        'ndpt': 'National Diploma Part-Time Programmes',
+        'hndft': 'Higher National Diploma Full-Time Programmes',
+        'hndpt': 'Higher National Diploma Part-Time Programmes',
+        'pgd': 'Postgraduate Diploma Programmes',
+        'rmd': 'Remedial Programmes',
+        'no': 'no application',
+        }
+
+    STUDY_MODES_DICT = {
+        'nd_ft': 'National Diploma Full-Time',
+        'nd_pt': 'National Diploma Part-Time',
+        'hnd_ft': 'Higher National Diploma Full-Time',
+        'hnd_pt': 'Higher National Diploma Part-Time',
+        'pgd_ft': 'Postgraduate Diploma Full-Time',
+        'pgd_pt': 'Postgraduate Diploma Part-Time',
+        'prend': 'Pre-ND',
+        'rmd': 'Remedial',
+        }
+
+    PAYMENT_CATEGORIES = {
+        'schoolfee': 'School Fee',
+        'carryover1': '1 CarryOver',
+        'carryover2': '2 CarryOvers',
+        'carryover3': '3 CarryOvers',
+        'clearance': 'Acceptance Fee',
+        'bed_allocation': 'Bed Allocation Fee',
+        'hostel_maintenance': 'Hostel Maintenance Fee',
+        'application': 'Application Fee',
+        'certificate': 'Certificate',
+        'state_result': 'Statement of Result',
+        'transcript_local': 'Transcript (local)',
+        'transcript_foreign': 'Transcript (foreign)',
+        'ver_result': 'Verification of Result',
+        'change_course': 'Change of Course',
+        'change_inst': 'Change of Institute',
+        'jamb_reject': 'JAMB Rejection Form',
+        'cert_of_cert': 'Certification of Certificate',
+        'ref_let': 'Recommendation/Reference Letter',
+        'proc_cert': 'Processing of Certificate by Proxy',
+        'loss_idcard': 'Loss of ID Card',
+        'loss_examcard': 'Loss of Exam Card',
+        'loss_result': 'Loss of Result',
+        'loss_receipt': 'Loss of Receipt',
+        'loss_clearance': 'Loss of Clearance',
+        'conv_brochure': 'Convocation Brochure',
+        }
+
+    SELECTABLE_PAYMENT_CATEGORIES = {
+        'schoolfee': 'School Fee',
+        'carryover1': 'One CarryOver',
+        'carryover2': 'Two CarryOvers',
+        'carryover3': 'Three CarryOvers',
+        'hostel_maintenance': 'Hostel Maintenance Fee',
+        'certificate': 'Certificate',
+        'state_result': 'Statement of Result',
+        'transcript_local': 'Transcript (local)',
+        'transcript_foreign': 'Transcript (foreign)',
+        'ver_result': 'Verification of Result',
+        'change_course': 'Change of Course',
+        'change_inst': 'Change of Institute',
+        'jamb_reject': 'JAMB Rejection Form',
+        'cert_of_cert': 'Certification of Certificate',
+        'ref_let': 'Recommendation/Reference Letter',
+        'proc_cert': 'Processing of Certificate by Proxy',
+        'loss_idcard': 'Loss of ID Card',
+        'loss_examcard': 'Loss of Exam Card',
+        'loss_result': 'Loss of Result',
+        'loss_receipt': 'Loss of Receipt',
+        'loss_clearance': 'Loss of Clearance',
+        'conv_brochure': 'Convocation Brochure',
+        }
+
+    SPECIAL_HANDLING_DICT = {
+        'regular': 'Regular Hostel',
+        'blocked': 'Blocked Hostel',
+        'pg': 'Postgraduate Hostel',
+        'itch': 'ITCH Hostel'
+        }
+
+    SPECIAL_APP_DICT = {
+        'certificate': 'Certificate Payment',
+        'state_result': 'Statement of Result Payment',
+        'transcript_local': 'Transcript (local) Payment',
+        'transcript_foreign': 'Transcript (foreign) Payment',
+        'ver_result': 'Verification of Result Payment',
+        'change_course': 'Change of Course Payment',
+        'change_inst': 'Change of Institute Payment',
+        'jamb_reject': 'JAMB Rejection Form Payment',
+        'cert_of_cert': 'Certification of Certificate Payment',
+        'ref_let': 'Recommendation/Reference Letter Payment',
+        'proc_cert': 'Processing of Certificate by Proxy Payment',
+        'loss_idcard': 'Loss of ID Card Payment',
+        'loss_examcard': 'Loss of Exam Card Payment',
+        'loss_result': 'Loss of Result Payment',
+        'loss_receipt': 'Loss of Receipt Payment',
+        'loss_clearance': 'Loss of Clearance Payment',
+        'conv_brochure': 'Convocation Brochure Payment',
+        }
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/webservices.py
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/webservices.py	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/src/waeup/kwarapoly/webservices.py	(revision 11116)
@@ -0,0 +1,24 @@
+## $Id$
+##
+## Copyright (C) 2012 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+
+from waeup.kofa.webservices import PaymentDataWebservice
+
+class CustomPaymentDataWebservice(PaymentDataWebservice):
+
+    #ACCEPTED_IP = ('174.36.230.28', )
+    ACCEPTED_IP = None
Index: /main/waeup.kwarapoly/branches/henrik-diazo-themed/versions.cfg
===================================================================
--- /main/waeup.kwarapoly/branches/henrik-diazo-themed/versions.cfg	(revision 11116)
+++ /main/waeup.kwarapoly/branches/henrik-diazo-themed/versions.cfg	(revision 11116)
@@ -0,0 +1,130 @@
+# Versions of packages used by waeup.kofa
+[buildout]
+# default set of versions we use.
+extends= http://grok.zope.org/releaseinfo/grok-1.1.cfg
+
+versions = versions
+
+[versions]
+collective.recipe.sphinxbuilder = 0.7.0
+hurry.workflow = 0.11
+# Pinned to circumvent breakage in 0.4.x
+hurry.zoperesource = 0.6
+# Pinned to prevent buildout svn-error.
+lovely.recipe = 1.0.0
+megrok.layout = 1.0.2
+reportlab = 2.5
+transaction = 1.1.0
+z3c.testsetup = 0.6.1
+zc.buildout = 2.1.0
+zc.recipe.egg = 2.0.0a3
+zc.recipe.testrunner = 2.0.0
+zope.app.testing = 3.8.1
+# for support of @provider directive
+zope.interface = 3.6.3
+# for support of contextual default values
+zope.schema = 3.8.0
+zope.testing = 3.10.2
+zope.xmlpickle = 3.4.0
+# Require latest version...
+Sphinx = 1.0.7
+ZODB3 = 3.10.3
+docutils = 0.7
+Jinja2 = 2.3
+# for support of unicode encoded passwords
+zope.password = 3.6.1
+# need at least 3.12.2 for working XMLRPC support...
+zope.publisher = 3.12.2
+# Pillow >= 2.0 supports Python 2.6, 2.7, 3.x
+# Pillow < 1.x supports Python 2.4, 2.5, 2.6, 2.7
+Pillow = 2.0.0
+mock = 1.0.1
+
+
+# Added by buildout at 2013-05-22 17:51:04.199624
+Beaker = 1.6.4
+Twisted = 13.0.0
+dolmen.beaker = 0.1
+hurry.resource = 0.10
+mr.developer = 1.25
+repoze.profile = 2.0
+repoze.sphinx.autointerface = 0.7.1
+unittest2 = 0.5.1
+z3c.coverage = 2.0.0
+zc.async = 1.5.4
+zc.dict = 1.2.1
+zc.twist = 1.3.1
+zc.z3monitor = 0.8.0
+zope.bforest = 1.2
+
+# Required by:
+# z3c.coverage==2.0.0
+coverage = 3.6
+
+# Required by:
+# waeup.kofa==0.2dev
+hurry.file = 1.2.1
+
+# Required by:
+# waeup.kofa==0.2dev
+hurry.jquery = 1.4.3.1
+
+# Required by:
+# waeup.kofa==0.2dev
+hurry.jqueryui = 1.8.5.1
+
+# Required by:
+# waeup.kofa==0.2dev
+hurry.query = 1.1.1
+
+# Required by:
+# grokui.base==0.2
+megrok.menu = 0.4
+
+# Required by:
+# dolmen.beaker==0.1
+pycryptopp = 0.6.0.1206569328141510525648634803928199668821045408958
+
+# Required by:
+# repoze.profile==2.0
+pyprof2calltree = 1.1.0
+
+# Required by:
+# zc.async==1.5.4
+rwproperty = 1.0
+
+# Required by:
+# zope.testrunner==4.3.3
+six = 1.3.0
+
+# Required by:
+# waeup.kofa==0.2dev
+ulif.loghandlers = 0.1.1
+
+# Required by:
+# waeup.kofa==0.2dev
+unicodecsv = 0.9.4
+
+# Required by:
+# zc.async==1.5.4
+uuid = 1.30
+
+# Required by:
+# zc.z3monitor==0.8.0
+zc.monitor = 0.3.1
+
+# Required by:
+# zc.monitor==0.3.1
+zc.ngi = 2.0.1
+
+# Required by:
+# zc.async==1.5.4
+zc.queue = 1.3
+
+# Required by:
+# waeup.kofa==0.2dev
+zope.errorview = 0.11
+
+# Required by:
+# zc.recipe.testrunner==2.0.0
+zope.testrunner = 4.3.3
