UX review changes

app/helpers/projects_helper.rb

@@ -153,7 +153,7 @@ module ProjectsHelper
       return nil unless team['display_name'] && team['id']
       [team['display_name'], team['id']]
     end.compact
-    teams_options.unshift(['Select a team...', '0']) unless teams_options.one?
+    teams_options.unshift(['Select team...', '0']) unless teams_options.one?
     teams_options
   end
 

app/views/projects/mattermost/new.html.haml

@@ -4,31 +4,38 @@
   %h3 Install Mattermost Command
   - if @teams.empty?
     %p
-      To install this service, you must be administrator of a team in the Mattermost instance at
-      %strong some_path.url
-    %p Ask your Mattermost system administrator for permissions.
+      You aren’t a member of any team on the Mattermost instance at
+      %strong= Gitlab.config.mattermost.host
+    %p
+      To install this service,
+      = link_to "#{Gitlab.config.mattermost.host}/select_team", target: '__blank' do
+        join a team
+        = icon('external-link')
+      and try again.
     %hr
     .clearfix
-      = link_to 'Go back', 'some_url', class: 'btn btn-lg pull-right'
+      = link_to 'Go back', edit_namespace_project_service_path(@project.namespace, @project, @service), class: 'btn btn-lg pull-right'
   - else
     %p
       This service will be installed on the Mattermost instance at
-      %strong some_path.url
+      %strong= Gitlab.config.mattermost.host
     %hr
-    = form_for(:create, method: :post, url: configure_namespace_project_mattermost_index_path(@project.namespace, @project, )) do |f|
+    = form_for(:create, method: :post, url: configure_namespace_project_mattermost_index_path(@project.namespace, @project)) do |f|
       %h4 Team
       %p Select or create the team where the slash commands will be used in
       - options = mattermost_teams_options(@teams)
       - isOneTeam = options.count === 1
       = f.select(:team_id, options, {}, {class: 'form-control', selected: "#{options.first[1] if isOneTeam}", disabled: isOneTeam})
-      - if isOneTeam
-        .help-block
+      .help-block
+        - if isOneTeam
           This is the only team where you are an administrator.
-          To create a team, ask your Mattermost system administrator.
-      - else
-        .help-block
+        - else
           The list shows teams where you are administrator
-          To create a team, ask your Mattermost system administrator.
+        To create a team, ask your Mattermost system administrator.
+        To create a team,
+        = link_to "#{Gitlab.config.mattermost.host}/create_team" do
+          use Mattermost's interface
+          = icon('external-link')
       %hr
       %h4 Command trigger word
       %p Choose the word that will trigger commands
@@ -43,9 +50,11 @@
           %code= @project.path_with_namespace
         %p
           Reserved:
-          = link_to 'see list of built-in slash commands', 'some_url'
+          = link_to 'https://docs.mattermost.com/help/messaging/executing-commands.html#built-in-commands', target: '__blank' do
+            see list of built-in slash commands
+            = icon('external-link')
       %hr
       .clearfix
         .pull-right
-          = link_to 'Cancel', 'some_url', class: 'btn btn-lg'
+          = link_to 'Cancel', edit_namespace_project_service_path(@project.namespace, @project, @service), class: 'btn btn-lg'
           = f.submit 'Install', class: 'btn btn-save btn-lg'

app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml

@@ -9,7 +9,7 @@
     .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'
+    = link_to Gitlab.config.mattermost.host, Gitlab.config.mattermost.host, class: 'col-sm-9', target: '__blank'
   - if @service.activated?
     .row
       %strong.col-sm-3.text-right Team