[Koha-patches] [PATCH] [SIGNED-OFF] Fix for bug 5451, can add tags with userlogin turned off
Nicole Engard
nengard at bywatersolutions.com
Sat Dec 18 00:11:43 CET 2010
From: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
---
.../opac-tmpl/prog/en/includes/doc-head-close.inc | 2 +-
koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc | 4 +-
.../opac-tmpl/prog/en/modules/opac-basket.tmpl | 47 +++++-----
.../opac-tmpl/prog/en/modules/opac-detail.tmpl | 24 +++--
.../opac-tmpl/prog/en/modules/opac-results.tmpl | 98 ++++++++++----------
.../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 52 +++++------
koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl | 9 +-
7 files changed, 119 insertions(+), 117 deletions(-)
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 fe7e7db..beda270 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -37,7 +37,7 @@
<script type="text/javascript" language="javascript"
<!-- TMPL_IF NAME="opacbookbag" -->src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"><!-- TMPL_ELSIF NAME="virtualshelves" -->src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"><!-- TMPL_ELSE -->>var readCookie;<!-- /TMPL_IF --></script>
-<!-- TMPL_IF NAME="TagsEnabled" --><script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/tags.js"></script><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="TagsEnabled" --><script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/tags.js"></script><!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- /TMPL_IF -->
<script type="text/javascript" language="javascript">
//<![CDATA[
<!-- TMPL_IF NAME="opacbookbag" -->var MSG_BASKET_EMPTY = _("Your cart is currently empty");
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
index 26bf502..b9e4f74 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
@@ -1,4 +1,4 @@
-<!-- TMPL_IF NAME="loggedinusername" -->
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" -->
<div id="menu">
<ul>
<!-- TMPL_IF NAME="userview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-user.pl">my summary</a></li>
@@ -32,5 +32,5 @@
</ul>
</div>
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- /TMPL_IF -->
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 e314342..b64205b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
@@ -30,11 +30,10 @@ $(document).ready(function()
}
);
-<!-- TMPL_IF NAME="TagsEnabled" -->
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- 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();
@@ -43,9 +42,6 @@ function tagSelected() {
} else {
alert(MSG_NO_RECORD_SELECTED);
}
- <!-- TMPL_ELSE -->
- window.location = "/cgi-bin/koha/opac-user.pl";
- <!-- /TMPL_IF -->
}
function tagCanceled() {
@@ -76,7 +72,7 @@ function tagAdded() {
KOHA.Tags.add_multitags_button(bibs, tag);
return false;
}
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
$(document).ready(function(){
$("#CheckAll").click(function(){
var checked = [];
@@ -97,14 +93,14 @@ function tagAdded() {
return false;
});
- <!-- TMPL_IF NAME="TagsEnabled" -->
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" -->
$("#tagsel_button").click(function(){
tagAdded();
return false;
});
- <!-- /TMPL_IF -->
+<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
});
-<!-- TMPL_IF NAME="RequestOnOpac" -->
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="RequestOnOpac" -->
function holdSel() {
var items = document.getElementById('records').value;
if (items) {
@@ -113,7 +109,7 @@ function tagAdded() {
alert(MSG_NO_RECORD_SELECTED);
}
}
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --><!-- /TMPL_IF -->
//]]>
</script>
<!-- /TMPL_IF -->
@@ -141,13 +137,14 @@ function tagAdded() {
<!-- TMPL_UNLESS NAME="print_basket" --><p style="padding: 7px 0; border-top : 1px solid #E8E8E8;"><a id="CheckAll" href="#">Select All</a> <a id="CheckNone" href="#">Clear All</a> | <b>Selected items :</b>
<span id="tag_hides">
<a href="#" onclick="delSelRecords(); return false;">Remove</a>
-<!-- TMPL_IF NAME="loggedinusername" -->
- | <a href="#" onclick="addSelToShelf(); return false;">Add to a list</a>
+<!-- TMPL_IF NAME="opacuserlogin" -->
+ <!-- TMPL_IF name="virtualshelves" --><!-- TMPL_IF NAME="loggedinusername" -->
+ | <a href="#" onclick="addSelToShelf(); return false;">Add to a list</a>
+ <!-- /TMPL_IF --><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="RequestOnOpac" -->| <a href="#" onclick="holdSel(); return false;">Place hold</a><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" -->
+ | <a href="#" onclick="tagSelected(); return false;">Tag</a><!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- /TMPL_IF -->
-
- <!-- TMPL_IF NAME="RequestOnOpac" -->| <a href="#" onclick="holdSel(); return false;">Place hold</a><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="TagsEnabled" -->
- | <a href="#" onclick="tagSelected(); return false;">Tag</a><!-- /TMPL_IF -->
</span>
<span id="tagsel_form" style="display:none">
<label for="tagsel_new" style="display:inline">New Tag:</label>
@@ -316,19 +313,21 @@ function tagAdded() {
| <b>Selected items :</b>
<span id="tag_hides">
<a href="#" onclick="delSelRecords(); return false;">Remove</a>
-<!-- TMPL_IF NAME="virtualshelves" --><!-- TMPL_IF NAME="loggedinusername" -->
+<!-- TMPL_IF NAME="opacuserlogin" -->
+ <!-- TMPL_IF NAME="virtualshelves" --><!-- TMPL_IF NAME="loggedinusername" -->
| <a href="#" onclick="addSelToShelf(); return false;">Add to a list</a>
-<!-- /TMPL_IF --><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="RequestOnOpac" -->| <a href="#" onclick="holdSel(); return false;">Place hold</a><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="TagsEnabled" -->
- | <a href="#" onclick="tagSelected(); return false;">Tag</a><!-- /TMPL_IF -->
+ <!-- /TMPL_IF --><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="RequestOnOpac" -->| <a href="#" onclick="holdSel(); return false;">Place hold</a><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" -->
+ | <a href="#" onclick="tagSelected(); return false;">Tag</a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
</span>
- <span id="tagsel_form" style="display:none">
+ <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" --><span id="tagsel_form" style="display:none">
<label for="tagsel_new" style="display:inline">New 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 --><!-- /TMPL_IF --><!-- /TMPL_IF -->
</p>
<!-- /TMPL_UNLESS -->
<table id="itemst">
@@ -356,7 +355,7 @@ function tagAdded() {
</a>
<!-- COinS / OpenURL -->
<span class="Z3988" title="ctx_ver=Z39.88-2004&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&rft.au=<!-- TMPL_VAR NAME="author" -->&rft.btitle=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->&rft.date=<!-- TMPL_VAR NAME="publicationyear" -->&rft.tpages=<!-- TMPL_VAR NAME="size" -->&rft.isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="url" -->&rft.aucorp=&rft.place=<!-- TMPL_VAR NAME="place" -->&rft.pub=<!-- TMPL_VAR NAME="publisher" ESCAPE="url" -->&rft.edition=<!-- TMPL_VAR NAME="edition" -->&rft.series=<!-- TMPL_VAR NAME="series" -->&rft.genre="></span>
- <div id="newtag<!-- TMPL_VAR NAME="biblionumber">_status" class="tagstatus results_summary" style="display:none">Tag status here.</div>
+ <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" --><div id="newtag<!-- TMPL_VAR NAME="biblionumber">_status" class="tagstatus results_summary" style="display:none">Tag status here.</div><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
</td>
<td><!-- TMPL_VAR NAME="author" --></td>
<td>
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 c45f0df..81fbfc8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -4,9 +4,9 @@
<script type="text/JavaScript" language="JavaScript">
//<![CDATA[
$(document).ready(function() {
- $("#tagform").hide();
- $("#addtagl").show();
$('#bibliodescriptions > ul').tabs();
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" -->$("#tagform").hide();
+ $("#addtagl").show();
$("#addtagl a").click(function(){
$("#addtagl").hide();
$("#tagform, #tagform a").show();
@@ -16,7 +16,7 @@
$("#addtagl").show();
$("#tagform").hide();
return false;
- });
+ });<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
$("#holdingst").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
dateFormat: 'uk',<!-- /TMPL_IF -->
widgets : ['zebra'],
@@ -44,9 +44,9 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
//]]>
</script>
-<style type="text/css">
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" --><style type="text/css">
#addtagl { display: none; }
-</style>
+</style><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
</head>
<body id="opac-detail">
@@ -226,6 +226,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
</span>
<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="TagsEnabled" -->
<!-- TMPL_IF NAME="TagsShowOnDetail" -->
<div class="results_summary">
<!-- TMPL_IF NAME="TagLoop" -->
@@ -234,9 +235,14 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
<li><a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="term" ESCAPE="HTML" --></a> <span class="weight">(<!-- TMPL_VAR NAME="weight_total" -->)</span></li>
<!-- /TMPL_LOOP -->
</ul><!-- TMPL_ELSE --><span class="label">Tags from this library:</span><div>No tags from this library for this title.</div>
- <!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="TagsInputOnDetail" -->
- <!-- TMPL_IF NAME="loggedinusername" -->
+ <!-- /TMPL_IF -->
+ </div>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="opacuserlogin" -->
+ <!-- TMPL_IF NAME="loggedinusername" -->
+ <!-- TMPL_IF NAME="TagsEnabled" -->
+ <!-- TMPL_IF NAME="TagsInputOnDetail" -->
+ <div class="results_summary">
<span class="label" id="addtagl"><a href="#">Add</a></span>
<form name="tagform<!-- TMPL_VAR NAME="biblionumber" -->" method="post" action="/cgi-bin/koha/opac-tags.pl" id="tagform">
<label for="newtag<!-- TMPL_VAR NAME="biblionumber" -->">New:</label><input name="newtag<!-- TMPL_VAR NAME="biblionumber" -->" id="newtag<!-- TMPL_VAR NAME="biblionumber" -->" maxlength="100" />
@@ -253,6 +259,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
<!-- /TMPL_IF -->
</div>
<!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="SyndeticsEnabled" --><!-- TMPL_IF NAME="SyndeticsSeries" --><!-- TMPL_IF NAME="SyndeticsSERIES1Exists" -->
<span class="results_summary">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index fb47c37..c561f67 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -13,7 +13,7 @@
<!-- TMPL_IF NAME="OpacHighlightedWords" --><script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.highlight-3.js"></script>
<!-- /TMPL_IF --><script type="text/javascript">
//<![CDATA[
-<!-- TMPL_IF name="RequestOnOpac" -->
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF name="RequestOnOpac" -->
function holdMultiple() {
var checkedBiblioNums = ""; // Separated by "/"
var checkedCount = 0;
@@ -77,7 +77,7 @@ function tagAdded() {
KOHA.Tags.add_multitags_button(bibs, tag);
return false;
-}<!-- /TMPL_IF -->
+}<!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="OpacHighlightedWords" -->
var q_array = new Array(); // holds search terms if available
@@ -150,7 +150,7 @@ $(document).ready(function(){
});
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
- $("#tagsel_span").html("<input id=\"tagsel_tag\" class=\"submit\" type=\"submit\" value=\"Tag\"/>");
+ <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="TagsEnabled" -->$("#tagsel_span").html("<input id=\"tagsel_tag\" class=\"submit\" type=\"submit\" value=\"Tag\"/>");<!-- /TMPL_IF --><!-- /TMPL_IF -->
function cartList(){
if($("#addto").find("option:selected").attr("value") == "addtolist"){
@@ -197,10 +197,10 @@ $(document).ready(function(){
$("#highlight_toggle_on" ).hide().click(function() {highlightOn() ;});
$("#highlight_toggle_off").show().click(function() {highlightOff();});<!-- /TMPL_IF --><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="TagsEnabled" -->
+<!-- TMPL_IF NAME="opacuserlogin" --> <!-- TMPL_IF NAME="TagsEnabled" -->
$(".tagbutton").click(KOHA.Tags.add_tag_button);
- <!-- TMPL_IF NAME="TagsInputOnList" -->
- <!-- TMPL_IF NAME="loggedinusername" -->
+ <!-- TMPL_IF NAME="TagsInputOnList" -->
+ <!-- TMPL_IF NAME="loggedinusername" -->
$("#tagsel_tag").click(function(){
tagSelected();
return false;
@@ -220,7 +220,7 @@ $(document).ready(function(){
});
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
+ <!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="GoogleJackets" -->KOHA.Google.GetCoverFromIsbn();<!-- /TMPL_IF -->
});
//]]>
@@ -340,22 +340,22 @@ $(document).ready(function(){
<span id="placehold"><!-- input class="submit" type="submit" value="Place Hold"/ --></span>
<div id="holdDetails"></div>
- <!-- TMPL_IF NAME="TagsEnabled" -->
- <!-- TMPL_IF NAME="TagsInputOnList" -->
- <span id="tagsel_span"></span>
- <!-- TMPL_IF NAME="loggedinusername" -->
- <span id="tagsel_form" style="display:none">
- <label for="tagsel_new">New Tag:</label>
- <input name="tagsel_new" id="tagsel_new" maxlength="100" />
- <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button" type="submit" value="Add" />
- <a href="#" id="tagsel_cancel">Cancel</a>
- </span>
- <span id="tagsel_status" class="tagsel_tatus" style="display:none;">
- Tag status here.
- </span>
- <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" -->
+ <!-- TMPL_IF NAME="TagsInputOnList" -->
+ <span id="tagsel_span"></span>
+ <!-- TMPL_IF NAME="loggedinusername" -->
+ <span id="tagsel_form" style="display:none">
+ <label for="tagsel_new">New Tag:</label>
+ <input name="tagsel_new" id="tagsel_new" maxlength="100" />
+ <input id="tagsel_button" name="tagsel_button" class="input tagsel_button" title="tagsel_button" type="submit" value="Add" />
+ <a href="#" id="tagsel_cancel">Cancel</a>
+ </span>
+ <span id="tagsel_status" class="tagsel_tatus" style="display:none;">
+ Tag status here.
+ </span>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
</div>
</td></tr>
@@ -458,32 +458,32 @@ $(document).ready(function(){
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="LibraryThingForLibrariesID" --><div class="ltfl_reviews"></div><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="TagsEnabled" -->
- <!-- TMPL_IF NAME="TagsShowOnList" -->
- <!-- TMPL_IF NAME="TagLoop" -->
- <div class="results_summary">
- <span class="label">Tags:</span>
- <ul style="display: inline; list-style: none;"><!-- TMPL_LOOP NAME="TagLoop" --><li style="display: inline; list-style: none;"><a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="term" --></a> <span class="weight">(<!-- TMPL_VAR NAME="weight_total" -->)</span></li>
- <!-- /TMPL_LOOP -->
- </ul>
- <!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="TagsInputOnList" -->
- <!-- TMPL_IF NAME="loggedinusername" -->
- <form name="tagform<!-- TMPL_VAR NAME="biblionumber" -->" method="post" action="/cgi-bin/koha/opac-tags.pl">
- <label for="newtag<!-- TMPL_VAR NAME="biblionumber" -->">New tag:</label>
- <input name="newtag<!-- TMPL_VAR NAME="biblionumber" -->" id="newtag<!-- TMPL_VAR NAME="biblionumber" -->" maxlength="100" />
- <input name="tagbutton" class="tagbutton" title="<!-- TMPL_VAR NAME="biblionumber" -->" type="submit" value="Add" />
- </form>
- <span id="newtag<!-- TMPL_VAR NAME="biblionumber" -->_status" class="tagstatus" style="display:none;">
- Tag status here.
- </span>
- <!-- TMPL_ELSIF NAME="__first__" --><span class="tagstatus" id="login4tags">Log in to add tags.</span>
- <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="TagLoop" -->
- </div><!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="TagsEnabled" -->
+ <!-- TMPL_IF NAME="TagsShowOnList" -->
+ <!-- TMPL_IF NAME="TagLoop" -->
+ <div class="results_summary">
+ <span class="label">Tags:</span>
+ <ul style="display: inline; list-style: none;"><!-- TMPL_LOOP NAME="TagLoop" --><li style="display: inline; list-style: none;"><a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="term" --></a> <span class="weight">(<!-- TMPL_VAR NAME="weight_total" -->)</span></li>
+ <!-- /TMPL_LOOP -->
+ </ul>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="TagsInputOnList" -->
+ <!-- TMPL_IF NAME="loggedinusername" -->
+ <form name="tagform<!-- TMPL_VAR NAME="biblionumber" -->" method="post" action="/cgi-bin/koha/opac-tags.pl">
+ <label for="newtag<!-- TMPL_VAR NAME="biblionumber" -->">New tag:</label>
+ <input name="newtag<!-- TMPL_VAR NAME="biblionumber" -->" id="newtag<!-- TMPL_VAR NAME="biblionumber" -->" maxlength="100" />
+ <input name="tagbutton" class="tagbutton" title="<!-- TMPL_VAR NAME="biblionumber" -->" type="submit" value="Add" />
+ </form>
+ <span id="newtag<!-- TMPL_VAR NAME="biblionumber" -->_status" class="tagstatus" style="display:none;">
+ Tag status here.
+ </span>
+ <!-- TMPL_ELSIF NAME="__first__" --><span class="tagstatus" id="login4tags">Log in to add tags.</span>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="TagLoop" -->
+ </div><!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- TMPL_IF Name="searchhighlightblob" --><span class="results_summary"><span class="label">Match:</span> <!-- TMPL_VAR NAME="searchhighlightblob" --></span><!-- /TMPL_IF -->
<span class="results_summary actions"><span class="label">Actions:</span>
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 7804bae..7013a1c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -1,7 +1,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › <!-- TMPL_IF NAME="viewshelf" -->Contents of <!-- TMPL_VAR NAME="shelfname" ESCAPE="html" --><!-- TMPL_ELSE -->My Lists<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-<script type="text/JavaScript" language="JavaScript">
+<script type="text/javascript">
//<![CDATA[
var MSG_NO_TAG_SPECIFIED = _("No tag was specified.");
var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these items from the list?");
@@ -12,7 +12,7 @@ $.tablesorter.addParser({
format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
type: 'text'
});
-
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="RequestOnOpac" -->
function holdSelections() {
var checkedBoxes = $(":checkbox:checked");
if ($(checkedBoxes).size() == 0) {
@@ -27,9 +27,8 @@ function holdSelections() {
document.location = "/cgi-bin/koha/opac-reserve.pl?biblionumbers="+bibs;
}
}
-
-function tagSelected() {
- <!-- TMPL_IF NAME="loggedinusername" -->
+<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" -->function tagSelected() {
var checkedBoxes = $("input:checkbox:checked");
if ($(checkedBoxes).size()) {
$("#tagsel_tag").hide();
@@ -38,9 +37,6 @@ function tagSelected() {
} else {
alert(MSG_NO_RECORD_SELECTED);
}
- <!-- TMPL_ELSE -->
- window.location = "/cgi-bin/koha/opac-user.pl";
- <!-- /TMPL_IF -->
}
function tagCanceled() {
@@ -70,17 +66,17 @@ function tagAdded() {
KOHA.Tags.add_multitags_button(bibs, tag);
return false;
-}
+}<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
$(function() {
$("span.clearall").html("<a id=\"CheckNone\" href=\"#\">"+_('Clear All')+"<\/a>|");
$("span.checkall").html("<a id=\"CheckAll\" href=\"#\">"+_('Select All')+"<\/a>");
$("a.print").show();
- <!-- TMPL_IF NAME="RequestOnOpac" -->$("#placehold").html("<a href=\"#\" class=\"hold tag_hides\">"+_('Place Hold')+"<\/a>");
- $("a.hold").click(function(){
- holdSelections();
- return false;
- });<!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="RequestOnOpac" -->$("#placehold").html("<a href=\"#\" class=\"hold tag_hides\">"+_('Place Hold')+"<\/a>");
+ $("a.hold").click(function(){
+ holdSelections();
+ return false;
+ });<!-- /TMPL_IF --><!-- /TMPL_IF -->
$("#listcontents").tablesorter({
widgets : ['zebra'],
<!-- TMPL_IF NAME="authorsort" -->
@@ -101,17 +97,17 @@ $(function() {
$(".checkboxed").unCheckCheckboxes();
return false;
});
- <!-- TMPL_IF NAME="TagsEnabled" -->
- $("#addtags").click(function(){
- tagSelected();
- return false;
- });
- $("#addtags").html("<a id=\"tagsel_tag\" href=\"#\">"+_("Tag")+"<\/a> |");
- $("#tagsel_button").click(function(){
- tagAdded();
- return false;
- });
- <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" -->
+ $("#addtags").click(function(){
+ tagSelected();
+ return false;
+ });
+ $("#addtags").html("<a id=\"tagsel_tag\" href=\"#\">"+_("Tag")+"<\/a> |");
+ $("#tagsel_button").click(function(){
+ tagAdded();
+ return false;
+ });
+ <!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
});
function Check(f) {
var _alertString="";
@@ -193,7 +189,7 @@ $(function() {
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="loggedinusername" -->
<!-- TMPL_IF NAME="TagsEnabled" -->
- <span id="addtags"></span>
+ <span id="addtags"></span>
<span id="tagsel_form" style="display:none">
<label for="tagsel_new" style="display:inline">New Tag:</label>
<input name="tagsel_new" id="tagsel_new" maxlength="100" style="display:inline"/>
@@ -258,8 +254,8 @@ $(function() {
<!-- TMPL_IF NAME="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- COinS / OpenURL -->
<!-- COinS / OpenURL --><span class="Z3988" title="<!-- TMPL_VAR NAME="coins" -->"></span>
- <br/>
- <div id="newtag<!-- TMPL_VAR NAME="biblionumber">_status" class="tagstatus results_summary" style="display:none">Tag status here.</div>
+ <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="TagsEnabled" --><br/>
+ <div id="newtag<!-- TMPL_VAR NAME="biblionumber">_status" class="tagstatus results_summary" style="display:none">Tag status here.</div><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
</td>
<td><!-- TMPL_VAR NAME="author" --></td>
<td>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
index 2e6ba39..80dac79 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
@@ -78,12 +78,11 @@
<form method="get" action="opac-tags.pl">
<fieldset>Show up to <input type="text" name="limit" style="text-align: right;" maxlength="4" size="4" value="<!-- TMPL_VAR NAME="limit" DEFAULT="100" -->" />
- tags from other users.
+ tags<!-- TMPL_IF NAME="opacuserlogin" --> from other users<!-- /TMPL_IF -->.
<input type="submit" value="OK" />
- <!-- TMPL_UNLESS NAME="loggedinusername" -->
- <a href="/cgi-bin/koha/opac-user.pl">Log in</a> to see your own saved tags.
- <!-- TMPL_ELSE -->
- <!-- /TMPL_UNLESS --></fieldset>
+ <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_UNLESS NAME="loggedinusername" -->
+ <a href="/cgi-bin/koha/opac-user.pl">Log in</a> to see your own saved tags.
+ <!-- /TMPL_UNLESS --><!-- /TMPL_IF --></fieldset>
</form>
<!-- TMPL_IF NAME="TAGLOOP" -->
--
1.5.6.5
More information about the Koha-patches
mailing list