Skip to content

feat(task-tray): show target name in background-task progress headings [OS-460] #2668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
elibosley wants to merge 1 commit into from
+14 −5
Closed

feat(task-tray): show target name in background-task progress headings [OS-460] #2668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions emhttp/plugins/dynamix.docker.manager/javascript/docker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function updateContainer(container) {
swal({
title:_('Are you sure?'),text:_('Update container')+': '+container, type:'warning',html:true,showCancelButton:true,closeOnConfirm:false,confirmButtonText:_('Yes, update it!'),cancelButtonText:_('Cancel')
},function(){
openDocker('update_container '+encodeURIComponent(container),_('Updating the container'),'','loadlist');
openDocker('update_container '+encodeURIComponent(container),_('Update container')+': '+container,'','loadlist');
});
}
function rmContainer(container, image, id) {
Expand Down Expand Up @@ -182,7 +182,7 @@ function updateAll() {
$('input[type=button]').prop('disabled',true);
var ct = [];
for (var i=0,d; d=docker[i]; i++) if (d.update==1) ct.push(encodeURIComponent(d.name));
openDocker('update_container '+ct.join('*'),_('Updating all Containers'),'','loadlist');
openDocker('update_container '+ct.join('*'),_('Updating all Containers')+' ('+ct.length+')','','loadlist');
}
function rebuildAll() {
$('input[type=button]').prop('disabled',true);
Expand Down
5 changes: 4 additions & 1 deletion emhttp/plugins/dynamix/Apps.page
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ Code="e942"
?>
<script>
function installPlugin(file) {
openPlugin("plugin install "+file,"_(Install Plugin)_","","refresh");
// show which plugin in the progress heading; sanitize to a safe display slug
// (the heading is rendered as HTML), derived from the .plg basename
var name = (file.split('/').pop()||'').replace(/\.[a-z0-9]+$/i,'').replace(/[^\w.\- ]+/g,' ').trim();
openPlugin("plugin install "+file,"_(Install Plugin)_"+(name?': '+name:''),"","refresh");
}
</script>

Expand Down
5 changes: 4 additions & 1 deletion emhttp/plugins/dynamix/Language.page
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ function getZIPfile(event,form) {
}
function installXML(name) {
var file = name.trim();
if (file) openPlugin('language install '+file, "_(Install Language)_");
// show which language pack in the progress heading; sanitize to a safe display
// slug (the heading is rendered as HTML), derived from the file basename
var disp = (file.split('/').pop()||'').replace(/\.[a-z0-9]+$/i,'').replace(/[^\w.\- ]+/g,' ').trim();
if (file) openPlugin('language install '+file, "_(Install Language)_"+(disp?': '+disp:''));
}
$(function() {
$('input.view').switchButton({labels_placement:'left', off_label:"_(User)_", on_label:"_(Developer)_"});
Expand Down
5 changes: 4 additions & 1 deletion emhttp/plugins/dynamix/Tailscale.page
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ Title="Tailscale"
?>
<script>
function installPlugin(file) {
openPlugin("plugin install "+file,"_(Install Plugin)_","","refresh");
// show which plugin in the progress heading; sanitize to a safe display slug
// (the heading is rendered as HTML), derived from the .plg basename
var name = (file.split('/').pop()||'').replace(/\.[a-z0-9]+$/i,'').replace(/[^\w.\- ]+/g,' ').trim();
openPlugin("plugin install "+file,"_(Install Plugin)_"+(name?': '+name:''),"","refresh");
}
</script>

Expand Down
Loading