Improved logic and look of the login.html (and partly the modal)

Also renamed the delete.png to abort, makes more sense.
Deployed abort.png where it fits (closewindow.gif loks bad when blown to 32pixel)

diff --git a/webcit/static/icons/essen/16x16/abort.png b/webcit/static/icons/essen/16x16/abort.png
new file mode 100644 (file)
index 0000000..f7b6255
Binary files /dev/null and b/webcit/static/icons/essen/16x16/abort.png differ

diff --git a/webcit/static/icons/essen/16x16/delete.png b/webcit/static/icons/essen/16x16/delete.png
index f7b62558f785ee8c3668d722b4d36577b668e175..787a6008a56f85b5c835963bcea17b357ec92785 100644 (file)
Binary files a/webcit/static/icons/essen/16x16/delete.png and b/webcit/static/icons/essen/16x16/delete.png differ

diff --git a/webcit/static/icons/essen/32x32/abort.png b/webcit/static/icons/essen/32x32/abort.png
new file mode 100644 (file)
index 0000000..72f9e21
Binary files /dev/null and b/webcit/static/icons/essen/32x32/abort.png differ

diff --git a/webcit/static/icons/essen/32x32/delete.png b/webcit/static/icons/essen/32x32/delete.png
deleted file mode 100644 (file)
index 72f9e21..0000000
Binary files a/webcit/static/icons/essen/32x32/delete.png and /dev/null differ

diff --git a/webcit/static/styles/login.css b/webcit/static/styles/login.css
index e90502b068ceb59f209b7427c126675260a1ccdc..b4ee10ebf5716fb61a11c81b9de1150c9be4e47a 100644 (file)
--- a/webcit/static/styles/login.css
+++ b/webcit/static/styles/login.css
@@ -1,24 +1,25 @@
 #login_screen, #logout_screen {
        position: fixed;
-       margin: 0px;
-       top: 0px;
-       left: 0px;
-       bottom: 0px;
-       right: 0px;
-       padding: 3% 6% 3% 6%;
+       left: 0;
+       right: 0;
+       margin: 5em auto;
+       width: 42em;
        overflow: auto;
 }
 
-#login_screen .login_message, #login_screen .login_image, .login_hello, #login_screen #login_form {
+#login_screen .login_message, .login_hello, #login_screen #login_form {
        display: block;
        margin: 5px auto 5px auto;
 }
 
 #login_screen .login_message, .login_hello { width: 80% }
 
-#login_screen .login_image { width: 135px }
+#login_screen .login_image { 
+       width: 135px;
+       margin: 0 auto;
+}
 
-#login_screen .login_image img { text-align: center }
+/*#login_screen .login_image img { width: 135px }*/
 
 #login_screen #login_form {
        padding: 10px;
@@ -68,3 +69,20 @@
        text-align: center;
        font-weight: bold;
 }
+
+.logbuttons, .registernow {
+       width: 50%;
+        margin: 1em auto;
+        text-align: center;
+        display: block;
+       height: 2em;
+       line-height: 2em;
+        background-color: #4d555c;
+        font-weight: bold;
+        -khtml-border-radius: 5px;
+        -moz-border-radius: 5px;
+        border-radius: 5px;
+        behavior: url(static/styles/PIE.htc);
+}
+
+.logbuttons a:link, .registernow a:link { color: #f0feff; }

diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css
index 7fa51c78f4f1d26751bd4779026b83d7c5050c3e..e0368b1807e62dc51761c351eb65cba500206114 100644 (file)
--- a/webcit/static/styles/webcit.css
+++ b/webcit/static/styles/webcit.css
@@ -30,7 +30,7 @@ html, body {
 
 .address_book_popup_title { font-size: 130% }
 
-#button, #content .button_link a, input#delbutton,.attachfile,.logbuttons input,.buttons input, .buttons a, .customize, .menubar_link, #banner ul.room_actions li, .selector_top, .selector_bottom, .banner .infos,li.search,li.view, .room_actions form select option, .selectbox, ul.adminitems li span, #message_list tr > td {
+#button, #content .button_link a, input#delbutton,.attachfile, .buttons input, .buttons a, .customize, .menubar_link, #banner ul.room_actions li, .selector_top, .selector_bottom, .banner .infos,li.search,li.view, .room_actions form select option, .selectbox, ul.adminitems li span, #message_list tr > td {
        font-size: 100%;
 }
 
@@ -389,11 +389,11 @@ input, select, .room_actions form select, .room_actions li.search input, .addres
 
 .buttons a:hover { background-color: #5c646b; }
  
-.button_link a, input#delbutton,.attachfile, .logbuttons input,.buttons input {
+.button_link a, input#delbutton,.attachfile, .buttons input {
        background-color: #4d555c;
 }
  
-.button_link a, input#delbutton,.attachfile, .logbuttons input,.buttons input {
+.button_link a, input#delbutton,.attachfile, .buttons input {
        border: 2px solid #5c646b;
        color: #F0FEFF;
 }
