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

Return to bug 20739