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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt (-12 / +12 lines)
Lines 27-37 Link Here
27
[% IF ( else ) %]Tag [% tagfield | html %] Subfield structure[% END %]
27
[% IF ( else ) %]Tag [% tagfield | html %] Subfield structure[% END %]
28
</div>
28
</div>
29
29
30
<div id="doc3" class="yui-t2">
30
<div class="main container-fluid">
31
31
    <div class="row">
32
    <div id="bd">
32
        <div class="col-sm-10 col-sm-push-2">
33
    <div id="yui-main">
33
            <main>
34
    <div class="yui-b">
35
34
36
[% IF ( add_form ) %]
35
[% IF ( add_form ) %]
37
    <h1>
36
    <h1>
Lines 310-323 Link Here
310
309
311
[% END %]
310
[% END %]
312
311
312
            </main>
313
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
313
314
314
315
        <div class="col-sm-2 col-sm-pull-10">
315
</div>
316
            <aside>
316
</div>
317
                [% INCLUDE 'admin-menu.inc' %]
317
<div class="yui-b noprint">
318
            </aside>
318
    [% INCLUDE 'admin-menu.inc' %]
319
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
319
</div>
320
     </div> <!-- /.row -->
320
</div>
321
321
322
[% MACRO jsinclude BLOCK %]
322
[% MACRO jsinclude BLOCK %]
323
    [% Asset.js("js/admin-menu.js") | $raw %]
