From 51820475d217683bf9ce1ce4551465cd4f1d2fde Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 21 Dec 2007 18:11:13 -0600
Subject: [PATCH] Adding some image files missing from yesterday's commit;
 Correcting patron image javascript in circ and moremember; Adding cardnumber
 to moremember display.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/css/staff-global.css              |   8 +++----
 .../prog/en/includes/circ-toolbar.inc         |   2 +-
 .../prog/en/includes/members-toolbar.inc      |   4 +---
 .../prog/en/modules/circ/circulation.tmpl     |   2 +-
 .../prog/en/modules/members/moremember.tmpl   |  22 ++++++++++--------
 .../intranet-tmpl/prog/img/button-bg.gif      | Bin 0 -> 582 bytes
 .../prog/img/toolbar-duplicate.gif            | Bin 0 -> 117 bytes
 .../intranet-tmpl/prog/img/toolbar-orders.gif | Bin 0 -> 118 bytes
 .../prog/img/toolbar-password.gif             | Bin 0 -> 112 bytes
 .../prog/img/toolbar-receive.gif              | Bin 0 -> 118 bytes
 .../intranet-tmpl/prog/img/toolbar-renew.gif  | Bin 0 -> 122 bytes
 .../intranet-tmpl/prog/img/toolbar-save.gif   | Bin 0 -> 134 bytes
 .../intranet-tmpl/prog/img/toolbar-search.gif | Bin 0 -> 124 bytes
 13 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/button-bg.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-duplicate.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-orders.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-password.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-receive.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-renew.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-save.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-search.gif

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index bc62341791..bd12796b3b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -823,8 +823,8 @@ fieldset.rows .inputnote {
 }
 
 
-#savemenuc .first-child {
-	padding-left : 15px;
+#savemenuc .first-child, #addbiblio .first-child {
+	padding-left : 34px;
 	background-image: url("../../img/toolbar-save.gif");
 	background-position : center left;
 	background-repeat : no-repeat;
@@ -892,7 +892,7 @@ fieldset.rows .inputnote {
 	background-repeat : no-repeat;
 }
 
-#editmenuc .first-child, #deleteshelf .first-child,#newmenuc .first-child, #addbiblio .first-child, #z3950search .first-child, #printmenuc .first-child, #newsupplier .first-child, #addbiblio .first-child {
+#editmenuc .first-child, #deleteshelf .first-child,#newmenuc .first-child, #addbiblio .first-child, #z3950search .first-child, #printmenuc .first-child, #newsupplier .first-child, #savemenuc .first-child {
 	padding-left : 15px;
 }
 
