Changeset 7464 for main

Timestamp:

13 Jan 2012, 07:16:53 (13 years ago)

Author:

Henrik Bettermann

Message:

Move form label to site layout pagetemplates. This saves even more code.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• applicants/browser_templates/applicantdisplaypage.pt (modified) (1 diff)
• applicants/browser_templates/applicanteditpage.pt (modified) (1 diff)
• applicants/browser_templates/applicantregister.pt (modified) (1 diff)
• applicants/browser_templates/applicantscontaineraddpage.pt (modified) (1 diff)
• applicants/browser_templates/applicantscontainermanagepage.pt (modified) (1 diff)
• applicants/browser_templates/applicantscontainerpage.pt (modified) (1 diff)
• applicants/browser_templates/applicantsrootmanagepage.pt (modified) (1 diff)
• applicants/browser_templates/applicantsrootpage.pt (modified) (1 diff)
• browser/templates/certificatemanagepage.pt (modified) (1 diff)
• browser/templates/configurationmanagepage.pt (modified) (1 diff)
• browser/templates/contactform.pt (modified) (1 diff)
• browser/templates/datacenterimport1page.pt (modified) (1 diff)
• browser/templates/datacenterimport2page.pt (modified) (1 diff)
• browser/templates/datacenterimport3page.pt (modified) (1 diff)
• browser/templates/datacenterimport4page.pt (modified) (1 diff)
• browser/templates/datacenterlogspage.pt (modified) (1 diff)
• browser/templates/datacentermanagepage.pt (modified) (1 diff)
• browser/templates/datacenteruploadpage.pt (modified) (1 diff)
• browser/templates/default_waeup_display_form.pt (modified) (1 diff)
• browser/templates/default_waeup_edit_form.pt (modified) (1 diff)
• browser/templates/departmentmanagepage.pt (modified) (1 diff)
• browser/templates/departmentpage.pt (modified) (1 diff)
• browser/templates/facultiescontainermanagepage.pt (modified) (1 diff)
• browser/templates/facultymanagepage.pt (modified) (1 diff)
• browser/templates/facultypage.pt (modified) (1 diff)
• browser/templates/loginpage.pt (modified) (1 diff)
• browser/templates/searchpage.pt (modified) (1 diff)
• browser/templates/showstudentspage.pt (modified) (1 diff)
• browser/templates/staffsitelayout.pt (modified) (1 diff)
• browser/templates/studentsitelayout.pt (modified) (1 diff)
• browser/templates/universitypage.pt (modified) (1 diff)
• browser/templates/usereditformpage.pt (modified) (1 diff)
• hostels/browser_templates/containermanagepage.pt (modified) (1 diff)
• hostels/browser_templates/containerpage.pt (modified) (1 diff)
• hostels/browser_templates/hostelmanagepage.pt (modified) (1 diff)
• students/browser_templates/accommodationmanagepage.pt (modified) (1 diff)
• students/browser_templates/basemanagepage.pt (modified) (1 diff)
• students/browser_templates/basepage.pt (modified) (1 diff)
• students/browser_templates/change_password.pt (modified) (1 diff)
• students/browser_templates/changepw.pt (modified) (1 diff)
• students/browser_templates/clearanceeditpage.pt (modified) (1 diff)
• students/browser_templates/containermanagepage.pt (modified) (1 diff)
• students/browser_templates/containerpage.pt (modified) (1 diff)
• students/browser_templates/courseticketmanagepage.pt (modified) (1 diff)
• students/browser_templates/courseticketpage.pt (modified) (1 diff)
• students/browser_templates/enterpin.pt (modified) (1 diff)
• students/browser_templates/filesuploadpage.pt (modified) (1 diff)
• students/browser_templates/paymentsmanagepage.pt (modified) (1 diff)
• students/browser_templates/paymentspage.pt (modified) (1 diff)
• students/browser_templates/setpassword.pt (modified) (1 diff)
• students/browser_templates/studenthistory.pt (modified) (1 diff)
• students/browser_templates/studentpage.pt (modified) (1 diff)
• students/browser_templates/studycoursemanagepage.pt (modified) (1 diff)
• students/browser_templates/studycoursepage.pt (modified) (1 diff)
• students/browser_templates/studyleveladdpage.pt (modified) (1 diff)
• students/browser_templates/studyleveleditpage.pt (modified) (1 diff)
• students/browser_templates/studylevelmanagepage.pt (modified) (1 diff)
• students/browser_templates/studylevelpage.pt (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantdisplaypage.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <h2> ... <span tal:replace="context/state">Application State</span> ... </h2>
 

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicanteditpage.pt

@@ -1 +1 @@
 <form action="." tal:attributes="action request/URL" method="post"
       enctype="multipart/form-data">
-
-  <h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
 
   <h2> ... <span tal:replace="context/state">Application State</span> ... </h2>

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantregister.pt

@@ -1 +1 @@
 <form action="." tal:attributes="action request/URL" method="post"
       enctype="multipart/form-data">
-
-  <h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
 
   <table class="form-table">

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontaineraddpage.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"
-    tal:content="view/label">Label</h2>
 
   <table class="form-table">

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.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" tal:content="view/label">Label</h2>
 
   <ul class="tabs" data-tabs="tabs">

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainerpage.pt

@@ -1 @@
-<h2 tal:content="view/label">Title</h2>
-
 <span tal:replace="structure view/widgets/description">Description</span>
 

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootmanagepage.pt

@@ -1 @@
-<h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST"  enctype="multipart/form-data">
   <ul class="tabs" data-tabs="tabs">

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootpage.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <table class="display dataTable">
   <thead>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST"
       enctype="multipart/form-data"> 

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/configurationmanagepage.pt

@@ -1 @@
-<h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
     <ul class="tabs" data-tabs="tabs">

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactform.pt

@@ -1 +1 @@
 <form action="." tal:attributes="action request/URL" method="post"
       enctype="multipart/form-data">
-
-  <h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
 
   <tal:block repeat="widget view/widgets">

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport1page.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
 <h3>Step 1</h3>
 <p>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport2page.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
 <h3>Step 2</h3>
 <form method="POST">

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport3page.pt

@@ -3 +3 @@
 </div>
 
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
 <h3>Step 3</h3>
 <form>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport4page.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
 <h3>Step 4</h3>
 <p>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogspage.pt

@@ -1 @@
-<h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
 <div tal:define="files view/files">
   <p tal:condition="not: files">Currently no log files are available.

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacentermanagepage.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
 <form method="POST">
   <div>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenteruploadpage.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
 <form method="post" enctype="multipart/form-data">
   <input type="file" name="uploadfile:file" />

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_display_form.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <table class="form-table">
   <tbody>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt

@@ -1 +1 @@
 <form action="." tal:attributes="action request/URL" method="post"
       enctype="multipart/form-data">
-
-  <h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
 
   <table class="form-table">

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt

@@ -1 @@
-<h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
   <ul class="tabs" data-tabs="tabs">

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentpage.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
 <ul class="tabs" data-tabs="tabs">
   <li class="active"><a href="#tab-1"><span>Courses</span></a></li>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultiescontainermanagepage.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST"
       enctype="multipart/form-data">

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt

@@ -1 @@
-<h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
   <ul class="tabs" data-tabs="tabs">

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt

@@ -1 @@
-<h2 tal:content="view/label">TITLE</h2>
-
 <div tal:condition="python: not len(context.keys())">
 There no subobjects registered yet.

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/loginpage.pt

@@ -1 @@
-<h2 i18n:translate=""  tal:condition="view/label"  tal:content="view/label">Label</h2>
 <form method="post">
   <table id="login" class="form-table" summary="Table for entering login information">

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/searchpage.pt

@@ -1 @@
-<h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
 <form method="post">
   <input type="text" name="query"

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/showstudentspage.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
 <table class="display dataTableManage">
   <thead>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt

@@ -90 +90 @@
         </div>
         <span tal:replace="structure provider:actionbar" />
+        <h2 i18n:translate="" tal:condition="view/label|nothing"
+            tal:content="view/label">Label</h2>
         <div tal:content="structure view/content"> THE CONTENT
         </div>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt

@@ -76 +76 @@
         </div>
         <span tal:replace="structure provider:actionbar" />
+        <h2 i18n:translate="" tal:condition="view/label|nothing"
+            tal:content="view/label">Label</h2>
         <div tal:content="structure view/content"> THE CONTENT
         </div>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/universitypage.pt

@@ -1 @@
-<h1 tal:content="view/label">Title</h1>
-
 <span tal:replace="structure view/frontpage">Frontpage</span>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/usereditformpage.pt

@@ -1 +1 @@
 <form action="." tal:attributes="action request/URL" method="post"
       enctype="multipart/form-data">
-
-  <h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
 
   <table class="form-table">

main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/containermanagepage.pt

@@ -1 @@
-<h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
   <table>

main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/containerpage.pt

@@ -1 @@
-<h2 tal:content="view/label">TITLE</h2>
-
 <div tal:condition="python: not len(context.keys())">
 There no subobjects registered yet.

main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/hostelmanagepage.pt

@@ -1 @@
-<h2 i18n:translate=""
-  tal:condition="view/label"
-  tal:content="view/label">Label</h2>
-
-  <form action="." tal:attributes="action request/URL" method="POST"
-        enctype="multipart/form-data">
+<form action="." tal:attributes="action request/URL" method="POST"
+      enctype="multipart/form-data">
 
   <ul class="tabs" data-tabs="tabs">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/accommodationmanagepage.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST"
       enctype="multipart/form-data">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/basemanagepage.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="post"
       enctype="multipart/form-data">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/basepage.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <table class="form-table">
   <tbody>

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/change_password.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="post"
       enctype="multipart/form-data">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/changepw.pt

@@ -1 +1 @@
 <form action="." tal:attributes="action request/URL" method="post"
       enctype="multipart/form-data">
-
-  <h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
 
   <table class="form-table">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/clearanceeditpage.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="post"
       enctype="multipart/form-data">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/containermanagepage.pt

@@ -1 @@
-<h2 tal:content="view/label">Title</h2>
 <form method="POST">
-
 <br />
-
   <input class="btn primary" type="submit" name="search" value="Search" />
   for students

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/containerpage.pt

@@ -1 @@
-<h2 tal:content="view/label">Title</h2>
 <form method="POST">
-
 <br />
-
   <input class="btn primary" type="submit" name="search" value="Search" />
   for students

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/courseticketmanagepage.pt

@@ -1 +1 @@
 <form action="." tal:attributes="action request/URL" method="post"
       enctype="multipart/form-data">
-
-  <h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
 
   <table class="form-table">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/courseticketpage.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <table class="form-table">
   <tbody>

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/enterpin.pt

@@ -1 @@
-<h2 i18n:translate=""  tal:condition="view/label"
-    tal:content="view/label">Label</h2>
 <form method="POST">
   <table class="form-table">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/filesuploadpage.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="post"
       enctype="multipart/form-data">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/paymentsmanagepage.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST"
       enctype="multipart/form-data">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/paymentspage.pt

@@ -1 @@
-<h2 tal:content="view/label">TITLE</h2>
-
 <table class="display dataTable">
   <thead>

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/setpassword.pt

@@ -1 @@
-<h2 i18n:translate=""  tal:condition="view/label"
-    tal:content="view/label">Label</h2>
 <form method="POST">
   <table class="form-table">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studenthistory.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <div class="workflow">
   <div tal:repeat="msg context/history/messages">

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studentpage.pt

@@ -1 @@
-<h2 i18n:translate=""
-    tal:condition="view/label"
-    tal:content="view/label">Label</h2>
-
 <table class="form-table">
   <tbody>

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studycoursemanagepage.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST"
       enctype="multipart/form-data"> 

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studycoursepage.pt

@@ -1 @@
-<h2 tal:content="view/label">TITLE</h2>
-
 <table class="form-table">
 <thead>

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studyleveladdpage.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST"
       enctype="multipart/form-data"> 

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studyleveleditpage.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST"
       enctype="multipart/form-data"> 

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelmanagepage.pt

@@ -1 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
 <form action="." tal:attributes="action request/URL" method="POST"
       enctype="multipart/form-data"> 

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelpage.pt

@@ -1 @@
-<h2 tal:content="view/label">TITLE</h2>
-
 <table class="form-table">
 <thead>