projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6594530)
Fix for Bug 2743, Z39.50, not z39.50
authorOwen Leonard <oleonard@myacpl.org>
Mon, 28 Dec 2009 16:17:38 +0000 (11:17 -0500)
committerHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Thu, 31 Dec 2009 09:58:03 +0000 (10:58 +0100)
koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tmpl patch | blob | history

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index 91ebe4c..83cad83 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -138,7 +138,7 @@ function confirm_items_deletion() {
                new YAHOO.widget.Button({
                        id: "z3950search", 
                        type: "button", 
-                       label: _("z39.50 Search"), 
+                       label: _("Z39.50 Search"), 
                        container: "z3950searchc",
                        onclick: {fn:function(){PopupZ3950()}}
                });
@@ -177,7 +177,7 @@ function confirm_items_deletion() {
         <!-- TMPL_UNLESS name="bi_notforloan" -->
        <!-- TMPL_UNLESS NAME="norequests" --><li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
        <!-- /TMPL_IF -->
-       <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" --><li id="z3950searchc"><input type="button" id="z3950search" value="z39.50 Search" onclick="PopupZ3950(); return false;" /></li><!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" --><li id="z3950searchc"><input type="button" id="z3950search" value="Z39.50 Search" onclick="PopupZ3950(); return false;" /></li><!-- /TMPL_IF -->
     </ul>
 </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
index d20789e..a555bab 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-toolbar.inc
@@ -55,7 +55,7 @@
         new YAHOO.widget.Button({
                 id: "z3950search",
                 type: "button",
-                label: _("z39.50 Search"),
+                label: _("Z39.50 Search"),
                 container: "newmenuc",
                 onclick: {fn:function(){PopupZ3950()}}
         });
@@ -79,7 +79,7 @@
                        </select>
                        <input type="submit" value="Add Record Without Search" />
                </form>
-        <a id="z3950search" onclick="PopupZ3950(); return false;">z39.50 Search</a>
+        <a id="z3950search" onclick="PopupZ3950(); return false;">Z39.50 Search</a>
     <!-- /TMPL_IF -->  
 
   </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
index 9a628a0..93b498c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="else" -->z39.50 Servers<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_form" --> z39.50 Servers &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->New z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" -->z39.50 Servers &rsaquo; Confirm Deletion<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" -->z39.50 Servers &rsaquo; z39.50 Server Added<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Servers &rsaquo; z39.50 Server Deleted<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="else" -->Z39.50 Servers<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_form" --> Z39.50 Servers &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify Z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->New Z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Z39.50 Servers &rsaquo; Confirm Deletion<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->Z39.50 Servers &rsaquo; Z39.50 Server Added<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->Z39.50 Servers &rsaquo; Z39.50 Server Deleted<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_IF NAME="add_form" -->
@@ -71,11 +71,11 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="z3950-admin-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="else" -->z39.50 Servers<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_form" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">z39.50 Servers</a> &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->New z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">z39.50 Servers</a> &rsaquo; Confirm Deletion<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">z39.50 Servers</a> &rsaquo; z39.50 Server Added<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="delete_confirmed" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">z39.50 Servers</a> &rsaquo; z39.50 Server Deleted<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="else" -->Z39.50 Servers<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_form" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify Z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->New Z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; Confirm Deletion<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; Z39.50 Server Added<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" --> <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a> &rsaquo; Z39.50 Server Deleted<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -283,7 +283,7 @@
        }       //]]>
        </script>
        <ul class="toolbar">
-       <li><a id="newserver" href="/cgi-bin/koha/admin/z3950servers.pl?op=add_form">New z39.50 Server</a></li>
+       <li><a id="newserver" href="/cgi-bin/koha/admin/z3950servers.pl?op=add_form">New Z39.50 Server</a></li>
 </ul></div>
 
 <h3>Z39.50 Servers Administration</h3>
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 9650adb..d62fcd3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -236,14 +236,14 @@ function GetZ3950Terms(){
                 <!-- /TMPL_IF -->
                <span class="addto"></span>
 
-                               <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" --><input type="button" onclick="PopupZ3950(); return false;" value="z39.50 Search"/><!-- /TMPL_IF -->
+                               <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" --><input type="button" onclick="PopupZ3950(); return false;" value="Z39.50 Search"/><!-- /TMPL_IF -->
             </div>
         </div>
     <!-- TMPL_IF NAME="stopwords_removed" --><div><p class="tip">Ignored the following common words: "<!-- TMPL_VAR NAME="stopwords_removed" -->"<p></div><!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
         <div id="searchheader">
                        <form method="post" name="fz3950" class="fz3950bigrpad">
-                               <span id="z3950searchc"><input type="button" id="z3950search" value="z39.50 Search" onclick="PopupZ3950(); return false;" /></span>
+                               <span id="z3950searchc"><input type="button" id="z3950search" value="Z39.50 Search" onclick="PopupZ3950(); return false;" /></span>
                        </form>
             <h3>No results found</h3>
         <!-- TMPL_IF NAME="searchdesc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index 41d78ff..f14bbc6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -639,7 +639,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
                new YAHOO.widget.Button({
                                             id: "z3950search", 
                                             type: "button", 
-                                            label: _("z39.50 Search"), 
+                                            label: _("Z39.50 Search"), 
                                             container: "z3950searchc",
                                                                                        onclick: {fn:function(){PopupZ3950()}}
                                         });
@@ -650,7 +650,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 
                <ul class="toolbar">
                        <li><input id="addbiblio" type="submit" value="Save" /></li>
-                       <li id="z3950searchc"><input type="button" id="z3950search" value="z39.50 Search" onclick="PopupZ3950(); return false;" /></li>
+                       <li id="z3950searchc"><input type="button" id="z3950search" value="Z39.50 Search" onclick="PopupZ3950(); return false;" /></li>
                        <li id="changeframework"><label for="Frameworks">Change framework: </label>
                        <select name="Frameworks" id="Frameworks" onchange="Changefwk(this);">
                                        <option value="">Default</option>                
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tmpl
index 9d29ef4..0ef48bc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tmpl
@@ -133,7 +133,7 @@ To perform a Z39.50 search
        </ul>
        </li>
        <li>
-       Click 'z39.50 Search'</li>
+       Click 'Z39.50 Search'</li>
        <li>
        Alter your search and choose Z39.50 targets from the pop-up window
        </li>
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git