@@ -1361,7 +1361,7 @@ input[type=submit], input[type=button], input.submit {
 	border-top-color: #666;
 	border-left-color: #666;
 	padding: 0.25em;
-	background : #E8E8E8 url(../../img/button-bg2.gif) top left repeat-x;
+	background : #E8E8E8 url(../../img/button-bg.gif) top left repeat-x;
 	color: #333333;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index 5490aa46d0..154ecc12aa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -89,7 +89,6 @@ function confirm_reregistration() {
 	//]]>
 	</script>
 	<ul class="toolbar">
-	<!-- TMPL_IF name="adultborrower" --><li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">Add child</a></li><!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="category_type" -->
             <!--TMPL_IF NAME="guarantor"-->
                 <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
@@ -103,6 +102,7 @@ function confirm_reregistration() {
                 <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=A">Edit</a></li>
             <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
+	<!-- TMPL_IF name="adultborrower" --><li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">Add child</a></li><!-- /TMPL_IF -->
 <!--	<li><a id="addnote" href="/cgi-bin/koha/members/addnotes.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Add Note</a></li> -->
 <!-- TMPL_IF NAME="StaffMember" --><!-- TMPL_IF NAME="CAN_user_staffaccess" --> <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Change Password</a></li><!-- /TMPL_IF-->
           <!-- TMPL_ELSE--> <li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Change Password</a></li><!-- /TMPL_IF -->	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index f2bef2b879..657de03f6a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -76,7 +76,6 @@ function update_child() {
 	        container: "moremenuc"
 	    });
 
-	    new YAHOO.widget.Button("checkout");
 	    <!-- TMPL_IF name="adultborrower" -->new YAHOO.widget.Button("addchild");<!-- /TMPL_IF -->
 	    new YAHOO.widget.Button("editpatron");
 	    new YAHOO.widget.Button("addnote");
@@ -93,8 +92,6 @@ function update_child() {
 
 	</script>
 	<ul class="toolbar">
-	<li><a id="checkout" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Check Out</a></li>
-	<!-- TMPL_IF name="adultborrower" --><li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">Add child</a></li><!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="category_type" -->
             <!--TMPL_IF NAME="guarantor"-->
                 <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&amp;category_type=<!-- TMPL_VAR NAME="category_type"-->">
@@ -108,6 +105,7 @@ function update_child() {
                 <li><a id="editpatron" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=A">Edit</a></li>
             <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
+	<!-- TMPL_IF name="adultborrower" --><li><a id="addchild" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;category_type=C">Add child</a></li><!-- /TMPL_IF -->
 <!--	<li><a id="addnote" href="/cgi-bin/koha/members/addnotes.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Add Note</a></li> -->
 	<li><a id="changepassword" href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Change Password</a></li>
 	<li id="printmenuc"><a id="printpage" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page">Print Page</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index a10961a568..331100af10 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -10,7 +10,7 @@
 	 $(document).ready(function() {
  		$('#patronlists').tabs();
 	 });
-<!-- TMPL_IF NAME="patronimages " -->$(window).load(function() {
+<!-- TMPL_IF NAME="patronimages" -->$(window).load(function() {
 		verify_patron_images();
 	 });<!-- /TMPL_IF -->
 //]]>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 08048046c5..919c69f9f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -6,14 +6,14 @@
 $(document).ready(function() {
 	$('#finesholdsissues').tabs();
  });
-		 $(window).load(function() {
+<!-- TMPL_IF NAME="patronimages" -->$(window).load(function() {
 			verify_patron_images();
-		 });
+		 });<!-- /TMPL_IF -->
 //]]>
 </script><!-- /TMPL_IF -->
 
 </head>
-<body onload="verify_patron_images();">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
@@ -26,20 +26,22 @@ $(document).ready(function() {
 	<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
 <!-- TMPL_IF NAME="error" -->
-<div class="error">
+<div class="dialog alert">
 <!-- TMPL_IF NAME="AUTH_UPDATE_FAILED" -->
-Userid / Password update failed:
-Insufficient user permissions.
-Other fields updated.
+<h3>Userid / Password update failed</h3>
+<strong>Insufficient user permissions.</strong>
+<p>Other fields updated.</p>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="CANT_DELETE" -->
-Unable to delete member: insufficient privileges.
+<p><strong>Unable to delete member:</strong> insufficient privileges.</p>
 <!-- /TMPL_IF -->
 </div>
 <!-- /TMPL_IF -->
 <div class="yui-g">
 <!-- TMPL_IF NAME="unknowuser" -->
-    This patron does not exist.
+   <div class="dialog message">
+   	 This patron does not exist.
+   </div>
 <!-- TMPL_ELSE -->
 <!-- TMPL_IF NAME="reregistration" --><div class="dialog message">Patron's account has been renewed until <!-- TMPL_VAR NAME="dateexpiry" --></div><!-- /TMPL_IF -->
 <form action="" name="form">
@@ -65,7 +67,7 @@ Unable to delete member: insufficient privileges.
 <!-- /TMPL_IF -->
 
 <h3><!-- TMPL_UNLESS NAME="I" -->
-   <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="surname" --></h3>
+   <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
  <div class="yui-u first">
 <div id="patron-information" style="padding : .5em;">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/img/button-bg.gif b/koha-tmpl/intranet-tmpl/prog/img/button-bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a63f4875e40f6520615a10411b35519b09a42880
GIT binary patch
literal 582
zcmZ?wbhEHb)L;l?xXQrr?%lh`k00N^fB)C7U;qC7`}60|$B!R>{P^+n=g*ffU%r3;
z{?45{ckkYP^5n^zH*daw|NiXRvrnHs-M)SM)vH%uzI^%m_3MKN51v1N{_x?$yLa#1
zx^?@(gNM(bzxe(8H&F7))2H|D-T(CY^TUUaUcY&B`}Uo0-@g6*`}fwZTmS$6zj^Z}
z1I0k`CkxmN9S{lf69e0ShbaXfI#T@}N{J_Ptma?Hxa_hvYW<BhWvAa(t!&*;;iEVE
z{Nr;8XY+R7|4<?Axc>J0AA9cAz4-mVp|PpCp1-ZVqqD2Kr(IQa!o*3Fr%atTQBGvm
z>^XDi&0jEEQE<u9Wy@ErT(y*K?Yi|FHg4Lyo@?9o9XogJ-m`;Y|AB*t4j(ysP?_)K
zsnci9o;!bvQ~2_gtJkjIxOqi}^X|R-4<0^xd{18d`HPpYUcY(!f>Ge(r_W!$e*6AO
ziTC%PzyJO-Fn_u&uwcQ#W)5Mkn2Z31wsrw!uQ?tYm0SeGjI!>W*tqz3zmzeDgy*Iu
zCnswJPl`FPVCm`U2Fa)9yqt8TX|_f2t2-w*tNSJM3N>-bdTm*8aj}!XM(n9AD=#k(
zSnM^|D>Sofb;RbZyQj9UzP>);aF?w2wlz05XIx$tdwSd2+uI8spPK8vecj#N6`x<-
oJ-vPX{rwHh+;ToUHatAsA*>yDX2-_I$0sOz&-2-tE5Kk40Ck{39RL6T

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-duplicate.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-duplicate.gif
new file mode 100644
index 0000000000000000000000000000000000000000..522eaf00b370ab2270973b22e0573d55abc37cad
GIT binary patch
literal 117
zcmV-*0E+)dNk%w1VIBY&0FeR!G;XT@|IGjY{{R30A^8LW00062EC2ui03HAs0006;
zl#i*)?GK}zv?hSF23CLoh9PHt+ZSjQDvls2ncMrWt%$;rtkJ1`^XVYGj1U;i*-pm^
X>!x&`dcRVzR+?ry+^+ZgEdT&JmohKT

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-orders.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-orders.gif
new file mode 100644
index 0000000000000000000000000000000000000000..55dcc1ef14568e1384e222e336f65750f36e5140
GIT binary patch
literal 118
zcmZ?wbhEHblw*)!n8?InlDF#r|1<yp|7T!eQ2fcl$iTqFpaWzxfaDpN+^6)fJpGn`
z@tiGs4V$;QRVSn#^yo`aofc6L#Bh3DiuK-n%k~e)Uzy)?erw|>&J(eQ*VMC<_h!!x
WJ4x9|&lV+F+*$XX+fIam!5RRcp)73x

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-password.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-password.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cea10cadfb9c49d4e8b9dc7d640d7f5b2dc64bdd
GIT binary patch
literal 112
zcmZ?wbhEHblw*)!n8?InlDF#r|1<yp|7T!eQ2fcl$iTqFpaWzxfaDpN9H;cJJpGn`
z@tiHUx}|R@C=0YWK5tC&NK#NQ(qmtHsOs7a<;&}>AKCVD^##pZm}&7kN9Fjm^fINi
QnDeW?cAd>qXJxPk0EkX1%K!iX

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-receive.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-receive.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8ee4e25d825f5207f4a507a5e1ed2731b75a127c
GIT binary patch
literal 118
zcmZ?wbhEHblw*)!n8?hq@Ae~;yjB1IpZWj)zv538Mg|6E1|0?<0Le2jxzFiedHOB?
z;yH#9-q8X!Dcef#3vu0>F-5&<<@Jc7O()NN;<{aN?VdhA2a_4&!wHwXwA2-!x~g=l
Wrdzw8aZ9zDyJFpU?sFmx4AuZ(>n;=k

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-renew.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-renew.gif
new file mode 100644
index 0000000000000000000000000000000000000000..125366214b0b48a02c7317c55ee05e44362ddae3
GIT binary patch
literal 122
zcmV-=0EPcYNk%w1VIBY&0FeR!G;XT@|IGjY{{R30A^8LW00062EC2ui03HAs0006@
zl#i*)?GK}z5?DZ)4IJkLaH97aVRxC|8IWe1ovy&nPK~f#wI3I1Q~X+%To0my`9>3*
cQQ3sPj!n~0x)M=KwO}k&3X8|&GNJ$gJ5_xzBme*a

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-save.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-save.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ee85a23ebbd5452c2da2f5c6cbe25fd7ca0fb2f2
GIT binary patch
literal 134
zcmZ?wbhEHblw*)!Sj56`=FAzByjB1IpZO043^1VhlZBCifrUW_Bmh#&!0hd@>&`!e
zQ=Y5$T4c-a`X498aWG+?GXslK=R8HTY588;zF0rrdiK=1TYMf&y?HK;MLYk*_8sH<
cw33A}ESURCvFxcu^Ls0N^k$#$VPUWa01CY{ZU6uP

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/toolbar-search.gif b/koha-tmpl/intranet-tmpl/prog/img/toolbar-search.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1c621cccaa2fcd2b9a962248317c1e88e9ec4f72
GIT binary patch
literal 124
zcmZ?wbhEHblw*)!Sj5UOW9#mHw;%og|KB8U)&KuzfD8sOQ2fcl$iTqLpabH8)G{zT
zM(n!t&)}5j>b(}PZL98|73g6!Xy}sQU}2oG;>5OhoLwc{_Z{Po>(4q_R=w9|#gz1!
XB?_~9)I&Vy)GfQQrtG#41A{dH<LEL{

literal 0
HcmV?d00001

-- 
2.39.5