Return own tab for wall. Improve Wiki nav. Removed attachments listing page
This commit is contained in:
parent
6956f1f6e1
commit
ae06a0aab8
12 changed files with 25 additions and 62 deletions
|
@ -1,16 +1,8 @@
|
|||
%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
|
||||
|
|
|
@ -1,14 +1,11 @@
|
|||
%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
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
= render 'wikis/nav'
|
||||
%h3.page_title
|
||||
Editing page
|
||||
= render partial: 'main_links'
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
= render 'wikis/nav'
|
||||
%h3.page_title
|
||||
Git Access
|
||||
%strong= @gollum_wiki.path_with_namespace
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
= render 'wikis/nav'
|
||||
%h3.page_title
|
||||
%span.cgray History for
|
||||
%span.light History for
|
||||
= @wiki.title.titleize
|
||||
= render partial: 'main_links'
|
||||
%br
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue