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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt (-16 / +14 lines)
Lines 12-24 Link Here
12
12
13
<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; <strong>Task scheduler</strong></div>
13
<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; <strong>Task scheduler</strong></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
21
<div id="main">
22
19
23
[% IF ( job_add_failed ) %]
20
[% IF ( job_add_failed ) %]
24
<div class="dialog message">Failed to add scheduled task</div>
21
<div class="dialog message">Failed to add scheduled task</div>
Lines 84-103 Link Here
84
[% END %]
81
[% END %]
85
</table>[% END %]
82
</table>[% END %]
86
83
84
            </main>
85
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
87
86
88
</div>
87
        <div class="col-sm-2 col-sm-pull-10">
89
</div>
88
            <aside>
90
</div>
89
                [% INCLUDE 'tools-menu.inc' %]
91
<div class="yui-b noprint">
90
                [% INCLUDE 'guided-reports-view.inc' %]
92
[% INCLUDE 'tools-menu.inc' %]
91
            </aside>
93
[% INCLUDE 'guided-reports-view.inc' %]
92
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
94
</div>
93
     </div> <!-- /.row -->
95
</div>
96
94
97
[% MACRO jsinclude BLOCK %]
95
[% MACRO jsinclude BLOCK %]
98
    [% Asset.js("js/tools-menu.js") | $raw %]
96
    [% Asset.js("js/tools-menu.js") | $raw %]
99
    [% INCLUDE 'calendar.inc' %]
97
    [% INCLUDE 'calendar.inc' %]
100
    <script type="text/javascript">
98
    <script>