@@ -571,7 +571,7 @@ body {
        padding: 2px;
 }
 
-.button_link a, .attachfile, .logbuttons input,.buttons input .logbutton {
+.button_link a, .attachfile, .buttons input .logbutton {
        margin: 3px;
        padding: 2px 4px 2px 4px;
 }
@@ -798,7 +798,7 @@ table.advanced {
 
 /* Links and buttons */
 
-.logbuttons, .buttons, .registernow {
+.buttons {
        margin: 2px auto 2px auto;
        width: 96%;
        text-align: center;
@@ -1325,10 +1325,6 @@ a.event_title:hover span.bttbottom, a.event_unread:hover span.bttbottom, a.event
         padding-left: 18px;
 }
 
-.registernow {
-       text-align: right;
-}
-
 .older_blog_posts, .newer_blog_posts {
        font-size: 110%;
 }

diff --git a/webcit/static/t/confirmlogoff.html b/webcit/static/t/confirmlogoff.html
index 203a3afc7519dbe8cb3c0e345d68a42b86f7ae11..d9f8c7b4a8ce90a4eeb74f67480bfa0b2bd8d832 100644 (file)
--- a/webcit/static/t/confirmlogoff.html
+++ b/webcit/static/t/confirmlogoff.html
@@ -1,6 +1,6 @@
 <html>
        <body><center>
                <h1><a href="termquit"><img src="static/icons/essen/32x32/logout.png" border="0">&nbsp;<?_("Log off")></a></h1>
-               <h1><a href="javascript:toggleModal(0);"><img src="static/icons/closewindow.gif" height="32" width="32" border="0">&nbsp;<?_("Cancel")></a></h1>
+               <h1><a href="javascript:toggleModal(0);"><img src="static/icons/essen/32x32/abort.png" height="32" width="32" border="0">&nbsp;<?_("Cancel")></a></h1>
        </center></body>
 </html>

diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html
index cb4e8f951329254019aa5edd295228e37828f55a..96beced84490f634854b35da11fe95ec3377c80d 100644 (file)
--- a/webcit/static/t/login.html
+++ b/webcit/static/t/login.html
@@ -2,22 +2,21 @@
 <!-- start login.html -->
 <div id="login_screen">
                <div class="box">
-               <div class="boxlabel"><?SERV:HUMANNODE> - <?_("powered by")>
-                       <a href="http://www.citadel.org">Citadel</a>
-               </div>
-               <div class="boxcontent">
-                       <div id="hellomsg"><?SERV:MESG("hello")></div>
-               <?!("COND:IMPMSG", 1)>
-                       <div class="login_message"><?IMPORTANTMESSAGE></div>
-               <?!("X", 1)>
-                       <div class="login_image"><img src="image?name=hello" alt="">
-                               <span class="button_link">
+                       <div class="boxlabel"><?SERV:HUMANNODE> - <?_("powered by")>
+                               <a href="http://www.citadel.org">Citadel</a>
+                       </div>
+                       <div class="boxcontent">
+                               <div id="hellomsg"><?SERV:MESG("hello")></div>
+                               <?!("COND:IMPMSG", 1)>
+                                       <div class="login_message"><?IMPORTANTMESSAGE></div>
+                               <?!("X", 1)>
+                               <div class="login_image"><img src="image?name=hello" alt=""></div>
+                               <span class="logbuttons">
                                        <a href="javascript:GetLoggedInFirst('do_welcome');"><?_("Log in")></a>
                                </span>
                        </div>
-</div>
+               </div>
 <!-- end login.html -->
-<?=("endbox")>
 <script type="text/javascript">
        GetLoggedInFirst('do_welcome');
 </script>