@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/en/css/datatables.css | 9 +++++ koha-tmpl/intranet-tmpl/prog/en/css/uploader.css | 19 +++++++++-- .../prog/en/modules/tools/quotes-upload.tt | 33 +++++++++++-------- .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 19 ++++++++--- 4 files changed, 57 insertions(+), 23 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css +++ a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css @@ -191,6 +191,15 @@ div.dataTables_paginate.paging_four_button { width: 250px; } +.delete, .save, .cancel { + border-radius: 5px; + margin: 1px; +} + +input { + border-radius: 5px; +} + /* table.display { width: 100%; --- a/koha-tmpl/intranet-tmpl/prog/en/css/uploader.css +++ a/koha-tmpl/intranet-tmpl/prog/en/css/uploader.css @@ -10,12 +10,13 @@ -webkit-transition: opacity 1s linear; } #progress_bar.loading { - opacity: 1.0; + opacity: 1.0; } #progress_bar .percent { - background-color: #99ccff; - height: auto; - width: 0; + color: #E6F0F2; + background-color: #004D99; + height: auto; + width: 0; } #server_response { background-color: white; @@ -36,3 +37,13 @@ top: 50%; width: 250px; } + +#file_uploader { + position: relative; + top: -24px; +} + +#file_upload { + position: relative; + top: -1px; +} --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes-upload.tt @@ -134,14 +134,14 @@ for(var i=0; ifrtip', "aaData" : aaData, "aoColumns" : [ { @@ -162,7 +162,6 @@ }, "fnRowCallback": function( nRow, aData, iDisplayIndex ) { noEditFields = [2]; /* action */ - /* console.log('Quote ID: '+quoteID); */ /* do foo on various cells in the current row */ $('td:eq(2)', nRow).html(''); /* apply no_edit id to noEditFields */ @@ -184,9 +183,9 @@ }, "height" : "14px", }); - $("div.save_quotes").html(''); }, }); + document.getElementById('footer').style.visibility="visible"; } function fnHandleFileSelect(evt) { @@ -201,13 +200,14 @@ alert('File read cancelled'); }; reader.onloadstart = function(e) { + document.getElementById('cancel_upload').style.visibility="visible"; document.getElementById('progress_bar').className = 'loading'; }; reader.onload = function(e) { // Ensure that the progress bar displays 100% at the end. progress.style.width = '100%'; progress.textContent = '100%'; - setTimeout("document.getElementById('progress_bar').className='';", 2000); + document.getElementById('cancel_upload').style.visibility="hidden"; quotes = fnCSVToArray(e.target.result, ','); fnDataTable(quotes); } @@ -215,7 +215,8 @@ reader.readAsText(evt.target.files[0]); } - document.getElementById('files').addEventListener('change', fnHandleFileSelect, false); + //document.getElementById('file_upload').addEventListener('change', fnHandleFileSelect, false); + $('#file_upload').one('change', fnHandleFileSelect); }); @@ -264,11 +265,16 @@
- -
- - -
0%
+
+ +
+ + +
0%
+
Server Response
@@ -288,9 +294,8 @@ - - - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt @@ -21,12 +21,11 @@ "sAjaxSource" : "/cgi-bin/koha/tools/quotes/quotes_ajax.pl", "aoColumns" : [ { "sWidth": "3%" }, - { "sWidth": "12%" }, + { "sWidth": "11%" }, { "sWidth": "65%" }, { "sWidth": "10%" }, - { "sWidth": "10%" }, + { "sWidth": "11%" }, ], - "sDom" : '<"add_quote">frtip', "oLanguage" : { "sEmptyTable": sEmptyTable, }, @@ -64,7 +63,6 @@ }); }, }); - $("div.add_quote").html(''); }); function fnClickAddQuote() { @@ -155,7 +153,16 @@
- +
+
    +
  • + + + Click Source or Text field to edit contents +
  • +
+
+
@@ -176,6 +183,8 @@
ID
+
--