From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] ui: add TaskButton in header
Date: Thu, 9 Jul 2020 13:38:21 +0200 [thread overview]
Message-ID: <20200709113821.9152-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20200709113821.9152-1-d.csapak@proxmox.com>
opens a grid with the running tasks and a shortcut the the node tasks
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
i am not set on the text/icon or colors, but it seemed somewhat sensible
www/MainView.js | 4 ++
www/Makefile | 1 +
www/button/TaskButton.js | 92 +++++++++++++++++++++++++++++++++++
www/css/ext6-pbs.css | 19 ++++++++
www/dashboard/RunningTasks.js | 2 +
5 files changed, 118 insertions(+)
create mode 100644 www/button/TaskButton.js
diff --git a/www/MainView.js b/www/MainView.js
index cb7a81d..1dd315b 100644
--- a/www/MainView.js
+++ b/www/MainView.js
@@ -224,6 +224,10 @@ Ext.define('PBS.MainView', {
href: '/docs/index.html',
margin: '0 5 0 0',
},
+ {
+ xtype: 'pbsTaskButton',
+ margin: '0 5 0 0',
+ },
{
reference: 'logoutButton',
xtype: 'button',
diff --git a/www/Makefile b/www/Makefile
index b205f67..f75082b 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -9,6 +9,7 @@ JSSRC= \
form/RemoteSelector.js \
form/DataStoreSelector.js \
data/RunningTasksStore.js \
+ button/TaskButton.js \
config/UserView.js \
config/RemoteView.js \
config/ACLView.js \
diff --git a/www/button/TaskButton.js b/www/button/TaskButton.js
new file mode 100644
index 0000000..67cc147
--- /dev/null
+++ b/www/button/TaskButton.js
@@ -0,0 +1,92 @@
+Ext.define('PBS.TaskButton', {
+ extend: 'Ext.button.Button',
+ alias: 'widget.pbsTaskButton',
+
+ config: {
+ badgeText: '0',
+ badgeCls: '',
+ },
+
+ iconCls: 'fa fa-list',
+ userCls: 'pmx-has-badge',
+ text: gettext('Tasks'),
+
+ setText: function(value) {
+ let me = this;
+ me.realText = value;
+ let badgeText = me.getBadgeText();
+ let badgeCls = me.getBadgeCls();
+ let text = `${value} <span class="pmx-button-badge ${badgeCls}">${badgeText}</span>`;
+ return me.callParent([text]);
+ },
+
+ getText: function() {
+ let me = this;
+ return me.realText;
+ },
+
+ setBadgeText: function(value) {
+ let me = this;
+ me.badgeText = value.toString();
+ return me.setText(me.getText());
+ },
+
+ setBadgeCls: function(value) {
+ let me = this;
+ let res = me.callParent([value]);
+ let badgeText = me.getBadgeText();
+ me.setBadgeText(badgeText);
+ return res;
+ },
+
+ handler: function() {
+ let me = this;
+ if (me.grid.isVisible()) {
+ me.grid.setVisible(false);
+ } else {
+ me.grid.showBy(me, 'tr-br');
+ }
+ },
+
+ initComponent: function() {
+ let me = this;
+
+ me.grid = Ext.create({
+ xtype: 'pbsRunningTasks',
+ title: '',
+ hideHeaders: false,
+ floating: true,
+
+ width: 600,
+
+ bbar: [
+ '->',
+ {
+ xtype: 'button',
+ text: gettext('Show All Tasks'),
+ handler: function() {
+ var mainview = me.up('mainview');
+ mainview.getController().redirectTo('pbsServerAdministration:tasks');
+ me.grid.hide();
+ },
+ },
+ ],
+
+ listeners: {
+ 'taskopened': function() {
+ me.grid.hide();
+ },
+ },
+ });
+ me.callParent();
+ me.mon(me.grid.getStore().rstore, 'load', function(store, records, success) {
+ if (!success) return;
+
+ let count = records.length;
+ let text = count > 9 ? '9+' : count.toString();
+ let cls = count > 0 ? 'active': '';
+ me.setBadgeText(text);
+ me.setBadgeCls(cls);
+ });
+ },
+});
diff --git a/www/css/ext6-pbs.css b/www/css/ext6-pbs.css
index e634cfc..551d1d1 100644
--- a/www/css/ext6-pbs.css
+++ b/www/css/ext6-pbs.css
@@ -190,3 +190,22 @@ p.logs {
visibility: hidden;
width: 5px;
}
+
+.pmx-has-badge .x-btn-inner {
+ padding: 0 0 0 5px;
+ min-width: 24px;
+}
+
+.pmx-button-badge {
+ display: inline-block;
+ font-weight: bold;
+ border-radius: 20px;
+ background-color: #AAA;
+ padding: 2px 3px;
+ min-width: 24px;
+ line-height: 1em;
+}
+
+.pmx-button-badge.active {
+ background-color: #F00;
+}
diff --git a/www/dashboard/RunningTasks.js b/www/dashboard/RunningTasks.js
index e31218e..4c1d4d1 100644
--- a/www/dashboard/RunningTasks.js
+++ b/www/dashboard/RunningTasks.js
@@ -18,6 +18,8 @@ Ext.define('PBS.RunningTasks', {
upid: record.data.upid,
endtime: record.data.endtime,
}).show();
+
+ view.fireEvent('taskopened', view, record.data.upid);
},
openTaskItemDblClick: function(grid, record) {
--
2.20.1
next prev parent reply other threads:[~2020-07-09 11:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 11:38 [pbs-devel] [PATCH proxmox-backup 1/2] ui: add RunningTasksStore Dominik Csapak
2020-07-09 11:38 ` Dominik Csapak [this message]
2020-07-09 12:30 ` [pbs-devel] applied: " Dietmar Maurer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200709113821.9152-2-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal