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

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (-1 / +23 lines)
Lines 2461-2471 fieldset.rows table.mceListBox { Link Here
2461
2461
2462
#jobpanel,#jobstatus,#jobfailed { display : none; }
2462
#jobpanel,#jobstatus,#jobfailed { display : none; }
2463
#jobstatus { margin:.4em; }
2463
#jobstatus { margin:.4em; }
2464
#jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('../img/progress.png') -300px 0px no-repeat; }
2464
2465
#jobprogress{
2466
    display: inline-block;
2467
    width:200px;
2468
    height:10px;
2469
    border:1px solid #666;
2470
    background:url('../img/progress.png') -300px 0px no-repeat;
2471
 }
2472
2473
.progress_panel {
2474
    clear: both;
2475
    font-size: 120%;
2476
    margin: 1em 0;
2477
    padding: 1em;
2478
    border: 2px solid #EEE;
2479
    border-radius: 5px;
2480
}
2481
2482
progress {
2483
    width: 50%;
2484
}
2485
2465
#selections { width : 100%; white-space : normal; }
2486
#selections { width : 100%; white-space : normal; }
2466
#selections span { margin:3px;padding:3px;background-color:#EBF3FF;-moz-border-radius:5px;border-radius:5px;white-space:nowrap;line-height:240%;font-size:75%; }
2487
#selections span { margin:3px;padding:3px;background-color:#EBF3FF;-moz-border-radius:5px;border-radius:5px;white-space:nowrap;line-height:240%;font-size:75%; }
2467
#selections span.selected { background-color : #CCE0FC; }
2488
#selections span.selected { background-color : #CCE0FC; }
2468
#selections input { vertical-align:middle;margin:0 2px; }
2489
#selections input { vertical-align:middle;margin:0 2px; }
2490
2469
#changepasswordf input[type="text"],
2491
#changepasswordf input[type="text"],
2470
#changepasswordf input[type="password"] {
2492
#changepasswordf input[type="password"] {
2471
    font-size: 140%;
2493
    font-size: 140%;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt (-5 / +1 lines)
