Attachment 2446 Details for Bug 4984 – Proposed fix for 3.0.x

[patch] Proposed fix for 3.0.x

0001-3.0.x-Fix-for-Bug-4984-Invalid-XHTML-in-staff-client.patch (text/plain), 10.97 KB, created by Owen Leonard on 2010-08-03 16:20:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2010-08-03 16:20:40 UTC

Size: 10.97 KB

patch

obsolete

>From 51614527343f46a04d532a493a2ac08cdbb8e6c6 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 3 Aug 2010 12:18:12 -0400
>Subject: [PATCH] 3.0.x Fix for Bug 4984, Invalid XHTML in staff client search results
>Content-Type: text/plain; charset="utf-8"
>
>---
> .../intranet-tmpl/prog/en/includes/facets.inc      |    6 +++---
> .../prog/en/includes/page-numbers.inc              |    6 +++---
> .../prog/en/modules/catalogue/results.tmpl         |   14 ++++++--------
> 3 files changed, 12 insertions(+), 14 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>index 95f65e8..26f635f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>@@ -3,7 +3,7 @@
> <div id="search-facets">
> <h4>Refine your search</h4>
> <ul>
>-	<li>Availability<ul><li>Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/catalogue/search.pl?&sort_by=">Show all items</a>Limit to <a href="/cgi-bin/koha/catalogue/search.pl?&sort_by=&amp;limit=available">currently available items.</a></li></ul>
>+	<li>Availability<ul><li>Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/catalogue/search.pl?&amp;sort_by=">Show all items</a>Limit to <a href="/cgi-bin/koha/catalogue/search.pl?&amp;sort_by=&amp;limit=available">currently available items.</a></li></ul>
> 	 <li>(related searches: )</li>
> 	</li>
> 
>@@ -17,8 +17,8 @@
> Series
> Libraries
> <ul>
>-        <li><a href="/cgi-bin/koha/catalogue/search.pl?&sort_by=&amp;limit=:" title=""></a> ) --></li>
>-        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?&amp;sort_by=&amp;offset=&amp;expand=#">Show More</a></li>
>+        <li><a href="/cgi-bin/koha/catalogue/search.pl?&amp;sort_by=&amp;limit=:" title=""></a> ) --></li>
>+        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?&amp;sort_by=&amp;offset=&amp;expand=#">Show More</a></li>
> 
> </ul></li>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc
>index e7e6d0e..be2e724 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc
>@@ -1,7 +1,7 @@
> <div class="pages">
>     
>-        <a class="nav" href="/cgi-bin/koha/catalogue/search.pl?&amp;offset=&amp;sort_by=">&lt;&lt; Previous</a>
>-    <span class="current"></span>        <a class="nav" href="/cgi-bin/koha/catalogue/search.pl?&amp;offset=&amp;sort_by="></a>
>+        <a class="nav" href="/cgi-bin/koha/catalogue/search.pl?&amp;offset=&amp;sort_by=">&lt;&lt; Previous</a>
>+    <span class="current"></span>        <a class="nav" href="/cgi-bin/koha/catalogue/search.pl?&amp;offset=&amp;sort_by="></a>
>     
>-        <a class="nav" href="/cgi-bin/koha/catalogue/search.pl?&amp;offset=&amp;sort_by=">Next &gt;&gt;</a>
>+        <a class="nav" href="/cgi-bin/koha/catalogue/search.pl?&amp;offset=&amp;sort_by=">Next &gt;&gt;</a>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
>index 8185e0f..5351e01 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
>@@ -163,7 +163,7 @@ function yuiZ3950button() {
> 
>     
>         <div id="searchheader">
>-			<form method="post" name="fz3950" class="fz3950">
>+			<form method="post" name="fz3950" class="fz3950" action="/cgi-bin/koha/catalogue/search.pl">
> 					<span id="z3950searchc"><input type="button" id="z3950search" value="z39.50 Search" onclick="PopupZ3950(); return false;" /></span>
> 			</form>
>             <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="sortbyform">
>@@ -275,10 +275,9 @@ function yuiZ3950button() {
>             </form>
>         
> 
>-            
>+            
>             <div id="facets">
>                 <dl>
>-                
>                 
>                 
>                     <dt id="facets1" onclick="var Elt=document.getElementById('facets_list');if (Elt.style.display!='block'){Elt.style.display='block';} else {Elt.style.display='none';}">
>@@ -310,10 +309,9 @@ function yuiZ3950button() {
>                     </dd>
>                 
>                 
>-                 
>                 </dl>
>             </div>
>-            
>+             
> 
>             <div id="searchresults">
>                     
>@@ -341,8 +339,8 @@ function yuiZ3950button() {
>                                      <a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=">
>                                      <a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=">
> 									
>-                                            <b>No title</b>
>-                                        </a>  ,  
>+                                            <b>No title</b>
>+                                        </a>  ,  
> , , 
>                                 </p>
> 							    <p>
>@@ -361,7 +359,7 @@ function yuiZ3950button() {
>                                 
>                                     </p>
>                                 
>-                                        
>+                                        
> 										Edition: 
>                                         Description: 
>                                          ; 
>-- 
>1.7.0.4
>

Actions: View | Diff | Splinter Review

Attachments on bug 4984: 2348 | 2446 | 2948