projects / koha.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bug 16682: Fix display if Batch patron modification tool does not get any patrons
[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / tools / upload-images.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
index 6108b3d..4fa8092 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
@@ -1,14 +1,40 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Tools &rsaquo; Upload Images</title>
+<title>Koha &rsaquo; Tools &rsaquo; Upload images</title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'file-upload.inc' %]
-[% INCLUDE 'background-job.inc' %]
+
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script>
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/file-upload.js"></script>
+
 <style type="text/css">
-       #uploadpanel,#fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; }
+    #fileuploadstatus,#fileuploadfailed,#jobpanel,#jobstatus,#jobfailed { display : none; }
        #fileuploadstatus,#jobstatus { margin:.4em; }
-       #fileuploadprogress,#jobprogress{ width:150px;height:10px;border:1px solid #666;background:url('/intranet-tmpl/prog/img/progress.png') -300px 0px no-repeat; }</style>
+    #fileuploadprogress,#jobprogress { width:150px;height:10px;border:1px solid #666;background:url('[% interface %]/[% theme %]/img/progress.png') -300px 0px no-repeat; }
+</style>
+
 <script type="text/javascript">
 //<![CDATA[
+function StartUpload() {
+    if( $('#fileToUpload').prop('files').length == 0 ) return;
+    $('#uploadform button.submit').prop('disabled',true);
+    $("#fileuploadstatus").show();
+    $("#uploadedfileid").val('');
+    xhr= AjaxUpload( $('#fileToUpload'), $('#fileuploadprogress'), 'temp=1', cbUpload );
+}
+function cbUpload( status, fileid ) {
+    if( status=='done' ) {
+        $("#uploadedfileid").val( fileid );
+        $('#fileToUpload').prop('disabled',true);
+        $("#processfile").show();
+    } else {
+        $("#fileuploadstatus").hide();
+        $("#fileuploadfailed").show();
+        $("#fileuploadfailed").text( _("Upload status: ") +
+            ( status=='failed'? _("Failed"):
+            ( status=='denied'? _("Denied"): status ))
+        );
+        $("#processfile").hide();
+    }
+}
 $(document).ready(function(){
        $("#processfile").hide();
        $("#zipfile").click(function(){
@@ -17,24 +43,21 @@ $(document).ready(function(){
        $("#image").click(function(){
                $("#bibnum").show();
        });
+    $("#uploadfile").validate({
+        submitHandler: function(form) {
+            StartUpload();
+            return false;
+        }
+    });
 });
-function CheckForm(f) {
-    if ($("#fileToUpload").value == '') {
-        alert(_('Please upload a file first.'));
-    } else {
-        return submitBackgroundJob(f);
-    }
-    return false;
-}
-
 //]]>
 </script>
 </head>
-<body>
+<body id="tools_upload-images" class="tools">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<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>
+<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>
 
 <div id="doc3" class="yui-t2">
 
@@ -42,11 +65,11 @@ function CheckForm(f) {
        <div id="yui-main">
        <div class="yui-b">
 
-<h1>Upload Local Cover Image</h1>
+<h1>Upload local cover image</h1>
 [% IF ( uploadimage ) %]
 <p>Image upload results :</p>
 <ul>
-       <li>[% total %]  images found</li>
+    <li>[% total %] images found</li>
     [% IF ( error ) %]
     <div class="dialog alert">
     [% IF ( error == 'UZIPFAIL' ) %]<p><b>Failed to unzip archive.<br />Please ensure you are uploading a valid zip file and try again.</b></p>
@@ -72,15 +95,22 @@ function CheckForm(f) {
 <ol>
        <li>
         <div id="fileuploadform">
-               <label for="fileToUpload">Select the file to upload: </label>
-               <input type="file" id="fileToUpload" name="fileToUpload" />
+        <label for="fileToUpload" class="required">Select the file to upload: </label>
+        <input type="file" id="fileToUpload" name="fileToUpload" required="required" class="required" />
+    <span class="required">Required</span>
         </div> </li>
 </ol>
-  <fieldset class="action"><button class="submit" onclick="return ajaxFileUpload();">Upload file</button></fieldset>
+    <fieldset class="action"><button class="submit">Upload file</button></fieldset>
 </fieldset>
 
-        <div id="uploadpanel"><div id="fileuploadstatus">Upload progress: <div id="fileuploadprogress"></div> <span id="fileuploadpercent">0</span>%</div>
-        <div id="fileuploadfailed"></div></div>
+    <div id="uploadpanel">
+        <div id="fileuploadstatus">Upload progress:
+            <progress min="0" max="100" value="0" id="fileuploadprogress">
+            </progress>
+            <span class="fileuploadpercent">0</span>%
+        </div>
+        <div id="fileuploadfailed"></div>
+    </div>
 </form>
 
     <form method="post" id="processfile" action="[% SCRIPT_NAME %]" enctype="multipart/form-data">
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git