Changeset 5346

Timestamp:

30 Jul 2010, 10:06:19 (14 years ago)

Author:

Henrik Bettermann

Message:

merge changes made in trunk into henrik-experimental-layout

Location:

main/waeup.sirp/branches/henrik-experimental-layout

Files:

• buildout.cfg (modified) (3 diffs)
• docs (copied) (copied from main/waeup.sirp/trunk/docs)
• docs/INSTALL.txt (copied) (copied from main/waeup.sirp/trunk/docs/INSTALL.txt)
• docs/Makefile (copied) (copied from main/waeup.sirp/trunk/docs/Makefile)
• docs/build (copied) (copied from main/waeup.sirp/trunk/docs/build)
• docs/build/Makefile (copied) (copied from main/waeup.sirp/trunk/docs/build/Makefile)
• docs/build/make.bat (copied) (copied from main/waeup.sirp/trunk/docs/build/make.bat)
• docs/make.bat (copied) (copied from main/waeup.sirp/trunk/docs/make.bat)
• docs/source (copied) (copied from main/waeup.sirp/trunk/docs/source)
• docs/source/_static (copied) (copied from main/waeup.sirp/trunk/docs/source/_static)
• docs/source/_static/favicon.ico (copied) (copied from main/waeup.sirp/trunk/docs/source/_static/favicon.ico)
• docs/source/_templates (copied) (copied from main/waeup.sirp/trunk/docs/source/_templates)
• docs/source/_templates/mainpage.template (copied) (copied from main/waeup.sirp/trunk/docs/source/_templates/mainpage.template)
• docs/source/bugs.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/bugs.rst)
• docs/source/changes.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/changes.rst)
• docs/source/conf.py (copied) (copied from main/waeup.sirp/trunk/docs/source/conf.py)
• docs/source/contents.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/contents.rst)
• docs/source/copyright.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/copyright.rst)
• docs/source/developerdocs (copied) (copied from main/waeup.sirp/trunk/docs/source/developerdocs)
• docs/source/developerdocs/api (copied) (copied from main/waeup.sirp/trunk/docs/source/developerdocs/api)
• docs/source/developerdocs/api/api_app.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/developerdocs/api/api_app.rst)
• docs/source/developerdocs/api/index.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/developerdocs/api/index.rst)
• docs/source/developerdocs/index.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/developerdocs/index.rst)
• docs/source/documentation.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/documentation.rst)
• docs/source/glossary.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/glossary.rst)
• docs/source/index.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/index.rst)
• docs/source/intro.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/intro.rst)
• docs/source/license.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/license.rst)
• docs/source/userdocs (copied) (copied from main/waeup.sirp/trunk/docs/source/userdocs)
• docs/source/userdocs/buildingdocs.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/userdocs/buildingdocs.rst)
• docs/source/userdocs/index.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/userdocs/index.rst)
• docs/source/userdocs/install.rst (copied) (copied from main/waeup.sirp/trunk/docs/source/userdocs/install.rst)
• src/waeup/sirp/app.py (modified) (3 diffs)

main/waeup.sirp/branches/henrik-experimental-layout/buildout.cfg

@@ -2 +2 @@
 develop = .
 parts = app data zopectl i18n test waeupdocs coverage-detect coverage-report
-find-links = http://download.zope.org/distribution/
+#find-links = http://download.zope.org/distribution/
 #newest = false
 #extends= http://grok.zope.org/releaseinfo/grok-1.0.cfg
@@ -19 +19 @@
 #hurry.zoperesource = 0.4
 megrok.layout = 1.0.2
-Sphinx = 0.6.4
 hurry.resource = 0.4.1  # We need to pin this as hurry.resource 0.9
                         # requires extra packages (WebOb) we don't
@@ -108 +107 @@
 
 [waeupdocs]
-recipe = z3c.recipe.sphinxdoc
-eggs = waeup.sirp [docs]
-default.css =
-layout.html = 
-extensions = sphinx.ext.autodoc
+recipe = collective.recipe.sphinxbuilder
+eggs = waeup.sirp
+source = ${buildout:directory}/docs/source
+build = ${buildout:directory}/docs/build

main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/app.py

@@ -25 +25 @@
     """
     grok.implements(IUniversity)
+    
     # Setup authentication for this app. Note: this is only
     # initialized, when a new instance of this app is created.
@@ -30 +31 @@
         PluggableAuthentication, provides = IAuthentication,
         setup = setup_authentication,)
+
+    #: The name of the university.
+    name=u'Sample University'
     
     @property
     def logger(self):
+        """The application logger.
+
+        Returns a standard logger object as provided by :mod:`logging`
+        module from the standard library.
+        
+        Other components can use this logger to perform log entries
+        into the 'main' logfile.
+
+        The logger is initialized the first time, it is called.
+        """
         sitename = self.__name__
         loggername = 'waeup.sirp.%s' % sitename
@@ -47 +61 @@
 
     def setup(self):
+        """Setup some hard-wired components.
+
+        Create local datacenter, containers for users, students and
+        the like.
+        """
         self['users'] = UserContainer()
         self['datacenter'] = DataCenter()