diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-08 21:29:59 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-08 21:29:59 +0000 |
commit | c8e9246ef65da784d6b9d48fb77e66989cea2534 (patch) | |
tree | 7c1b4aa32c794ca70dcc68938112c251aa650901 /app/helpers/projects_helper.rb | |
parent | d991e3e41a83c9479d0f5d95732f998cf352c57d (diff) | |
parent | a0b9fe12886f55875bc4bce49f2566be3bff79cd (diff) | |
download | gitlab-ce-c8e9246ef65da784d6b9d48fb77e66989cea2534.tar.gz |
Merge branch 'project-home-page' into 'master'
New project home page
## Why?
Because current project page is overloaded with information
## Changes
* move activity to separate tab
* make project show page cleaner by removing redundant information
* render README as main content of project page
cc @sytses @JobV
See merge request !938
Diffstat (limited to 'app/helpers/projects_helper.rb')
-rw-r--r-- | app/helpers/projects_helper.rb | 54 |
1 files changed, 7 insertions, 47 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index ec65e473919..1bcd9a49527 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -84,53 +84,6 @@ module ProjectsHelper @project.milestones.active.order("due_date, title ASC") end - def link_to_toggle_star(title, starred) - cls = 'star-btn btn btn-sm btn-default' - - toggle_text = - if starred - ' Unstar' - else - ' Star' - end - - toggle_html = content_tag('span', class: 'toggle') do - icon('star') + toggle_text - end - - count_html = content_tag('span', class: 'count') do - @project.star_count.to_s - end - - link_opts = { - title: title, - class: cls, - method: :post, - remote: true, - data: { type: 'json' } - } - - path = toggle_star_namespace_project_path(@project.namespace, @project) - - content_tag 'span', class: starred ? 'turn-on' : 'turn-off' do - link_to(path, link_opts) do - toggle_html + ' ' + count_html - end - end - end - - def link_to_toggle_fork - html = content_tag('span') do - icon('code-fork') + ' Fork' - end - - count_html = content_tag(:span, class: 'count') do - @project.forks_count.to_s - end - - html + count_html - end - def project_for_deploy_key(deploy_key) if deploy_key.projects.include?(@project) @project @@ -306,4 +259,11 @@ module ProjectsHelper def leave_project_message(project) "Are you sure you want to leave \"#{project.name}\" project?" end + + def new_readme_path + ref = @repository.root_ref if @repository + ref ||= 'master' + + namespace_project_new_blob_path(@project.namespace, @project, tree_join(ref), file_name: 'README.md') + end end |