Lines 55-64 function CheckForm(f) { Link Here
55
55
56
//]]>
56
//]]>
57
</script>
57
</script>
58
<style type="text/css">
59
	#fileuploadstatus,#jobstatus { margin:.4em; }
60
    #fileuploadprogress,#jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('[% interface %]/[% theme %]/img/progress.png') -300px 0px no-repeat; }
61
</style>
62
</head>
58
</head>
63
<body id="ocirc_process_koc" class="circ ocirc">
59
<body id="ocirc_process_koc" class="circ ocirc">
64
[% INCLUDE 'header.inc' %]
60
[% INCLUDE 'header.inc' %]
Lines 96-102 function CheckForm(f) { Link Here
96
       <fieldset class="action"><input type="button" class="submit" value="Upload file" onclick="StartUpload();return false;" /></fieldset>
92
       <fieldset class="action"><input type="button" class="submit" value="Upload file" onclick="StartUpload();return false;" /></fieldset>
97
	   </fieldset>
93
	   </fieldset>
98
     </form>
94
     </form>
99
     <div id="fileuploadstatus" style="display:none">Upload progress: <progress id="fileuploadprogress" min="0" max="100" value="0"></progress> <span class="fileuploadpercent">0</span>%</div>
95
     <div id="fileuploadstatus" class="progress_panel" style="display:none">Upload progress: <progress id="fileuploadprogress" max="100" value="0"></progress> <span class="fileuploadpercent">0</span>%</div>
100
     <div id="fileuploadfailed" style="display:none"></div>
96
     <div id="fileuploadfailed" style="display:none"></div>
101
   </div>
97
   </div>
102
98
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt (-9 / +4 lines)
Lines 1-7 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Tools &rsaquo; Batch item deletion</title>
2
<title>Koha &rsaquo; Tools &rsaquo; Batch item deletion</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script>
5
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
4
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
6
[% INCLUDE 'datatables.inc' %]
5
[% INCLUDE 'datatables.inc' %]
7
<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/batchMod.js"></script>
6
<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/batchMod.js"></script>
Lines 37-44 for( x=0; x<allColumns.length; x++ ){ Link Here
37
                [% IF ( show ) %]<h1>Batch item deletion</h1>[% ELSE %]<h1>Batch item deletion results</h1>[% END %]
36
                [% IF ( show ) %]<h1>Batch item deletion</h1>[% ELSE %]<h1>Batch item deletion results</h1>[% END %]
38
	    [% IF ( barcode_not_unique ) %]<div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>[% END %]
37
	    [% IF ( barcode_not_unique ) %]<div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div>[% END %]
39
	    [% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>[% END %]
38
	    [% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>[% END %]
40
	    [% IF ( book_on_loan ) %]<div class="dialog alert"><strong>Cannot Delete</strong>: item is checked out.</div>[% END %]
39
        [% IF ( book_on_loan ) %]<div class="dialog alert"><strong>Cannot delete</strong>: item is checked out.</div>[% END %]
41
	    [% IF ( book_reserved ) %]<div class="dialogalert"><strong>Cannot Delete</strong>: item has a waiting hold.</div>[% END %]
40
        [% IF ( book_reserved ) %]<div class="dialogalert"><strong>Cannot delete</strong>: item has a waiting hold.</div>[% END %]
42
41
43
    [% UNLESS ( action ) %]
42
    [% UNLESS ( action ) %]
44
43
Lines 131-145 for( x=0; x<allColumns.length; x++ ){ Link Here
131
	     <p>This will delete [% IF ( too_many_items ) %]all the[% ELSE %]the selected[% END %] items.</p>
130
	     <p>This will delete [% IF ( too_many_items ) %]all the[% ELSE %]the selected[% END %] items.</p>
132
	     <input type="hidden" name="del" value="1" />
131
	     <input type="hidden" name="del" value="1" />
133
	     <fieldset class="action">    
132
	     <fieldset class="action">    
134
		<div id="jobpanel">
135
		    <div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
136
		    <div id="jobfailed"></div>
137
		</div>
138
        <input type="checkbox" name="del_records" id="del_records" /> <label for="del_records">Delete records if no items remain.</label>
133
        <input type="checkbox" name="del_records" id="del_records" /> <label for="del_records">Delete records if no items remain.</label>
139
        [% IF too_many_items %]
134
        [% IF too_many_items %]
140
            <input type="submit" name="mainformsubmit" value="Delete ALL submitted items" onclick="return submitBackgroundJob(this.form);" />
135
            <input type="submit" name="mainformsubmit" value="Delete ALL submitted items" />
141
        [% ELSE %]
136
        [% ELSE %]
142
            <input type="submit" name="mainformsubmit" value="Delete selected items" onclick="return submitBackgroundJob(this.form);" />
137
            <input type="submit" name="mainformsubmit" value="Delete selected items" />
143
        [% END %]
138
        [% END %]
144
139
145
		<a href="/cgi-bin/koha/tools/batchMod.pl?del=1" class="cancel">Cancel</a>
140
		<a href="/cgi-bin/koha/tools/batchMod.pl?del=1" class="cancel">Cancel</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt (-1 / +1 lines)
Lines 232-238 $(document).ready(function(){ Link Here
232
    </fieldset>
232
    </fieldset>
233
    <fieldset class="action">    
233
    <fieldset class="action">    
234
   <div id="jobpanel">
234
   <div id="jobpanel">
235
       <div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
235
       <div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
236
       <div id="jobfailed"></div>
236
       <div id="jobfailed"></div>
237
   </div>
237
   </div>
238
   <input type="submit" name="mainformsubmit" value="Save" onclick="return submitBackgroundJob(this.form);" />
238
   <input type="submit" name="mainformsubmit" value="Save" onclick="return submitBackgroundJob(this.form);" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt (-1 / +1 lines)
Lines 252-258 $(document).ready(function() { Link Here
252
          <a class="cancel" href="/cgi-bin/koha/tools/batch_record_modification.pl">Cancel</a>
252
          <a class="cancel" href="/cgi-bin/koha/tools/batch_record_modification.pl">Cancel</a>
253
        </fieldset>
253
        </fieldset>
254
        <div id="jobpanel">
254
        <div id="jobpanel">
255
          <div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
255
          <div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
256
          <div id="jobfailed"></div>
256
          <div id="jobfailed"></div>
257
        </div>
257
        </div>
258
      </form>
258
      </form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt (-4 / +2 lines)
Lines 151-159 $(document).ready(function(){ Link Here
151
//]]>
151
//]]>
152
</script>
152
</script>
153
<style type="text/css">
153
<style type="text/css">
154
	#jobpanel,#jobstatus,#jobfailed { display : none; }
154
    #jobpanel,#jobstatus,#jobfailed { display : none; }
155
	#jobstatus { margin:.4em; }
156
    #jobprogress{ width:200px;height:10px;border:1px solid #666;background:url('[% interface %]/[% theme %]/img/progress.png') -300px 0px no-repeat; } span.change-status { font-style:italic; color:#666; display:none; }#marcPreview { width : 80%; margin-left : -40%; } @media (max-width: 767px) { #marcPreview { margin: 0; width : auto; } }
157
</style>
155
</style>
158
</head>
156
</head>
159
<body id="tools_manage-marc-import" class="tools">
157
<body id="tools_manage-marc-import" class="tools">
Lines 355-361 $(document).ready(function(){ Link Here
355
    [% END %]
353
    [% END %]
356
    </fieldset>
354
    </fieldset>
357
  </form>
355
  </form>
358
  <div id="jobpanel"><div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
356
  <div id="jobpanel"><div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
359
     <div id="jobfailed"></div></div>
357
     <div id="jobfailed"></div></div>
360
  [% END %]
358
  [% END %]
361
  [% IF ( can_revert ) %]
359
  [% IF ( can_revert ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt (-6 / +4 lines)
Lines 7-14 Link Here
7
7
8
<style type="text/css">
8
<style type="text/css">
9
    #fileuploadstatus,#fileuploadfailed,#fileuploadcancel,#jobpanel,#jobstatus,#jobfailed { display : none; }
9
    #fileuploadstatus,#fileuploadfailed,#fileuploadcancel,#jobpanel,#jobstatus,#jobfailed { display : none; }
10
	#fileuploadstatus,#jobstatus { margin:.4em; }
11
    #fileuploadprogress,#jobprogress { width:150px;height:10px;border:1px solid #666;background:url('[% interface %]/[% theme %]/img/progress.png') -300px 0px no-repeat; }
12
</style>
10
</style>
13
11
14
<script type="text/javascript">
12
<script type="text/javascript">
Lines 151-158 function cbUpload( status, fileid ) { Link Here
151
</fieldset>
149
</fieldset>
152
		
150
		
153
    <div id="fileuploadpanel">
151
    <div id="fileuploadpanel">
154
        <div id="fileuploadstatus">Upload progress:
152
        <div id="fileuploadstatus" class="progress_panel">Upload progress:
155
            <progress id="fileuploadprogress" min="0" max="100" value="0">
153
            <progress id="fileuploadprogress" max="100" value="0">
156
            </progress>
154
            </progress>
157
            <span class="fileuploadpercent">0</span>%
155
            <span class="fileuploadpercent">0</span>%
158
        </div>
156
        </div>
Lines 179-185 function cbUpload( status, fileid ) { Link Here
179
    </li>
177
    </li>
180
	<li>
178
	<li>
181
		<label for="encoding">Character encoding: </label>
179
		<label for="encoding">Character encoding: </label>
182
            <select name="encoding" id="encoding"><option value="utf8" selected="selected">UTF-8 (Default)</option><option value="MARC-8">MARC 8</option><option value="ISO_5426">ISO 5426</option><option value="ISO_6937">ISO 6937</option><option value=ISO_8859-1">ISO 8859-1</option><option value="EUC-KR">EUC-KR</option></select>
180
            <select name="encoding" id="encoding"><option value="utf8" selected="selected">UTF-8 (Default)</option><option value="MARC-8">MARC 8</option><option value="ISO_5426">ISO 5426</option><option value="ISO_6937">ISO 6937</option><option value="ISO_8859-1">ISO 8859-1</option><option value="EUC-KR">EUC-KR</option></select>
183
	</li>
181
	</li>
184
</ol></fieldset>
182
</ol></fieldset>
185
183
Lines 256-262 function cbUpload( status, fileid ) { Link Here
256
  </fieldset>
254
  </fieldset>
257
  <fieldset class="action"><input type="button" id="mainformsubmit" onclick="return CheckForm(this.form);" value="Stage for import" /></fieldset>
255
  <fieldset class="action"><input type="button" id="mainformsubmit" onclick="return CheckForm(this.form);" value="Stage for import" /></fieldset>
258
 
256
 
259
       <div id="jobpanel"><div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
257
       <div id="jobpanel"><div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
260
     <div id="jobfailed"></div></div>
258
     <div id="jobfailed"></div></div>
261
  
259
  
262
</form>
260
</form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt (-11 / +5 lines)
Lines 7-14 Link Here
7
7
8
<style type="text/css">
8
<style type="text/css">
9
    #fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; }
9
    #fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; }
10
	#fileuploadstatus,#jobstatus { margin:.4em; }
11
    #fileuploadprogress,#jobprogress { width:150px;height:10px;border:1px solid #666;background:url('[% interface %]/[% theme %]/img/progress.png') -300px 0px no-repeat; }
12
</style>
10
</style>
13
11
14
<script type="text/javascript">
12
<script type="text/javascript">
Lines 89-95 $(document).ready(function(){ Link Here
89
<ul>
87
<ul>
90
	<li>Select an image file or ZIP file to upload. The tool will accept images in GIF, JPEG, PNG, and XPM formats.</li>
88
	<li>Select an image file or ZIP file to upload. The tool will accept images in GIF, JPEG, PNG, and XPM formats.</li>
91
</ul>
89
</ul>
92
<form method="post" action="[% SCRIPT_NAME %]" id="uploadfile" enctype="multipart/form-data">
90
<form method="post" action="/cgi-bin/koha/tools/upload-cover-image.pl" id="uploadfile" enctype="multipart/form-data">
93
<fieldset class="rows" id="uploadform">
91
<fieldset class="rows" id="uploadform">
94
<legend>Upload images</legend>
92
<legend>Upload images</legend>
95
<ol>
93
<ol>
Lines 104-111 $(document).ready(function(){ Link Here
104
</fieldset>
102
</fieldset>
105
103
106
    <div id="uploadpanel">
104
    <div id="uploadpanel">
107
        <div id="fileuploadstatus">Upload progress:
105
        <div id="fileuploadstatus" class="progress_panel">Upload progress:
108
            <progress min="0" max="100" value="0" id="fileuploadprogress">
106
            <progress max="100" value="0" id="fileuploadprogress">
109
            </progress>
107
            </progress>
110
            <span class="fileuploadpercent">0</span>%
108
            <span class="fileuploadpercent">0</span>%
111
        </div>
109
        </div>
Lines 113-119 $(document).ready(function(){ Link Here
113
    </div>
111
    </div>
114
</form>
112
</form>
115
113
116
    <form method="post" id="processfile" action="[% SCRIPT_NAME %]" enctype="multipart/form-data">
114
    <form method="post" id="processfile" action="/cgi-bin/koha/tools/upload-cover-image.pl" enctype="multipart/form-data">
117
<fieldset class="rows">
115
<fieldset class="rows">
118
        <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
116
        <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
119
        <input type="hidden" name="runinbackground" id="runinbackground" value="" />
117
        <input type="hidden" name="runinbackground" id="runinbackground" value="" />
Lines 128-134 $(document).ready(function(){ Link Here
128
      </li>
126
      </li>
129
      <li class="radio">
127
      <li class="radio">
130
        [% IF (filetype == 'image' ) %]<input type="radio" id="image" name="filetype" value="image" checked="checked" />[% ELSE %]<input type="radio" id="image" name="filetype" value="image" />[% END %]
128
        [% IF (filetype == 'image' ) %]<input type="radio" id="image" name="filetype" value="image" checked="checked" />[% ELSE %]<input type="radio" id="image" name="filetype" value="image" />[% END %]
131
        <label for="imagefile">Image file</label>
129
        <label for="image">Image file</label>
132
      </li>
130
      </li>
133
      <li class="radio">
131
      <li class="radio">
134
        [% IF ( filetype == 'image' ) %]<span id="bibnum">[% ELSE %]<span id="bibnum" style="display: none">[% END %]<label for="biblionumber">Enter cover biblionumber: </label><input type="text" id="biblionumber" name="biblionumber" value="[% biblionumber %]" size="15" /></span>
132
        [% IF ( filetype == 'image' ) %]<span id="bibnum">[% ELSE %]<span id="bibnum" style="display: none">[% END %]<label for="biblionumber">Enter cover biblionumber: </label><input type="text" id="biblionumber" name="biblionumber" value="[% biblionumber %]" size="15" /></span>
Lines 145-154 $(document).ready(function(){ Link Here
145
    </ol>
143
    </ol>
146
  </fieldset>
144
  </fieldset>
147
  <fieldset class="action"><input type="submit" value="Process images" /></fieldset>
145
  <fieldset class="action"><input type="submit" value="Process images" /></fieldset>
148
149
       <div id="jobpanel"><div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
150
     <div id="jobfailed"></div></div>
151
152
</form>
146
</form>
153
147
154
</div>
148
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt (-2 / +1 lines)
Lines 81-87 Link Here
81
        </fieldset>
81
        </fieldset>
82
        </fieldset>
82
        </fieldset>
83
        <div id="fileuploadpanel">
83
        <div id="fileuploadpanel">
84
            <div id="fileuploadstatus">Upload progress:
84
            <div id="fileuploadstatus" class="progress_panel">Upload progress:
85
            <progress id="fileuploadprogress" max="100" value="0">
85
            <progress id="fileuploadprogress" max="100" value="0">
86
            </progress>
86
            </progress>
87
            <span class="fileuploadpercent">0</span>%
87
            <span class="fileuploadpercent">0</span>%
88
- 

Return to bug 16538