Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-02-12 05:08:53 +0300
committerMarin Jankovski <maxlazio@gmail.com>2015-02-12 05:29:24 +0300
commitb3f944a3983db179fdaee0a1f0618c94600be823 (patch)
tree34ac71beff9c3e357e344779c9fd53cb10e9fc79 /app/views
parent6b4ddf2cc13eda5dd6df64bab6f95f88d64cd2fa (diff)
Annotate services. Add a link to service template.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/application_settings/_external_issues_tracker_template.html.haml22
-rw-r--r--app/views/layouts/nav/_admin.html.haml6
2 files changed, 6 insertions, 22 deletions
diff --git a/app/views/admin/application_settings/_external_issues_tracker_template.html.haml b/app/views/admin/application_settings/_external_issues_tracker_template.html.haml
deleted file mode 100644
index b998df44665..00000000000
--- a/app/views/admin/application_settings/_external_issues_tracker_template.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-- service.fields.each do |field|
- TOPD
- / - name = field[:name]
- / - value = "V"#@service.send(name) unless field[:type] == 'password'
- / - type = field[:type]
- / - placeholder = field[:placeholder]
- / - choices = field[:choices]
- / - default_choice = field[:default_choice]
-
- / .form-group
- / = f.label name, class: "control-label"
- / .col-sm-10
- / - if type == 'text'
- / = f.text_field name, class: "form-control", placeholder: placeholder
- / - elsif type == 'textarea'
- / = f.text_area name, rows: 5, class: "form-control", placeholder: placeholder
- / - elsif type == 'checkbox'
- / = f.check_box name
- / - elsif type == 'select'
- / = f.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" }
- / - elsif type == 'password'
- / = f.password_field name, class: 'form-control'
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index 4813a4f16f5..4f864926d08 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -46,6 +46,12 @@
%span
Applications
+ = nav_link(controller: :application_settings) do
+ = link_to admin_application_settings_services_path, title: 'Service Templates' do
+ %i.fa.fa-copy
+ %span
+ Service Templates
+
= nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
= link_to admin_application_settings_path, title: 'Settings' do
%i.fa.fa-cogs