[Koha-patches] [PATCH] Style corrections (Bug 3676) and improved behavior of tags link

[Owen Leonard]

- Conditionally displaying tags functionality based on system pref
- Suppressing tag link for non-logged-in users. Previously a login redirect was used, but that seemed problematic to me. After the user has logged in, how to get back to their cart?
---
 .../opac-tmpl/prog/en/modules/opac-basket.tmpl     |   25 ++++++++-----------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
index a687d64..aea6077 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
@@ -11,26 +11,23 @@
 	<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 	<script type="text/javascript">
 	//<![CDATA[
+<!-- TMPL_IF NAME="TagsEnabled" -->
 var MSG_NO_TAG_SPECIFIED = _("No tag was specified.");
 
 function tagSelected() {
-    <!-- TMPL_IF NAME="loggedinusername" -->
     var bibs = document.getElementById('records').value;
     if (bibs) {
-        $("#tagsel_tag").hide();
+        $("#tag_link").hide();
         $("#tag_hides").hide();
         $("#tagsel_form").show();
     } else {
         alert(MSG_NO_RECORD_SELECTED);
     }
-    <!-- TMPL_ELSE -->
-    window.location = "/cgi-bin/koha/opac-user.pl";
-    <!-- /TMPL_IF -->
 }
 
 function tagCanceled() {
     $("#tagsel_form").hide();
-    $("#tagsel_tag").show();
+    $("#tag_link").show();
     $("#tag_hides").show();
 }
 
@@ -56,7 +53,7 @@ function tagAdded() {
     KOHA.Tags.add_multitags_button(bibs, tag);
     return false;
 }
-
+<!-- /TMPL_IF -->
 	$(document).ready(function(){
 		$("#CheckAll").click(function(){
 		var checked = [];
@@ -84,7 +81,7 @@ function tagAdded() {
         <!-- TMPL_IF NAME="TagsEnabled" -->
         <!-- TMPL_IF NAME="TagsInputOnList" -->
           $(".tagsep").text("| ");
-          $("#tagsel_tag").text(_("Tag"));
+	      <!-- TMPL_IF NAME="loggedinusername" -->$("#tag_link").html(_("<a href=\"#\" onclick=\"tagSelected(); return false;\">Tag</a>"));<!-- TMPL_ELSE -->$("#tag_link").css("color","#BBB").html(_("Log in to add tags"));<!-- /TMPL_IF -->
           $("#tagsel_button").click(function(){
               tagAdded();
               return false;
@@ -134,16 +131,16 @@ function tagAdded() {
 <!-- /TMPL_IF -->
      <span class="holdsep"></span>
      <a href="#" onclick="holdSel(); return false;"><span class="hold"></span></a>
-     <span class="tagsep"></span>
-     <a href="#" onclick="tagSelected(); return false;"><span id="tagsel_tag"></span></a>
+     <!-- TMPL_IF NAME="TagsEnabled" --><span class="tagsep"></span>
+     <span id="tag_link"></span><!-- /TMPL_IF -->
 </span>
-     <span id="tagsel_form" style="display:none">
+     <!-- TMPL_IF NAME="TagsEnabled" --><span id="tagsel_form" style="display:none">
        <label for="tagsel_new" style="display:inline">New&nbsp;Tag:</label>
        <input name="tagsel_new" id="tagsel_new" maxlength="100" style="display:inline"/>
        <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button"
            type="submit" value="Add" style="display:inline" />
        <a href="#" id="tagsel_cancel" onclick="tagCanceled(); return false;" style="display:inline">Cancel</a>
-     </span>
+     </span><!-- /TMPL_IF -->
 </p><!-- /TMPL_UNLESS -->
             <form action="opac-basket.pl" method="get" name="bookbag_form" id="bookbag_form">
     <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
@@ -305,14 +302,14 @@ function tagAdded() {
      | <a href="#" onclick="addSelToShelf(); return false;">Add to a list</a>
 <!-- /TMPL_IF -->
      <span class="holdsep"></span><a href="#" onclick="holdSel(); return false;"><span class="hold"></span></a>
-     <span class="tagsep"></span><a href="#" onclick="tagSelected(); return false;"><span id="tagsel_tag"></span></a>
+<!-- TMPL_IF NAME="TagsEnabled" -->     <span class="tagsep"></span> <span id="tag_link"></span>
 </span>
      <span id="tagsel_form" style="display:none">
        <label for="tagsel_new" style="display:inline">New&nbsp;Tag:</label>
        <input name="tagsel_new" id="tagsel_new" maxlength="100"  style="display:inline"/>
        <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button" type="submit" value="Add"  style="display:inline"/>
        <a href="#" id="tagsel_cancel" onclick="tagCanceled(); return false;" style="display:inline">Cancel</a>
-     </span>
+     </span><!-- /TMPL_IF -->
 </td></tr><!-- /TMPL_UNLESS -->
         <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
             <!-- TMPL_IF NAME="even" -->
-- 
1.5.6.5