Changeset 12345

Timestamp:

30 Dec 2014, 17:14:14 (10 years ago)

Author:

Henrik Bettermann

Message:

Render content title below state/history box.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

• browser.py (modified) (3 diffs)
• browser_templates/contractpage.pt (modified) (2 diffs)
• browser_templates/documentpage.pt (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

@@ -857 +857 @@
     grok.template('documentpage')
     pnav = 4
+    label = None  # We render the context title in the documentpage template
 
     @property
     def form_fields(self):
         return grok.AutoFields(self.context.form_fields_interface)
-
-    @property
-    def label(self):
-        return self.context.title
-
 
 class DocumentManageFormPage(IkobaEditFormPage):
@@ -1258 +1254 @@
     grok.template('contractpage')
     pnav = 4
+    label = None  # We render the context title in the contractpage template
 
     @property
@@ -1266 +1263 @@
                 form_fields[field.__name__].custom_widget = HREFDisplayWidget
         return form_fields
-
-    @property
-    def label(self):
-        return self.context.title
 
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/contractpage.pt

@@ +1 @@
+<br />
 <div class="wfstatus-sub"  i18n:domain="waeup.ikoba">
   Contract State: <span tal:replace="context/translated_state">
@@ -9 +10 @@
   </div>
 </div>
+
+<h1 class="ikoba-content-label"
+    tal:condition="context/title|nothing"
+    tal:content="context/title">TITLE</h1>
 
 <table class="form-table" i18n:domain="waeup.ikoba">

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/documentpage.pt

@@ +1 @@
+<br />
 <div class="wfstatus-sub"  i18n:domain="waeup.ikoba">
   Document State: <span tal:replace="context/translated_state">
@@ -9 +10 @@
   </div>
 </div>
+
+<h1 class="ikoba-content-label"
+    tal:condition="context/title|nothing"
+    tal:content="context/title">TITLE</h1>
 
 <table class="form-table" i18n:domain="waeup.ikoba"

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -850 +850 @@
 
         # Document can be edited
-        self.browser.getLink(docid).click()
+        self.browser.getLink(docid[:6]).click()
         self.browser.getLink("Manage").click()
         self.browser.getControl(name="form.title").value = 'My second doc'
@@ -931 +931 @@
 
         # Document can be edited ...
-        self.browser.getLink(docid).click()
+        self.browser.getLink(docid[:6]).click()
         self.browser.open(self.documents_path + '/' + docid + '/edit')
         #self.browser.getLink("Edit").click()