From 34b67109d1930e11792b65c87a54c1933b771195 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 24 Sep 2007 15:17:43 -0500
Subject: [PATCH] A couple more tweaks to member entry form. Still unfinished:
 inline CSS will have to be generalized and moved to external stylesheet.
 Trying some changes to circ page, including moving patron info into sidebar,
 consolidating messages and warnings. Also unfinished!

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 circ/circulation.pl                           |   5 +-
 .../prog/en/css/staff-global.css              |  34 +++-
 .../prog/en/includes/circ-menu.inc            |  35 ++++
 .../prog/en/modules/circ/circulation.tmpl     | 170 +++++-------------
 .../en/modules/members/memberentrygen.tmpl    |  16 +-
 5 files changed, 118 insertions(+), 142 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index d6deedb14a..0a92e686ca 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -313,7 +313,6 @@ if ($borrowernumber) {
         $getreserv{nottransfered} = 0;
 
         $getreserv{reservedate}    = format_date( $num_res->{'reservedate'} );
-        $getreserv{biblionumber}   = $getiteminfo->{'biblionumber'};
         $getreserv{title}          = $getiteminfo->{'title'};
         $getreserv{itemtype}       = $itemtypeinfo->{'description'};
         $getreserv{author}         = $getiteminfo->{'author'};
@@ -326,6 +325,7 @@ if ($borrowernumber) {
             $getreserv{waiting} = 1;
 #     genarate information displaying only waiting reserves
         $getWaitingReserveInfo{title}        = $getiteminfo->{'title'};
+        $getWaitingReserveInfo{biblionumber}   = $getiteminfo->{'biblionumber'};
         $getWaitingReserveInfo{itemtype}    = $itemtypeinfo->{'description'};
         $getWaitingReserveInfo{author}        = $getiteminfo->{'author'};
         $getWaitingReserveInfo{reservedate}    = format_date( $num_res->{'reservedate'} );
@@ -722,7 +722,8 @@ $template->param(
       $borrower->{'dateexpiry'},    #format_date($borrower->{'dateexpiry'}),
     categorycode      => $borrower->{'categorycode'},
     streetaddress     => $borrower->{'address'},
-    emailaddress      => $borrower->{'emailaddress'},
+    email      => $borrower->{'email'},
+	emailpro           => $borrower->{'emailpro'},
     borrowernotes     => $borrower->{'borrowernotes'},
     city              => $borrower->{'city'},
     phone             => $borrower->{'phone'} || $borrower->{'mobile'},
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 2c5a3cd7c2..1e2268aa0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -17,27 +17,27 @@ form {
 }
 
 h1 {
-	font-size : 182%;
+	font-size : 161.6%;
 	font-weight : bold;
 }
 
 h2 {
-	font-size : 167%;
+	font-size : 146.5%;
 	font-weight : bold;
 }
 
 h3 {
-	font-size : 153.9%;
+	font-size : 131%;
 	font-weight : bold;
 }
 
 h4 {
-	font-size : 138.5%;	
+	font-size : 116%;	
 	font-weight : bold;
 }
 
 h5 {
-	font-size : 123.1%;	
+	font-size : 100%;	
 	font-weight : bold;
 }
 
@@ -478,4 +478,28 @@ div.message {
 	width : 33%;
 	margin : 1em;
 	padding : .5em;
+}
+
+div.patroninfo {
+	margin-bottom : .5em;
+	margin-top : -.5em;
+}
+
+div.patroninfo h5 {
+	background-color : #F5F0CC;
+	border-top :  1px solid #CCCC99;
+	border-left :  1px solid #CCCC99;
+	border-right :  1px solid #CCCC99;
+	margin-bottom : 0;
+	padding-bottom : .5em;
+}
+
+div.patroninfo ul {
+	border : 1px solid #CCCC99;
+	border-top : 0;
+	background-color : #F5F0CC;
+}
+
+div.patroninfo ul li {
+	list-style-type : none;
 }
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 0b21742da5..fa4d368afd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -1,8 +1,43 @@
+<!-- TMPL_IF NAME="borrowernumber" -->
+<div class="patroninfo"><h5><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h5>
+<ul>
+	        <li><!-- TMPL_IF NAME="streetaddress"-->
+            <!-- TMPL_VAR NAME="streetaddress" -->,
+        <!-- TMPL_ELSE -->
+            <span class="problem">No address stored for patron.</span>
+        <!-- /TMPL_IF --></li>
+       <li> <!-- TMPL_IF NAME="city" -->
+            <!-- TMPL_VAR NAME="city" -->
+        <!-- TMPL_ELSE -->
+            No city stored.
+        <!-- /TMPL_IF --></li>
+   <li> <!--TMPL_IF NAME="phone" -->
+        <!-- TMPL_VAR NAME="phone" -->
+    <!-- TMPL_ELSE -->
+        <span class="problem">No phone stored.</span>    
+    <!-- /TMPL_IF --></li>
+	    <!-- TMPL_IF NAME="email" -->
+   <li> <a href="mailto:<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" --></a></li>
+    <!-- /TMPL_IF -->
+		    <!-- TMPL_IF NAME="emailpro" -->
+   <li> <a href="mailto:<!-- TMPL_VAR NAME="emailpro" -->"><!-- TMPL_VAR NAME="emailpro" --></a></li>
+    <!-- /TMPL_IF -->
+    <li>Category: <!-- TMPL_VAR name="categorycode" --></li>
+</ul></div>
+<ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Details</a></li>
+	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Fines</a></li>
+	<li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Reading Record</a></li>
+	<!-- TMPL_IF NAME="CAN_user_parameters"--><li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber" -->">Modification Log</a></li><!-- /TMPL_IF --></ul>
+<!-- /TMPL_IF -->
+
 <ul>
 	<li><a href="/cgi-bin/koha/circ/returns.pl">Check In</a></li>
 	<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
 	<li>    <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
 </ul>
+
+
+
 <h5>Circulation Reports</h5>
 <ul class="left-nav">
 	<li>    <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="holds to retrieve off the shelf">Holds to pull</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 aaddbcb8e2..bb25287d55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -7,51 +7,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
-    /**
-    *  MoreBorrowerDetails();
-    *  This function displays or not borrower information.
-    */
-    function MoreBorrowerDetails() {
-        var div = document.getElementById('BorrowerDetails');
-        if(div.getAttribute('class') == "content_visible"){
-            div.removeAttribute('class');
-            div.setAttribute('class',"content_hidden");
-        }
-        else {
-            div.setAttribute('class',"content_visible");
-            div.setAttribute('style',"height:180px;");
-        }
-    }
-    /**
-    *  active(numlayer)
-    *  This function activate the numlayer div.
-    */
-    function active(numlayer){
-        for (i=0; i <= 1 ; i++ ) {
-            var tab;
-            try{
-                tab = document.getElementById(i+'XX');
-                tab.getAttribute('id'); // that throw an exception.
-            }
-            catch(e){
-                continue; // go to the next step.
-            }
-            if (numlayer==i) {
-                tab.setAttribute("class","content_visible");
-                var tabactive=document.getElementById('link'+i);
-                tabactive.removeAttribute("class");
-                tabactive.setAttribute("class","tab_active");
-            } else {
-                tab.setAttribute("class","content_hidden");
-                try {
-                    var tabactive=document.getElementById('link'+i);
-                    tabactive.removeAttribute("class");
-                    tabactive.setAttribute("class","tab_inactive");
-                }
-                catch(e){};
-            }
-        }
-    }
 	 $(document).ready(function() {
  		$('#patronlists').tabs();
 	 });
@@ -84,72 +39,47 @@
 <!-- TMPL_IF NAME="borrowernumber" -->
 
 <div id="BorrowerDetails">
-        <fieldset>
-            <legend><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
-            </legend>
-<!--             <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">details</a>
-                / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ&categorycode=<!-- TMPL_VAR name="categorycode" -->">edit</a> -->
-        <p>
-        <!--TMPL_IF Name="warndeparture"--><p class="problem"> Patron card expires on <!-- TMPL_VAR name="warndeparture" -->.</p><!--/TMPL_IF-->
-        <!-- TMPL_IF NAME="streetaddress"-->
-            <!-- TMPL_VAR NAME="streetaddress" -->,
-        <!-- TMPL_ELSE -->
-            <span class="problem">No address stored for patron.</span>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="city" -->
-            <!-- TMPL_VAR NAME="city" -->
-        <!-- TMPL_ELSE -->
-            No city stored.
-        <!-- /TMPL_IF -->
-    <!--TMPL_IF NAME="phone" -->
-        <!-- TMPL_VAR NAME="phone" -->
-    <!-- TMPL_ELSE -->
-        <span class="problem">No phone stored.</span>    
-    <!-- /TMPL_IF -->
-    </p>
-    <!-- TMPL_IF NAME="emailaddress" -->
-    <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a>
-    <!-- /TMPL_IF -->
-    <p>Category: <!-- TMPL_VAR name="categorycode" --></p>
-    </fieldset>
+
+       
+
     <!-- TMPL_IF NAME="overduecount" -->
         <span class="problem"><b><big>This borrower has <!-- TMPL_VAR name="overduecount" --> overdue(s) items</big></b></span>
     <!--/TMPL_IF-->
     <!-- TMPL_IF NAME="flagged" -->
-        <fieldset>
-            <legend class="problem">Warning</legend>
-            <!-- TMPL_IF NAME="gna" -->
-                <p>Address: Patron's address in doubt</p>
-            <!-- /TMPL_IF -->
-        
-            <!-- TMPL_IF NAME="lost" -->
-                <p>Lost: Patron's card is lost</p>
-            <!-- /TMPL_IF -->
-        
-            <!-- TMPL_IF NAME="dbarred" -->
-                <p>
-                Restricted: Patron's account is restricted <a href="/cgi-bin/koha/members/setdebar.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;status=0">Lift restriction</a>
-                </p>
-            <!-- /TMPL_IF -->
-        
-            <!-- TMPL_IF name="odues" -->
-            <p>
-                <!-- TMPL_IF name="nonreturns" -->
-            Overdues: See highlighted items <a href="JavaScript:active(1)">below</a>
-                <!-- /TMPL_IF -->
-            </p>
-            <!-- /TMPL_IF --> <!-- odues -->
-        
-            <!-- TMPL_IF NAME="charges" -->
-            <p>
-            Fines: Patron has 
+        <div class="warning">
+		<h3>Warning</h3>
+		<ul>
+			<!--TMPL_IF Name="warndeparture"--><li> Patron card expires on <!-- TMPL_VAR name="warndeparture" -->.</li><!--/TMPL_IF-->
+            <!-- TMPL_IF NAME="gna" --><li>Address: Patron's address in doubt</li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="lost" --><li>Lost: Patron's card is lost</li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="dbarred" --><li>
+                Restricted: Patron's account is restricted <a href="/cgi-bin/koha/members/setdebar.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;status=0">Lift restriction</a></li><!-- /TMPL_IF -->
+        	<!-- TMPL_IF name="odues" --><li><!-- TMPL_IF name="nonreturns" -->Overdues: See highlighted items <a href="JavaScript:active(1)">below</a><!-- /TMPL_IF --></li>
+            <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="charges" --><li>Fines: Patron has 
             <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Outstanding fines</a>.
-            Make <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a>
-            </p>
+            Make <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="WaitingReserveLoop" -->	
+<li>
+    <strong>Holds waiting:</strong>
+        <!-- TMPL_LOOP NAME="WaitingReserveLoop" -->
+            <ul> 
+                <li> <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title"--></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"-->,<!-- /TMPL_IF --> reserved on <!-- TMPL_VAR NAME="reservedate"--> 
+            <!-- TMPL_IF NAME="waitingat" -->
+                waiting at : <!-- TMPL_VAR NAME="waitingat" -->	
             <!-- /TMPL_IF -->
+                </li>
+            </ul>
+    <!-- /TMPL_LOOP -->
+</li>
+
+<!-- /TMPL_IF -->
+
+
             <!-- this part must be removed if we keep the new waiting infos display-->
             <!-- TMPL_IF NAME="waiting" -->
-            <p>
+            <li>
             Reserves waiting:
                 <!-- TMPL_LOOP name="itemswaiting" -->
                 <li>
@@ -157,14 +87,15 @@
                 (<!-- TMPL_VAR name="barcode" --> -- <!-- TMPL_VAR name="branchname" -->)
                 </li>
                 <!-- /TMPL_LOOP --> <!-- itemswaiting -->
-            </p>
+            </li>
             <!-- /TMPL_IF --> <!-- waiting -->
             <!-- end of this part must be removed if we keep the new waiting infos display-->
         
             <!-- TMPL_IF name="notes" -->
-            <p>Notes: <!-- TMPL_VAR name="notesmsg" --></p>
+            <li>Notes: <!-- TMPL_VAR name="notesmsg" --></li>
             <!-- /TMPL_IF --> <!-- notes -->
-        </fieldset>
+			</ul>
+        </div>
     <!-- /TMPL_IF --> <!-- flagged -->
 
 </div> <!-- id=BorrowerDetails -->
@@ -304,7 +235,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 <!-- TMPL_IF NAME="borrowernumber" -->
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform">
 <fieldset id="circ_circulation_issue">
-    <legend>Checkout an item</legend>
+    <legend>Check Out to <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></legend>
 
     <p>
     <label for="barcode">Enter item barcode: </label><input type="text" name="barcode" class="focus" size="14" />
@@ -676,27 +607,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 </fieldset>
 </form>
 
-<!-- TMPL_IF NAME="WaitingReserveLoop" -->	
-<fieldset id="circ_circulation_issue">
-    <legend class="problem">Holds waiting</legend>
-        This patron has holds waiting:
-        <!-- TMPL_LOOP NAME="WaitingReserveLoop" -->
-        <p>
-            <ul> 
-                <li> <!-- TMPL_VAR NAME="title"--> (<!-- TMPL_VAR NAME="itemtype"-->), author : <!-- TMPL_VAR NAME="author"-->, reserved the : <!-- TMPL_VAR NAME="reservedate"--> 
-            <!-- TMPL_IF NAME="waitingat" -->
-                waiting at : <!-- TMPL_VAR NAME="waitingat" -->	
-            <!-- /TMPL_IF -->
-                </li>
-            </ul>
-        </p>
-    <!-- /TMPL_LOOP -->
-</fieldset>
-
-<!-- /TMPL_IF -->
-
 <div id="patronlists">
-    <h2><!-- TMPL_VAR NAME="firstname"--> <!-- TMPL_VAR NAME="surname"--> (<!-- TMPL_VAR NAME="cardnumber"-->) has</h2>
 
 <ul>   
 <li>    <!--TMPL_IF NAME="issuecount"-->
@@ -716,8 +627,8 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 <div id="checkouts">
     <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
     <p>
-    <span class="click" onclick="window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page')">Print Page</span>
-    / <span class="click" onclick="window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip')">Print Slip</span>
+    <a href="#" onclick="window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page'); return false;">Print Page</a>
+    / <a href="#" onclick="window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip'); return false;">Print Slip</a>
     </p>
     
     <input type="hidden" value="circ" name="destination" />
@@ -884,7 +795,6 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 </div>
 <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
-<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 43f0d8017a..49f3ad7d08 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -15,14 +15,13 @@ border-bottom : 1px solid black;
 float : left;
 font-size : 90%;
 clear : left;
-margin: 1.5em 0 0 0;  
+margin: .9em 0 0 0;  
 padding: 0;
 width: 100%; 
 }
 
 legend {  
-margin-left: 1em;  
-color: #000000;  
+margin-left: 1em;
 font-weight: bold;
 font-size : 110%;
 }
@@ -63,6 +62,13 @@ ol.radio label.radio {
 	width : 12em;
 	margin-right : 1em;
 }
+
+fieldset.action {
+	float : none;
+	border : none;
+	margin : 0;
+	padding : 1em 0 .3em 0;
+}	
 </style>
 </head>
 <body>
@@ -631,13 +637,13 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 		<!-- /TMPL_UNLESS -->	
 </div>
 <!-- /TMPL_IF -->
-    <div id="action">
+    <fieldset class="action">
       <!-- TMPL_IF NAME="opadd" -->
         <input type="button" name="step4" onclick="return check_form_borrowers(); unique();" value="Add member" />
       <!-- TMPL_ELSE -->
         <input type="button" name="step4" onclick="return check_form_borrowers();" value="Modify member" />
       <!--/TMPL_IF -->
-    </div>
+    </fieldset>
 </form>
   
 </div>
-- 
2.39.5