323
    [% Asset.js("js/admin-menu.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt (-13 / +15 lines)
Lines 49-55 Link Here
49
    </select>
49
    </select>
50
[% END %]
50
[% END %]
51
51
52
<style type="text/css">
52
<style>
53
  fieldset.rows fieldset.rows { border-width : 0; }
53
  fieldset.rows fieldset.rows { border-width : 0; }
54
  fieldset.rows fieldset.rows fieldset.rows { border-width : 1px; }
54
  fieldset.rows fieldset.rows fieldset.rows { border-width : 1px; }
55
  fieldset, fieldset.rows { width : 90%; padding: .3em .6em .3em .6em; }
55
  fieldset, fieldset.rows { width : 90%; padding: .3em .6em .3em .6em; }
Lines 74-84 Link Here
74
[% END %]
74
[% END %]
75
</div>
75
</div>
76
76
77
<div id="doc3" class="yui-t2">
77
<div class="main container-fluid">
78
78
    <div class="row">
79
   <div id="bd">
79
        <div class="col-sm-10 col-sm-push-2">
80
    <div id="yui-main">
80
            <main>
81
    <div class="yui-b">
82
81
83
[% IF ( matching_rule_form ) %]
82
[% IF ( matching_rule_form ) %]
84
  [% IF ( edit_matching_rule ) %]
83
  [% IF ( edit_matching_rule ) %]
Lines 573-588 Link Here
573
</div>
572
</div>
574
[% END %]
573
[% END %]
575
574
576
</div>
575
            </main>
577
</div>
576
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
578
<div class="yui-b">
577
579
[% INCLUDE 'admin-menu.inc' %]
578
        <div class="col-sm-2 col-sm-pull-10">
580
</div>
579
            <aside>
581
</div>
580
                [% INCLUDE 'admin-menu.inc' %]
581
            </aside>
582
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
583
     </div> <!-- /.row -->
582
584
583
[% MACRO jsinclude BLOCK %]
585
[% MACRO jsinclude BLOCK %]
584
    [% Asset.js("js/admin-menu.js") | $raw %]
586
    [% Asset.js("js/admin-menu.js") | $raw %]
585
    <script type="text/javascript">
587
    <script>
586
        var maxMatchPoint = [% max_matchpoint | html %];
588
        var maxMatchPoint = [% max_matchpoint | html %];
587
        var maxMatchCheck = [% max_matchcheck | html %];
589
        var maxMatchCheck = [% max_matchcheck | html %];
588
590
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt (-11 / +14 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/oai_sets.pl">OAI sets configuration</a> &rsaquo; <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% id | html %]">OAI set mappings</a></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/oai_sets.pl">OAI sets configuration</a> &rsaquo; <a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% id | html %]">OAI set mappings</a></div>
14
14
15
<div id="doc3" class="yui-t2">
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
      [% IF ( mappings_saved ) %]
20
      [% IF ( mappings_saved ) %]
21
        <div class="dialog message">
21
        <div class="dialog message">
22
          <h4>Mappings have been saved</h4>
22
          <h4>Mappings have been saved</h4>
Lines 87-102 Link Here
87
        </fieldset>
87
        </fieldset>
88
      </form>
88
      </form>
89
89
90
    </div>
90
            </main>
91
  </div>
91
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
92
  <div class="yui-b">
92
93
    [% INCLUDE 'admin-menu.inc' %]
93
        <div class="col-sm-2 col-sm-pull-10">
94
  </div>
94
            <aside>
95
</div>
95
                [% INCLUDE 'admin-menu.inc' %]
96
            </aside>
97
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
98
     </div> <!-- /.row -->
96
99
97
[% MACRO jsinclude BLOCK %]
100
[% MACRO jsinclude BLOCK %]
98
    [% Asset.js("js/admin-menu.js") | $raw %]
101
    [% Asset.js("js/admin-menu.js") | $raw %]
99
    <script type="text/javascript">
102
    <script>
100
        $(document).ready(function() {
103
        $(document).ready(function() {
101
            $("#mappingform").submit(function(){
104
            $("#mappingform").submit(function(){
102
              hideDialogBox();
105
              hideDialogBox();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt (-11 / +14 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; [% IF ( op_new ) %]<a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> &rsaquo; Add a new OAI set[% ELSIF ( op_mod ) %]<a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> &rsaquo; Edit OAI set '[% spec | html %]'[% ELSE %] OAI sets configuration[% END %]</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; [% IF ( op_new ) %]<a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> &rsaquo; Add a new OAI set[% ELSIF ( op_mod ) %]<a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a> &rsaquo; Edit OAI set '[% spec | html %]'[% ELSE %] OAI sets configuration[% END %]</div>
14
14
15
<div id="doc3" class="yui-t2">
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
        [% IF ( op_new || op_mod ) %]
20
        [% IF ( op_new || op_mod ) %]
21
            <form method="post" action="/cgi-bin/koha/admin/oai_sets.pl" class="validated">
21
            <form method="post" action="/cgi-bin/koha/admin/oai_sets.pl" class="validated">
22
            [% IF ( op_new ) %]
22
            [% IF ( op_new ) %]
Lines 107-122 Link Here
107
        [% END %]
107
        [% END %]
108
        [% END %]
108
        [% END %]
109
109
110
    </div>
110
            </main>
111
  </div>
111
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
112
  <div class="yui-b">
112
113
    [% INCLUDE 'admin-menu.inc' %]
113
        <div class="col-sm-2 col-sm-pull-10">
114
  </div>
114
            <aside>
115
</div>
115
                [% INCLUDE 'admin-menu.inc' %]
116
            </aside>
117
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
118
     </div> <!-- /.row -->
116
119
117
[% MACRO jsinclude BLOCK %]
120
[% MACRO jsinclude BLOCK %]
118
    [% Asset.js("js/admin-menu.js") | $raw %]
121
    [% Asset.js("js/admin-menu.js") | $raw %]
119
    <script type="text/javascript">
122
    <script>
120
        function newDescField() {
123
        function newDescField() {
121
            $("#adddescription").before(
124
            $("#adddescription").before(
122
                '<li><label>' + _("setDescription: ") + '</label>' +
125
                '<li><label>' + _("setDescription: ") + '</label>' +
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt (-13 / +15 lines)
Lines 35-45 Link Here
35
[% END %]
35
[% END %]
36
</div>
36
</div>
37
37
38
<div id="doc3" class="yui-t2">
38
<div class="main container-fluid">
39
39
    <div class="row">
40
   <div id="bd">
40
        <div class="col-sm-10 col-sm-push-2">
41
    <div id="yui-main">
41
            <main>
42
    <div class="yui-b">
43
42
44
[% IF ( WARNING_extended_attributes_off ) %]
43
[% IF ( WARNING_extended_attributes_off ) %]
45
<div class="dialog message">Because the 'ExtendedPatronAttributes` system preference is currently not enabled, extended patron attributes cannot be given to patron records.  Go <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=ExtendedPatronAttributes">here</a> if you wish to enable this feature.</div>
44
<div class="dialog message">Because the 'ExtendedPatronAttributes` system preference is currently not enabled, extended patron attributes cannot be given to patron records.  Go <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=ExtendedPatronAttributes">here</a> if you wish to enable this feature.</div>
Lines 292-308 Link Here
292
<div class="pages">[% pagination_bar | $raw %]</div>
291
<div class="pages">[% pagination_bar | $raw %]</div>
293
292
294
[% END %]
293
[% END %]
295
 
294
296
</div>
295
            </main>
297
</div>
296
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
298
<div class="yui-b">
297
299
[% INCLUDE 'admin-menu.inc' %]
298
        <div class="col-sm-2 col-sm-pull-10">
300
</div>
299
            <aside>
301
</div>
300
                [% INCLUDE 'admin-menu.inc' %]
301
            </aside>
302
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
303
     </div> <!-- /.row -->
302
304
303
[% MACRO jsinclude BLOCK %]
305
[% MACRO jsinclude BLOCK %]
304
    [% Asset.js("js/admin-menu.js") | $raw %]
306
    [% Asset.js("js/admin-menu.js") | $raw %]
305
    <script type="text/javascript">
307
    <script>
306
        $(document).ready(function() {
308
        $(document).ready(function() {
307
            if ( $("#branches option:selected").length < 1 ) {
309
            if ( $("#branches option:selected").length < 1 ) {
308
                $("#branches option:first").attr("selected", "selected");
310
                $("#branches option:first").attr("selected", "selected");
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt (-15 / +18 lines)
Lines 16-26 Link Here
16
16
17
<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; System preferences</div>
17
<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; System preferences</div>
18
18
19
<div id="doc3" class="yui-t2">
19
<div class="main container-fluid">
20
20
    <div class="row">
21
   <div id="bd">
21
        <div class="col-sm-10 col-sm-push-2">
22
    <div id="yui-main">
22
            <main>
23
	    <div class="yui-b">
24
23
25
    [% IF ( jump_not_found ) %]
24
    [% IF ( jump_not_found ) %]
26
    <h2>System preferences</h2>
25
    <h2>System preferences</h2>
Lines 147-164 Link Here
147
    </form>
146
    </form>
148
    </div>
147
    </div>
149
    [% END %]
148
    [% END %]
150
</div>
149
151
</div>
150
            </main>
152
<div class="yui-b">
151
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
153
[% INCLUDE 'prefs-menu.inc' %]
152
154
</div>
153
        <div class="col-sm-2 col-sm-pull-10">
155
</div>
154
            <aside>
155
                [% INCLUDE 'admin-menu.inc' %]
156
            </aside>
157
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
158
     </div> <!-- /.row -->
156
159
157
[% MACRO jsinclude BLOCK %]
160
[% MACRO jsinclude BLOCK %]
158
    [% INCLUDE 'datatables.inc' %]
161
    [% INCLUDE 'datatables.inc' %]
159
    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %]
162
    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %]
160
    [% Asset.js("lib/jquery/plugins/multiple-select/jquery.multiple.select.js") | $raw %]
163
    [% Asset.js("lib/jquery/plugins/multiple-select/jquery.multiple.select.js") | $raw %]
161
    <script type="text/javascript">
164
    <script>
162
        [% UNLESS ( searchfield ) %]$(document).ready(function(){
165
        [% UNLESS ( searchfield ) %]$(document).ready(function(){
163
                $('#toolbar').fixFloat();
166
                $('#toolbar').fixFloat();
164
            });[% END %]
167
            });[% END %]
Lines 191-199 Link Here
191
        var MSG_DATA_NOT_SAVED = _( "Error; your data might not have been saved" );
194
        var MSG_DATA_NOT_SAVED = _( "Error; your data might not have been saved" );
192
        var MSG_LOADING = _( "Loading..." );
195
        var MSG_LOADING = _( "Loading..." );
193
    </script>
196
    </script>
194
    <script src="[% interface | html %]/lib/jquery/plugins/humanmsg.js" type="text/javascript"></script>
197
    [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
195
    <script src="[% interface | html %]/[% theme | html %]/js/ajax.js" type="text/javascript"></script>
198
    [% Asset.js("js/ajax.js") | $raw %]
196
    <script src="[% interface | html %]/[% theme | html %]/js/pages/preferences.js" type="text/javascript"></script>
199
    [% Asset.js("js/pages/preferences.js") | $raw %]
197
    [%# Add WYSIWYG editor for htmlarea system preferences %]
200
    [%# Add WYSIWYG editor for htmlarea system preferences %]
198
    [% INCLUDE 'wysiwyg-systempreferences.inc' %]
201
    [% INCLUDE 'wysiwyg-systempreferences.inc' %]
199
[% END %]
202
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt (-12 / +14 lines)
Lines 33-42 Link Here
33
[% IF op ==  'add' %]&rsaquo; New [% PROCESS ServerType %] server[% END %]
33
[% IF op ==  'add' %]&rsaquo; New [% PROCESS ServerType %] server[% END %]
34
</div>
34
</div>
35
35
36
<div id="doc3" class="yui-t2">
36
<div class="main container-fluid">
37
<div id="bd">
37
    <div class="row">
38
<div id="yui-main">
38
        <div class="col-sm-10 col-sm-push-2">
39
<div class="yui-b">
39
            <main>
40
40
41
[% IF msg_deleted %]
41
[% IF msg_deleted %]
42
    <div class="dialog alert">Z39.50/SRU server deleted ([% msg_add | html %])</div>
42
    <div class="dialog alert">Z39.50/SRU server deleted ([% msg_add | html %])</div>
Lines 193-204 Link Here
193
    </table>
193
    </table>
194
[% END %]
194
[% END %]
195
195
196
</div>
196
            </main>
197
</div>
197
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
198
<div class="yui-b">
198
199
[% INCLUDE 'admin-menu.inc' %]
199
        <div class="col-sm-2 col-sm-pull-10">
200
</div>
200
            <aside>
201
</div>
201
                [% INCLUDE 'admin-menu.inc' %]
202
            </aside>
203
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
204
     </div> <!-- /.row -->
202
205
203
[% MACRO jsinclude BLOCK %]
206
[% MACRO jsinclude BLOCK %]
204
    [% Asset.js("js/admin-menu.js") | $raw %]
207
    [% Asset.js("js/admin-menu.js") | $raw %]
Lines 206-212 Link Here
206
        [% INCLUDE 'datatables.inc' %]
209
        [% INCLUDE 'datatables.inc' %]
207
    [% END %]
210
    [% END %]
208
211
209
    <script type="text/javascript">
212
    <script>
210
        [% IF ( add_form ) %]
213
        [% IF ( add_form ) %]
211
            $(document).ready(function(){
214
            $(document).ready(function(){
212
                // Update selects for syntax, encoding and recordtype
215
                // Update selects for syntax, encoding and recordtype
213
- 

Return to bug 20742