Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/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/students/browser_templates/basepage.pt (modified) (1 diff)
• src/waeup/kofa/students/browser_templates/requestpw.pt (modified) (1 diff)
• src/waeup/kofa/students/browser_templates/requestpwmailsent.pt (modified) (1 diff)
• src/waeup/kofa/students/browser_templates/studentpage.pt (copied) (copied from main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/browser_templates/studentpage.pt)
• src/waeup/kofa/students/browser_templates/studycoursepage.pt (modified) (1 diff)
• src/waeup/kofa/students/browser_templates/studyleveleditpage.pt (modified) (2 diffs)
• src/waeup/kofa/students/browser_templates/studylevelmanagepage.pt (modified) (2 diffs)
• src/waeup/kofa/students/browser_templates/studylevelpage.pt (modified) (1 diff)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/browser_templates/basepage.pt

@@ -18 +18 @@
           <tal:password replace="view/hasPassword" />
       </td>
-    </tr>
+    <tr>
     <tal:files content="structure provider:files" />
   </tbody>

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/browser_templates/requestpw.pt

@@ -17 +17 @@
   </table>
   <p i18n:translate="">
-    Your student record will be looked up and
-    your login credentials will be sent to the email address given above.
-    To be able to proceed you must provide a valid email address!
+    Your student record will be looked up and an email with your login
+    credentials will be sent to the address provided.
   </p>
   <div tal:condition="view/availableActions">

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/browser_templates/requestpwmailsent.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/students/browser_templates/studycoursepage.pt

@@ -47 +47 @@
         </td>
       </tr>
-      <tr tal:condition="view/prev_studycourses">
-        <td i18n:translate="">
-            Previous Study Courses:
-        </td>
-        <td>
-          <span tal:repeat="value view/prev_studycourses">
-            <a tal:attributes="href value/href" tal:content="value/title">
-              FACULTY
-            </a>
-          </span>
-        </td>
-      </tr>
   </tbody>
 </table>

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/browser_templates/studyleveleditpage.pt

@@ -22 +22 @@
   </thead>
   <tbody>
-    <tr tal:repeat="value view/translated_values" class="gradeC">
+    <tr tal:repeat="value context/values" class="gradeC">
        <td>
         <input type="checkbox" name="val_id"
                   tal:attributes="value value/__name__"
-        tal:condition="not: value/mandatory_bool" />
+        tal:condition="not: value/mandatory" />
       </td>
       <td tal:content="value/semester">SEMESTER</td>
@@ -36 +36 @@
       <td tal:content="value/fcode">FACULTY</td>
       <td tal:content="value/credits">CREDITS</td>
-      <td tal:content="value/score|nothing">SCORE</td>
+      <td tal:content="value/score">SCORE</td>
       <td tal:content="value/carry_over">CO</td>
     </tr>

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/browser_templates/studylevelmanagepage.pt

@@ -46 +46 @@
       </thead>
       <tbody>
-        <tr tal:repeat="value view/translated_values" class="gradeC">
+        <tr tal:repeat="value context/values" class="gradeC">
           <td>
             <input type="checkbox" name="val_id"
@@ -60 +60 @@
           <td tal:content="value/credits">CREDITS</td>
           <td tal:content="value/mandatory">MANDATORY</td>
-          <td tal:content="value/score|nothing">SCORE</td>
+          <td tal:content="value/score">SCORE</td>
           <td tal:content="value/carry_over">CO</td>
           <td tal:content="value/automatic">AUTO</td>

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/browser_templates/studylevelpage.pt

@@ -34 +34 @@
       <th i18n:translate="">Code</th>
       <th i18n:translate="">Title</th>
-      <th i18n:translate="">Dep.</th>
-      <th i18n:translate="">Fac.</th>
+      <th i18n:translate="">Dept.</th>
+      <th i18n:translate="">Fact.</th>
       <th i18n:translate="">Cred.</th>
       <th i18n:translate="">Mand.</th>