Customizing new 2.2 templates

diff --git a/koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl b/koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl
index e026f44..c684a45 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl
@@ -1,51 +1,43 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
-<div id="mainbloc">
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Suggestion Management
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<div id="main">
 
 <!-- TMPL_IF name="op_else" -->
-       <h1 class="acquisition">Suggestions</h1>
+       <h1>Suggestions Management</h1>
+       <form method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
+       <input type="hidden" name="op" value="aorr_confirm">
        <table>
                <tr>
-                       <th class="acquisition">Status</th>
-                       <th class="acquisition">Suggestion</th>
-                       <th class="acquisition">Suggested by</th>
+                       <th>Status</th>
+                       <th>Suggestion</th>
+                       <th>Suggested by</th>
                </tr>
-               <form method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
-                       <input type="hidden" name="op" value="aorr_confirm">
                <!-- TMPL_LOOP NAME="suggestions_loop" -->
-                       <tr>
+                       <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
                                <td>
                                        <select name="aorr">
-                                               <option value=""></option>
+                                               <option value=""> -- Choose Action --</option>
                                                <option value="R<!--TMPL_VAR name="suggestionid" -->">Reject</option>
                                                <option value="A<!--TMPL_VAR name="suggestionid" -->">Accept</option>
                                        </select>
                                </td>
-                               <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-                                       <p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
-                                       <p>
-                                               <!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
-                                               <!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
-                                               <!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF -->
-                                               <!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF -->
-                                               <!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF -->
-                                               <!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF -->
-                                               <!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR name="copyrightdate" -->)</i></p> <!-- /TMPL_IF -->
+                               <td><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br>
+                                       <!-- TMPL_IF name="copyrightdate" -->&copy <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->
 
                                </td>
-                               <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+                               <td>
                                        <!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
                                </td>
                        </tr>
                <!-- /TMPL_LOOP -->
-               <tr>
-                       <td>
-                               <input type="submit" class="button acquisition" value="change status">
-                       </td>
-                       <td> &nbsp; </td>
-                       <td> &nbsp; </td>
-               </tr>
-               </form>
-       </table>
+               </table></form>
+               <p><input type="submit" class="submit" value="Change Status"></p>
+
+       
 <!-- /TMPL_IF -->
 </div>
-<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ACCEPTED.tmpl b/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ACCEPTED.tmpl
index ded4724..db86df7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ACCEPTED.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ACCEPTED.tmpl
@@ -1,10 +1,11 @@
-Dear library user,
+Dear <!-- TMPL_VAR NAME="LibraryName" --> user,
 
-You have suggested to the library to buy <!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="author" -->from <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->
+You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.
 
-<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> managed your suggestions today, and found it interesting.
-The document will be bought as soon as possible. You will be warned by mail when the acquisition will be done, then mailed again when the book arrives at the library.
+<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today, and found it interesting. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the book arrives at the library.
 
-Ask any question to <!-- TMPL_VAR name="libemail" -->
--- 
-You library
\ No newline at end of file
+If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.
+
+Thank you,
+
+<!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_AVAILABLE.tmpl b/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_AVAILABLE.tmpl
index 0c8506d..edc4a02 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_AVAILABLE.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_AVAILABLE.tmpl
@@ -1,8 +1,11 @@
-Dear library user,
+Dear <!-- TMPL_VAR NAME="LibraryName" --> user,
 
-You have suggested to the library to buy <!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="author" -->from <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->
+You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.
 
-We are glad to inform you that the book is now available at the library.
+We are pleased to inform you that the item is now part of the collection of the Nelsonville Public Library.
 
--- 
-You library
\ No newline at end of file
+If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.
+
+Thank you,
+
+<!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ORDERED.tmpl b/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ORDERED.tmpl
index 55ff2fb..428d141 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ORDERED.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ORDERED.tmpl
@@ -1,9 +1,13 @@
-Dear library user,
+Dear <!-- TMPL_VAR NAME="LibraryName" --> user,
 
-You have suggested to the library to buy <!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="author" -->from <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->
+You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.
 
-We are glad to inform you that the book has been ordered. It should arrive soon at the library.
+We are pleased to inform you that the book has now been ordered. It should arrive soon, at which time it will be processed for addition to the collection.
 
-You will be mailed again when the book is available.
--- 
-You library
\ No newline at end of file
+You will be notified again when the book is available.
+
+If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->
+
+Thank you,
+
+<!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_REJECTED.tmpl b/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_REJECTED.tmpl
index 1961ca7..7df8469 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_REJECTED.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_REJECTED.tmpl
@@ -1,9 +1,11 @@
-Dear library user,
+Dear <!-- TMPL_VAR NAME="LibraryName" --> user,
 
-You have suggested to the library to buy <!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="author" -->from <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->
+You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.
 
-<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> managed your suggestions today, and decided to reject it.
+<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your request today, and has decided not to accept the suggestion at this time.
 
-Don't hesitate to ask for more explanations by mailing <!-- TMPL_VAR name="libemail" -->
--- 
-You library
\ No newline at end of file
+If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.
+
+Thank you,
+
+<!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file