Changeset 3558 for waeup/branches/hraban/src

Timestamp:

3 Jul 2008, 00:02:46 (16 years ago)

Author:

hraban

Message:

display viewlets work, forms still don't

Location:

waeup/branches/hraban/src/waeup

Files:

• basecontainer.py (modified) (3 diffs)
• basecontainer_templates/add.pt (deleted)
• basecontainer_templates/edit_form.pt (modified) (2 diffs)
• baseitem.py (modified) (2 diffs)
• baseitem_templates/content.pt (modified) (1 diff)
• docs/faq-staff-de.rst (modified) (2 diffs)
• docs/uli-on-interfaces.txt (added)
• interfaces.py (modified) (2 diffs)
• static/app.css (modified) (2 diffs)
• students/interfaces.py (modified) (1 diff)
• viewlets.py (modified) (2 diffs)
• viewlets_templates/logo.pt (modified) (1 diff)
• viewlets_templates/navigationbar.pt (modified) (1 diff)

waeup/branches/hraban/src/waeup/basecontainer.py

@@ -1 +1 @@
 import grok
+import os
 from waeup.interfaces import IBaseContainer
 from waeup.baseitem import BaseItem
-from waeup.viewlets import MainArea
+from waeup.viewlets import MainArea, Edit
+from zope.component import getMultiAdapter
 
-class BaseContainer(BaseItem, grok.Container):
+class BaseContainer(grok.Container):
     """
     The base container. This is a stub for now. It can have
@@ -19 +21 @@
     """
     grok.viewletmanager(MainArea)
-    #grok.context(grok.interfaces.IContainer)
-    
-class Add(grok.AddForm):
-    #form_fields = grok.AutoFields(self.context.childClass)
-#DOESN'T WORK    grok.template("../basecontainer_templates/add.pt")
+
+class AddForm(grok.AddForm):
+    #grok.template('edit_form')
+    template = grok.PageTemplate(filename=os.path.join('basecontainer_templates', 'edit_form.pt'))
 
     def update(self):
@@ -29 +30 @@
         grok.AddForm.update(self)
 
-    @grok.action('Add Item')
-    def addItem(self, name, *args, **kw):
-        item = self.context.childClass(name=name)
-        self.context[name] = item
-        self.redirect(self.url(item))
+    @grok.action('Add item')
+    def add(self, **data):
+        obj = self.context.childClass(**data)
+        name = data['name'].lower().replace(' ', '_')
+        self.context[name] = obj
+
+class Add(grok.Viewlet):
+    grok.viewletmanager(MainArea)
+    #grok.template('edit_form')
+    grok.context(IBaseContainer)
+    grok.view(Edit)
+
+    def update(self):
+        self.form = getMultiAdapter((self.context, self.request),
+                                    name='addform')
+        self.form.update_form()
+
+    def render(self):
+        return self.form.render()

waeup/branches/hraban/src/waeup/basecontainer_templates/edit_form.pt

@@ -1 +1 @@
 <form action="." tal:attributes="action request/URL" method="post"
       class="edit-form" enctype="multipart/form-data">
-
+<!-- 
   <h2 i18n:translate=""
     tal:condition="view/label"
@@ -20 +20 @@
     </ul>
   </div>
+-->
 
   <div class="form-fields">

waeup/branches/hraban/src/waeup/baseitem.py

@@ +1 @@
+# baseitem.py
+import os
 import grok
-from waeup.viewlets import MainArea
+from waeup.viewlets import MainArea, Edit
+from waeup.interfaces import IBaseItem
+from zope.component import getMultiAdapter
 
 class BaseItem(grok.Model):
