@@ -, +, @@
module, section Patrons and circulation
-Patron list -> my_list_saved -> Add patrons -> Remove selected patrons,
Clear all, Select all
-Comments -> Approve, delete and, unapprove
-Tags -> Apply filter(s), Test, Approved, Reject, Select all, Clear all,
Select all pending. Set TagsModeration to Require.
-Verify that all tools work as expected
---
koha-tmpl/intranet-tmpl/js/autocomplete/patrons.js | 2 +-
.../prog/en/modules/patron_lists/list.tt | 8 +-
.../prog/en/modules/reviews/reviewswaiting.tt | 4 +-
.../intranet-tmpl/prog/en/modules/tags/review.tt | 98 +++++++++++++---------
4 files changed, 67 insertions(+), 45 deletions(-)
--- a/koha-tmpl/intranet-tmpl/js/autocomplete/patrons.js
+++ a/koha-tmpl/intranet-tmpl/js/autocomplete/patrons.js
@@ -33,7 +33,7 @@ function patron_autocomplete(params) {
}
function AddPatron( patron_name, value, container, input_name ) {
- div = "
";
+ div = "";
$(container).append( div );
$(container).parent().show( 800 );
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
@@ -102,10 +102,10 @@ $(document).ready(function() {
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt
@@ -53,8 +53,8 @@
[% review.review |html %]
- [% IF ( status ) %]Unapprove[% ELSE %]Approve[% END %] |
- Delete
+ [% IF ( status ) %] Unapprove[% ELSE %] Approve[% END %]
+ Delete
|
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
@@ -74,11 +74,11 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
var success_test_call = function() {
$('#test_button').prop('disabled', false);
- $('#test_button').attr("value",_("Test"));
+ $('#test_button').html("" +_(" Test"));
};
$(document).ready(function() {
$('.ajax_buttons' ).css({visibility:"visible"});
- $("p.check").html(""+_("Select:")+" <\/strong>"+_("All")+"<\/a> "+_("Pending")+"<\/a> "+_("None")+"<\/a>");
+ $("p.check").html("");
$("#CheckAll").click(function(){
$(".checkboxed").checkCheckboxes();
return false;
@@ -96,27 +96,49 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
// window.alert(_("Click detected on ") + event.target + ": " + $(event.target).html);
if ($(event.target).is('.ok')) {
$.ajax({
- "data": {ok: $(event.target).attr("title")},
- "success": count_approve // success_approve
+ data: {ok: $(event.target).attr("title")},
+ success: count_approve // success_approve
});
- $(event.target).next(".rej").prop('disabled', false).attr("value",_("Reject")).css("color","#000");
- $(event.target).attr( "value",_("Approved")).prop('disabled', true).css("color","#666");
+ $(event.target).next(".rej").prop('disabled', false).css("color","#000");
+ $(event.target).next(".rej").html("" + _(" Reject"));
+ $(event.target).prop('disabled', true).css("color","#666");
+ $(event.target).html("" + _(" Approved"));
+ var getelement = $(event.target).attr("title");
+ var gettitle = "span[data-title|=" + getelement + "]";
+ if ($(gettitle).attr("class") == "pending"){
+ $(gettitle).text("Approved");
+ $(gettitle).toggleClass("pending approved");
+ } else {
+ $(gettitle).text("Approved");
+ $(gettitle).toggleClass("rejected approved");
+ }
return false; // cancel submit
}
if ($(event.target).is('.rej')) {
$.ajax({
- "data": {rej: $(event.target).attr("title")},
- "success": count_reject // success_reject
+ data: {rej: $(event.target).attr("title")},
+ success: count_reject // success_reject
});
- $(event.target).prev(".ok").prop('disabled', false).attr("value",_("Approve")).css("color","#000");
- $(event.target).attr( "value",_("Rejected")).prop('disabled', true).css("color","#666");
+ $(event.target).prev(".ok").prop('disabled', false).css("color","#000");
+ $(event.target).prev(".ok").html("" + _(" Approve"));
+ $(event.target).prop('disabled', true).css("color","#666");
+ $(event.target).html("" + _(" Rejected"));
+ var getelement = $(event.target).attr("title");
+ var gettitle = "span[data-title|=" + getelement + "]";
+ if ($(gettitle).attr("class") == "pending"){
+ $(gettitle).text("Rejected");
+ $(gettitle).toggleClass("pending rejected");
+ } else {
+ $(gettitle).text("Rejected");
+ $(gettitle).toggleClass("approved rejected");
+ }
return false; // cancel submit
}
if ($(event.target).is('#test_button')) {
- $(event.target).attr( "value",_("Testing...")).prop('disabled', true);
+ $(event.target).text(_("Testing...")).prop('disabled', true);
$.ajax({
- "data": {test: $('#test').attr("value")},
- "success": success_test_call // success_reject
+ data: {test: $('#test').attr("value")},
+ success: success_test_call // success_reject
});
return false; // cancel submit
}
@@ -239,11 +261,11 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
[% IF ( tagloo.approved == -1 ) %]
- Rejected
+ Rejected
[% ELSIF ( tagloo.approved == 1 ) %]
- Approved
+ Approved
[% ELSE %]
- Pending
+ Pending
[% END %]
|
[% tagloo.term %]
@@ -253,11 +275,11 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
[% IF ( tagloo.approved ) %]
|
[% IF ( tagloo.approved == -1 ) %]
-
-
+
+
[% ELSE %]
-
-
+
+
[% END %]
|
@@ -265,8 +287,8 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
[% ELSE %]
-
-
+
+
|
[% UNLESS ( filter_approved_pending ) %] | [% END %]
@@ -280,8 +302,8 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
[% END %]
[% IF ( tagloop ) %][% END %]
@@ -289,18 +311,18 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
@@ -309,7 +331,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
Enter a word or phrase to check against approved/rejected lists: