Changeset 15163 for main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates

Timestamp:

23 Sep 2018, 05:05:04 (6 years ago)

Author:

Henrik Bettermann

Message:

Merge with /main/waeup.kofa/branches/henrik-transcript-workflow:15127-15162

Location:

main/waeup.kofa/trunk

Files:

• . (modified) (1 prop)
• src/waeup/kofa (modified) (1 prop)
• src/waeup/kofa/students/browser_templates/containermanagepage.pt (modified) (1 diff)
• src/waeup/kofa/students/browser_templates/containerpage.pt (modified) (1 diff)
• src/waeup/kofa/students/browser_templates/transcript.pt (modified) (1 diff)
• src/waeup/kofa/students/browser_templates/transcriptprocess.pt (deleted)
• src/waeup/kofa/students/browser_templates/transcriptrelease.pt (copied) (copied from main/waeup.kofa/branches/henrik-transcript-workflow/src/waeup/kofa/students/browser_templates/transcriptrelease.pt)
• src/waeup/kofa/students/browser_templates/transcriptrequest.pt (modified) (1 diff)

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

@@ -17 +17 @@
         with deactivated account (search term omitted)
       </option>
-      <option i18n:translate="" value="transcript">
-        who requested transcript (search term omitted)
+      <option i18n:translate="" value="transcript requested">
+        in state 'transcript requested' (search term omitted)
+      </option>
+      <option i18n:translate="" value="transcript validated">
+        in state 'transcript validated' (search term omitted)
       </option>
     </select>

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

@@ -17 +17 @@
         with deactivated account (search term omitted)
       </option>
-      <option i18n:translate="" value="transcript">
-        who requested transcript (search term omitted)
+      <option i18n:translate="" value="transcript requested">
+        in state 'transcript requested' (search term omitted)
+      </option>
+      <option i18n:translate="" value="transcript validated">
+        in state 'transcript validated' (search term omitted)
       </option>
     </select>

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/transcript.pt

@@ -58 +58 @@
   </tbody>
 </table>
+<br />
+<div tal:content="python:getattr(context, 'transcript_signees', '')">SIGNEES</div>
 </tal:def>

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/transcriptrequest.pt

@@ -73 +73 @@
 
     <div id="tab2" class="tab-pane">
-      <p tal:content="structure view/correspondence"></p>
+      <br /><p tal:content="structure view/correspondence"></p>
     </div>
   </div>