* fix self service account button

* fix important message handler

diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html
index 7afc0edc0fede8c2366bbc9dd5480bbfdaf7a576..0dddc2daa3f5571e7c7649de446d33fb97ecde1d 100644 (file)
--- a/webcit/static/t/login.html
+++ b/webcit/static/t/login.html
@@ -6,7 +6,7 @@
 <?SERV:MESG("hello")>
 
 <?!("COND:IMPMSG", 1)>
-<?IMPORTANTMESSAGE>
+<div class="login_message"><?IMPORTANTMESSAGE></div>
 <?!("X", 1)>
 
 <div class="login_message"></div>
@@ -20,10 +20,13 @@
         <div class="logbuttons">
         <input type="submit" name="login_action" value="<?_("Login")>" class="logbutton">
        <??("COND:SERV:NEWU", 1)>
+        <input name="newuser_action" value="<?_("New User")>" class="logbutton" type="submit">
+       <??("X", 1)>
+       <?!("COND:SERV:NEWU", 2)>
         <div style="display:none;">
-        <input type="submit" name="newuser_action" value="<?_("New User")>" class="logbutton" >
+        <input name="newuser_action" value="<?_("New User")>" class="logbutton" type="submit">
         </div>
-       <??("X", 1)>
+       <??("X", 2)>
         <input type="submit" name="exit_action" value="<?_("Exit")>"  class="logbutton">
         <br>
         </div>

diff --git a/webcit/webcit.c b/webcit/webcit.c
index c2866279e847c260c6e282df4e8ab688fa51f868..24d0de34858536f38c9f8008527f1e70eec30dbe 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1914,9 +1914,8 @@ void tmplput_importantmessage(StrBuf *Target, int nArgs, WCTemplateToken *Tokens
                StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType,
                                     WCC->ImportantMessage, 0);
 */
-               WCC->ImportantMessage[0] = '\0';
                StrEscAppend(Target, NULL, WCC->ImportantMessage, 0, 0);
-                       WCC->ImportantMessage[0] = '\0';
+               WCC->ImportantMessage[0] = '\0';
        }
 }