diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-07-31 13:56:15 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-07-31 13:56:15 +0200 |
commit | 7ba765201939bafb1d433cfa315779ab5b6d92b1 (patch) | |
tree | 84ec17a9bb38d8ea1eab59484e1caf5e5c76123d /app/views/projects | |
parent | 1e4b3264637a5b66a9bfb04fe9444bcf1f7e18ed (diff) | |
download | gitlab-ce-7ba765201939bafb1d433cfa315779ab5b6d92b1.tar.gz |
Tweak project page buttons.
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/_home_panel.html.haml | 8 | ||||
-rw-r--r-- | app/views/projects/buttons/_dropdown.html.haml | 29 | ||||
-rw-r--r-- | app/views/projects/buttons/_fork.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/buttons/_star.html.haml | 4 |
4 files changed, 26 insertions, 19 deletions
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 7b6b4b35c8d..159ce1ecf3f 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -20,8 +20,14 @@ = forked_from_project.namespace.try(:name) - if can? current_user, :download_code, @project + = link_to "#", class: 'btn js-toggle-clone-holder' do + = icon('cloud-download fw') + Clone + + - if can? current_user, :download_code, @project = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: @ref, format: 'zip'), class: 'btn', rel: 'nofollow' do - %i.fa.fa-download + = icon('download fw') + Download = render 'projects/buttons/dropdown' diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml index 99c2ed62545..cade930c8cc 100644 --- a/app/views/projects/buttons/_dropdown.html.haml +++ b/app/views/projects/buttons/_dropdown.html.haml @@ -1,31 +1,32 @@ - if current_user %span.dropdown %a.dropdown-toggle.btn.btn-new{href: '#', "data-toggle" => "dropdown"} - %i.fa.fa-plus + = icon('plus') %ul.dropdown-menu - - if @project.issues_enabled && can?(current_user, :create_issue, @project) + - if can?(current_user, :create_issue, @project) %li - = link_to url_for_new_issue, title: "New Issue" do + = link_to url_for_new_issue do + = icon('exclamation-circle fw') New issue - - if @project.merge_requests_enabled && can?(current_user, :create_merge_request, @project) + - if can?(current_user, :create_merge_request, @project) %li - = link_to new_namespace_project_merge_request_path(@project.namespace, @project), title: "New Merge Request" do + = link_to new_namespace_project_merge_request_path(@project.namespace, @project) do + = icon('tasks fw') New merge request - - if @project.snippets_enabled && can?(current_user, :create_snippet, @project) + - if can?(current_user, :create_snippet, @project) %li - = link_to new_namespace_project_snippet_path(@project.namespace, @project), title: "New Snippet" do + = link_to new_namespace_project_snippet_path(@project.namespace, @project) do + = icon('file-text-o fw') New snippet - - if can?(current_user, :admin_project_member, @project) - %li - = link_to namespace_project_project_members_path(@project.namespace, @project), title: "New project member" do - New project member - - if can? current_user, :push_code, @project + - if can?(current_user, :push_code, @project) %li.divider %li = link_to new_namespace_project_branch_path(@project.namespace, @project) do - New git branch + = icon('code-fork fw') + New branch %li = link_to new_namespace_project_tag_path(@project.namespace, @project) do - New git tag + = icon('tags fw') + New tag diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml index f0483c79edc..854c154824d 100644 --- a/app/views/projects/buttons/_fork.html.haml +++ b/app/views/projects/buttons/_fork.html.haml @@ -1,13 +1,13 @@ - if current_user && can?(current_user, :fork_project, @project) - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2 = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn' do - = icon('code-fork') + = icon('code-fork fw') Fork %span.count = @project.forks_count - else = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn' do - = icon('code-fork') + = icon('code-fork fw') Fork %span.count = @project.forks_count diff --git a/app/views/projects/buttons/_star.html.haml b/app/views/projects/buttons/_star.html.haml index b5f14b43bfd..5d7df5ae099 100644 --- a/app/views/projects/buttons/_star.html.haml +++ b/app/views/projects/buttons/_star.html.haml @@ -1,6 +1,6 @@ - if current_user = link_to toggle_star_namespace_project_path(@project.namespace, @project), class: 'btn star-btn toggle-star', method: :post, remote: true do - = icon('star') + = icon('star fw') - if current_user.starred?(@project) Unstar - else @@ -16,7 +16,7 @@ - else = link_to new_user_session_path, class: 'btn has_tooltip star-btn', title: 'You must sign in to star a project' do - = icon('star') + = icon('star fw') Star %span.count = @project.star_count |