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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc (-1 / +1 lines)
Lines 1-5 Link Here
1
[%# transletable strings for merge-record.js %]
1
[%# transletable strings for merge-record.js %]
2
<script type="text/javascript">
2
<script>
3
    var MSG_MERGEREC_ALREADY_EXISTS = _("The field is non-repeatable and already exists in the destination record. Therefore, you cannot add it.");
3
    var MSG_MERGEREC_ALREADY_EXISTS = _("The field is non-repeatable and already exists in the destination record. Therefore, you cannot add it.");
4
    var MSG_MERGEREC_SUBFIELD_ALREADY_EXISTS = _("The subfield is non-repeatable and already exists in the destination record. Therefore, you cannot add it.");
4
    var MSG_MERGEREC_SUBFIELD_ALREADY_EXISTS = _("The subfield is non-repeatable and already exists in the destination record. Therefore, you cannot add it.");
5
</script>
5
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt (-6 / +5 lines)
Lines 51-59 table.grid td.default { Link Here
51
    <div class="row">
51
    <div class="row">
52
        <div class="col-sm-10 col-sm-push-2">
52
        <div class="col-sm-10 col-sm-push-2">
53
            <main>
53
            <main>
54
54
                <div class="row">
55
<div class="yui-g">
55
                    <div class="col-sm-6">
56
<div class="yui-u first">
57
<h1>Item circulation alerts</h1>
56
<h1>Item circulation alerts</h1>
58
<h2>Select a library:</h2>
57
<h2>Select a library:</h2>
59
<form id="branch_selector" method="get" action="/cgi-bin/koha/admin/item_circulation_alerts.pl">
58
<form id="branch_selector" method="get" action="/cgi-bin/koha/admin/item_circulation_alerts.pl">
Lines 64-70 table.grid td.default { Link Here
64
<input type="submit" name="pick" value="Pick" />
63
<input type="submit" name="pick" value="Pick" />
65
</form>
64
</form>
66
</div>
65
</div>
67
<div class="yui-u">
66
                    <div class="col-sm-6">
68
<table class="grid">
67
<table class="grid">
69
<caption>Legend</caption>
68
<caption>Legend</caption>
70
<thead>
69
<thead>
Lines 88-95 table.grid td.default { Link Here
88
  </tr>
87
  </tr>
89
</tbody>
88
</tbody>
90
</table>
89
</table>
91
</div>
90
                    </div> <!-- /.col-sm-6 -->
92
</div>
91
                </div> <!-- /.row -->
93
92
94
<h2>Circulation alerts for [% Branches.GetName( branch ) || 'Default' | html %]</h2>
93
<h2>Circulation alerts for [% Branches.GetName( branch ) || 'Default' | html %]</h2>
95
<p>Click on the grid to toggle the settings.</p>
94
<p>Click on the grid to toggle the settings.</p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt (-13 / +13 lines)
Lines 5-11 Link Here
5
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Koha &rsaquo; Cataloging &rsaquo; Merging records</title>
6
<title>Koha &rsaquo; Cataloging &rsaquo; Merging records</title>
7
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
8
<style type="text/css">
8
<style>
9
div.record ul, div.record li { float:none; display:block; }
9
div.record ul, div.record li { float:none; display:block; }
10
div#result { margin-top: 1em; }
10
div#result { margin-top: 1em; }
11
/* We use this style "against" the li ui-tabs-nav style automatically applied */
11
/* We use this style "against" the li ui-tabs-nav style automatically applied */
Lines 20-25 div#result { margin-top: 1em; } Link Here
20
<div class="main container-fluid">
20
<div class="main container-fluid">
21
    <div class="row">
21
    <div class="row">
22
        <div class="col-md-8 col-md-offset-2">
22
        <div class="col-md-8 col-md-offset-2">
23
            <main>
23
24
24
<h1>Merging records</h1>
25
<h1>Merging records</h1>
25
26
Lines 45-52 div#result { margin-top: 1em; } Link Here
45
46
46
[% ELSIF ( result ) %]
47
[% ELSIF ( result ) %]
47
48
48
        <script type="text/javascript">window.location.href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | html %]"</script>
49
    <script>window.location.href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | html %]";</script>
49
        <p>The merging was successful. <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | uri %]">Click here to see the merged record.</a></p>
50
    <p>The merging was successful. <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | uri %]">Click here to see the merged record.</a></p>
50
51
51
[% ELSIF ( choosereference ) %]
52
[% ELSIF ( choosereference ) %]
52
53
Lines 84-96 div#result { margin-top: 1em; } Link Here
84
85
85
<form id="mergeform" action="/cgi-bin/koha/authorities/merge.pl" method="post" onsubmit="return mergeformsubmit()">
86
<form id="mergeform" action="/cgi-bin/koha/authorities/merge.pl" method="post" onsubmit="return mergeformsubmit()">
86
87
87
<div class="yui-g">
88
    <div class="row">
88
<div class="yui-u first">
89
        <div class="col-sm-6">
89
[% PROCESS mergesource sourcerecords=records %]
90
[% PROCESS mergesource sourcerecords=records %]
90
</div>
91
</div>
91
<div class="yui-u">
92
        <div class="col-sm-6">
92
[% PROCESS mergetarget %]
93
[% PROCESS mergetarget %]
93
</div> <!-- .yui-u -->
94
</div>
95
</div>
94
96
95
<input type="hidden" name="recordid1" value="[% recordid1 | html %]" />
97
<input type="hidden" name="recordid1" value="[% recordid1 | html %]" />
96
<input type="hidden" name="recordid2" value="[% recordid2 | html %]" />
98
<input type="hidden" name="recordid2" value="[% recordid2 | html %]" />
Lines 98-117 div#result { margin-top: 1em; } Link Here
98
<input type="hidden" name="frameworkcode" value="[% framework | html %]" />
100
<input type="hidden" name="frameworkcode" value="[% framework | html %]" />
99
101
100
<fieldset class="action"><input type="submit" name="merge" value="Merge" /></fieldset>
102
<fieldset class="action"><input type="submit" name="merge" value="Merge" /></fieldset>
101
</div>
102
</form>
103
</form>
103
104
104
[% END %]
105
[% END %]
105
106
106
</div>
107
        </main>
108
    </div> <!-- /.col-md-8 col-md-offset-2 -->
109
</div> <!-- /.row -->
107
110
108
[% MACRO jsinclude BLOCK %]
111
[% MACRO jsinclude BLOCK %]
109
    [% INCLUDE 'merge-record-strings.inc' %]
112
    [% INCLUDE 'merge-record-strings.inc' %]
110
    [% INCLUDE 'authorities_js.inc' %]
113
    [% INCLUDE 'authorities_js.inc' %]
111
    [% Asset.js("js/merge-record.js") | $raw %]
114
    [% Asset.js("js/merge-record.js") | $raw %]
112
    [% INCLUDE 'merge-record-strings.inc' %]
115
    <script>
113
    <script type="text/javascript">
114
    //<![CDATA[
115
116
116
        // When submiting the form
117
        // When submiting the form
117
        function mergeformsubmit() {
118
        function mergeformsubmit() {
Lines 140-146 div#result { margin-top: 1em; } Link Here
140
        $("#Frameworks").val(fw);
141
        $("#Frameworks").val(fw);
141
    }
142
    }
142
143
143
    //]]>
144
    </script>
144
    </script>
145
[% END %]
145
[% END %]
146
146
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt (-11 / +14 lines)
Lines 14-24 Link Here
14
14
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Stock rotation details for <i>[% biblio.title | html %][% FOREACH subtitle IN biblio.subtitles %][% subtitle.subfield | html %][% END %]</i></div>
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Stock rotation details for <i>[% biblio.title | html %][% FOREACH subtitle IN biblio.subtitles %][% subtitle.subfield | html %][% END %]</i></div>
16
16
17
<div id="doc3" class="yui-t2">
17
<div class="main container-fluid">
18
18
    <div class="row">
19
   <div id="bd">
19
        <div class="col-sm-10 col-sm-push-2">
20
    <div id="yui-main">
20
            <main>
21
    <div class="yui-b">
22
21
23
<div id="catalogue_detail_biblio">
22
<div id="catalogue_detail_biblio">
24
23
Lines 157-168 Link Here
157
156
158
</div>
157
</div>
159
158
160
</div>
159
            </main>
161
</div>
160
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
162
<div class="yui-b">
161
163
[% INCLUDE 'biblio-view-menu.inc' %]
162
        <div class="col-sm-2 col-sm-pull-10">
164
</div>
163
            <aside>
165
</div>
164
                [% INCLUDE 'biblio-view-menu.inc' %]
165
            </aside>
166
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
167
    </div> <!-- /.row -->
168
166
169
167
[% MACRO jsinclude BLOCK %]
170
[% MACRO jsinclude BLOCK %]
168
    [% INCLUDE 'browser-strings.inc' %]
171
    [% INCLUDE 'browser-strings.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt (-15 / +19 lines)
Lines 23-38 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here
23
        <div class="row">
23
        <div class="row">
24
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
24
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
25
[% ELSE %]
25
[% ELSE %]
26
    <div id="doc3" class="yui-t2">
26
    <div class="main container-fluid">
27
        <div id="bd">
27
        <div class="row">
28
            <div id="yui-main">
28
            <div class="col-sm-10 col-sm-push-2">
29
                <div class="yui-b">
30
[% END %]
29
[% END %]
30
                <main>
31
31
32
[% UNLESS ( add_form ) %]
32
[% UNLESS ( add_form ) %]
33
    [% IF error_message == 'title_missing' %]
33
    [% IF error_message == 'title_missing' %]
34
        <div class="dialog alert">Error: Required news title missing!</div>
34
        <div class="dialog alert">Error: Required news title missing!</div>
35
    [% END %]
35
    [% END %]
36
<h2>News</h2>
36
<div id="toolbar" class="btn-toolbar">
37
<div id="toolbar" class="btn-toolbar">
37
    <a class="btn btn-default btn-sm" id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;lang=[% lang | html %]"><i class="fa fa-plus"></i> New entry</a>
38
    <a class="btn btn-default btn-sm" id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;lang=[% lang | html %]"><i class="fa fa-plus"></i> New entry</a>
38
</div>
39
</div>
Lines 216-236 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here
216
            <div class="dialog message">There are no news items.</div>
217
            <div class="dialog message">There are no news items.</div>
217
        [% END %]
218
        [% END %]
218
    [% END %]
219
    [% END %]
219
</div>
220
220
</div>
221
                </main>
221
[% UNLESS ( add_form ) %]
222
            [% UNLESS ( add_form ) %]
222
    <div class="yui-b noprint">
223
                </div> <!-- /.col-sm-10.col-sm-push-2 -->
223
        [% INCLUDE 'tools-menu.inc' %]
224
224
    </div>
225
                <div class="col-sm-2 col-sm-pull-10">
225
[% END %]
226
                    <aside>
226
</div>
227
                        [% INCLUDE 'tools-menu.inc' %]
228
                    </aside>
229
                </div> <!-- /.col-sm-2.col-sm-pull-10 -->
230
            [% END %]
231
        </div> <!-- /.row -->
227
232
228
[% MACRO jsinclude BLOCK %]
233
[% MACRO jsinclude BLOCK %]
229
    [% INCLUDE 'calendar.inc' %]
234
    [% INCLUDE 'calendar.inc' %]
230
    [% Asset.js("js/tools-menu.js") | $raw %]
235
    [% Asset.js("js/tools-menu.js") | $raw %]
231
    [% IF ( opac_news_count ) %]
236
    [% IF ( opac_news_count ) %]
232
        [% INCLUDE 'datatables.inc' %]
237
        [% INCLUDE 'datatables.inc' %]
233
        <script type="text/javascript">
238
        <script>
234
            $(document).ready(function() {
239
            $(document).ready(function() {
235
                $("#newst").dataTable($.extend(true, {}, dataTablesDefaults, {
240
                $("#newst").dataTable($.extend(true, {}, dataTablesDefaults, {
236
                    "aoColumnDefs": [
241
                    "aoColumnDefs": [
Lines 268-274 Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> Link Here
268
        </script>
273
        </script>
269
    [% END %]
274
    [% END %]
270
    [% Asset.js("lib/tiny_mce/tiny_mce.js") | $raw %]
275
    [% Asset.js("lib/tiny_mce/tiny_mce.js") | $raw %]
271
    <script type="text/javascript">
276
    <script>
272
        tinyMCE.baseURL = "[% interface | html %]/lib/tiny_mce";
277
        tinyMCE.baseURL = "[% interface | html %]/lib/tiny_mce";
273
        tinyMCE.init({
278
        tinyMCE.init({
274
            mode : "textareas",
279
            mode : "textareas",
275
- 

Return to bug 21672