Commit ae06a0aa authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Return own tab for wall. Improve Wiki nav. Removed attachments listing page

parent 6956f1f6
......@@ -32,6 +32,9 @@ module Projects
@project.namespace_id = current_user.namespace_id
end
# Disable wall by default
@project.wall_enabled = false
@project.creator = current_user
# Import project from cloneable resource
......
......@@ -68,10 +68,6 @@ class ProjectsController < ProjectResourceController
end
end
def files
@notes = @project.notes.where("attachment != 'NULL'").order("created_at DESC").limit(100)
end
#
# Wall
#
......
......@@ -80,16 +80,6 @@ module TabHelper
end
end
def project_wiki_tab_class
[:files, :wall].each do |action|
return "active" if current_page?(controller: "projects", action: action, id: @project)
end
if ['wikis', 'snippets'].include? controller.controller_name
"active"
end
end
def branches_tab_class
if current_page?(branches_project_repository_path(@project)) ||
current_controller?(:protected_branches) ||
......
......@@ -35,11 +35,17 @@
Merge Requests
%span.count.merge_counter= @project.merge_requests.opened.count
= nav_link(html_options: {class: "#{project_wiki_tab_class}"}) do
= link_to 'Wiki', project_wiki_path(@project, :home)
- if @project.wiki_enabled
= nav_link(controller: :wikis) do
= link_to 'Wiki', project_wiki_path(@project, :home)
- if @project.wall_enabled
= nav_link(path: 'projects#wall') do
= link_to 'Wall', wall_project_path(@project)
- if can? current_user, :admin_project, @project
= nav_link(html_options: {class: "#{project_tab_class}"}) do
= link_to edit_project_path(@project), class: "stat-tab tab " do
Settings
.content= yield
= render 'wikis/nav'
- unless @notes.empty?
%table
%thead
%tr
%th File name
%th
- @notes.each do |note|
%tr
%td
= link_to note.attachment.secure_url, target: "_blank" do
= image_tag gravatar_icon(note.author_email), class: "avatar s24"
= note.attachment_identifier
%td
Added
= time_ago_in_words(note.created_at)
ago
- else
%p.slead All files attached to project wall, issues etc will be displayed here
= render 'wikis/nav'
%div.wall_page
= render "notes/reversed_notes_with_form"
= render 'wikis/nav'
%h3.page_title
Snippets
%small share code pastes with others out of git repository
......
%span.pull-right
= link_to project_wiki_path(@project, :home), class: "btn btn-small grouped" do
Home
= link_to pages_project_wikis_path(@project), class: "btn btn-small grouped" do
Pages
- if (@wiki && @wiki.persisted?)
= link_to history_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
History
- if can?(current_user, :write_wiki, @project)
- if @wiki && @wiki.persisted?
Page History
- if can?(current_user, :write_wiki, @project)
= link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
%i.icon-edit
Edit
= link_to git_access_project_wikis_path(@project), class: "btn btn-small grouped" do
%i.icon-download-alt
Git Access
%ul.nav.nav-tabs
- if @project.wiki_enabled
= nav_link(controller: 'wikis') do
= link_to 'Wiki', project_wiki_path(@project, :home)
= nav_link(html_options: {class: params[:id] == 'home' ? 'active' : '' }) do
= link_to 'Home', project_wiki_path(@project, :home)
- if @project.wall_enabled
= nav_link(path: 'projects#wall') do
= link_to 'Wall', wall_project_path(@project)
= nav_link(path: 'wikis#pages') do
= link_to 'Pages', pages_project_wikis_path(@project)
= nav_link(path: 'projects#files') do
= link_to 'Attachments', files_project_path(@project), class: "files-tab tab"
= nav_link(controller: :snippets) do
= link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
= nav_link(path: 'wikis#git_access') do
= link_to git_access_project_wikis_path(@project) do
%i.icon-download-alt
Git Access
= render 'wikis/nav'
%h3.page_title
Editing page
= render partial: 'main_links'
......
= render 'wikis/nav'
%h3.page_title
Git Access
%strong= @gollum_wiki.path_with_namespace
......
= render 'wikis/nav'
%h3.page_title
%span.cgray History for
%span.light History for
= @wiki.title.titleize
= render partial: 'main_links'
%br
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment