Styling for error and login pages.

Error messages are now displayed in red.  Success messages are
displayed in green.

The login/register/edit user forms are now boxed.

diff --git a/templates/disorder.css b/templates/disorder.css
index 809947c93161b70a8fd998e7637e5003fe72ddfb..6062da877c290ff6564673d3659b59233b73e562 100644 (file)
--- a/templates/disorder.css
+++ b/templates/disorder.css
@@ -154,7 +154,7 @@ p.mgmt,form.volume {
   display: inline
 }
 
-/* choose *********************************************************************/
+/* choose ********************************************************************/
 
 /* first letter choice */
 p.choosealpha {
@@ -225,7 +225,7 @@ a.file:active {
   color: red
 }
 
-/* buttons ********************************************************************/
+/* buttons *******************************************************************/
 
 /* a.allfiles turns up in track choice
  * button is used e.g. in searching
@@ -259,7 +259,7 @@ img.button {
   border-width: 0
 }
 
-/* searching ******************************************************************/
+/* searching *****************************************************************/
 
 div.searchresults {
 }
@@ -309,7 +309,7 @@ a.search_title:active {
   color: red
 }
 
-/* sidebar ********************************************************************/
+/* sidebar *******************************************************************/
 
 div#sidebar {
   margin: 1em;
@@ -349,7 +349,7 @@ a.sidebarlink:visited {
   color: black
 }
 
-/* topbar *********************************************************************/
+/* topbar ********************************************************************/
 
 p.menubar {
   word-spacing: 1em
@@ -390,7 +390,7 @@ span.invalidmenu {
   font-size: 14pt
 }
 
-/* prefs **********************************************************************/
+/* prefs *********************************************************************/
 
 p.prefs_new,p.prefs_head {
   font-weight: bold
@@ -427,7 +427,7 @@ input.prefs_name,input.prefs_value {
   font-family: monospace
 }
 
-/* help ***********************************************************************/
+/* help **********************************************************************/
 
 .helpbuttons,.helpprefs,.helpcontexts {
   margin-left: 2em;
@@ -452,13 +452,35 @@ input.prefs_name,input.prefs_value {
   font-weight: bold
 }
 
-/* volume *********************************************************************/
+/* volume ********************************************************************/
 
 p.volume {
   text-align: center
 }
 
-/* miscelleanous **************************************************************/
+/* login page ****************************************************************/
+
+form.login,form.register,form.edituser {
+  border-style: solid;
+  border-width: 1px;
+  border-color: black
+}
+
+form.logout {
+  border-style: none;
+}
+
+p.loginstatus {
+  color: green
+}
+
+/* errors ********************************************************************/
+
+p.error {
+  color: red
+}
+
+/* miscelleanous *************************************************************/
 
 /* credits */
 p.credits {

diff --git a/templates/error.html b/templates/error.html
index d8bcaf428a8a90b3b17fd466ecefca522eed47e1..d87e1ee1303b45df8e46af2474b9f2b9aaf12015 100644 (file)
--- a/templates/error.html
+++ b/templates/error.html
@@ -27,9 +27,9 @@ USA
 @include{topbar}@
    <h1 class=title>@label:error.title@</h1>
     
-    <p>@label{error.@label:error@}@</p>
+    <p class=error>@label{error.@label:error@}@</p>
 
-    <p>@label:error.generic@</p>
+    <p class=error>@label:error.generic@</p>
 
 @include{topbarend}@
  </body>

diff --git a/templates/login.html b/templates/login.html
index 65f1939242b07365389125fd9285bbc8ddf96524..9684705584f4edaa69fce5e0becc47ee238a2f2d 100644 (file)
--- a/templates/login.html
+++ b/templates/login.html
@@ -30,7 +30,7 @@ USA
    @if{@ne{@label:error@}{error}@}{
    @#{error reporting from some earlier operation}@
    <!-- TODO make error string visually intrusive, also error.html -->
-   <p>@label{error.@label:error@}@</p>
+   <p class=error>@label{error.@label:error@}@</p>
    }@
 
    @if{@ne{@label:status@}{status}@}{
@@ -38,8 +38,6 @@ USA
    <p class=loginstatus>@label{login.@label:status@}@</p>
    }@
 
-  <p>User: @user@</p>
-
    @if{@eq{@user@}{guest}@}{
    @#{guest user, allow login and registration}@
    <h2>Existing users</h2>
@@ -117,7 +115,7 @@ USA
 
    <p>Use this form to change your email address and/or password.</p>
 
-   <form class=register action="@url@" method=POST
+   <form class=edituser action="@url@" method=POST
          enctype="multipart/form-data" accept-charset=utf-8>
      <table class=edituser>
        <tr>
@@ -142,7 +140,7 @@ USA
 
    <p>Use this button to log out @user@.</p>
 
-   <form class=register action="@url@" method=POST
+   <form class=logout action="@url@" method=POST
          enctype="multipart/form-data" accept-charset=utf-8>
      <div class=logout>
        <button class=logout name=action type=submit value=logout>

diff --git a/templates/options.labels b/templates/options.labels
index b62a918ffcb4e74ca229677a45f316dcc6fd050e..56e3fe625512446bcb48e1945dc7def8cbb656bf 100644 (file)
--- a/templates/options.labels
+++ b/templates/options.labels
@@ -146,6 +146,7 @@ label       login.register          "Register"
 label  login.edituser          "Change Details"
 label  login.logout            "Logout"
 
+# Text for login page responses
 label  login.loginok           "Logged in OK"
 label  login.logoutok          "Logged out OK"
 label  login.registered        "Registered your new login"
@@ -162,7 +163,7 @@ label       error.title             "DisOrder error"
 label  error.connect           "Cannot connect to server."
 
 # Text used when cannot become right user
-label  error.become            "Unauthorized user."
+label  error.loginfailed       "Incorrect username and/or password."
 
 # Text appended to all error pages
 label  error.generic           ""