From f7d237976490b31f67bd5d79701b6a206ed37c5e Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 19 May 2011 13:42:50 -0400
Subject: [PATCH] Fix for Bug 6375, Markup and style corrections for overdue
 report
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

[2011.05.21] F. Demians - I confirm the bug and solution

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../prog/en/css/staff-global.css              |  9 +++++++++
 .../prog/en/modules/circ/overdue.tt           | 19 ++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

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 09f00b4bce..59011e26dc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -556,6 +556,15 @@ div.yui-b fieldset.brief li.radio input {
 	padding:0.3em 0;
 }
 
+div.yui-b fieldset.brief fieldset {
+	margin : 0 .3em;
+	padding : .5em;
+}
+
+div.yui-b fieldset.brief fieldset legend {
+	font-size : 85%;
+}
+
 fieldset.rows {  
 border-width : 1px;
 border-bottom : 1px solid #666;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index 67df77c147..c511b1c03c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -118,7 +118,7 @@
         <td>[% overdueloo.duedate %]</td>
         <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overdueloo.borrowernumber %]">[% overdueloo.name %]</a>
         [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email %]?subject=Overdue: [% overdueloo.title |html %]">email</a>][% END %]
-        ([% IF ( overdueloo.phone ) %][% overdueloo.phone %][% ELSIF ( overdueloo.mobile ) %][% overdueloo.mobile %][% ELSIF ( overdueloo.phonepro ) %][% overdueloo.phonepro %][% END %])</td>
+        [% IF ( overdueloo.phone ) %]([% overdueloo.phone %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro %])[% END %]</td>
         <td>[% overdueloo.branchcode %]</td>
         <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% overdueloo.title |html %]  [% overdueloo.subtitle %]</a> [% IF ( overdueloo.author ) %], by [% overdueloo.author %][% END %]
         </td>
@@ -137,12 +137,11 @@
 <form method="post" action="/cgi-bin/koha/circ/overdue.pl">
   <fieldset class="brief">
 <h4>Filter On:</h4>
+	<fieldset><legend>Date due:</legend>
 	<ol>
-    <li style="border: dashed; border-width:1px;">Date due:
-	<label for="dateduefrom">From:
+    <li><label for="dateduefrom">From:</label>
+	<input type="text" id="dateduefrom" name="dateduefrom" size="10" value="[% dateduefrom %]" />
 	<img src="[% themelang %]/lib/calendar/cal.gif" id="dateduefrom_button" alt="Show Calendar" />
-	</label>
-	<input type="text" id="dateduefrom" name="dateduefrom" size="20" value="[% dateduefrom %]" />
 	<script language="JavaScript" type="text/javascript">
 	    Calendar.setup(
 	    {
@@ -152,11 +151,11 @@
 	    }
 	    );
 	</script>
-
-	<label for="datedueto">To:
+	</li>
+	<li>
+	<label for="datedueto">To:</label>
+	<input type="text" id="datedueto" name="datedueto" size="10" value="[% datedueto %]" />
 	<img src="[% themelang %]/lib/calendar/cal.gif" id="datedueto_button" alt="Show Calendar" />
-	</label>
-	<input type="text" id="datedueto" name="datedueto" size="20" value="[% datedueto %]" />
 	<script language="JavaScript" type="text/javascript">
 	    Calendar.setup(
 	    {
@@ -167,6 +166,8 @@
 	    );
 	</script>
     </li>
+    </ol></fieldset>
+    <ol>
     <li><label>Name or cardnumber:</label><input type="text" name="borname" value="[% borname |html %]" /></li>
     <li><label>Patron category:</label><select name="borcat" id="borcat"><option value="">Any</option>
       [% FOREACH borcatloo IN borcatloop %]
-- 
2.39.5