From 2b2f7a179422db9fea97ec46dfb330b4236bd89e Mon Sep 17 00:00:00 2001
From: Joshua Ferraro <jmf@liblime.com>
Date: Fri, 10 Aug 2007 12:11:22 -0500
Subject: [PATCH] revisions to login page to make it pretty

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 C4/Auth.pm                                    |   2 +-
 koha-tmpl/intranet-tmpl/prog/en/auth.tmpl     |  20 ++-
 .../prog/en/images/fade-butt.png              | Bin 0 -> 785 bytes
 .../prog/en/images/koha-logo.gif              | Bin 0 -> 3910 bytes
 .../prog/en/includes/doc-head-close.inc       |   5 +-
 .../intranet-tmpl/prog/en/includes/login.css  | 139 ++++++++++++++++++
 6 files changed, 153 insertions(+), 13 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/images/fade-butt.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/images/koha-logo.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/login.css

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 06401fe976..cc1a5ac0da 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -638,7 +638,6 @@ sub checkauth {
         push @inputs, { name => $name, value => $value };
     }
     # get the branchloop, which we need for authetication
-	use C4::Branch;
     my $branches = GetBranches();
     my @branch_loop;
     for my $branch_hash (keys %$branches) {
@@ -648,6 +647,7 @@ sub checkauth {
     my $template = gettemplate( $template_name, $type, $query );
     $template->param(branchloop => \@branch_loop,);
     $template->param(
+		login				 => 1,
         INPUTS               => \@inputs,
         suggestion           => C4::Context->preference("suggestion"),
         virtualshelves       => C4::Context->preference("virtualshelves"),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
index bb566f9bd4..73f2288614 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
@@ -14,15 +14,15 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="timed_out" -->
-<div id="login_error"><strong>Login Error</strong>: session timed out, please log in again</div>
+<div id="login_error"><strong>Error</strong>: session timed out, please log in again</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="different_ip" -->
-<div id="login_error"><strong>Login Error</strong>IP address has changed, please log in again </div>
+<div id="login_error"><strong>Error</strong>: IP address has changed, please log in again </div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="invalid_username_or_password" -->
-<div id="login_error"><strong>Login Error</strong>Incorrect username or password</div>
+<div id="login_error"><strong>Error</strong>: Incorrect username or password</div>
 <!-- /TMPL_IF -->
 
 <!-- login prompt time-->
@@ -36,22 +36,20 @@
 <p><label>Password:<br />
 <input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" /></label>
 </p>
-<p>
-<label for="branch">Library:</label>
+<p><label for="branch">Library:<br />
 <select name="branch" id="branch" class="input">
 <!-- TMPL_LOOP NAME="branchloop" -->
 <option value="<!-- TMPL_VAR NAME='branchcode' -->"><!-- TMPL_VAR NAME='branchname' --></option>
 <!-- /TMPL_LOOP -->
-</select>
-</p>
-<p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label>
+</select></label>
 </p>
+<!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
 
 <p class="submit"><input id="submit" type="submit" value="Login &raquo;" tabindex="4" /></p>
 </form>
-<ul>
-	<li><a href="/cgi-bin/koha/lostpassword.pl" title="Password Lost and Found">Lost your password?</a></li>
-</ul>
+<!--<ul> -->
+<!--	<li><a href="/cgi-bin/koha/lostpassword.pl" title="Password Lost and Found">Lost your password?</a></li> -->
+<!-- </ul> -->
 <!-- /TMPL_IF -->
 
 <script type="text/javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/fade-butt.png b/koha-tmpl/intranet-tmpl/prog/en/images/fade-butt.png
new file mode 100644
index 0000000000000000000000000000000000000000..42f08b79942d32f9d7e693b6952c2d935e352774
GIT binary patch
literal 785
zcmb`F-%C?r7{}lJa2&>jxy)rl9Mwn%LP*puyzuCjPMwJ95JKF>j+PKsXg_GsnhtD8
zh=^TCB+KZ+w1O@i>_T)@BanhF!iyL+Vms&T{MtEZJ7;Iq>;Dih&-?H^?}zX6eBpgE
zG}u$CKdlD<)Vh0}!!XywXhAgaPSf^0Oxh{bg97mO^W~b@aosrU8k@a3GdX+De+L6-
za3+9R-8cPH*f8b~KDeF6Iv|7(4UD)7Bq<02RVXNmg6H!LO&2+?R4U1`OcDggapiKE
zFY+wIunf!d#VW*b2<D}-Bnkq{G9|G@k|fXbG)<REB1zyJ$4ce0B+GoUNDzb|h<F|+
zah#$kx=@g1NvXnFIRXm7hg^=PXo$m85=DwC&@?4W5`hy0o+ojl$Z|!FRVo!(lHn4P
zB-0ed(3B{OL>^}-T9V2H+?-(*rOF(SfEtt}NrEU;s|w4ql}aU_%l$QMw*#Qsc019L
z`$qxet-2wzufeA~GdF29GQ(3k#HwpP=Tp5>sTUs~bbFp^79H8|jwMGn{Nu=E4WHV@
z<`Pj1OGKNZ!frxXz@l>r$fB|FiN4r)-$3m7_{6|c6Ou{+s8EME>s@=BuaUFM*eAr;
zY2XyDLos!9uJm+8Ui3todx6%dF|QjeX0yfetkJS=SZ+O-Jgk9eC?1L*hC<0?DEZSH
ziYJrFcpRuw8!vzFO<!+G+i!fax2E;#l^xj3d<^cTHm5g!9i}$p`$0``t6c?!=N<FA
z4vluP+Z_gh%t&VS(x^9+U0w68c`tbXWV08K?KYf8QO`rP4L#v$JAvA4o;K75abuv)
zWD5BG-@fVs*8X|dH4AhfdJn>2-wvIO)u`0SmbDZ3PihhCn+Q-Xj2f-scY3wf=tci0
Zqyhce4|i>ku8hL(3f!(i=T4U|@(=9Ekd*)c

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/images/koha-logo.gif b/koha-tmpl/intranet-tmpl/prog/en/images/koha-logo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..247f30007d35bc6ebd1fa8439361c145b3e8ca59
GIT binary patch
literal 3910
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

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index f959558e27..bbf580977c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -2,8 +2,11 @@
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet-print.css" />
 <style type="text/css" media="screen"> 
-  <!--TMPL_IF NAME="popup"-->
+  <!-- TMPL_IF NAME="popup" -->
     @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet2popup.css);
+  <!-- /TMPL_IF -->
+  <!-- TMPL_IF NAME="login" -->
+	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/login.css);
   <!-- TMPL_ELSE -->
 	  <!-- TMPL_IF NAME="intranetstylesheet" -->
 	    @import url(<!-- TMPL_VAR NAME="intranetstylesheet" -->);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/login.css b/koha-tmpl/intranet-tmpl/prog/en/includes/login.css
new file mode 100644
index 0000000000..b98f13f138
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/login.css
@@ -0,0 +1,139 @@
+a.edit, a.delete, a.edit:hover, a.delete:hover {
+	border-bottom: none;
+	display: block;
+	padding: 5px 0;
+	text-align: center;
+}
+
+a.edit:hover {
+	background: #ccc;
+	color: #036;
+}
+
+a:visited {
+	color: #006;
+}
+
+a:hover {
+/*	border-bottom: 1px solid #3a75ae;*/
+	color: #069;
+}
+
+body	{
+	background: #f9fcfe;
+	color: #000;
+	margin: 0;
+	padding: 0;
+}
+
+body, td {
+	font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
+}
+
+form, label input {
+	margin: 0;
+	padding: 0;
+}
+
+input:focus, textarea:focus, label:focus {
+	background: #fff;
+	border: 1px solid #686868;
+}
+
+label {
+	cursor: pointer;
+}
+
+#logo { margin-bottom: 2em; }
+
+#login {
+	background: #fff;
+	border: 1px solid #a2a2a2;
+	margin: 5em auto;
+	padding: 1.5em;
+	width: 25em;
+}
+
+#login #login_error {
+	background: #c00;
+	border: 1px solid #a40000;
+	color: #fff;
+	font-size: 16px;
+	font-weight: bold;
+	padding: .5em;
+	text-align: center;
+}
+
+#login h1 {
+	background: url(/intranet-tmpl/prog/en/images/koha-logo.gif) no-repeat top left;
+	margin-top: 0;
+}
+
+#login h1 a {
+	display: block;
+	text-indent: -1000px;
+	height: 66px;
+	border-bottom: none;
+}
+
+#login input {
+	padding: 3px;
+}
+
+#login ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+#login ul li {
+	display: inline;
+	margin-left: 1.4em;
+	text-align: center;
+}
+
+#login #userid, #password {
+	font-size: 1.7em;
+	width: 80%;
+}
+
+#login #submit {
+	font-size: 1.7em;
+}
+
+
+#footer {
+        text-align: center;
+        border-top: 1px solid #ccc;
+        padding-top: 1em;
+        font-style: italic;
+}
+
+.submit input, .submit input:focus, .button {
+	background: url(/intranet-tmpl/prog/en/images/fade-butt.png );
+	border: 3px double #999;
+	border-left-color: #ccc;
+	border-top-color: #ccc;
+	color: #333;
+	padding: 0.25em;
+}
+
+.submit input:active, .button:active {
+	background: #f4f4f4;
+	border: 3px double #ccc;
+	border-left-color: #999;
+	border-top-color: #999;
+}
+
+.submit, .editform th, #postcustomsubmit {
+	text-align: right;
+}
+
+textarea, input, select {
+	background: #f4f4f4;
+	border: 1px solid #b2b2b2;
+	color: #000;
+	font:  13px Verdana, Arial, Helvetica, sans-serif;
+	margin: 1px;
+	padding: 3px;
+}
-- 
2.39.5