From f2b5ed9eecdacff4c70a0e6c323a3332bafa7e10 Mon Sep 17 00:00:00 2001 From: rob Date: Sat, 5 Nov 2022 02:37:55 -0400 Subject: [PATCH] many small UI enhancements --- app/views/admin/announcement/index.pug | 4 +- app/views/admin/newsletter/index.pug | 4 +- app/views/admin/newsletter/job-status.pug | 79 ++++++++++++++--------- app/views/admin/newsroom/editor.pug | 14 +++- app/views/admin/newsroom/index.pug | 2 +- app/views/admin/settings/editor.pug | 2 +- 6 files changed, 67 insertions(+), 38 deletions(-) diff --git a/app/views/admin/announcement/index.pug b/app/views/admin/announcement/index.pug index 0e421ca..3c242ba 100644 --- a/app/views/admin/announcement/index.pug +++ b/app/views/admin/announcement/index.pug @@ -5,7 +5,7 @@ block content .uk-width-expand h1 Announcements .uk-width-auto - a(href="/admin/announcement/create").uk-button.dtp-button-primary + a(href="/admin/announcement/create").uk-button.dtp-button-primary.uk-border-rounded span i.fas.fa-plus span.uk-margin-small-left Create @@ -21,7 +21,7 @@ block content i(class=`fas ${announcement.title.icon.class}`) span.uk-margin-small-left= announcement.title.content .uk-width-auto - button(type="button", data-announcement-id= announcement._id, onclick="return dtp.adminApp.deleteAnnouncement(event);").uk-button.dtp-button-danger + button(type="button", data-announcement-id= announcement._id, onclick="return dtp.adminApp.deleteAnnouncement(event);").uk-button.dtp-button-danger.uk-border-rounded span i.fas.fa-trash else diff --git a/app/views/admin/newsletter/index.pug b/app/views/admin/newsletter/index.pug index fa0f0a2..f3874df 100644 --- a/app/views/admin/newsletter/index.pug +++ b/app/views/admin/newsletter/index.pug @@ -21,7 +21,7 @@ block content data-newsletter-id= newsletter._id, data-newsletter-title= newsletter.title, onclick="return dtp.adminApp.deleteNewsletter(event);", - ).uk-button.uk-button-danger + ).uk-button.uk-button-danger.uk-border-rounded +renderButtonIcon('fa-trash', 'Delete') .uk-width-auto @@ -30,7 +30,7 @@ block content data-newsletter-id= newsletter._id, data-newsletter-title= newsletter.title, onclick="return dtp.adminApp.sendNewsletter(event);", - ).uk-button.uk-button-default + ).uk-button.uk-button-default.uk-border-rounded +renderButtonIcon('fa-paper-plane', 'Send') else div There are no newsletters at this time. \ No newline at end of file diff --git a/app/views/admin/newsletter/job-status.pug b/app/views/admin/newsletter/job-status.pug index 6ea723c..7d7ac4e 100644 --- a/app/views/admin/newsletter/job-status.pug +++ b/app/views/admin/newsletter/job-status.pug @@ -6,40 +6,59 @@ block content .uk-margin h1 Job Queue: #{queueName} div(uk-grid).uk-flex-between - - var pendingJobCount = jobCounts.waiting + jobCounts.delayed + jobCounts.paused + jobCounts.active - .uk-width-auto Total#[br]#{numeral(pendingJobCount).format('0,0')} - .uk-width-auto Waiting#[br]#{numeral(jobCounts.waiting).format('0,0')} - .uk-width-auto Delayed#[br]#{numeral(jobCounts.delayed).format('0,0')} - .uk-width-auto Paused#[br]#{numeral(jobCounts.paused).format('0,0')} - .uk-width-auto Active#[br]#{numeral(jobCounts.active).format('0,0')} - .uk-width-auto Completed#[br]#{numeral(jobCounts.completed).format('0,0')} - .uk-width-auto Failed#[br]#{numeral(jobCounts.failed).format('0,0')} + .uk-width-auto + label.uk-form-label.uk-text-primary Active + .uk-text-large= numeral(jobCounts.active).format('0,0') + .uk-width-auto + label.uk-form-label.uk-text-success Completed + .uk-text-large= numeral(jobCounts.completed).format('0,0') + .uk-width-auto + label.uk-form-label.uk-text-warning Delayed + .uk-text-large= numeral(jobCounts.delayed).format('0,0') + .uk-width-auto + label.uk-form-label.uk-text-danger Failed + .uk-text-large= numeral(jobCounts.failed).format('0,0') + .uk-width-auto + label.uk-form-label.uk-text-muted Waiting + .uk-text-large= numeral(jobCounts.waiting).format('0,0') + .uk-width-auto + label.uk-form-label.uk-text-muted Paused + .uk-text-large= numeral(jobCounts.paused).format('0,0') div(uk-grid) div(class="uk-width-1-1 uk-width-1-2@l") - .uk-card.uk-card-default.uk-card-small - .uk-card-header - h3.uk-card-title Active - .uk-card-body - +renderJobQueueJobList(newsletterQueue, jobs.active) + .uk-margin + .uk-card.uk-card-default.uk-card-small + .uk-card-header + h3.uk-card-title Active + .uk-card-body + +renderJobQueueJobList(newsletterQueue, jobs.active) - div(class="uk-width-1-1 uk-width-1-2@l") - .uk-card.uk-card-default.uk-card-small - .uk-card-header - h3.uk-card-title Waiting - .uk-card-body - +renderJobQueueJobList(newsletterQueue, jobs.waiting) + .uk-margin + .uk-card.uk-card-default.uk-card-small + .uk-card-header + h3.uk-card-title Delayed + .uk-card-body + +renderJobQueueJobList(newsletterQueue, jobs.delayed) - div(class="uk-width-1-1 uk-width-1-2@l") - .uk-card.uk-card-default.uk-card-small - .uk-card-header - h3.uk-card-title Delayed - .uk-card-body - +renderJobQueueJobList(newsletterQueue, jobs.delayed) + .uk-margin + .uk-card.uk-card-default.uk-card-small + .uk-card-header + h3.uk-card-title Paused + .uk-card-body + +renderJobQueueJobList(newsletterQueue, jobs.paused) div(class="uk-width-1-1 uk-width-1-2@l") - .uk-card.uk-card-default.uk-card-small - .uk-card-header - h3.uk-card-title Failed - .uk-card-body - +renderJobQueueJobList(newsletterQueue, jobs.failed) \ No newline at end of file + .uk-margin + .uk-card.uk-card-default.uk-card-small + .uk-card-header + h3.uk-card-title Waiting + .uk-card-body + +renderJobQueueJobList(newsletterQueue, jobs.waiting) + + .uk-margin + .uk-card.uk-card-default.uk-card-small + .uk-card-header + h3.uk-card-title Failed + .uk-card-body + +renderJobQueueJobList(newsletterQueue, jobs.failed) \ No newline at end of file diff --git a/app/views/admin/newsroom/editor.pug b/app/views/admin/newsroom/editor.pug index 55c5eb2..684077b 100644 --- a/app/views/admin/newsroom/editor.pug +++ b/app/views/admin/newsroom/editor.pug @@ -34,6 +34,9 @@ block content .uk-card-footer div(uk-grid).uk-flex-right.uk-flex-middle + .uk-width-expand + +renderBackButton() + if feed .uk-width-auto button( @@ -41,6 +44,13 @@ block content data-feed-id= feed._id, data-feed-title= feed.title, onclick="return dtp.adminApp.removeNewsroomFeed(event);", - ).uk-button.uk-button-danger.uk-border-rounded Remove Feed + ).uk-button.uk-button-danger.uk-border-rounded + span + i.fas.fa-trash + span.uk-margin-small-left Remove Feed + .uk-width-auto - button(type="submit").uk-button.uk-button-primary.uk-border-rounded= feed ? 'Update Feed' : 'Add Feed' \ No newline at end of file + button(type="submit").uk-button.uk-button-primary.uk-border-rounded + span + i.fas.fa-save + span.uk-margin-small-left= feed ? 'Update Feed' : 'Add Feed' \ No newline at end of file diff --git a/app/views/admin/newsroom/index.pug b/app/views/admin/newsroom/index.pug index 91644a0..4996f4c 100644 --- a/app/views/admin/newsroom/index.pug +++ b/app/views/admin/newsroom/index.pug @@ -5,7 +5,7 @@ block content .uk-width-expand h1 Newsroom Feeds .uk-width-auto - a(href='/admin/newsroom/create').uk-button.uk-button-primary #[i.fas.fa-plus]#[span.uk-margin-small-left Add Feed] + a(href='/admin/newsroom/create').uk-button.uk-button-primary.uk-border-rounded #[i.fas.fa-plus]#[span.uk-margin-small-left Add Feed] if Array.isArray(newsroom.feeds) && (newsroom.feeds.length > 0) ul.uk-list.uk-list-divider diff --git a/app/views/admin/settings/editor.pug b/app/views/admin/settings/editor.pug index 8ca206a..e0090d8 100644 --- a/app/views/admin/settings/editor.pug +++ b/app/views/admin/settings/editor.pug @@ -24,4 +24,4 @@ block content option(value="controlled", selected= (site.networkPolicy === 'controlled')) Controlled (Approval Required) option(value="closed", selected= (site.networkPolicy === 'closed')) Closed (Auto-Reject) - button(type="submit").uk-button.dtp-button-primary Save Settings \ No newline at end of file + button(type="submit").uk-button.dtp-button-primary.uk-border-rounded Save Settings \ No newline at end of file