More changes to opac suggestions, including enabling the AnonSuggestions system prefe...

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 156ca97..cd775c4 100755 (executable)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -270,6 +270,7 @@ sub get_template_and_user {
         $LibraryNameTitle =~ s/<(?:[^<>'"]|'(?:[^']*)'|"(?:[^"]*)")*>//sg;
   $template->param(
             KohaAdminEmailAddress  => "" . C4::Context->preference("KohaAdminEmailAddress"),
+                       AnonSuggestions =>  "" . C4::Context->preference("AnonSuggestions"),
             suggestion             => "" . C4::Context->preference("suggestion"),
             virtualshelves         => "" . C4::Context->preference("virtualshelves"),
             OpacNav                => "" . C4::Context->preference("OpacNav"),

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index 3bd8f9c..e4d2c26 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -34,6 +34,10 @@
     var MSG_NRECORDS_IN_BASKET = _("already in the bag");
     var MSG_NO_RECORD_SELECTED = _("No item was selected");
     var MSG_NO_RECORD_ADDED = _("No item was added to your book bag");
+       <!-- TMPL_IF NAME="AmazonContent" --> $(document).ready(function() {
+       //verify_images();
+ });
+ <!-- /TMPL_IF -->
 </script>
 <!-- TMPL_IF NAME="opacuserjs" -->
 <script language="JavaScript" type="text/javascript">

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 3dc133d..c732f32 100755 (executable)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -47,7 +47,7 @@
     </p>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="MARCAUTHORS" -->
-    <p><span class="label">Additional Author:</span>
+    <p><span class="label">Authors:</span>
         <!-- TMPL_LOOP NAME="MARCAUTHORS" -->
         <a href="/cgi-bin/koha/opac-search.pl?q=au,wrdl:<!-- TMPL_VAR NAME="value" -->">
             <!-- TMPL_VAR NAME="value" -->
@@ -92,7 +92,7 @@
     <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="MARCSUBJCTS" -->
-            <p><strong>Subject(s):</strong> <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+            <p><span class="label">Subject(s):</span> <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
                             <!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" -->
                                 <!-- TMPL_VAR NAME="separator" --><a title="$<!-- TMPL_VAR NAME="code" --> <!-- TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" -->su:<!-- TMPL_VAR NAME="link" --> <!-- /TMPL_LOOP -->"><!-- TMPL_VAR NAME="value" --></a>
                             <!-- /TMPL_LOOP --> |  <!-- /TMPL_LOOP --></p>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
index 4706801..836c79c 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
@@ -60,32 +60,27 @@
             <input type="hidden" name="op" value="delete_confirm" />
                        <table>
                        <tr>
-            <th>&nbsp;</th>
+            <!-- TMPL_IF NAME="loggedinusername" --><th>&nbsp;</th><!-- /TMPL_IF -->
             <th>Summary</th>
-            <th>Status</th>
+            <th>Note</th>
             <th>Suggested by</th>
             <th>Managed by</th>
-            <th>Note</th>
+            <th>Status</th>
         </tr>
         <!-- TMPL_LOOP NAME="suggestions_loop" -->
             <!-- TMPL_IF name="even" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-                <td>
+<!-- TMPL_IF NAME="loggedinusername" --><td>
                     <input type="checkbox" name="delete_field" value="<!--TMPL_VAR name="suggestionid" -->" />
-                </td>
+                </td><!-- /TMPL_IF -->
                 <td>
-                    <p><!-- TMPL_VAR NAME="title" --></p>
+                    <p><strong><!-- TMPL_VAR NAME="title" --></strong></p>
                     <p><!-- TMPL_IF name="author" --><!-- TMPL_VAR NAME="author" -->,<!-- /TMPL_IF -->
                         <!-- TMPL_IF name="copyrightdate" --> - <!-- TMPL_VAR NAME="copyrightdate" -->,<!-- /TMPL_IF --> 
                         <!-- TMPL_IF name="publishercode" --> - <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
                     </p>
                 </td>
                 <td>
-                    <!-- TMPL_IF name="ASKED" -->Requested<!-- /TMPL_IF -->
-                    <!-- TMPL_IF name="ACCEPTED" -->Accepted by the library<!-- /TMPL_IF -->
-                    <!-- TMPL_IF name="ORDERED" -->Ordered by the library<!-- /TMPL_IF -->
-                    <!-- TMPL_IF name="REJECTED" -->Suggestion declined <!-- /TMPL_IF -->
-                    <!-- TMPL_IF name="AVAILABLE" -->Available in the library<!-- /TMPL_IF -->
-                    <!-- TMPL_IF name="reason" -->(<!-- TMPL_VAR name="reason" -->)<!-- /TMPL_IF -->
+                    <!-- TMPL_VAR name="note" -->
                 </td>
                 <td>
                     <!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
@@ -94,15 +89,20 @@
                                        <!-- TMPL_VAR name="surnamemanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamemanagedby" -->
                 </td>
                 <td>
-                    <!-- TMPL_VAR name="note" -->
+                    <!-- TMPL_IF name="ASKED" -->Requested<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="ACCEPTED" -->Accepted by the library<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="ORDERED" -->Ordered by the library<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="REJECTED" -->Suggestion declined <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="AVAILABLE" -->Available in the library<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="reason" -->(<!-- TMPL_VAR name="reason" -->)<!-- /TMPL_IF -->
                 </td>
             </tr>
         <!-- /TMPL_LOOP -->
-        <tr>
+        <!-- TMPL_IF NAME="loggedinusername" --><tr>
             <td colspan="9">
                 <input type="submit" value="Delete Checked Items" />
             </td>
-        </tr>
+        </tr><!-- /TMPL_IF -->
     </table>
         </form>
     <!-- TMPL_ELSE --><p>There are no pending purchase suggestions.</p><!-- /TMPL_IF -->