Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/browser/templates/loginpage.pt

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/browser/templates/loginpage.pt (modified) (1 diff)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/browser/templates/loginpage.pt

@@ -37 +37 @@
     If you are having trouble logging in, make sure to enable  cookies in your web browser.
   </p>
-  <p i18n:translate="login_trouble2" tal:condition="python:False">
+  <p i18n:translate="login_trouble2">
     You don't have an account because you are a fresh student, or your student record has just been created?
-    Acquire a Password Activation Code (PWD) and inititialize your student account
-    <strong><a href ="setpassword"> here</a></strong>.
-  </p>
-  <p i18n:translate="login_trouble4">
-    You don't have an account because you are a fresh student, or your student record has just been created?
-    Inititialize your student account <strong><a href="requestpw"> here</a></strong>.
+    Acquire a Password Access Code (PWD) and inititialize your student account
+    <strong><a href  ="setpassword"> here</a></strong>.
   </p>
   <p i18n:translate="login_trouble3"> Or simply forgot your student id, application id or password? Then request a new password