Fixing some menu formatting

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

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 727e0b6..49748f8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -469,10 +469,7 @@ div.patroninfo {
 }
 
 div.patroninfo h5 {
-       background-color : #FCFAF3;
-       /*border-top :  1px solid #CCCC99;
-       border-left :  1px solid #CCCC99;*/
-       border-right :  1px solid #CCCC99;
+       border-right :  1px solid #000;
        margin-bottom : 0;
        padding-left : .5em;
        padding-top : .3em;
@@ -480,11 +477,9 @@ div.patroninfo h5 {
 }
 
 div.patroninfo ul {
-       /*border : 1px solid #CCCC99;*/
-       border-right : 1px solid #CCCC99;
+       border-right : 1px solid #000;
        border-bottom : 0;
        border-top : 0;
-       background-color : #FCFAF3;
        padding-bottom : .5em;
 }
 
@@ -493,11 +488,8 @@ div.patroninfo ul li, div.patronviews ul li {
 }
 
 div.patronviews {
-       background-color : #FDFCF7;
-       /*border-left : 1px solid #CCCC99;
-       border-bottom : 1px solid #CCCC99;*/
-       border-right :  1px solid #CCCC99;
-       border-top : 1px solid #CCCC99;
+       border-right :  1px solid #000;
+       border-top : 1px solid #000;
        margin-bottom : .5em;
        padding : .5em 0 .5em 0;
 }
@@ -1089,4 +1081,17 @@ h1#logo a {
        padding:44px 0 0;
        text-decoration:none;
        width:180px;
+}
+
+#closewindow {
+       margin-top : 2em;
+       text-align : center;
+}
+
+#closewindow a {
+       font-weight : bold;     
+}
+
+.patroninfo+#menu {
+       margin-right : 0;
 }
\ 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 da05e80..7a605cd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -27,11 +27,14 @@
     <!-- /TMPL_IF -->
     <li>Category: <!-- TMPL_VAR name="categorycode" --></li>
 </ul></div>
-<div class="patronviews">
-<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>
+<!-- TMPL_IF NAME="borrowernumber" -->
+<div id="menu">
+<ul>
+       <!-- TMPL_IF NAME="detailview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Details</a></li>
+       <!-- TMPL_IF NAME="finesview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Fines</a></li>
        <!-- TMPL_IF NAME="intranetreadinghistory" --><li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Reading Record</a></li><!-- /TMPL_IF -->
-       <!-- 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 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>
 </div>
 <!-- /TMPL_IF -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
index 2614e05..36aee33 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
@@ -1,9 +1,10 @@
 <!-- TMPL_IF NAME="borrowernumber" -->
-<h5>Patron Details</h5>
+<div id="menu">
 <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>
+       <!-- TMPL_IF NAME="detailview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Details</a></li>
+       <!-- TMPL_IF NAME="finesview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Fines</a></li>
        <!-- TMPL_IF NAME="intranetreadinghistory" --><li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Reading Record</a></li><!-- /TMPL_IF -->
        <!-- 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>
+</div>
 <!-- /TMPL_IF -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index 9615fd9..9983c04 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -10,6 +10,9 @@ function _(s) { return s } // dummy function for gettext
                $('#header_search').find('div:visible').find('input').eq(0).focus();
            }   
        });
+       $(".close").click(function(){
+               window.close();
+       });
  });
  
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
index 9885b4b..d5a4e4d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -15,47 +15,6 @@
        <div class="yui-b">
 
 <h2>Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></h2>
-  
-  <form method="post" action="/cgi-bin/koha/circ/overdue.pl">
-  <div id="filters">Filter on :<br />
-    Name or cardnumber :<input type="text" name="borname" value="<!--TMPL_VAR Name="borname"-->">
-    Patron category :<select name="borcat" id="borcat"><option value="">Any</option>
-      <!-- TMPL_LOOP name="borcatloop" -->
-        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="catname" --></option>
-      <!-- /TMPL_LOOP -->
-      </select>
-      
-      
-    Patron flags :<!--TMPL_VAR Name="CGIflags" --><br/>
-      Item type :<select name="itemtype" id="itemtype"><option value="">Any</option>
-      <!-- TMPL_LOOP name="itemtypeloop" -->
-        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemtypename" --></option>
-      <!-- /TMPL_LOOP -->
-      </select>
-    
-    
-    Library :<select name="branch" id="branch">
-        <option value="">Any</option>
-      <!-- TMPL_LOOP name="branchloop" -->
-        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
-      <!-- /TMPL_LOOP -->
-      </select><br/>
-    Show any items currently issued:<input type="checkbox" name="showall" value="show" <!--TMPL_IF Name="showall"-->checked="checked"<!--/TMPL_IF-->>
-    
-    
-    Sort By<select name="order" tabindex="0" size="1" id="order">
-<option <!--TMPL_UNLESS Name"order"-->selected<!-- /TMPL_UNLESS--> value="">Due Date</option>
-<option  value="borrower">Patron</option>
-<option  value="title">Title</option>
-<option  value="barcode">Barcode</option>
-<option  value="date_due desc">Due Date desc</option>
-<option  value="borrower desc">Patron desc</option>
-<option  value="title desc">Title desc</option>
-<option  value="barcode desc">Barcode</option>
-</select>
-      <input TYPE="submit" value="Apply Filter" class="button reports">
-   </div>   
-  </form>
 
 <div class="searchresults">
 <table>