101
        $(document).ready(function(){
99
        $(document).ready(function(){
102
            $("#startdate").datepicker({ minDate: "+0D" });
100
            $("#startdate").datepicker({ minDate: "+0D" });
103
        });
101
        });
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt (-6 / +11 lines)
Lines 4-10 Link Here
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Tools &rsaquo; Manage staged MARC records &rsaquo; Compare matched records</title>
5
<title>Koha &rsaquo; Tools &rsaquo; Manage staged MARC records &rsaquo; Compare matched records</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
<style type="text/css">
7
<style>
8
    ins { background-color: #e6ffe6; }
8
    ins { background-color: #e6ffe6; }
9
    del { background-color: #ffe6e6; }
9
    del { background-color: #ffe6e6; }
10
    #col1 ins, #col2 del { display: none; }
10
    #col1 ins, #col2 del { display: none; }
Lines 20-28 Link Here
20
    <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/manage-marc-import.pl">Manage staged MARC records</a> &rsaquo; <a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | html %]">Batch [% batchid | html %]</a> &rsaquo; Compare matched records
20
    <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/manage-marc-import.pl">Manage staged MARC records</a> &rsaquo; <a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | html %]">Batch [% batchid | html %]</a> &rsaquo; Compare matched records
21
</div>
21
</div>
22
22
23
<div id="doc3">
23
<div class="main container-fluid">
24
    <div class="yui-g">
24
    <div class="row">
25
        <div id="col1" class="yui-u first">
25
            <main>
26
27
        <div id="col1" class="col-sm-6">
26
            <h1>Original</h1>
28
            <h1>Original</h1>
27
            [% IF ( ERROR_FORMATTED1 ) %]
29
            [% IF ( ERROR_FORMATTED1 ) %]
28
                <div class="dialog alert">
30
                <div class="dialog alert">
Lines 33-39 Link Here
33
                <pre>[% MARC_FORMATTED1 | html %]</pre>
35
                <pre>[% MARC_FORMATTED1 | html %]</pre>
34
            [% END %]
36
            [% END %]
35
        </div>
37
        </div>
36
        <div id="col2" class="yui-u">
38
        <div id="col2" class="col-sm-6">
37
            <h1>Imported</h1>
39
            <h1>Imported</h1>
38
            [% IF ( ERROR_FORMATTED2 ) %]
40
            [% IF ( ERROR_FORMATTED2 ) %]
39
                <div class="dialog alert">
41
                <div class="dialog alert">
Lines 48-57 Link Here
48
50
49
<p><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | uri %]">Return to staged MARC batch [% batchid | html %]</a></p>
51
<p><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | uri %]">Return to staged MARC batch [% batchid | html %]</a></p>
50
52
53
            </main>
54
        </div>
55
51
[% MACRO jsinclude BLOCK %]
56
[% MACRO jsinclude BLOCK %]
52
    [% Asset.js("js/tools-menu.js") | $raw %]
57
    [% Asset.js("js/tools-menu.js") | $raw %]
53
    [% Asset.js("lib/jsdiff/jsdiff.min.js") | $raw %]
58
    [% Asset.js("lib/jsdiff/jsdiff.min.js") | $raw %]
54
    <script type="text/javascript">
59
    <script>
55
        $(document).ready(function(){
60
        $(document).ready(function(){
56
          var diff1 = $("#col1 pre").text();
61
          var diff1 = $("#col1 pre").text();
57
          var diff2 = $("#col2 pre").text();
62
          var diff2 = $("#col2 pre").text();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt (-13 / +15 lines)
Lines 4-10 Link Here
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Tools &rsaquo; Stage MARC records for import</title>
5
<title>Koha &rsaquo; Tools &rsaquo; Stage MARC records for import</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
<style type="text/css">
7
<style>
8
    #fileuploadstatus,#fileuploadfailed,#fileuploadcancel,#jobpanel,#jobstatus,#jobfailed { display : none; }
8
    #fileuploadstatus,#fileuploadfailed,#fileuploadcancel,#jobpanel,#jobstatus,#jobfailed { display : none; }
9
</style>
9
</style>
10
10
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 ( uploadmarc ) %]<a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a> &rsaquo; Upload Results[% ELSE %]Stage MARC records for import[% 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 ( uploadmarc ) %]<a href="/cgi-bin/koha/tools/stage-marc-import.pl">Stage MARC records for import</a> &rsaquo; Upload Results[% ELSE %]Stage MARC records for import[% END %]</div>
17
17
18
<div id="doc3" class="yui-t2">
18
<div class="main container-fluid">
19
   
19
    <div class="row">
20
   <div id="bd">
20
        <div class="col-sm-10 col-sm-push-2">
21
	<div id="yui-main">
21
            <main>
22
	<div class="yui-b">
23
22
24
[% IF ( uploadmarc ) %]
23
[% IF ( uploadmarc ) %]
25
<div id="toolbar" class="btn-toolbar">
24
<div id="toolbar" class="btn-toolbar">
Lines 200-217 Link Here
200
</form>
199
</form>
201
[% END %]
200
[% END %]
202
201
203
</div>
202
            </main>
204
</div>
203
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
205
<div class="yui-b">
204
206
[% INCLUDE 'tools-menu.inc' %]
205
        <div class="col-sm-2 col-sm-pull-10">
207
</div>
206
            <aside>
208
</div>
207
                [% INCLUDE 'tools-menu.inc' %]
208
            </aside>
209
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
210
     </div> <!-- /.row -->
209
211
210
[% MACRO jsinclude BLOCK %]
212
[% MACRO jsinclude BLOCK %]
211
    [% Asset.js("js/tools-menu.js") | $raw %]
213
    [% Asset.js("js/tools-menu.js") | $raw %]
212
    [% Asset.js("js/background-job-progressbar.js") | $raw %]
214
    [% Asset.js("js/background-job-progressbar.js") | $raw %]
213
    [% Asset.js("js/file-upload.js") | $raw %]
215
    [% Asset.js("js/file-upload.js") | $raw %]
214
    <script type="text/javascript">
216
    <script>
215
        var xhr;
217
        var xhr;
216
        $(document).ready(function(){
218
        $(document).ready(function(){
217
            $("#processfile").hide();
219
            $("#processfile").hide();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt (-14 / +16 lines)
Lines 4-10 Link Here
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Tools &rsaquo; Upload images</title>
5
<title>Koha &rsaquo; Tools &rsaquo; Upload images</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
<style type="text/css">
7
<style>
8
    #fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; }
8
    #fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; }
9
</style>
9
</style>
10
</head>
10
</head>
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 ( uploadimage ) %]<a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a> &rsaquo; Upload results[% ELSE %]Upload local cover image[% 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 ( uploadimage ) %]<a href="/cgi-bin/koha/tools/upload-cover-image.pl">Upload local cover image</a> &rsaquo; Upload results[% ELSE %]Upload local cover image[% END %]</div>
17
17
18
<div id="doc3" class="yui-t2">
18
<div class="main container-fluid">
19
19
    <div class="row">
20
   <div id="bd">
20
        <div class="col-sm-10 col-sm-push-2">
21
	<div id="yui-main">
21
            <main>
22
	<div class="yui-b">
23
22
24
<h1>Upload local cover image</h1>
23
<h1>Upload local cover image</h1>
25
[% IF ( uploadimage ) %]
24
[% IF ( uploadimage ) %]
Lines 46-52 Link Here
46
	<li>Select an image file or ZIP file to upload. The tool will accept images in GIF, JPEG, PNG, and XPM formats.</li>
45
	<li>Select an image file or ZIP file to upload. The tool will accept images in GIF, JPEG, PNG, and XPM formats.</li>
47
</ul>
46
</ul>
48
<form method="post" action="/cgi-bin/koha/tools/upload-cover-image.pl" id="uploadfile" enctype="multipart/form-data">
47
<form method="post" action="/cgi-bin/koha/tools/upload-cover-image.pl" id="uploadfile" enctype="multipart/form-data">
49
<fieldset class="rows" id="uploadform">
48
<fieldset class="rows" >
50
<legend>Upload images</legend>
49
<legend>Upload images</legend>
51
<ol>
50
<ol>
52
	<li>
51
	<li>
Lines 103-120 Link Here
103
  <fieldset class="action"><button type="submit" class="btn btn-default btn-sm">Process images</button></fieldset>
102
  <fieldset class="action"><button type="submit" class="btn btn-default btn-sm">Process images</button></fieldset>
104
</form>
103
</form>
105
104
106
</div>
105
            </main>
107
</div>
106
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
108
<div class="yui-b">
107
109
[% INCLUDE 'tools-menu.inc' %]
108
        <div class="col-sm-2 col-sm-pull-10">
110
</div>
109
            <aside>
111
</div>
110
                [% INCLUDE 'tools-menu.inc' %]
111
            </aside>
112
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
113
     </div> <!-- /.row -->
112
114
113
[% MACRO jsinclude BLOCK %]
115
[% MACRO jsinclude BLOCK %]
114
    [% Asset.js("js/tools-menu.js") | $raw %]
116
    [% Asset.js("js/tools-menu.js") | $raw %]
115
    [% Asset.js("js/background-job-progressbar.js") | $raw %]
117
    [% Asset.js("js/background-job-progressbar.js") | $raw %]
116
    [% Asset.js("js/file-upload.js") | $raw %]
118
    [% Asset.js("js/file-upload.js") | $raw %]
117
    <script type="text/javascript">
119
    <script>
118
        function StartUpload() {
120
        function StartUpload() {
119
            if( $('#fileToUpload').prop('files').length == 0 ) return;
121
            if( $('#fileToUpload').prop('files').length == 0 ) return;
120
            $('#uploadform button.submit').prop('disabled',true);
122
            $('#uploadform button.submit').prop('disabled',true);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt (-18 / +24 lines)
Lines 189-195 Link Here
189
   </table>
189
   </table>
190
[% END %]
190
[% END %]
191
191
192
<style type="text/css">
192
<style>
193
    #fileuploadstatus,#fileuploadfailed { display : none; }
193
    #fileuploadstatus,#fileuploadfailed { display : none; }
194
    #fileuploadstatus { margin:.4em; }
194
    #fileuploadstatus { margin:.4em; }
195
    #fileuploadprogress { width:150px;height:10px;border:1px solid #666;background:url('[% interface | html %]/[% theme | html %]/img/progress.png') -300px 0px no-repeat; }
195
    #fileuploadprogress { width:150px;height:10px;border:1px solid #666;background:url('[% interface | html %]/[% theme | html %]/img/progress.png') -300px 0px no-repeat; }
Lines 200-220 Link Here
200
200
201
[% IF ( plugin ) %]
201
[% IF ( plugin ) %]
202
    <body id="tools_upload" class="tools">
202
    <body id="tools_upload" class="tools">
203
        <div class="yui-t7">
203
        <div class="main container-fluid">
204
            <div id="bd">
204
            <div class="row">
205
                <div class="yui-g">
205
                <div class="col-sm-12">
206
                    <main>
206
[% ELSE %]
207
[% ELSE %]
207
    <body id="tools_upload" class="tools">
208
    <body id="tools_upload" class="tools">
208
    [% INCLUDE 'header.inc' %]
209
    [% INCLUDE 'header.inc' %]
209
    [% INCLUDE 'cat-search.inc' %]
210
    [% INCLUDE 'cat-search.inc' %]
210
    [% PROCESS breadcrumbs %]
211
    [% PROCESS breadcrumbs %]
211
    <div id="doc3" class="yui-t2">
212
        <div id="bd">
213
            <div id="yui-main">
214
                <div class="yui-b">
215
[% END %]
216
217
212
213
    <div class="main container-fluid">
214
        <div class="row">
215
            <div class="col-sm-10 col-sm-push-2">
216
                <main>
217
[% END %]
218
218
219
<h1>Upload</h1>
219
<h1>Upload</h1>
220
<div class="dialog alert" id="myalerts" style="display:none;"></div>
220
<div class="dialog alert" id="myalerts" style="display:none;"></div>
Lines 236-257 Link Here
236
    [% END %]
236
    [% END %]
237
[% END %]
237
[% END %]
238
238
239
</div>
240
241
[% IF !plugin %]
239
[% IF !plugin %]
242
</div>
240
            </main>
243
    <div class="yui-b noprint">
241
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
244
        [% INCLUDE 'tools-menu.inc' %]
242
245
    </div>
243
        <div class="col-sm-2 col-sm-pull-10">
244
            <aside>
245
                [% INCLUDE 'tools-menu.inc' %]
246
            </aside>
247
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
248
     </div> <!-- /.row -->
249
[% ELSE %]
250
            </main>
251
        </div> <!-- .col-sm-12 -->
252
     </div> <!-- /.row -->
246
[% END %]
253
[% END %]
247
254
248
</div>
249
255
250
[% MACRO jsinclude BLOCK %]
256
[% MACRO jsinclude BLOCK %]
251
    [% Asset.js("js/tools-menu.js") | $raw %]
257
    [% Asset.js("js/tools-menu.js") | $raw %]
252
    [% INCLUDE 'datatables.inc' %]
258
    [% INCLUDE 'datatables.inc' %]
253
    [% Asset.js("js/file-upload.js") | $raw %]
259
    [% Asset.js("js/file-upload.js") | $raw %]
254
    <script type="text/javascript">
260
    <script>
255
        function StartUpload() {
261
        function StartUpload() {
256
            if( $('#fileToUpload').prop('files').length == 0 ) return;
262
            if( $('#fileToUpload').prop('files').length == 0 ) return;
257
            $('#fileToUpload').prop('disabled',true);
263
            $('#fileToUpload').prop('disabled',true);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-19 / +24 lines)
Lines 77-86 Link Here
77
	[% END %]
77
	[% END %]
78
</div>
78
</div>
79
79
80
<div id="doc3" class="yui-t2">
80
<div class="main container-fluid">
81
	<div id="bd">
81
    <div class="row">
82
		<div id="yui-main">
82
        <div class="col-sm-10 col-sm-push-2">
83
			<div class="yui-b">
83
            <main>
84
84
				<h1>Browse system logs</h1>
85
				<h1>Browse system logs</h1>
85
				<form method="post" action="/cgi-bin/koha/tools/viewlog.pl">
86
				<form method="post" action="/cgi-bin/koha/tools/viewlog.pl">
86
					[% IF ( do_it ) %]
87
					[% IF ( do_it ) %]
Lines 271-290 Link Here
271
                        </div>
272
                        </div>
272
                    [% END %]
273
                    [% END %]
273
                [% END %]
274
                [% END %]
274
			</div>
275
275
		</div>
276
276
		<div class="yui-b noprint">
277
            </main>
277
        [% IF ( circulation ) %]
278
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
278
				[% INCLUDE 'circ-menu.inc' %]
279
279
			[% ELSE %]
280
        <div class="col-sm-2 col-sm-pull-10">
280
				[% IF ( CATALOGUING ) %]
281
            <aside>
281
					[% INCLUDE 'biblio-view-menu.inc' %]
282
                [% IF ( circulation ) %]
282
				[% ELSE %]
283
                    [% INCLUDE 'circ-menu.inc' %]
283
					[% INCLUDE 'tools-menu.inc' %]
284
                [% ELSE %]
284
				[% END %]
285
                    [% IF ( CATALOGUING ) %]
285
			[% END %]
286
                        [% INCLUDE 'biblio-view-menu.inc' %]
286
		</div>
287
                    [% ELSE %]
287
	</div>
288
                        [% INCLUDE 'tools-menu.inc' %]
289
                    [% END %]
290
                [% END %]
291
            </aside>
292
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
293
     </div> <!-- /.row -->
288
294
289
[% MACRO jsinclude BLOCK %]
295
[% MACRO jsinclude BLOCK %]
290
    [% INCLUDE 'calendar.inc' %]
296
    [% INCLUDE 'calendar.inc' %]
291
- 

Return to bug 21436