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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt (-11 / +14 lines)
Lines 22-31 Link Here
22
[% IF op == 'delete_confirmed' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> &rsaquo; Category deleted[% END %]
22
[% IF op == 'delete_confirmed' %] <a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a> &rsaquo; Category deleted[% END %]
23
[% IF op == 'list' %]Patron categories[% END %]</div>
23
[% IF op == 'list' %]Patron categories[% END %]</div>
24
24
25
<div id="doc3" class="yui-t2">
25
<div class="main container-fluid">
26
   <div id="bd">
26
    <div class="row">
27
    <div id="yui-main">
27
        <div class="col-sm-10 col-sm-push-2">
28
    <div class="yui-b">
28
            <main>
29
29
30
[% FOR m IN messages %]
30
[% FOR m IN messages %]
31
    <div class="dialog [% m.type | html %]">
31
    <div class="dialog [% m.type | html %]">
Lines 485-503 Link Here
485
    [% END %]
485
    [% END %]
486
[% END %]
486
[% END %]
487
487
488
</div>
488
            </main>
489
</div>
489
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
490
<div class="yui-b">
490
491
[% INCLUDE 'admin-menu.inc' %]
491
        <div class="col-sm-2 col-sm-pull-10">
492
</div>
492
            <aside>
493
</div>
493
                [% INCLUDE 'admin-menu.inc' %]
494
            </aside>
495
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
496
     </div> <!-- /.row -->
494
497
495
[% MACRO jsinclude BLOCK %]
498
[% MACRO jsinclude BLOCK %]
496
    [% Asset.js("js/admin-menu.js") | $raw %]
499
    [% Asset.js("js/admin-menu.js") | $raw %]
497
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
500
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
498
    [% INCLUDE 'calendar.inc' %]
501
    [% INCLUDE 'calendar.inc' %]
499
    [% INCLUDE 'datatables.inc' %]
502
    [% INCLUDE 'datatables.inc' %]
500
    <script type="text/javascript">
503
    <script>
501
        var MSG_CATEGORYCODE_CHARS = _("Category code can only contain the following characters: letters, numbers, - and _.");
504
        var MSG_CATEGORYCODE_CHARS = _("Category code can only contain the following characters: letters, numbers, - and _.");
502
        var MSG_ONE_ENROLLMENTPERIOD = ("Please choose an enrollment period in months OR by date.");
505
        var MSG_ONE_ENROLLMENTPERIOD = ("Please choose an enrollment period in months OR by date.");
503
    </script>
506
    </script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt (-12 / +12 lines)
Lines 13-23 Link Here
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; MARC check
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; MARC check
14
[% IF ( total ) %]: [% total | html %] errors found[% ELSE %] : Configuration OK![% END %]</div>
14
[% IF ( total ) %]: [% total | html %] errors found[% ELSE %] : Configuration OK![% END %]</div>
15
15
16
<div id="doc3" class="yui-t2">
16
<div class="main container-fluid">
17
   
17
    <div class="row">
18
   <div id="bd">
18
        <div class="col-sm-10 col-sm-push-2">
19
	<div id="yui-main">
19
            <main>
20
	<div class="yui-b">
21
20
22
<h1>MARC bibliographic framework test</h1>
21
<h1>MARC bibliographic framework test</h1>
23
<table>
22
<table>
Lines 271-284 Link Here
271
        <p><b>Configuration OK, you don't have errors in your MARC parameters table</b></p>
270
        <p><b>Configuration OK, you don't have errors in your MARC parameters table</b></p>
272
[% END %]
271
[% END %]
273
272
273
            </main>
274
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
274
275
275
276
        <div class="col-sm-2 col-sm-pull-10">
276
</div>
277
            <aside>
277
</div>
278
                [% INCLUDE 'admin-menu.inc' %]
278
<div class="yui-b">
279
            </aside>
279
[% INCLUDE 'admin-menu.inc' %]
280
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
280
</div>
281
     </div> <!-- /.row -->
281
</div>
282
282
283
[% MACRO jsinclude BLOCK %]
283
[% MACRO jsinclude BLOCK %]
284
    [% Asset.js("js/admin-menu.js") | $raw %]
284
    [% Asset.js("js/admin-menu.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt (-18 / +22 lines)
Lines 22-32 Link Here
22
    [% END %]
22
    [% END %]
23
</div>
23
</div>
24
24
25
<div id="doc3" class="yui-t2">
25
<div class="main container-fluid">
26
26
    <div class="row">
27
   <div id="bd">
27
        <div class="col-sm-10 col-sm-push-2">
28
    <div id="yui-main">
28
            <main>
29
    <div class="yui-b">
30
29
31
[% FOR m IN messages %]
30
[% FOR m IN messages %]
32
    <div class="dialog [% m.type | html %]">
31
    <div class="dialog [% m.type | html %]">
Lines 138-149 Link Here
138
    [% IF cities.count %]
137
    [% IF cities.count %]
139
        <table id="table_cities">
138
        <table id="table_cities">
140
            <thead>
139
            <thead>
141
                <th>City ID</th>
140
                <tr>
142
                <th>City</th>
141
                    <th>City ID</th>
143
                <th>State</th>
142
                    <th>City</th>
144
                <th>ZIP/Postal code</th>
143
                    <th>State</th>
145
                <th>Country</th>
144
                    <th>ZIP/Postal code</th>
146
                <th>Actions</th>
145
                    <th>Country</th>
146
                    <th>Actions</th>
147
                </tr>
147
            </thead>
148
            </thead>
148
            <tbody>
149
            <tbody>
149
                [% FOREACH city IN cities %]
150
                [% FOREACH city IN cities %]
Lines 168-184 Link Here
168
    [% END %]
169
    [% END %]
169
[% END %]
170
[% END %]
170
171
171
</div>
172
            </main>
172
</div>
173
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
173
<div class="yui-b">
174
174
[% INCLUDE 'admin-menu.inc' %]
175
        <div class="col-sm-2 col-sm-pull-10">
175
</div>
176
            <aside>
176
</div>
177
                [% INCLUDE 'admin-menu.inc' %]
178
            </aside>
179
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
180
     </div> <!-- /.row -->
177
181
178
[% MACRO jsinclude BLOCK %]
182
[% MACRO jsinclude BLOCK %]
179
    [% Asset.js("js/admin-menu.js") | $raw %]
183
    [% Asset.js("js/admin-menu.js") | $raw %]
180
    [% INCLUDE 'datatables.inc' %]
184
    [% INCLUDE 'datatables.inc' %]
181
    <script type="text/javascript">
185
    <script>
182
        $(document).ready(function() {
186
        $(document).ready(function() {
183
            $("#table_cities").dataTable($.extend(true, {}, dataTablesDefaults, {
187
            $("#table_cities").dataTable($.extend(true, {}, dataTablesDefaults, {
184
                "aoColumnDefs": [
188
                "aoColumnDefs": [
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt (-10 / +13 lines)
Lines 45-54 Link Here
45
[% END %]
45
[% END %]
46
</div>
46
</div>
47
47
48
<div id="doc3" class="yui-t2">
48
<div class="main container-fluid">
49
  <div id="bd">
49
    <div class="row">
50
    <div id="yui-main">
50
        <div class="col-sm-10 col-sm-push-2">
51
      <div class="yui-b">
51
            <main>
52
52
53
[% IF ( class_source_form ) %]
53
[% IF ( class_source_form ) %]
54
  [% IF ( edit_class_source ) %]
54
  [% IF ( edit_class_source ) %]
Lines 262-273 Link Here
262
262
263
[% END %]
263
[% END %]
264
264
265
      </div>
265
            </main>
266
    </div>
266
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
267
<div class="yui-b">
267
268
[% INCLUDE 'admin-menu.inc' %]
268
        <div class="col-sm-2 col-sm-pull-10">
269
  </div>
269
            <aside>
270
</div>
270
                [% INCLUDE 'admin-menu.inc' %]
271
            </aside>
272
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
273
     </div> <!-- /.row -->
271
274
272
[% MACRO jsinclude BLOCK %]
275
[% MACRO jsinclude BLOCK %]
273
    [% Asset.js("js/admin-menu.js") | $raw %]
276
    [% Asset.js("js/admin-menu.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt (-10 / +12 lines)
Lines 12-22 Link Here
12
12
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fine rules</a> &rsaquo; Clone circulation and fine rules</div>
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fine rules</a> &rsaquo; Clone circulation and fine rules</div>
14
14
15
<div id="doc3" class="yui-t1">
15
<div class="main container-fluid">
16
    <div class="row">
17
        <div class="col-sm-10 col-sm-push-2">
18
            <main>
16
19
17
<div id="bd">
18
    <div id="yui-main">
19
    <div class="yui-b">
20
    <h2>Cloning circulation and fine rules
20
    <h2>Cloning circulation and fine rules
21
        [% IF frombranch %] from "[% Branches.GetName( frombranch ) | html %]"[% END %]
21
        [% IF frombranch %] from "[% Branches.GetName( frombranch ) | html %]"[% END %]
22
        [% IF tobranch %] to "[% Branches.GetName( tobranch ) | html %]"[% END %]
22
        [% IF tobranch %] to "[% Branches.GetName( tobranch ) | html %]"[% END %]
Lines 60-72 Link Here
60
    </form>
60
    </form>
61
61
62
    [% END %]
62
    [% END %]
63
    </div>
63
            </main>
64
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
64
65
65
</div>
66
        <div class="col-sm-2 col-sm-pull-10">
66
<div class="yui-b">
67
            <aside>
67
[% INCLUDE 'admin-menu.inc' %]
68
                [% INCLUDE 'admin-menu.inc' %]
68
</div>
69
            </aside>
69
</div>
70
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
71
     </div> <!-- /.row -->
70
72
71
[% MACRO jsinclude BLOCK %]
73
[% MACRO jsinclude BLOCK %]
72
    [% Asset.js("js/admin-menu.js") | $raw %]
74
    [% Asset.js("js/admin-menu.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt (-12 / +14 lines)
Lines 97-106 Link Here
97
[% INCLUDE 'prefs-admin-search.inc' %]
97
[% INCLUDE 'prefs-admin-search.inc' %]
98
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Columns settings</div>
98
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Columns settings</div>
99
99
100
<div id="doc3" class="yui-t2">
100
<div class="main container-fluid">
101
  <div id="bd">
101
    <div class="row">
102
    <div id="yui-main">
102
        <div class="col-sm-10 col-sm-push-2">
103
      <div class="yui-b">
103
            <main>
104
104
        <h2>Columns settings</h2>
105
        <h2>Columns settings</h2>
105
        <div id="modules">
106
        <div id="modules">
106
          <h3><a href="#acqui">Acquisition</a></h3>
107
          <h3><a href="#acqui">Acquisition</a></h3>
Lines 158-174 Link Here
158
          </div>
159
          </div>
159
160
160
        </div>
161
        </div>
161
      </div>
162
            </main>
162
    </div>
163
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
163
164
164
    <div class="yui-b">
165
        <div class="col-sm-2 col-sm-pull-10">
165
      [% INCLUDE 'admin-menu.inc' %]
166
            <aside>
166
    </div>
167
                [% INCLUDE 'admin-menu.inc' %]
167
  </div>
168
            </aside>
169
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
170
     </div> <!-- /.row -->
168
171
169
[% MACRO jsinclude BLOCK %]
172
[% MACRO jsinclude BLOCK %]
170
    [% Asset.js("js/admin-menu.js") | $raw %]
173
    [% Asset.js("js/admin-menu.js") | $raw %]
171
    <script type="text/javascript">
174
    <script>
172
        $(document).ready( function() {
175
        $(document).ready( function() {
173
            var accordion = $( "#modules" ).accordion({
176
            var accordion = $( "#modules" ).accordion({
174
                collapsible: true,
177
                collapsible: true,
175
- 

Return to bug 20739