Started on new slash commands edit view

3 files changed, 42 insertions, 105 deletions

diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index db51c4f8a4e..66ead59fc32 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -8,14 +8,14 @@
   .col-lg-9
     = form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
       = render 'shared/service_settings', form: form, subject: @service
+      - if @service.to_param != 'mattermost_slash_commands'
+        .footer-block.row-content-block
+          = form.submit 'Save changes', class: 'btn btn-save'
+           
+          - if @service.valid? && @service.activated?
+            - unless @service.can_test?
+              - disabled_class = 'disabled'
+              - disabled_title = @service.disabled_title
 
-      .footer-block.row-content-block
-        = form.submit 'Save changes', class: 'btn btn-save'
-         
-        - if @service.valid? && @service.activated?
-          - unless @service.can_test?
-            - disabled_class = 'disabled'
-            - disabled_title = @service.disabled_title
-
-          = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service), class: "btn #{disabled_class}", title: disabled_title
-        = link_to "Cancel", namespace_project_services_path(@project.namespace, @project), class: "btn btn-cancel"
+            = link_to 'Test settings', test_namespace_project_service_path(@project.namespace, @project, @service), class: "btn #{disabled_class}", title: disabled_title
+          = link_to "Cancel", namespace_project_services_path(@project.namespace, @project), class: "btn btn-cancel"
diff --git a/app/views/projects/services/mattermost_slash_commands/_help.html.haml b/app/views/projects/services/mattermost_slash_commands/_help.html.haml
index 6494d3cd793..cc19b7462da 100644
--- a/app/views/projects/services/mattermost_slash_commands/_help.html.haml
+++ b/app/views/projects/services/mattermost_slash_commands/_help.html.haml
@@ -1,6 +1,3 @@
-- pretty_path_with_namespace = "#{@project ? @project.namespace.name : 'namespace'} / #{@project ? @project.name : 'name'}"
-- run_actions_text = "Perform common operations on this project: #{pretty_path_with_namespace}"
-
 .well
   This service allows GitLab users to perform common operations on this
   project by entering slash commands in Mattermost.
@@ -8,96 +5,5 @@
   See list of available commands in Mattermost after setting up this service,
   by entering
   %code /<command_trigger_word> help
