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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt (-13 / +15 lines)
Lines 5-11 Link Here
5
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Koha &rsaquo; Tools &rsaquo; Export data</title>
6
<title>Koha &rsaquo; Tools &rsaquo; Export data</title>
7
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
8
<style type="text/css">
8
<style>
9
    fieldset.rows fieldset.rows {
9
    fieldset.rows fieldset.rows {
10
        width: 90%;
10
        width: 90%;
11
    }
11
    }
Lines 18-28 Link Here
18
18
19
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Export data</div>
19
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Export data</div>
20
20
21
<div id="doc3" class="yui-t2">
21
<div class="main container-fluid">
22
   
22
    <div class="row">
23
   <div id="bd">
23
        <div class="col-sm-10 col-sm-push-2">
24
	<div id="yui-main">
24
            <main>
25
	<div class="yui-b">
26
25
27
[% FOR m IN messages %]
26
[% FOR m IN messages %]
28
    <div class="dialog [% m.type | html %]">
27
    <div class="dialog [% m.type | html %]">
Lines 282-298 Link Here
282
281
283
</div>
282
</div>
284
283
285
</div>
284
            </main>
286
</div>
285
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
287
<div class="yui-b noprint">
286
288
[% INCLUDE 'tools-menu.inc' %]
287
        <div class="col-sm-2 col-sm-pull-10">
289
</div>
288
            <aside>
290
</div>
289
                [% INCLUDE 'tools-menu.inc' %]
290
            </aside>
291
        </div> <!-- .col-sm-2.col-sm-pull-10 -->
292
     </div> <!-- /.row -->
291
293
292
[% MACRO jsinclude BLOCK %]
294
[% MACRO jsinclude BLOCK %]
293
    [% Asset.js("js/tools-menu.js") | $raw %]
295
    [% Asset.js("js/tools-menu.js") | $raw %]
294
    [% INCLUDE 'calendar.inc' %]
296
    [% INCLUDE 'calendar.inc' %]
295
    <script type="text/javascript">
297
    <script>
