Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/browser_templates

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt (modified) (2 diffs)
• src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt (modified) (1 diff)
• src/waeup/kofa/applicants/browser_templates/applicantregemailsent.pt (modified) (1 diff)
• src/waeup/kofa/applicants/browser_templates/applicantscontainerpage.pt (modified) (2 diffs)
• src/waeup/kofa/applicants/browser_templates/applicantsrootpage.pt (modified) (1 diff)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt

@@ -1 @@
-<h2 i18n:domain="waeup.kofa">
-  ...
-  <span tal:replace="context/translated_state">APPLICATIONSTATE
-  </span>
-  <span tal:omit-tag=""
-    i18n:translate="" tal:condition="context/suspended">(account suspended)
-  </span>
-  ...
+<h2>
+... <span tal:replace="context/translated_state">APPLICATIONSTATE</span> ...
 </h2>
 
@@ -20 +14 @@
   <tbody>
     <tal:widgets content="structure provider:widgets" />
-    <tr tal:condition="view/getCourseAdmitted">
+    <tr>
       <td class="fieldname" i18n:translate="">
           Admitted Course of Study:

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt

@@ -3 +3 @@
       autocomplete="off">
 
-  <h2 i18n:domain="waeup.kofa">
-    ...
-    <span tal:replace="context/translated_state">APPLICATIONSTATE
-    </span>
-    <span tal:omit-tag=""
-      i18n:translate="" tal:condition="context/suspended">(account suspended)
-    </span>
-    ...
+  <h2>
+  ... <span tal:replace="context/translated_state">APPLICATIONSTATE</span> ...
   </h2>
 

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/browser_templates/applicantregemailsent.pt

@@ -29 +29 @@
     <tr>
   </table>
-  <p>
-    <span i18n:translate="">Print this page and proceed to the</span>
+  <p i18n:translate="">
+    Print this page and proceed to the
     <a tal:attributes="href python: view.url(layout.site, 'login')">login form</a>.
-    <span i18n:translate="">Please note that passwords are case-sensitive,
+    Please note that passwords are case-sensitive,
     <br />when entering your credentials, and keep your password secret!
-    </span>
   </p>
   <p tal:condition = "view/email">

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/browser_templates/applicantscontainerpage.pt

@@ -1 @@
-<table class="form-table">
+<span tal:condition="view/introduction" tal:omit-tag="">
+  <p tal:content="structure view/introduction">INTRODUCTION</p>
+</span>
+
+<table class="form-table" tal:condition="layout/isAuthenticated">
   <tbody>
     <tal:block repeat="widget view/widgets">
@@ -15 +19 @@
   </tbody>
 </table>
-
-<span tal:condition="view/introduction" tal:omit-tag="">
-  <p tal:content="structure view/introduction">INTRODUCTION</p>
-</span>

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/browser_templates/applicantsrootpage.pt

@@ -25 +25 @@
       </td>
       <td>
-      <span tal:content="python: layout.formatTZDate(entry.startdate)">START</span>
+      <span tal:content="python: layout.formatDate(entry.startdate)">START</span>
       -
-      <span tal:content="python: layout.formatTZDate(entry.enddate)">END</span>
+      <span tal:content="python: layout.formatDate(entry.enddate)">END</span>
       </td>
     </tr>