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:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-29 20:09:27 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-29 20:09:27 +0400
commit08fded3fac00b2628e167c21541379784e9d2fa0 (patch)
tree437e8934e3eca65dc3d6dd9c999a6dc4a81b5326 /app/views
parent9df6f7bfad0b18ddaa9fdda2506a8c8958224a7e (diff)
Minor improvments to UI
Diffstat (limited to 'app/views')
-rw-r--r--app/views/dashboard/index.html.haml1
-rw-r--r--app/views/groups/_projects.html.haml2
-rw-r--r--app/views/groups/show.html.haml1
-rw-r--r--app/views/layouts/project_resource.html.haml1
-rw-r--r--app/views/projects/empty.html.haml1
-rw-r--r--app/views/shared/_no_ssh.html.haml2
6 files changed, 4 insertions, 4 deletions
diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index d0882c6dab7..6b360dc1fef 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -2,7 +2,6 @@
.projects
.activities.span8
= render "events/event_last_push", event: @last_push
- = render 'shared/no_ssh'
.event_filter
= event_filter_link EventFilter.push, 'Push events'
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 6425a2e61ce..39c0b6af685 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -9,6 +9,8 @@
%i.icon-plus
New Project
%ul.unstyled
+ - if projects.blank?
+ %p.nothing_here_message This groups has no projects yet
- projects.each do |project|
%li.wll
= link_to project_path(project), class: dom_class(project) do
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 0c2eb150f42..b929b267e8b 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -6,7 +6,6 @@
&nbsp;
%span.cgray Events and projects are filtered in scope of group
%hr
- = render 'shared/no_ssh'
- if @events.any?
.content_list= render @events
- else
diff --git a/app/views/layouts/project_resource.html.haml b/app/views/layouts/project_resource.html.haml
index aa312328153..b52ef5747ae 100644
--- a/app/views/layouts/project_resource.html.haml
+++ b/app/views/layouts/project_resource.html.haml
@@ -4,6 +4,7 @@
%body{class: "#{app_theme} project"}
= render "layouts/flash"
= render "layouts/head_panel", title: @project.name
+ = render 'shared/no_ssh'
.container
%ul.main_menu
= nav_link(html_options: {class: "home #{project_tab_class}"}) do
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index d9a151fc706..c0b2a8e6005 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -1,4 +1,3 @@
-= render 'shared/no_ssh'
= render 'clone_panel'
%div.git-empty
diff --git a/app/views/shared/_no_ssh.html.haml b/app/views/shared/_no_ssh.html.haml
index 4e643090904..5fdcea850b2 100644
--- a/app/views/shared/_no_ssh.html.haml
+++ b/app/views/shared/_no_ssh.html.haml
@@ -1,3 +1,3 @@
- if current_user.require_ssh_key?
- %p.error_message
+ %p.error_message.centered
You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_key_path} to your profile