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
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-30 19:13:05 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-30 19:13:05 +0400
commitbfd00caff3010100f367ed60d73f065cc8b21f06 (patch)
treea6851df74a4805d5581f98d9a7510eadc7f116a0 /app
parent560985b0f685f810a1ce16ae206fbbf81b8fb704 (diff)
Few usability improvments
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/_project_head.html.haml8
-rw-r--r--app/views/team_members/_form.html.haml2
-rw-r--r--app/views/team_members/_show.html.haml2
3 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_project_head.html.haml
index cc215502859..b8c88853a62 100644
--- a/app/views/projects/_project_head.html.haml
+++ b/app/views/projects/_project_head.html.haml
@@ -13,19 +13,19 @@
= link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
- if can? current_user, :admin_project, @project
- = nav_link(controller: :deploy_keys, html_options: {class: 'right'}) do
+ = nav_link(controller: :deploy_keys, html_options: {class: 'pull-right'}) do
= link_to project_deploy_keys_path(@project) do
%span
Deploy Keys
- = nav_link(controller: :hooks, html_options: {class: 'right'}) do
+ = nav_link(controller: :hooks, html_options: {class: 'pull-right'}) do
= link_to project_hooks_path(@project) do
%span
Hooks
- = nav_link(controller: :services, html_options: {class: 'right'}) do
+ = nav_link(controller: :services, html_options: {class: 'pull-right'}) do
= link_to project_services_path(@project) do
%span
Services
- = nav_link(path: 'projects#edit', html_options: {class: 'right'}) do
+ = nav_link(path: 'projects#edit', html_options: {class: 'pull-right'}) do
= link_to edit_project_path(@project), class: "stat-tab tab " do
%i.icon-edit
Edit
diff --git a/app/views/team_members/_form.html.haml b/app/views/team_members/_form.html.haml
index ee435c84ca2..05bea2db87e 100644
--- a/app/views/team_members/_form.html.haml
+++ b/app/views/team_members/_form.html.haml
@@ -19,5 +19,5 @@
.input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
.actions
- = f.submit 'Save', class: "btn btn-save"
+ = f.submit 'Add users', class: "btn btn-create"
= link_to "Cancel", project_team_index_path(@project), class: "btn btn-cancel"
diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index b59bb7b1e52..3df2caed64a 100644
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -19,7 +19,7 @@
- if current_user == user
%span.btn.disabled This is you!
- if @project.namespace_owner == user
- %span.btn.disabled.btn-success Owner
+ %span.btn.disabled Owner
- elsif user.blocked
%span.btn.disabled.blocked Blocked
- elsif allow_admin