From 444e380ca17e34fe8ddabe595e01a66bde7023c3 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Mon, 3 Jul 2017 22:11:17 +0100 Subject: [PATCH] Tidy up admin user interface --- .../modal/admin-plugins-chat-edit-rule.hbs | 111 ++++++++++++------ .../templates/admin/plugins-chat-provider.hbs | 12 +- .../stylesheets/chat-integration-admin.scss | 56 +++++++++ config/locales/client.en.yml | 37 ++++-- lib/discourse_chat/rule.rb | 1 - plugin.rb | 5 + 6 files changed, 168 insertions(+), 54 deletions(-) create mode 100644 assets/stylesheets/chat-integration-admin.scss diff --git a/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-rule.hbs b/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-rule.hbs index a3b960e..40a1726 100644 --- a/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-rule.hbs +++ b/assets/javascripts/admin/templates/modal/admin-plugins-chat-edit-rule.hbs @@ -1,49 +1,84 @@ -{{#d-modal-body title="chat_integration.edit_rule_modal.title"}} - - -
-
- {{i18n 'chat_integration.edit_rule_modal.provider'}}: {{i18n (concat 'chat_integration.provider.' model.provider '.title')}} -
-
- - {{category-chooser - name="category" - value=model.category_id - rootNoneLabel="slack.choose.all_categories" - rootNone=true - allowUncategorized="true" - }} -
+{{#d-modal-body id="chat_integration_edit_rule_modal" title="chat_integration.edit_rule_modal.title"}} +
+ + - {{#if siteSettings.tagging_enabled}} -
- - {{tag-chooser name="tags" tags=model.tags placeholderKey="chat_integration.edit_rule_modal.placeholders.tags"}} -
- {{/if}} + + + + + + + + -
- - {{text-field - name="channel" - value=model.channel - placeholderKey="chat_integration.edit_rule_modal.placeholders.channel" - class="channel"}} -
+ + + + + + + + -
- - {{combo-box name="filter" content=model.available_filters value=model.filter}} -
+ + + + + + + + - + + + + + + + + + {{#if siteSettings.tagging_enabled}} + + + + + + + + + {{/if}} + +
+ {{i18n (concat 'chat_integration.provider.' model.provider '.title')}} +
+ {{text-field + name="channel" + value=model.channel + autofocus="autofocus" + id="channel-field"}} +
+ {{combo-box name="filter" content=model.available_filters value=model.filter}} +
+ {{category-chooser + name="category" + value=model.category_id + rootNoneLabel="chat_integration.all_categories" + rootNone=true + overrideWidths=false + }} +
+ {{tag-chooser placeholderKey="chat_integration.all_tags" name="tags" tags=model.tags}} +
+ + +
{{/d-modal-body}}
- {{d-button class='btn-primary' action="save" title="chat_integration.edit_rule_modal.save" label="chat_integration.edit_rule_modal.save"}} + {{d-button class='btn-primary btn-large' action="save" title="chat_integration.edit_rule_modal.save" label="chat_integration.edit_rule_modal.save"}} - {{d-button action="cancel" title="chat_integration.edit_rule_modal.cancel" label="chat_integration.edit_rule_modal.cancel"}} + {{d-button class="btn-large" action="cancel" title="chat_integration.edit_rule_modal.cancel" label="chat_integration.edit_rule_modal.cancel"}}
\ No newline at end of file diff --git a/assets/javascripts/discourse/templates/admin/plugins-chat-provider.hbs b/assets/javascripts/discourse/templates/admin/plugins-chat-provider.hbs index d784c57..6c10e92 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-chat-provider.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-chat-provider.hbs @@ -18,7 +18,7 @@ {{#each model.rules as |rule|}} - + {{rule.channel}} {{rule.filterName}} @@ -32,7 +32,13 @@ {{#if siteSettings.tagging_enabled}} - {{rule.tags}} + + {{#if rule.tags}} + {{rule.tags}} + {{else}} + {{i18n "chat_integration.all_tags"}} + {{/if}} + {{/if}} @@ -45,7 +51,7 @@ -
+
{{d-button action="create" actionParam=model.provider icon="plus" title="chat_integration.create_rule" label="chat_integration.create_rule"}}
diff --git a/assets/stylesheets/chat-integration-admin.scss b/assets/stylesheets/chat-integration-admin.scss new file mode 100644 index 0000000..27a6276 --- /dev/null +++ b/assets/stylesheets/chat-integration-admin.scss @@ -0,0 +1,56 @@ +#admin-plugin-chat{ + + table{ + td:last-child{ + white-space:nowrap; + } + td:not(:last-child){ + width: 25%; + } + } + + div.table-footer{ + margin-top: 10px; + } + +} + +#chat_integration_edit_rule_modal{ + table{ + width:100%; + + tr.input td{ + padding-top: 10px; + + &.label{ + width: 100px; + label{ + margin-bottom: 0px; + font-weight: bold; + } + } + } + + tr.instructions label{ + color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); + } + + + } + + input{ + width: 200px; + margin-bottom: 0px; + box-shadow: none; + } + .tag-chooser{ + ul.select2-choices{ + border: none; + background:none; + } + margin-bottom: 0px; + margin-top: 0px; + } + + + } \ No newline at end of file diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 0ed3c38..c23069b 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -4,19 +4,20 @@ en: menu_title: "Chat Integrations" settings: "Settings" no_providers: "You need to enable some providers in the plugin settings" - all_categories: "All Categories" + all_categories: "(all categories)" + all_tags: "(all tags)" create_rule: "Create Rule" + filter: + mute: 'Mute' + follow: 'First post only' + watch: 'All posts and replies' rule_table: channel: "Channel" filter: "Filter" category: "Category" tags: "Tags" - edit: "Edit" - delete: "Delete" - filter: - watch: "Watch" - follow: "Follow" - mute: "Mute" + edit_rule: "Edit" + delete_rule: "Delete" edit_rule_modal: title: "Edit Rule" save: "Save Rule" @@ -26,11 +27,23 @@ en: tags: "Tags" channel: "Channel" filter: "Filter" - placeholders: - tags: "Choose tags" - channel: "#channel, @user or Channel ID" + instructions: + filter: "Notification level. Mute overrides other matching rules." + category: "This rule will only apply to topics in the specified category." + tags: "If specified, this rule will only apply to topics which have at least one of these tags." + provider: + + ####################################### + ########### SLACK STRINGS ############# + ####################################### + slack: + title: "Slack" + channel_instructions: "e.g. #channel, @username." + + ####################################### + ########## TELEGRAM STRINGS ########### + ####################################### telegram: title: "Telegram" - slack: - title: "Slack" \ No newline at end of file + channel_instructions: "Enter a chat_id. You will need to add the bot to the chat first." \ No newline at end of file diff --git a/lib/discourse_chat/rule.rb b/lib/discourse_chat/rule.rb index a8b22ad..e7805cd 100644 --- a/lib/discourse_chat/rule.rb +++ b/lib/discourse_chat/rule.rb @@ -1,4 +1,3 @@ - # Similar to an ActiveRecord class, but uses PluginStore for storage instead. Adapted from discourse-data-explorer # Using this means we can use a standard serializer for sending JSON to the client, and also have convenient save/update/delete methods # Since this is now being used in two plugins, maybe it should be built into core somehow diff --git a/plugin.rb b/plugin.rb index 5f5aae3..4990062 100644 --- a/plugin.rb +++ b/plugin.rb @@ -5,6 +5,8 @@ enabled_site_setting :chat_integration_enabled +register_asset "stylesheets/chat-integration-admin.scss" + # Site setting validators must be loaded before initialize require_relative "lib/validators/chat_integration_slack_enabled_setting_validator" @@ -82,6 +84,9 @@ after_initialize do raise Discourse::NotFound end + filter_order = ["watch", "follow", "mute"] + rules = rules.sort_by{ |r| [r.channel, filter_order.index(r.filter), r.category_id] } + render_serialized rules, DiscourseChat::RuleSerializer, root: 'rules' end