diff --git a/ChangeLog b/ChangeLog index 6d7bebac..6cd86e5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20536,3 +20536,5 @@ 'text/html'. 2020-11-01 Fred Gleason * Incremented the package version to 3.4.1int3. +2020-11-02 Fred Gleason + * Added a 'donut-spinner' indicator to Webget. diff --git a/icons/Makefile.am b/icons/Makefile.am index 6c36ce95..fbdc470c 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -22,6 +22,7 @@ install-exec-am: mkdir -p $(DESTDIR)@libexecdir@ + cp donut-spinner.gif $(DESTDIR)@libexecdir@ cp greencheckmark.png $(DESTDIR)@libexecdir@ cp redx.png $(DESTDIR)@libexecdir@ cp blueball.png $(DESTDIR)@libexecdir@ @@ -187,6 +188,7 @@ install-exec-am: cp rivendell-32x32.xpm $(DESTDIR)@prefix@/share/X11/fvwm2/pixmaps/rivendell.xpm uninstall-local: + rm -f $(DESTDIR)@libexecdir@/donut-spinner.gif rm -f $(DESTDIR)@libexecdir@/greencheckmark.png rm -f $(DESTDIR)@libexecdir@/redx.png rm -f $(DESTDIR)@libexecdir@/blueball.png @@ -275,6 +277,8 @@ EXTRA_DIST = admin.xpm\ checkmark.xpm\ cover_art_default-60x60.xcf\ cover_art_default-60x60.xpm\ + donut-spinner.gif\ + donut-spinner.xcf\ download.xpm\ ex.xpm\ fillstart.xpm\ diff --git a/icons/donut-spinner.gif b/icons/donut-spinner.gif new file mode 100644 index 00000000..d1aa1969 Binary files /dev/null and b/icons/donut-spinner.gif differ diff --git a/icons/donut-spinner.xcf b/icons/donut-spinner.xcf new file mode 100644 index 00000000..3824a5fa Binary files /dev/null and b/icons/donut-spinner.xcf differ diff --git a/web/webget/webget.cpp b/web/webget/webget.cpp index 00910117..b7c64370 100644 --- a/web/webget/webget.cpp +++ b/web/webget/webget.cpp @@ -500,7 +500,7 @@ void MainObject::ServeForm() printf(" \n"); printf(" \n"); printf(" \n"); - printf("  \n"); + printf("  \n"); printf(" \n"); printf(" \n"); @@ -541,7 +541,7 @@ void MainObject::ServeForm() printf(" \n"); printf(" \n"); printf(" \n"); - printf("  \n"); + printf("  \n"); printf(" \n"); printf(" \n"); diff --git a/web/webget/webget.js b/web/webget/webget.js index 1877dc60..afc3e55d 100644 --- a/web/webget/webget.js +++ b/web/webget/webget.js @@ -32,7 +32,7 @@ function ProcessGet() form.append('title',Id('title').value); form.append('preset',Id('preset').value); - SendForm(form,"webget.cgi"); + SendForm(form,'webget.cgi','get_spinner'); } @@ -46,11 +46,11 @@ function ProcessPut() form.append('group',Id('group').value); form.append('filename',Id('filename').files[0]); - SendForm(form,"webget.cgi"); + SendForm(form,'webget.cgi','put_spinner'); } -function SendForm(form,url) +function SendForm(form,url,spinner_id) { var http=new XMLHttpRequest(); if(http==null) { @@ -60,6 +60,7 @@ function SendForm(form,url) // // Send the form // + Id(spinner_id).innerHTML=''; http.open("POST",url,true); http.setRequestHeader("Content-Type","application/x-www-form-urlencoded"); http.responseType='blob'; @@ -69,7 +70,7 @@ function SendForm(form,url) // Process the response // http.onload=function(e) { - + Id(spinner_id).innerHTML=''; var blob=new Blob([this.response], {type: http.getResponseHeader('content-type')}); var f0=blob.type.split(';');