projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9949b23)
bug 2908 followup - use "list", not "shelf"
authorGalen Charlton <galen.charlton@liblime.com>
Mon, 12 Jan 2009 22:16:47 +0000 (16:16 -0600)
committerHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Tue, 26 May 2009 19:15:24 +0000 (21:15 +0200)
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tmpl patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl patch | blob | history

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tmpl
index b82976b..204fd20 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelf.tmpl
@@ -1,11 +1,11 @@
 <SUBJECT>
-Your Shelf : <!-- TMPL_VAR NAME="shelfname" -->
+Your List : <!-- TMPL_VAR NAME="shelfname" -->
 <END_SUBJECT>
 
 <HEADER>
 Hi,
 
-Here is your shelf called <!-- TMPL_VAR NAME="shelfname" -->, sent from our Online Catalog.
+Here is your list called <!-- TMPL_VAR NAME="shelfname" -->, sent from our Online Catalog.
 
 Please note that the attached file is a MARC biblographic records file
 which can be imported into a Personal Bibliographic Software like EndNote,
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl
index b55856a..41f7d32 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Sending Your Shelf
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Sending Your List
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding: 1em;" id="sendbasket">
@@ -10,7 +10,7 @@
         <p><a class="close focus" href="#">Close window</a></p>
     <!-- /TMPL_IF  -->
     <!-- TMPL_IF NAME="error" -->
-    <p>Problem sending the shelf...</p>
+    <p>Problem sending the list...</p>
     <!-- /TMPL_IF -->
     
 <!-- TMPL_ELSE -->
@@ -18,7 +18,7 @@
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post">
 
 <fieldset class="rows"> 
-<legend>Sending your shelf</legend>
+<legend>Sending your list</legend>
 <ol>   <li>
         <label for="email">Email Address:</label>
         <input type="text" id="email" name="email" size="43" class="focus" />
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index 3e39e3d..9a18033 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -290,7 +290,11 @@ $.tablesorter.addParser({
           <!-- /TMPL_IF -->
         </form>
       <!-- /TMPL_IF -->&nbsp;
+<<<<<<< HEAD:koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
       <a href="#" class="send" onclick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelf" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Send List</a>
+=======
+      <a href="#" class="send" onClick="open(CGIBIN+'opac-sendshelf.pl?shelfid=<!-- TMPL_VAR NAME="shelf" -->','win_form','dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100')">Send List</a>
+>>>>>>> b99e65c... bug 2908 followup - use "list", not "shelf":koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
     </td>
                </tr>
             <!-- /TMPL_LOOP -->
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git