diff options
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/_dropdown.html.haml | 15 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 14 |
2 files changed, 15 insertions, 14 deletions
diff --git a/app/views/projects/_dropdown.html.haml b/app/views/projects/_dropdown.html.haml index e646d04282e..e283bd2bf1d 100644 --- a/app/views/projects/_dropdown.html.haml +++ b/app/views/projects/_dropdown.html.haml @@ -6,15 +6,19 @@ - if @project.issues_enabled && can?(current_user, :write_issue, @project) %li = link_to url_for_new_issue, title: "New Issue" do - Issue + New issue - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project) %li = link_to new_project_merge_request_path(@project), title: "New Merge Request" do - Merge Request + New merge request - if @project.snippets_enabled && can?(current_user, :write_snippet, @project) %li = link_to new_project_snippet_path(@project), title: "New Snippet" do - Snippet + New snippet + - if can?(current_user, :admin_team_member, @project) + %li + = link_to new_project_team_member_path(@project), title: "New project member" do + New project member - if can? current_user, :push_code, @project %li.divider %li @@ -26,9 +30,4 @@ %i.icon-tag Git tag - - if can?(current_user, :admin_team_member, @project) - %li.divider - %li - = link_to new_project_team_member_path(@project), title: "New project member" do - Project member diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index cad072a83db..5e5b316d722 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -34,19 +34,20 @@ = render 'shared/event_filter' .content_list .loading.hide - .span3 + .span3.project-side .clearfix - if @project.forked_from_project .alert.alert-success - %i.icon-code-fork + %i.icon-code-fork.project-fork-icon Forked from: + %br = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project) - unless @project.empty_repo? - if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace - if current_user.already_forked?(@project) = link_to project_path(current_user.fork_of(@project)), class: 'btn btn-block' do - %i.icon-ok - Already forked + %i.icon-compass + Go to fork - else = link_to fork_project_path(@project), title: "Fork", class: "btn btn-block", method: "POST" do %i.icon-code-fork @@ -56,8 +57,9 @@ = link_to archive_project_repository_path(@project), class: "btn btn-block" do %i.icon-download-alt %span Download - %br - .light-well + = link_to project_compare_index_path(@project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-block' do + Compare code + .prepend-top-10 %p %span.light Created on #{@project.created_at.stamp('Aug 22, 2013')} |