@@ -84,7 +43,7 @@
 </div>
 </div>
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="overdue-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
index 4bc73db..add0071 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
@@ -1,38 +1,39 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Guarantor Search</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+   <style type="text/css">
+   #custom-doc { width:44.46em;*width:43.39em;min-width:578px; margin:auto; text-align:left; }
+   </style>
 </head>
-<body>
 
-<div id="doc" class="yui-t7">
+<div id="custom-doc" class="yui-t7">
    <div id="bd">
+       <div class="yui-g">
        
 
-<h1>Search for guarantor</h1>
+<h3>Search for guarantor</h3>
        <form action="/cgi-bin/koha/members/guarantor_search.pl" method="post">
-               <input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->" /> Ordered by
+               <fieldset>
+               <input type="text" name="member" id="member" value="<!-- TMPL_VAR NAME="member" -->" class="focus" /> Ordered by
                <select name="orderby">
                        <option value="surname,firstname">Surname</option>
                        <option value="cardnumber">Cardnumber</option>
-               </select>
-               <input type="submit" class="button" value="Search" />
+               </select> <input type="submit" class="button" value="Search" /></fieldset>
        </form>
 
 <!--TMPL_IF NAME="results" -->
-       <p>Searched for <!-- TMPL_VAR NAME="member" -->, <!-- TMPL_VAR Name ="numresults" --> borrower(s) found:</p>
+       <p>Searched for <span class="ex"><!-- TMPL_VAR NAME="member" --></span>, <!-- TMPL_VAR Name ="numresults" --> patron(s) found:</p>
        <table>
                <tr>
                        <th>Cardnumber</th>
-                       <th>Surname</th>
-                       <th>Firstname</th>
+                       <th>Name</th>
                        <th>Date of birth</th>
                        <th>Address</th>
                </tr>
                <!-- TMPL_LOOP NAME="resultsloop" -->
                        <tr>
                                <td><!-- TMPL_VAR NAME="cardnumber" --></td>
-                               <td><p><a href="javascript:window.opener.document.form.guarantorid.value=<!-- TMPL_VAR NAME="borrowernumber" -->;window.opener.document.form.guarantorsearch.value='Modify Guarantor';window.opener.document.form.contactname.value='<!-- TMPL_VAR NAME="surname" ESCAPE=JS -->';window.opener.document.form.contactfirstname.value='<!-- TMPL_VAR NAME="firstname" ESCAPE=JS -->';window.opener.document.form.address.value='<!-- TMPL_VAR NAME="address" ESCAPE=JS -->';window.opener.document.form.city.value='<!-- TMPL_VAR NAME="city" ESCAPE=JS -->';window.opener.document.form.zipcode.value='<!-- TMPL_VAR NAME="zipcode" ESCAPE=JS -->';self.close();"><!-- TMPL_VAR NAME="surname" --></a></p>
-                               <td><b><!-- TMPL_VAR NAME="firstname" --></b></td> 
+                               <td><a href="javascript:window.opener.document.form.guarantorid.value=<!-- TMPL_VAR NAME="borrowernumber" -->;window.opener.document.form.guarantorsearch.value='Modify Guarantor';window.opener.document.form.contactname.value='<!-- TMPL_VAR NAME="surname" ESCAPE=JS -->';window.opener.document.form.contactfirstname.value='<!-- TMPL_VAR NAME="firstname" ESCAPE=JS -->';window.opener.document.form.address.value='<!-- TMPL_VAR NAME="address" ESCAPE=JS -->';window.opener.document.form.city.value='<!-- TMPL_VAR NAME="city" ESCAPE=JS -->';window.opener.document.form.zipcode.value='<!-- TMPL_VAR NAME="zipcode" ESCAPE=JS -->';self.close();"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a></td> 
                                <td><!-- TMPL_VAR NAME="dateofbirth" --></td>
                                <td><p><!-- TMPL_VAR NAME="address" --> <!-- TMPL_VAR NAME="city" --></p></td>
                        </tr>
@@ -40,5 +41,7 @@
        </table>
 <!--/TMPL_IF-->
 
+<div id="closewindow"><a href="#" class="close">Cancel</a></div>
+</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 9e7ccc5..e126b83 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -57,7 +57,7 @@ patron <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
                                Duplicate suspected
                                <a href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" >Detail</a>
                                Duplicate ?
-                               <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->">Yes</a> 
+                               <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&amp;category_type=<!--TMPL_VAR NAME="check_categorytype"-->">Yes</a> 
                                &nbsp;&nbsp;&nbsp; No, it is not
                                <!-- TMPL_IF NAME="checked"-->
                                        <input type="checkbox" checked="checked" name="answernodouble" >

diff --git a/members/boraccount.pl b/members/boraccount.pl
index 006d6b7..35cbbbf 100755 (executable)
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -103,6 +103,7 @@ $template->param(
                            branchcode => $data->{'branchcode'},
                    total           => sprintf("%.2f",$total),
                 totalcredit => $totalcredit,
+                               finesview => 1,
                 accounts        => \@accountrows );
 
 output_html_with_http_headers $input, $cookie, $template->output;

diff --git a/members/moremember.pl b/members/moremember.pl
index b85a6b2..9eb3ffa 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -299,6 +299,7 @@ my $branch=C4::Context->userenv->{'branch'};
 $template->param($data);
 
 $template->param(
+       detailview => 1,
     roaddetails      => $roaddetails,
     borrowernumber   => $borrowernumber,
     reregistration   => $reregistration,