296
        $(document).ready(function() {
298
        $(document).ready(function() {
297
            $('#exporttype').tabs();
299
            $('#exporttype').tabs();
298
300
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt (-17 / +21 lines)
Lines 6-12 Link Here
6
<title>Koha &rsaquo; Tools &rsaquo; [% Branches.GetName( branch ) | html %] calendar</title>
6
<title>Koha &rsaquo; Tools &rsaquo; [% Branches.GetName( branch ) | html %] calendar</title>
7
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
8
[% Asset.css("css/datatables.css") | $raw %]
8
[% Asset.css("css/datatables.css") | $raw %]
9
<style type="text/css"> .key { padding : 3px; white-space:nowrap; line-height:230%; }
9
<style> .key { padding : 3px; white-space:nowrap; line-height:230%; }
10
.ui-datepicker { font-size : 150%; }
10
.ui-datepicker { font-size : 150%; }
11
.ui-datepicker th, .ui-datepicker .ui-datepicker-title select { font-size : 80%; }
11
.ui-datepicker th, .ui-datepicker .ui-datepicker-title select { font-size : 80%; }
12
.ui-datepicker td a { padding : .5em; }
12
.ui-datepicker td a { padding : .5em; }
Lines 23-29 td.repeatableweekly a.ui-state-default { background: #FFFF99 none; color : Bl Link Here
23
td.repeatableyearly a.ui-state-default {  background:  #FFCC66 none; color :  Black;  border : 1px solid #BCBCBC; }
23
td.repeatableyearly a.ui-state-default {  background:  #FFCC66 none; color :  Black;  border : 1px solid #BCBCBC; }
24
.information { z-index : 1; background-color :  #DCD2F1; width : 300px; display : none; border : 1px solid #000000; color :  #000000; font-size :  8pt; font-weight :  bold; background-color :  #FFD700; cursor :  pointer; padding : 2px; }
24
.information { z-index : 1; background-color :  #DCD2F1; width : 300px; display : none; border : 1px solid #000000; color :  #000000; font-size :  8pt; font-weight :  bold; background-color :  #FFD700; cursor :  pointer; padding : 2px; }
25
.panel { z-index : 1; display : none; border : 3px solid #CCC; padding : 3px; margin-top: .3em;  background-color: #FEFEFE; } fieldset.brief { border : 0; margin-top: 0; }
25
.panel { z-index : 1; display : none; border : 3px solid #CCC; padding : 3px; margin-top: .3em;  background-color: #FEFEFE; } fieldset.brief { border : 0; margin-top: 0; }
26
#showHoliday { margin : .5em 0; } h1 select { width: 20em; } div.yui-b fieldset.brief ol { font-size:100%; } div.yui-b fieldset.brief li, div.yui-b fieldset.brief li.radio  { padding:0.2em 0; } .help { margin:.3em 0;border:1px solid #EEE;padding:.3em .7em; font-size : 90%; } #holidayweeklyrepeatable, #holidaysyearlyrepeatable, #holidaysunique, #holidayexceptions { font-size : 90%; margin-bottom : 1em;} .calendar td, .calendar th, .calendar .button, .calendar tbody .day { padding : .7em; font-size: 110%; } .calendar { width: auto; border : 0; }
26
#showHoliday { margin : .5em 0; } h1 select { width: 20em; } fieldset.brief ol { font-size:100%; } fieldset.brief li, fieldset.brief li.radio  { padding:0.2em 0; } .help { margin:.3em 0;border:1px solid #EEE;padding:.3em .7em; font-size : 90%; } #holidayweeklyrepeatable, #holidaysyearlyrepeatable, #holidaysunique, #holidayexceptions { font-size : 90%; margin-bottom : 1em;} .calendar td, .calendar th, .calendar .button, .calendar tbody .day { padding : .7em; font-size: 110%; } .calendar { width: auto; border : 0; }
27
</style>
27
</style>
28
</head>
28
</head>
29
<body id="tools_holidays" class="tools">
29
<body id="tools_holidays" class="tools">
Lines 32-45 td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl Link Here
32
32
33
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% Branches.GetName( branch ) | html %] calendar</div>
33
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% Branches.GetName( branch ) | html %] calendar</div>
34
34
35
<div id="doc3" class="yui-t1">
35
<div class="main container-fluid">
36
   
36
    <div class="row">
37
   <div id="bd">
37
        <div class="col-sm-10 col-sm-push-2">
38
    <div id="yui-main">
38
            <main>
39
    <div class="yui-b">
39
40
    <h2>[% Branches.GetName( branch ) | html %] calendar</h2>
40
    <h2>[% Branches.GetName( branch ) | html %] calendar</h2>
41
    <div class="yui-g">
41
42
    <div class="yui-u first">
42
    <div class="row">
43
    <div class="col-sm-6">
43
        <label for="branch">Define the holidays for:</label>
44
        <label for="branch">Define the holidays for:</label>
44
            <select id="branch" name="branch">
45
            <select id="branch" name="branch">
45
                [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
46
                [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
Lines 215-221 td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl Link Here
215
</div>
216
</div>
216
217
217
</div>
218
</div>
218
<div class="yui-u">
219
<div class="col-sm-6">
219
<div class="help">
220
<div class="help">
220
<h4>Hints</h4>
221
<h4>Hints</h4>
221
    <ul>
222
    <ul>
Lines 331-349 td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl Link Here
331
</div>
332
</div>
332
</div>
333
</div>
333
</div>
334
</div>
334
</div>
335
</div>
336
335
337
<div class="yui-b noprint">
336
            </main>
338
[% INCLUDE 'tools-menu.inc' %]
337
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
339
</div>
338
340
</div>
339
        <div class="col-sm-2 col-sm-pull-10">
340
            <aside>
341
                [% INCLUDE 'tools-menu.inc' %]
342
            </aside>
343
        </div> <!-- .col-sm-2.col-sm-pull-10 -->
344
     </div> <!-- /.row -->
341
345
342
[% MACRO jsinclude BLOCK %]
346
[% MACRO jsinclude BLOCK %]
343
    [% INCLUDE 'calendar.inc' %]
347
    [% INCLUDE 'calendar.inc' %]
344
    [% INCLUDE 'datatables.inc' %]
348
    [% INCLUDE 'datatables.inc' %]
345
    [% Asset.js("js/tools-menu.js") | $raw %]
349
    [% Asset.js("js/tools-menu.js") | $raw %]
346
    <script type="text/javascript">
350
    <script>
347
        var weekdays = new Array(_("Sundays"),_("Mondays"),_("Tuesdays"),_("Wednesdays"),_("Thursdays"),_("Fridays"),_("Saturdays"));
351
        var weekdays = new Array(_("Sundays"),_("Mondays"),_("Tuesdays"),_("Wednesdays"),_("Thursdays"),_("Fridays"),_("Saturdays"));
348
352
349
        /* Creates all the structures to deal with all different kinds of holidays */
353
        /* Creates all the structures to deal with all different kinds of holidays */
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt (-15 / +19 lines)
Lines 6-12 Link Here
6
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Koha &rsaquo; Tools &rsaquo; Import patrons [% IF ( uploadborrowers ) %]&rsaquo; Results[% END %]</title>
7
<title>Koha &rsaquo; Tools &rsaquo; Import patrons [% IF ( uploadborrowers ) %]&rsaquo; Results[% END %]</title>
8
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
9
<style type="text/css">
9
<style>
10
    .yui-u fieldset.rows .widelabel { width: 12em; }
10
    .yui-u fieldset.rows .widelabel { width: 12em; }
11
    label.description { width: 20em; }
11
    label.description { width: 20em; }
12
    .line_error { width: 100%; }
12
    .line_error { width: 100%; }
Lines 20-31 Link Here
20
20
21
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a>[% IF ( uploadborrowers ) %] &rsaquo; Results[% END %]</div>
21
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a>[% IF ( uploadborrowers ) %] &rsaquo; Results[% END %]</div>
22
22
23
<div id="doc3" class="yui-t2">
23
<div class="main container-fluid">
24
 <div id="bd">
24
    <div class="row">
25
  <div id="yui-main">
25
        <div class="col-sm-10 col-sm-push-2">
26
   <div class="yui-b">
26
            <main>
27
    <div class="yui-g">
27
28
     <div class="yui-u first">
28
    <div class="row">
29
     <div class="col-sm-6">
29
<h1>Import patrons</h1>
30
<h1>Import patrons</h1>
30
[% IF ( uploadborrowers ) %]
31
[% IF ( uploadborrowers ) %]
31
    <h5>Import results :</h5>
32
    <h5>Import results :</h5>
Lines 244-250 Link Here
244
245
245
</div>
246
</div>
246
247
247
<div class="yui-u">
248
<div class="col-sm-6">
248
    <h2>Notes:</h2>
249
    <h2>Notes:</h2>
249
    <ul>
250
    <ul>
250
        <li>The first line in the file must be a header row defining which columns you are supplying in the import file.</li>
251
        <li>The first line in the file must be a header row defining which columns you are supplying in the import file.</li>
Lines 281-300 you can supply dates in ISO format (e.g., '2010-10-28'). Link Here
281
    </ul>
282
    </ul>
282
</div>
283
</div>
283
</div>
284
</div>
284
</div>
285
</div>
286
285
287
<div class="yui-b noprint">
286
            </main>
288
    [% INCLUDE 'tools-menu.inc' %]
287
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
289
</div>
288
290
</div>
289
        <div class="col-sm-2 col-sm-pull-10">
290
            <aside>
291
                [% INCLUDE 'tools-menu.inc' %]
292
            </aside>
293
        </div> <!-- .col-sm-2.col-sm-pull-10 -->
294
     </div> <!-- /.row -->
291
295
292
[% MACRO jsinclude BLOCK %]
296
[% MACRO jsinclude BLOCK %]
293
    [% INCLUDE 'calendar.inc' %]
297
    [% INCLUDE 'calendar.inc' %]
294
    [% Asset.js("js/tools-menu.js") | $raw %]
298
    [% Asset.js("js/tools-menu.js") | $raw %]
295
    [% INCLUDE 'str/members-menu.inc' %]
299
    [% INCLUDE 'str/members-menu.inc' %]
296
    [% Asset.js("js/members-menu.js") | $raw %]
300
    [% Asset.js("js/members-menu.js") | $raw %]
297
    <script type="text/javascript">
301
    <script>
298
        $(document).ready(function() {
302
        $(document).ready(function() {
299
            [%# Make date fields have the datepicker %]
303
            [%# Make date fields have the datepicker %]
300
            $("#dateenrolled, #dateexpiry, #dateofbirth").datepicker();
304
            $("#dateenrolled, #dateexpiry, #dateofbirth").datepicker();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt (-13 / +16 lines)
Lines 15-25 Link Here
15
15
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF (loop) %]<a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a> &rsaquo; Results[% ELSE %]Inventory[% END %]</div>
16
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; [% IF (loop) %]<a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a> &rsaquo; Results[% ELSE %]Inventory[% END %]</div>
17
17
18
<div id="doc3" class="yui-t2">
18
<div class="main container-fluid">
19
    <div class="row">
20
        <div class="col-sm-10 col-sm-push-2">
21
            <main>
19
22
20
   <div id="bd">
21
    <div id="yui-main">
22
    <div class="yui-b">
23
    <h1>Inventory</h1>
23
    <h1>Inventory</h1>
24
    [% IF (moddatecount) %]<div class="dialog message">[% moddatecount | html %] items modified : datelastseen set to [% date | $KohaDates %]</div>
24
    [% IF (moddatecount) %]<div class="dialog message">[% moddatecount | html %] items modified : datelastseen set to [% date | $KohaDates %]</div>
25
    <div class="dialog alert">Number of potential barcodes read: [% LinesRead | html %]</div>[% END %]
25
    <div class="dialog alert">Number of potential barcodes read: [% LinesRead | html %]</div>[% END %]
Lines 38-44 Link Here
38
        </div>
38
        </div>
39
    [% END %]
39
    [% END %]
40
       [% UNLESS op %]
40
       [% UNLESS op %]
41
    <div class="yui-g">
41
42
    <form method="post" id="inventory_form" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data">
42
    <form method="post" id="inventory_form" action="/cgi-bin/koha/tools/inventory.pl" enctype="multipart/form-data">
43
        <fieldset class="rows">
43
        <fieldset class="rows">
44
          <legend>Use a barcode file</legend>
44
          <legend>Use a barcode file</legend>
Lines 145-152 Link Here
145
145
146
            <fieldset class="action"><input type="submit" value="Submit" class="button" /></fieldset>
146
            <fieldset class="action"><input type="submit" value="Submit" class="button" /></fieldset>
147
    </form>
147
    </form>
148
    </div>
148
149
    </div>
150
    [% END %]
149
    [% END %]
151
    [% IF (op) %]
150
    [% IF (op) %]
152
    <form method="post" action="/cgi-bin/koha/tools/inventory.pl" class="checkboxed">
151
    <form method="post" action="/cgi-bin/koha/tools/inventory.pl" class="checkboxed">
Lines 241-254 Link Here
241
    [% END %]
240
    [% END %]
242
    </form>
241
    </form>
243
242
244
    </div>
245
243
246
    [% END %]
244
    [% END %]
247
</div>
245
248
<div class="yui-b">
246
            </main>
249
[% INCLUDE 'tools-menu.inc' %]
247
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
250
</div>
248
251
</div>
249
        <div class="col-sm-2 col-sm-pull-10">
250
            <aside>
251
                [% INCLUDE 'tools-menu.inc' %]
252
            </aside>
253
        </div> <!-- .col-sm-2.col-sm-pull-10 -->
254
     </div> <!-- /.row -->
252
255
253
[% MACRO jsinclude BLOCK %]
256
[% MACRO jsinclude BLOCK %]
254
    [% Asset.js("js/tools-menu.js") | $raw %]
257
    [% Asset.js("js/tools-menu.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt (-15 / +16 lines)
Lines 9-15 Link Here
9
</title>
9
</title>
10
[% INCLUDE 'doc-head-close.inc' %]
10
[% INCLUDE 'doc-head-close.inc' %]
11
[% Asset.css("css/datatables.css") | $raw %]
11
[% Asset.css("css/datatables.css") | $raw %]
12
<style type="text/css">
12
<style>
13
    #jobpanel,#jobstatus,#jobfailed { display : none; }
13
    #jobpanel,#jobstatus,#jobfailed { display : none; }
14
    span.change-status { font-style:italic; color:#666; display:none; }
14
    span.change-status { font-style:italic; color:#666; display:none; }
15
</style>
15
</style>
Lines 28-38 Link Here
28
[% END %]
28
[% END %]
29
</div>
29
</div>
30
30
31
<div id="doc3" class="yui-t2">
31
<div class="main container-fluid">
32
   
32
    <div class="row">
33
   <div id="bd">
33
        <div class="col-sm-10 col-sm-push-2">
34
	<div id="yui-main">
34
            <main>
35
	<div class="yui-b">
36
35
37
<h1>Manage staged MARC records
36
<h1>Manage staged MARC records
38
[% IF ( import_batch_id ) %]
37
[% IF ( import_batch_id ) %]
Lines 374-391 Link Here
374
    </div>
373
    </div>
375
[% END %]
374
[% END %]
376
375
377
</div>
376
            </main>
378
</div>
377
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
379
<div class="yui-b">
378
380
[% INCLUDE 'tools-menu.inc' %]
379
        <div class="col-sm-2 col-sm-pull-10">
381
</div>
380
            <aside>
382
</div>
381
                [% INCLUDE 'tools-menu.inc' %]
382
            </aside>
383
        </div> <!-- .col-sm-2.col-sm-pull-10 -->
384
     </div> <!-- /.row -->
383
385
384
[% MACRO jsinclude BLOCK %]
386
[% MACRO jsinclude BLOCK %]
385
    [% Asset.js("js/tools-menu.js") | $raw %]
387
    [% Asset.js("js/tools-menu.js") | $raw %]
386
[% Asset.js("js/background-job-progressbar.js") | $raw %]
388
    [% Asset.js("js/background-job-progressbar.js") | $raw %]
387
    [% INCLUDE 'datatables.inc' %]
389
    [% INCLUDE 'datatables.inc' %]
388
    <script type="text/javascript">
390
    <script>
389
        $(document).ready(function(){
391
        $(document).ready(function(){
390
            $("#staged-record-matching-rules select").change(function(){
392
            $("#staged-record-matching-rules select").change(function(){
391
                var str = $(this).attr("id");
393
                var str = $(this).attr("id");
392
- 

Return to bug 21434