From 04f7273461a130e93f19af935df673016ab1dbc7 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 12 May 2016 00:30:00 +0500 Subject: Improving compliance stuff (#2963) * Improving compliance stuff * Fixing padding on mobile --- webapp/components/admin_console/audits.jsx | 27 +-- .../admin_console/compliance_reports.jsx | 195 +++++++++++---------- webapp/i18n/en.json | 18 +- webapp/sass/responsive/_mobile.scss | 9 + webapp/sass/routes/_admin-console.scss | 11 -- webapp/sass/routes/_compliance.scss | 38 ++++ webapp/sass/routes/_module.scss | 1 + 7 files changed, 169 insertions(+), 130 deletions(-) create mode 100644 webapp/sass/routes/_compliance.scss (limited to 'webapp') diff --git a/webapp/components/admin_console/audits.jsx b/webapp/components/admin_console/audits.jsx index 1f94de7da..cb500f29c 100644 --- a/webapp/components/admin_console/audits.jsx +++ b/webapp/components/admin_console/audits.jsx @@ -75,24 +75,25 @@ export default class Audits extends React.Component {
-
+

+

- -
+
{content}
diff --git a/webapp/components/admin_console/compliance_reports.jsx b/webapp/components/admin_console/compliance_reports.jsx index 04b2c4deb..79b0d2210 100644 --- a/webapp/components/admin_console/compliance_reports.jsx +++ b/webapp/components/admin_console/compliance_reports.jsx @@ -266,7 +266,7 @@ export default class ComplianceReports extends React.Component { } return ( -
+

- - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - -
- {serverError} -
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+ {serverError} +
+
-
+
{content}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index cfa4d9e25..7e46903db 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -75,8 +75,8 @@ "add_outgoing_webhook.triggerWOrds": "Trigger Words (One Per Line)", "add_outgoing_webhook.triggerWords": "Trigger Words (One Per Line)", "add_outgoing_webhook.triggerWordsOrChannelRequired": "A valid channel or a list of trigger words is required", - "admin.audits.reload": "Reload", - "admin.audits.title": "User Activity", + "admin.audits.reload": "Reload User Activity Logs", + "admin.audits.title": "User Activity Logs", "admin.compliance.directoryDescription": "Directory to which compliance reports are written. If blank, will be set to ./data/.", "admin.compliance.directoryExample": "Ex \"./data/\"", "admin.compliance.directoryTitle": "Compliance Directory Location:", @@ -91,18 +91,18 @@ "admin.compliance.title": "Compliance Settings", "admin.compliance.true": "true", "admin.compliance_reports.desc": "Job Name:", - "admin.compliance_reports.desc_placeholder": "Ex \"Audit 445 for HR\"", + "admin.compliance_reports.desc_placeholder": "E.g. \"Audit 445 for HR\"", "admin.compliance_reports.emails": "Emails:", - "admin.compliance_reports.emails_placeholder": "Ex \"bill@example.com, bob@example.com\"", + "admin.compliance_reports.emails_placeholder": "E.g. \"bill@example.com, bob@example.com\"", "admin.compliance_reports.from": "From:", - "admin.compliance_reports.from_placeholder": "Ex \"2016-03-11\"", + "admin.compliance_reports.from_placeholder": "E.g. \"2016-03-11\"", "admin.compliance_reports.keywords": "Keywords:", - "admin.compliance_reports.keywords_placeholder": "Ex \"shorting stock\"", - "admin.compliance_reports.reload": "Reload", - "admin.compliance_reports.run": "Run", + "admin.compliance_reports.keywords_placeholder": "E.g. \"shorting stock\"", + "admin.compliance_reports.reload": "Reload Completed Compliance Reports", + "admin.compliance_reports.run": "Run Compliance Report", "admin.compliance_reports.title": "Compliance Reports", "admin.compliance_reports.to": "To:", - "admin.compliance_reports.to_placeholder": "Ex \"2016-03-15\"", + "admin.compliance_reports.to_placeholder": "E.g. \"2016-03-15\"", "admin.compliance_table.desc": "Description", "admin.compliance_table.download": "Download", "admin.compliance_table.params": "Params", diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index 3a4cd3b89..cc3d7a4b9 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -11,6 +11,15 @@ } } + .compliance-panel, + .audit-panel { + .row { + > .form-group { + padding-left: 15px; + } + } + } + .user-popover { pointer-events: none; } diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss index 65fefdb33..0f47e7529 100644 --- a/webapp/sass/routes/_admin-console.scss +++ b/webapp/sass/routes/_admin-console.scss @@ -160,17 +160,6 @@ width: 100%; } - .compliance__panel, - .audit__panel { - background-color: $white; - border: 1px solid $border-gray; - height: 70vh; - margin-top: 10px; - overflow: auto; - padding: 5px; - width: 100%; - } - .app__content { color: #333; diff --git a/webapp/sass/routes/_compliance.scss b/webapp/sass/routes/_compliance.scss new file mode 100644 index 000000000..57eb538c6 --- /dev/null +++ b/webapp/sass/routes/_compliance.scss @@ -0,0 +1,38 @@ +@charset 'UTF-8'; + +.compliance-panel__table, +.audit-panel__table { + background-color: $white; + border: 1px solid $border-gray; + margin-top: 10px; + max-height: 70vh; + min-height: 100px; + overflow: auto; + padding: 5px; + width: 100%; +} + +.compliance-panel, +.audit-panel { + .row { + > .form-group { + padding-left: 0; + + &:first-child { + padding-left: 15px; + } + } + + label { + font-weight: 600; + } + } + + .fa-refresh { + margin-right: 5px; + } +} + +.compliance-panel { + margin-bottom: 3em; +} diff --git a/webapp/sass/routes/_module.scss b/webapp/sass/routes/_module.scss index 4f3f6f9cd..11b815007 100644 --- a/webapp/sass/routes/_module.scss +++ b/webapp/sass/routes/_module.scss @@ -4,6 +4,7 @@ @import 'activity-log'; @import 'admin-console'; @import 'backstage'; +@import 'compliance'; @import 'docs'; @import 'error-page'; @import 'loading'; -- cgit v1.2.3-1-g7c22