-  %br
-  %br
-  To setup this service:
-  %ul.list-unstyled
-    %li
-      1.
-      = link_to 'Enable custom slash commands', 'https://docs.mattermost.com/developer/slash-commands.html#enabling-custom-commands'
-      on your Mattermost installation
-    %li
-      2.
-      = link_to 'Add a slash command', 'https://docs.mattermost.com/developer/slash-commands.html#set-up-a-custom-command'
-      in Mattermost with these options:
-
-  %hr
-
-  .help-form
-    .form-group
-      = label_tag :display_name, 'Display name', class: 'col-sm-2 col-xs-12 control-label'
-      .col-sm-10.col-xs-12.input-group
-        = text_field_tag :display_name, "GitLab / #{pretty_path_with_namespace}", class: 'form-control input-sm', readonly: 'readonly'
-        .input-group-btn
-          = clipboard_button(clipboard_target: '#display_name')
-
-    .form-group
-      = label_tag :description, 'Description', class: 'col-sm-2 col-xs-12 control-label'
-      .col-sm-10.col-xs-12.input-group
-        = text_field_tag :description, run_actions_text, class: 'form-control input-sm', readonly: 'readonly'
-        .input-group-btn
-          = clipboard_button(clipboard_target: '#description')
-
-    .form-group
-      = label_tag nil, 'Command trigger word', class: 'col-sm-2 col-xs-12 control-label'
-      .col-sm-10.col-xs-12.text-block
-        %p Fill in the word that works best for your team.
-        %p
-          Suggestions:
-          %code= 'gitlab'
-          %code= @project.path # Path contains no spaces, but dashes
-          %code= @project.path_with_namespace
-
-    .form-group
-      = label_tag :request_url, 'Request URL', class: 'col-sm-2 col-xs-12 control-label'
-      .col-sm-10.col-xs-12.input-group
-        = text_field_tag :request_url, service_trigger_url(subject), class: 'form-control input-sm', readonly: 'readonly'
-        .input-group-btn
-          = clipboard_button(clipboard_target: '#request_url')
-
-    .form-group
-      = label_tag nil, 'Request method', class: 'col-sm-2 col-xs-12 control-label'
-      .col-sm-10.col-xs-12.text-block POST
-
-    .form-group
-      = label_tag :response_username, 'Response username', class: 'col-sm-2 col-xs-12 control-label'
-      .col-sm-10.col-xs-12.input-group
-        = text_field_tag :response_username, 'GitLab', class: 'form-control input-sm', readonly: 'readonly'
-        .input-group-btn
-          = clipboard_button(clipboard_target: '#response_username')
-
-    .form-group
-      = label_tag :response_icon, 'Response icon', class: 'col-sm-2 col-xs-12 control-label'
-      .col-sm-10.col-xs-12.input-group
-        = text_field_tag :response_icon, asset_url('gitlab_logo.png'), class: 'form-control input-sm', readonly: 'readonly'
-        .input-group-btn
-          = clipboard_button(clipboard_target: '#response_icon')
-
-    .form-group
-      = label_tag nil, 'Autocomplete', class: 'col-sm-2 col-xs-12 control-label'
-      .col-sm-10.col-xs-12.text-block Yes
-
-    .form-group
-      = label_tag :autocomplete_hint, 'Autocomplete hint', class: 'col-sm-2 col-xs-12 control-label'
-      .col-sm-10.col-xs-12.input-group
-        = text_field_tag :autocomplete_hint, '[help]', class: 'form-control input-sm', readonly: 'readonly'
-        .input-group-btn
-          = clipboard_button(clipboard_target: '#autocomplete_hint')
-
-    .form-group
-      = label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-xs-12 control-label'
-      .col-sm-10.col-xs-12.input-group
-        = text_field_tag :autocomplete_description, run_actions_text, class: 'form-control input-sm', readonly: 'readonly'
-        .input-group-btn
-          = clipboard_button(clipboard_target: '#autocomplete_description')
-
-  %hr
-
-  %ul.list-unstyled
-    %li
-      3. After adding the slash command, paste the
-      %strong token
-      into the field below
 
-- if Gitlab.config.mattermost.enabled
-  = link_to "Auto config", new_namespace_project_mattermost_path(@project.namespace, @project)
+= render 'projects/services/mattermost_slash_commands/installation_info'
diff --git a/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml b/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml
new file mode 100644
index 00000000000..748660e9813
--- /dev/null
+++ b/app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml
@@ -0,0 +1,31 @@
+-# THE ALERT BOX...
+-# .alert.alert-info
+-#   Mattermost Command was successfully installed. You can now use GitLab inside Mattermost
+-#   = emoji_icon('')
+
+.services-installation-info
+  .row
+    %strong.col-sm-3.text-right Status
+    .col-sm-9= @service.activated? ? 'Installed' : 'Not installed'
+  .row
+    %strong.col-sm-3.text-right Mattermost
+    = link_to 'some_path.url', 'some_path.url', class: 'col-sm-9'
+  - if @service.activated?
+    .row
+      %strong.col-sm-3.text-right Team
+      .col-sm-9 some_team.name
+  .row
+    %strong.col-sm-3.text-right Installation
+    .col-sm-9
+      - if @service.activated?
+        To edit or uninstall this service, press
+        %strong Edit in Mattermost
+      - else
+        To install this service, press
+        %strong Add to Mattermost
+        and follow the instructions
+  .row
+    .col-sm-9.col-sm-offset-3
+      = link_to new_namespace_project_mattermost_path(@project.namespace, @project), class: 'btn btn-lg' do
+        = custom_icon('mattermost_logo', size: 15)
+        = @service.activated? ? 'Edit in Mattermost' : 'Add to Mattermost'