@@ -6 +10 @@
     Base item
     """
-
-class Edit(grok.EditForm):
+    grok.implements(IBaseItem)
     
-    def update(self):
-        self.form_fields = grok.AutoFields(self.context.__class__)
-        grok.EditForm.update(self)
-
 class Content(grok.Viewlet):
     grok.viewletmanager(MainArea)
-    #grok.context(grok.interfaces.IContainer)
+    grok.context(IBaseItem)
 
+
+#class Edit(grok.EditForm):
+#    
+#    def update(self):
+#        self.form_fields = grok.AutoFields(self.context.__class__)
+#        grok.EditForm.update(self)
+
+
+class AddForm(grok.AddForm):
+    #grok.template('edit_form')
+    template = grok.PageTemplate(filename=os.path.join('baseitem_templates', 'edit_form.pt'))
+
+    def update(self):
+        self.form_fields = grok.AutoFields(self.context.childClass)
+        grok.AddForm.update(self)
+
+    @grok.action('Add item')
+    def add(self, **data):
+        obj = self.context.childClass(**data)
+        name = data['name'].lower().replace(' ', '_')
+        self.context[name] = obj
+
+class Add(grok.Viewlet):
+    grok.viewletmanager(MainArea)
+    #grok.template('edit_form')
+    grok.context(IBaseItem)
+    grok.view(Edit)
+
+    def update(self):
+        self.form = getMultiAdapter((self.context, self.request),
+                                    name='addform')
+        self.form.update_form()
+
+    def render(self):
+        return self.form.render()

waeup/branches/hraban/src/waeup/baseitem_templates/content.pt

@@ -1 @@
-<h1>Object <span tal:replace="context/name"></span></h1>
-  <a href="" tal:attributes="href python:view.url(context.__parent__)">Up</a>
-  <a href="" tal:attributes="href python:view.url(context, 'edit')">Edit</a>
+<div class="menubar">
+        <ul>
+                <li><a href="" tal:attributes="href python:view.url(context.__parent__)">Up</a></li>
+                <li><a href="" tal:attributes="href python:view.url(context, 'edit')">Edit</a></li>
+        </ul>
+</div>
+<h2>Object <span tal:replace="context/name"></span></h2>

waeup/branches/hraban/src/waeup/docs/faq-staff-de.rst

@@ -57 +57 @@
    Hochschulen selbst ausgeführt werden.
 
+Zielgruppe des Portals
+----------------------
+
+Es gibt in Nigeria über 350 Hochschulen, für die das Portal geeignet
+wäre, davon ca. 200 "Fachhochschulen" mit 3000-10.000 Studenten und
+150 Universitäten mit 20.000-70.000 Studenten.
+
+Im Prinzip lässt sich das System auch in allen anderen Ländern einsetzen,
+wo es das Bachelor-/Master-Studiensystem gibt. Hierfür müssten allerdings
+die Workflows und Zahlungsmodalitäten angepasst werden.
+
 Geschäftsmodell
 ---------------
@@ -62 +73 @@
 WAeUP bekommt einen Anteil an allen Zahlungen, die über das Portal
 abgewickelt werden, etwa 1,20 € pro Student und Jahr.
-Es gibt in Nigeria über 350 Hochschulen, für die das Portal geeignet
-wäre, davon ca. 200 "Fachhochschulen" mit 3000-10.000 Studenten und
-150 Universitäten mit 20.000-70.000 Studenten.
 
 Was ist der derzeitige Status?

waeup/branches/hraban/src/waeup/interfaces.py

@@ -4 +4 @@
 #from zope.interface import Interface
 from zope import schema
-
-class IUniversity(grok.interfaces.IContainer):
-    """Representation of a university.
-    """
-    name = schema.TextLine(
-        title = u'Name of University',
-        default = u'Unnamed',
-        required = True,
-        )
 
 class IBaseContainer(grok.interfaces.IContainer):
@@ -21 +12 @@
         )
     
+
+class IBaseItem(IBaseContainer):
+    pass
+
+class IUniversity(IBaseContainer):
+    """Representation of a university.
+    """
+    name = schema.TextLine(
+        title = u'Name of University',
+        default = u'Unnamed',
+        required = True,
+        )

waeup/branches/hraban/src/waeup/static/app.css

@@ -99 +99 @@
         border: 1px solid #005500;
         border-bottom: none;
+        margin-left: 0.5em;
 }
 
@@ -108 +109 @@
         color: black;
         text-decoration: none;
+}
+
+.menubar ul li a:active {
+        font-weight: bold;
 }
 

waeup/branches/hraban/src/waeup/students/interfaces.py

@@ -3 +3 @@
 import grok
 from zope import schema
+from waeup.interfaces import IBaseItem
 
-class IStudent(grok.interfaces.IContainer):
+class IStudent(IBaseItem):
     """Representation of a student.
     """

waeup/branches/hraban/src/waeup/viewlets.py

@@ -14 +14 @@
     def __init__(self, context, request):#
         super(Index, self).__init__(context, request)
+    
+    def getSite(self):
+        return grok.getSite()
+
+class Edit(Index):
+    pass
 
 class Head(grok.ViewletManager):
@@ -41 +47 @@
     grok.viewletmanager(Header)
     grok.order(2)
-    
-    def getSite(self):
-        return grok.getSite()
 
 class LeftSidebar(grok.ViewletManager):

waeup/branches/hraban/src/waeup/viewlets_templates/logo.pt

@@ -1 @@
-<div id="logo">
+<div id="logo" tal:define="app view/getSite">
     <img tal:attributes="src static/logo_waeup.gif" alt="WAeUp logo" />
-    <h1 tal:content="context/name">Sample University</h1>
+    <h1 tal:content="app/name">Sample University</h1>
 </div>

waeup/branches/hraban/src/waeup/viewlets_templates/navigationbar.pt

@@ -1 +1 @@
 <div id="adminbar" class="menubar"
-    tal:define="app viewlet/getSite">
+    tal:define="app view/getSite">
 <!--    <ul>
                 <tal:block  tal:repeat="menuitem view/menuitems">