View | Details | Raw Unified | Return to bug 16456
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/js/autocomplete/patrons.js (-1 / +1 lines)
Lines 33-39 function patron_autocomplete(params) { Link Here
33
}
33
}
34
34
35
function AddPatron( patron_name, value, container, input_name ) {
35
function AddPatron( patron_name, value, container, input_name ) {
36
    div = "<div id='borrower_" + value + "'>" + patron_name + " ( <a href='#' class='removePatron'> " + MSG_REMOVE_PATRON + " </a> ) <input type='hidden' name='" + input_name + "' value='" + value + "' /></div>";
36
    div = "<div id='borrower_" + value + "'>" + patron_name + " ( <a href='#' class='removePatron'><i class='fa fa-trash' aria-hidden='true'></i> " + MSG_REMOVE_PATRON + " </a> ) <input type='hidden' name='" + input_name + "' value='" + value + "' /></div>";
37
    $(container).append( div );
37
    $(container).append( div );
38
38
39
    $(container).parent().show( 800 );
39
    $(container).parent().show( 800 );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt (-4 / +4 lines)
Lines 102-111 $(document).ready(function() { Link Here
102
        <form action="list.pl" id="remove_patrons" method="post">
102
        <form action="list.pl" id="remove_patrons" method="post">
103
103
104
            <div id="searchheader">
104
            <div id="searchheader">
105
                <span class="checkall"><a id="CheckAll" href="#">Select all</a></span> |
105
                <span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i>  Select all</a></span> |
106
                <span class="clearall"><a id="CheckNone" href="#">Clear all</a></span> |
106
                <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span> |
107
                <div class="btn-group">
107
                <div class="btn-group">
108
                    <button class="btn btn-mini list-remove" type="submit"><i class="fa fa-times-circle"></i> Remove selected</button>
108
                    <button class="btn btn-mini list-remove" type="submit"><i class="fa fa-trash" aria-hidden="true"></i> Remove selected</button>
109
                </div>
109
                </div>
110
            </div>
110
            </div>
111
111
Lines 152-158 $(document).ready(function() { Link Here
152
            </table>
152
            </table>
153
153
154
            <input type="hidden" name="patron_list_id" value="[% list.patron_list_id %]" />
154
            <input type="hidden" name="patron_list_id" value="[% list.patron_list_id %]" />
155
            <input type="submit" value="Remove selected patrons" />
155
            <button type="submit" class="btn btn-small"><i class="fa fa-trash" aria-hidden="true"></i> Remove selected patrons</button>
156
        </form>
156
        </form>
157
157
158
            </div>
158
            </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt (-2 / +2 lines)
Lines 53-60 Link Here
53
            [% review.review |html %]
53
            [% review.review |html %]
54
        </td>
54
        </td>
55
        <td>
55
        <td>
56
            [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&amp;reviewid=[% review.reviewid %]">Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&amp;reviewid=[% review.reviewid %]">Approve</a>[% END %] |
56
            [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&amp;reviewid=[% review.reviewid %]" class="btn btn-mini"><i class="fa fa-remove"></i> Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&amp;reviewid=[% review.reviewid %]" class="btn btn-mini"><i class="fa fa-check"></i> Approve</a>[% END %]
57
            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&amp;reviewid=[% review.reviewid %]">Delete</a>
57
            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&amp;reviewid=[% review.reviewid %]" class="btn btn-mini"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
58
        </td>
58
        </td>
59
    </tr>
59
    </tr>
60
    [% END %]</tbody>
60
    [% END %]</tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt (-39 / +60 lines)
Lines 74-84 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
74
74
75
	var success_test_call = function() {
75
	var success_test_call = function() {
76
        $('#test_button').prop('disabled', false);
76
        $('#test_button').prop('disabled', false);
77
        $('#test_button').attr("value",_("Test"));
77
        $('#test_button').html("<i class='fa fa-check-square-o' aria-hidden='true'></i>" +_(" Test"));
78
	};
78
	};
79
	$(document).ready(function() {
79
	$(document).ready(function() {
80
		$('.ajax_buttons' ).css({visibility:"visible"});
80
		$('.ajax_buttons' ).css({visibility:"visible"});
81
		$("p.check").html("<strong>"+_("Select:")+" <\/strong><a id=\"CheckAll\" href=\"/cgi-bin/koha/tags/review.pl\">"+_("All")+"<\/a> <a id=\"CheckPending\" href=\"/cgi-bin/koha/tags/review.pl\">"+_("Pending")+"<\/a> <a id=\"CheckNone\" href=\"/cgi-bin/koha/tags/review.pl\">"+_("None")+"<\/a>");
81
		$("p.check").html("<div id='searchheader'><a id=\"CheckAll\" href=\"/cgi-bin/koha/tags/review.pl\"><i class='fa fa-check'></i>"+_(" Select all")+"<\/a> | <a id=\"CheckPending\" href=\"/cgi-bin/koha/tags/review.pl\"><i class='fa fa-clock-o'></i>"+_(" Select all pending")+"<\/a> | <a id=\"CheckNone\" href=\"/cgi-bin/koha/tags/review.pl\"><i class='fa fa-remove'></i>"+_(" Clear all")+"<\/a></div>");
82
	    $("#CheckAll").click(function(){
82
	    $("#CheckAll").click(function(){
83
	        $(".checkboxed").checkCheckboxes();
83
	        $(".checkboxed").checkCheckboxes();
84
	        return false;
84
	        return false;
Lines 96-122 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
96
			// window.alert(_("Click detected on ") + event.target + ": " + $(event.target).html);
96
			// window.alert(_("Click detected on ") + event.target + ": " + $(event.target).html);
97
			if ($(event.target).is('.ok')) {
97
			if ($(event.target).is('.ok')) {
98
				$.ajax({
98
				$.ajax({
99
                    "data": {ok: $(event.target).attr("title")},
99
                    data: {ok: $(event.target).attr("title")},
100
					"success": count_approve // success_approve
100
					success: count_approve // success_approve
101
				});
101
				});
102
                $(event.target).next(".rej").prop('disabled', false).attr("value",_("Reject")).css("color","#000");
102
                $(event.target).next(".rej").prop('disabled', false).css("color","#000");
103
                $(event.target).attr(   "value",_("Approved")).prop('disabled', true).css("color","#666");
103
                $(event.target).next(".rej").html("<i class='fa fa-remove'></i>" + _(" Reject"));
104
                $(event.target).prop('disabled', true).css("color","#666");
105
                $(event.target).html("<i class='fa fa-check'></i>" + _(" Approved"));
106
                var getelement = $(event.target).attr("title");
107
                var gettitle = "span[data-title|=" + getelement + "]";
108
                if ($(gettitle).attr("class") == "pending"){
109
                $(gettitle).text("Approved");
110
                $(gettitle).toggleClass("pending approved");
111
                } else {
112
                $(gettitle).text("Approved");
113
                $(gettitle).toggleClass("rejected approved");
114
                }
104
				return false;	// cancel submit
115
				return false;	// cancel submit
105
			}
116
			}
106
			if ($(event.target).is('.rej')) {
117
			if ($(event.target).is('.rej')) {
107
				$.ajax({
118
				$.ajax({
108
                    "data": {rej: $(event.target).attr("title")},
119
                    data: {rej: $(event.target).attr("title")},
109
					"success": count_reject // success_reject
120
					success: count_reject // success_reject
110
				});
121
				});
111
                $(event.target).prev(".ok").prop('disabled', false).attr("value",_("Approve")).css("color","#000");
122
                $(event.target).prev(".ok").prop('disabled', false).css("color","#000");
112
                $(event.target).attr(   "value",_("Rejected")).prop('disabled', true).css("color","#666");
123
                $(event.target).prev(".ok").html("<i class='fa fa-check'></i>" + _(" Approve"));
124
                $(event.target).prop('disabled', true).css("color","#666");
125
                $(event.target).html("<i class='fa fa-remove'></i>" + _(" Rejected"));
126
                var getelement = $(event.target).attr("title");
127
                var gettitle = "span[data-title|=" + getelement + "]";
128
                if ($(gettitle).attr("class") == "pending"){
129
                $(gettitle).text("Rejected");
130
                $(gettitle).toggleClass("pending rejected");
131
                } else {
132
                $(gettitle).text("Rejected");
133
                $(gettitle).toggleClass("approved rejected");
134
                }
113
				return false;	// cancel submit
135
				return false;	// cancel submit
114
			}
136
			}
115
			if ($(event.target).is('#test_button')) {
137
			if ($(event.target).is('#test_button')) {
116
                $(event.target).attr(   "value",_("Testing...")).prop('disabled', true);
138
                $(event.target).text(_("Testing...")).prop('disabled', true);
117
				$.ajax({
139
				$.ajax({
118
					"data": {test: $('#test').attr("value")},
140
					data: {test: $('#test').attr("value")},
119
					"success": success_test_call // success_reject
141
					success: success_test_call // success_reject
120
				});
142
				});
121
				return false;	// cancel submit
143
				return false;	// cancel submit
122
			}
144
			}
Lines 239-249 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
239
            </td>
261
            </td>
240
            <td>
262
            <td>
241
                [% IF ( tagloo.approved == -1 ) %]
263
                [% IF ( tagloo.approved == -1 ) %]
242
                    <span class="rejected">Rejected</span>
264
                    <span class="rejected" data-title="[% tagloo.term %]">Rejected</span>
243
                [% ELSIF ( tagloo.approved == 1 ) %]
265
                [% ELSIF ( tagloo.approved == 1 ) %]
244
                    <span class="approved">Approved</span>
266
                    <span class="approved" data-title="[% tagloo.term %]">Approved</span>
245
                [% ELSE %]
267
                [% ELSE %]
246
                    <span class="pending">Pending</span>
268
                    <span class="pending" data-title="[% tagloo.term %]">Pending</span>
247
                [% END %]
269
                [% END %]
248
            </td>
270
            </td>
249
            <td><a href="/cgi-bin/koha/tags/list.pl?tag=[% tagloo.term|uri %]">[% tagloo.term %]</a>
271
            <td><a href="/cgi-bin/koha/tags/list.pl?tag=[% tagloo.term|uri %]">[% tagloo.term %]</a>
Lines 253-263 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
253
            [% IF ( tagloo.approved ) %]
275
            [% IF ( tagloo.approved ) %]
254
            <td class="actions"><span class="ajax_buttons" style="visibility:hidden">
276
            <td class="actions"><span class="ajax_buttons" style="visibility:hidden">
255
                    [% IF ( tagloo.approved == -1 ) %]
277
                    [% IF ( tagloo.approved == -1 ) %]
256
                <input class="ok"  type="submit" title="[% tagloo.term %]" value="Approve" name="approve" />
278
                <button class="ok btn btn-mini" type="submit" title="[% tagloo.term %]" value="Approve" name="approve"><i class="fa fa-check"></i> Approve</button>
257
                <input class="rej" disabled="disabled" type="submit" title="[% tagloo.term %]" value="Rejected" name="reject" />
279
                <button class="rej btn btn-mini" disabled="disabled" type="submit" title="[% tagloo.term %]" value="Rejected" name="reject"><i class="fa fa-remove"></i> Rejected</button>
258
                [% ELSE %]
280
                [% ELSE %]
259
                <input class="ok"  disabled="disabled" type="submit" title="[% tagloo.term %]" value="Approved" name="approve" />
281
                <button class="ok btn btn-mini"  disabled="disabled" type="submit" title="[% tagloo.term %]" value="Approved" name="approve"><i class="fa fa-check"></i> Approved</button>
260
                <input class="rej" type="submit" title="[% tagloo.term %]" value="Reject" name="reject" />
282
                <button class="rej btn btn-mini" type="submit" title="[% tagloo.term %]" value="Reject" name="reject"><i class="fa fa-remove"></i> Reject</button>
261
                [% END %]
283
                [% END %]
262
                </span>
284
                </span>
263
            </td>
285
            </td>
Lines 265-272 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
265
            </td>
287
            </td>
266
            [% ELSE %]
288
            [% ELSE %]
267
            <td class="actions"><span class="ajax_buttons" style="visibility:hidden">
289
            <td class="actions"><span class="ajax_buttons" style="visibility:hidden">
268
            <input class="ok"  type="submit" title="[% tagloo.term %]" value="Approve" name="approve" />
290
            <button class="ok btn btn-mini"  type="submit" title="[% tagloo.term %]" value="Approve" name="approve"><i class="fa fa-check"></i> Approve</button>
269
                <input class="rej" type="submit" title="[% tagloo.term %]" value="Reject" name="reject" />
291
                <button class="rej btn btn-mini" type="submit" title="[% tagloo.term %]" value="Reject" name="reject"><i class="fa fa-remove"></i> Reject</button>
270
                </span>
292
                </span>
271
            </td>
293
            </td>
272
            [% UNLESS ( filter_approved_pending ) %]<td>&nbsp;</td>[% END %]
294
            [% UNLESS ( filter_approved_pending ) %]<td>&nbsp;</td>[% END %]
Lines 280-287 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
280
  </table>
302
  </table>
281
  [% END %]
303
  [% END %]
282
    [% IF ( tagloop ) %]<fieldset class="action">
304
    [% IF ( tagloop ) %]<fieldset class="action">
283
   <input type="submit" value="Approve" id="approve_button" name="op-approve" />
305
   <button type="submit" value="Approve" class="btn btn-small" id="approve_button" name="op-approve"><i class="fa fa-check"></i> Approve</button>
284
   <input type="submit" value="Reject"  id="reject_button"  name="op-reject" />
306
   <button type="submit" value="Reject" class="btn btn-small"  id="reject_button" name="op-reject"><i class="fa fa-remove"></i> Reject</button>
285
  </fieldset>[% END %]
307
  </fieldset>[% END %]
286
  </form>
308
  </form>
287
</div>
309
</div>
Lines 289-306 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
289
 <fieldset class="brief">
311
 <fieldset class="brief">
290
  <h4>Terms summary</h4>
312
  <h4>Terms summary</h4>
291
  <ul>
313
  <ul>
292
  	<li><a href="/cgi-bin/koha/tags/review.pl?approved=1">Approved</a>:
314
    <li><a href="/cgi-bin/koha/tags/review.pl?approved=1">Approved</a>:
293
		<span id="terms_summary_approved_count">[% approved_count %]</span>
315
        <span id="terms_summary_approved_count">[% approved_count %]</span>
294
  	</li>
316
        </li>
295
  	<li><a href="/cgi-bin/koha/tags/review.pl?approved=-1">Rejected</a>:
317
    <li><a href="/cgi-bin/koha/tags/review.pl?approved=-1">Rejected</a>:
296
		<span id="terms_summary_rejected_count">[% rejected_count %]</span>
318
        <span id="terms_summary_rejected_count">[% rejected_count %]</span>
297
  	</li>
319
    </li>
298
	<li><a href="/cgi-bin/koha/tags/review.pl?approved=0">Pending</a>:
320
    <li><a href="/cgi-bin/koha/tags/review.pl?approved=0">Pending</a>:
299
		<span id="terms_summary_unapproved_count">[% unapproved_count %]</span>
321
    <span id="terms_summary_unapproved_count">[% unapproved_count %]</span>
300
  	</li>
322
    </li>
301
	<li><a href="/cgi-bin/koha/tags/review.pl?approved=all">Total</a>:
323
    <li><a href="/cgi-bin/koha/tags/review.pl?approved=all">Total</a>:
302
		<span id="terms_summary_approved_total">[% approved_total %]</span>
324
        <span id="terms_summary_approved_total">[% approved_total %]</span>
303
  	</li>
325
    </li>
304
  </ul>
326
  </ul>
305
  <span id="terms_summary_status">&nbsp;</span>
327
  <span id="terms_summary_status">&nbsp;</span>
306
  </fieldset>
328
  </fieldset>
Lines 309-315 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
309
   <div class="description">Enter a word or phrase to check against approved/rejected lists: </div>
331
   <div class="description">Enter a word or phrase to check against approved/rejected lists: </div>
310
   <form method="post" action="/cgi-bin/koha/tags/review.pl">
332
   <form method="post" action="/cgi-bin/koha/tags/review.pl">
311
   <input type="text" size="14" name="test" id="test" />
333
   <input type="text" size="14" name="test" id="test" />
312
   <fieldset class="action"><input type="submit" value="Test" id="test_button" name="op-test" /></fieldset>
334
   <fieldset class="action"><button type="submit" value="Test" class="btn btn-small" id="test_button" name="op-test"><i class="fa fa-check-square-o" aria-hidden="true"></i> Test</button></fieldset>
313
   <div id="verdict">
335
   <div id="verdict">
314
	[% IF ( test_term ) %]
336
	[% IF ( test_term ) %]
315
	[% IF ( verdict_ok ) %]
337
	[% IF ( verdict_ok ) %]
Lines 360-366 tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } Link Here
360
			<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
382
			<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
361
	    </li>
383
	    </li>
362
  </ol>
384
  </ol>
363
 <fieldset class="action"><input type="submit" value="Apply filter(s)" /></fieldset>
385
 <fieldset class="action"><button type="submit" class="btn btn-small"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset>
364
</fieldset>
386
</fieldset>
365
</form>
387
</form>
366
</div>
388
</div>
367
- 

Return to bug 16456