From d050b46df08c6babe304130816d34d5a4dca2868 Mon Sep 17 00:00:00 2001
From: the_mgt <themgt@ueberserver.de>
Date: Fri, 1 Jul 2011 14:12:13 +0200
Subject: [PATCH] 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)

---
 webcit/static/icons/essen/16x16/abort.png     | Bin 0 -> 640 bytes
 webcit/static/icons/essen/16x16/delete.png    | Bin 640 -> 603 bytes
 .../essen/32x32/{delete.png => abort.png}     | Bin
 webcit/static/styles/login.css                |  36 +++++++++++++-----
 webcit/static/styles/webcit.css               |  14 +++----
 webcit/static/t/confirmlogoff.html            |   2 +-
 webcit/static/t/login.html                    |  23 ++++++-----
 7 files changed, 44 insertions(+), 31 deletions(-)
 create mode 100644 webcit/static/icons/essen/16x16/abort.png
 rename webcit/static/icons/essen/32x32/{delete.png => abort.png} (100%)

diff --git a/webcit/static/icons/essen/16x16/abort.png b/webcit/static/icons/essen/16x16/abort.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7b62558f785ee8c3668d722b4d36577b668e175
GIT binary patch
literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!B1uF+RCwBA{Qv(y10{foftKK9kG2pH
z^N{6&N9~%13~an_|Fdv@e%Pj|O0ogKu*v4Kj%VPqhyn2maj9cL=5%=TgXu5}@oaW!
z&16O;Nd`tBpY4ib=KYrc=T;tnF$W}HvGpTv7ld1i@iVcoOyRWgV)*{~IKz+6CmFcx
zgBXA&%?8S`;dKEB{QUK=j?=(_Vf&mJ49{*oVEFs@AA^LlEQ6W8IRnGpqisMXCCKU-
zkvUgum3%maq&A;>_n+bJxhp6Ji^@wg*emid{QUIBSG)P%7OY<Q^XG52fUOV1{fpNy
z0_*j|rwqI{0bn)A;><9{xl-9$0d4D4E_EIT0gjUlwx0hP<bjc=uFt?=;mp7wA;ZWZ
zq+!6o@Qqs~UiH(zna4gIg1g{Ep_DcwD|?fmxe>$f4<{Kue`aNP`;vj-;Vnjn`!^WD
z?04^282)}f%^+xL$^cRe)T0MC;NQRh*<yBq4F7*!Wcd5_HiN1*1H-O0j0_h~Ffd#`
z#lWz286$(bE+bg(|E~)SVh%xIJzxWl=1HV;ODbjZD6=s9{&*Is;2qG^9}Jva2!C<_
z+02YTz;YlpJPJ$<ymA_8hjS$|KrWae<L1He=iL#8f8QSiL-IQV!{46_CbmBr*x3Fv
zuyg!puyFVZ76ZwF)ck&bgh9%|fq{vMc{<~oc;R9$R>mwIc19&qGTN7)|L=YK{eK!j
afB^s<z{XG<ENhJb0000<MNUMnLSTYN$}R5z

literal 0
HcmV?d00001

diff --git a/webcit/static/icons/essen/16x16/delete.png b/webcit/static/icons/essen/16x16/delete.png
index f7b62558f785ee8c3668d722b4d36577b668e175..787a6008a56f85b5c835963bcea17b357ec92785 100644
GIT binary patch
delta 542
zcmV+(0^$9D1=|FWNPhwSNkl<Zc-mt8xSf;X=8<0vriD`(2!VIU3KZWw<~sLJJeK$C
zF9qgP2angVFc1k|A1F|G|AOO+oNFrA-}gs8u3mQY*Pq{9YgmZY{O&o&RR#A<uD|d0
zGJJn}iQiEC@5^7j|Lzks;MM*D*$*$ct|+*tbNzd_pW)lnOMeVcul@P@pMk+2DE*5G
zpXTSg@)h1c=ei;1p3V)@{PpPth9}qld;@BBHprZE5~K#F0nc{i%YJ;#bydMLlj}cB
z^VL7!fl^K|%{UDJYktdhL(w~j>)+eGaLr823@*r;K>#BR9&gE4`0|14s<Lk`*WWjL
z7`{BY!0`0?pMM`rtPGxdsZ)-jt4A^5!TLOf?_YU=nzJFAAD@G0W?}FEYCed~wM>T;
z&Vm_Nr<QAd`^<X-tQqKRu;y!jeloK%c;V6vcfsSYTJi$CKQCLjdozJGKROH2{EL-?
z(MLOJ@_u|V#l&Cc$It&$Y42l$Zl-1XpMf<41MCkAJAZ>8Q1c!_>4b$#L}s~$iK8;}
zs)-Eq{);ilD+>G*|MxjwC%JbgF{zaCkgtj~2d}_U0S*TF+aG>C{LS&-K}zx317h<C
zOOK%S(>!0-E8mW+lV|sjmS^MQ+x?M&0f-o$0`Ut_CIsU9K>P)WZvydOvp;?p;4b+8
g|33pI02d&@0DC+0B+{3TWdHyG07*qoM6N<$g1V{|`2YX_

delta 579
zcmV-J0=)g(1b_vQNPhw%Nkl<Zc-mt8|NlP&C4h;6mf&TNwh$2WkmZ6$?V5%RY`ky(
zvv7WX*rusUvH`%b$>y?-XW+7k0r3iPsbfLrba?ZF=`aiNY<6kQWJV=P21X#C?TTXN
z{g(gdRvv#b2P9vy^&@T<gj<U7GqJEt;k5B$`2P7g!;jA=8GpF!gBXA&%?8S`;dKEB
z{QUK=j?=(_Vf&mJ49{*oVEFs@AA^LlEQ6W8IRnGpqisMXCCKU-kvUgum3%maq&A;>
z_n+bJxhp6Ji^@wg*emid{QUIBSG)P%7OY<Q^XG52fUOV1{fpNy0_*j|rwqI{0bn)A
z;><9{xl-9$0e@}lR4#QM1_6$f47Q&C8RUVHr>@VyVByTbAR)uZAf#cy!0?S*C0_N@
zznRBA9fG^yM4^;6BP)B8pt%vl?++&#K7VFqc>9up;o&VthWj@d!R&YMSQ!3(KFuI#
zY03an3)G_rH{jpD|Jh=8feinDU1a$C^)`d5HUq=1HGhl@7f&!STt3CXuyq+DgSsvw
zSnmI?3k+foL0~;#1CHiNq;pFuW%4MqF#P^_7O3DI(9|CcoLmThasb)Pj6c9~AT>M+
zObono8fk}fB{D!Rm?7il!SLtZ5r%)?9|J@3I|IYtpA06pKN;BA{xh(1{AaLm_z4yR
z$$`}TemsAKLCV2_fr*KEI^&vn;bJaU#w;FoMkP`*+LxdI?|u9Ie;Po50RSDq#!wtA
RYmEQ^002ovPDHLkV1l&1AWr}Q

diff --git a/webcit/static/icons/essen/32x32/delete.png b/webcit/static/icons/essen/32x32/abort.png
similarity index 100%
rename from webcit/static/icons/essen/32x32/delete.png
rename to webcit/static/icons/essen/32x32/abort.png
diff --git a/webcit/static/styles/login.css b/webcit/static/styles/login.css
index e90502b06..b4ee10ebf 100644
--- 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 7fa51c78f..e0368b180 100644
--- 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 203a3afc7..d9f8c7b4a 100644
--- 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 cb4e8f951..96beced84 100644
--- 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>
-- 
2.30.2