deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use wiki tab for wiki, wall, snippets

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-15 14:20:03 +02:00
parent 39bbdc468f
commit 35ad4fe7db
10 changed files with 87 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/views/wikis/_nav.html.haml Normal file
View file

@ -0,0 +1,14 @@
%ul.nav.nav-tabs
- if @project.wiki_enabled
= nav_link(controller: 'wikis') do
= link_to 'Wiki', project_wiki_path(@project, :index)
- if @project.wall_enabled
= nav_link(path: 'projects#wall') do
= link_to 'Wall', wall_project_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"

45
app/views/wikis/pages.html.haml
View file

@ -1,24 +1,21 @@
.row
.span3
= render 'writeboards/nav'
.span9
%h3.page_title All Pages
%br
%table
%thead
%tr
%th Title
%th Slug
%th Last updated
%th Updated by
%tbody
- @wiki_pages.each do |wiki_page|
%tr
%td
%strong= link_to wiki_page.title, project_wiki_path(@project, wiki_page)
%td= wiki_page.slug
%td
= wiki_page.created_at.to_s(:short) do
(#{time_ago_in_words(wiki_page.created_at)}
ago)
%td= link_to_member(@project, wiki_page.user)
= render 'wikis/nav'
%h3.page_title All Pages
%br
%table
%thead
%tr
%th Title
%th Slug
%th Last updated
%th Updated by
%tbody
- @wiki_pages.each do |wiki_page|
%tr
%td
%strong= link_to wiki_page.title, project_wiki_path(@project, wiki_page)
%td= wiki_page.slug
%td
= wiki_page.created_at.to_s(:short) do
(#{time_ago_in_words(wiki_page.created_at)}
ago)
%td= link_to_member(@project, wiki_page.user)

48
app/views/wikis/show.html.haml
View file

@ -1,30 +1,24 @@
.row
.span3.writeboards-menu
= render 'writeboards/nav'
.span9.writeboards-content
- if @wiki != @most_recent_wiki
.alert
This is an old version of this page.
You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}.
= render 'wikis/nav'
- if @wiki != @most_recent_wiki
.alert
This is an old version of this page.
You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}.
.file_holder
.file_title
= link_to '#', class: 'wiki-fullscreen' do
%i.icon-resize-horizontal
 
= @wiki.title
%span.options
= link_to pages_project_wikis_path(@project), class: "btn btn-tiny grouped" do
Pages
- if can? current_user, :write_wiki, @project
= link_to history_project_wiki_path(@project, @wiki), class: "btn btn-tiny grouped" do
History
= link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-tiny grouped" do
%i.icon-edit
Edit
.file_holder
.file_title
= @wiki.title
%span.options
= link_to pages_project_wikis_path(@project), class: "btn btn-tiny grouped" do
Pages
- if can? current_user, :write_wiki, @project
= link_to history_project_wiki_path(@project, @wiki), class: "btn btn-tiny grouped" do
History
= link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-tiny grouped" do
%i.icon-edit
Edit
.file_content.wiki
= preserve do
= markdown @wiki.content
.file_content.wiki
= preserve do
= markdown @wiki.content
%p.time Last edited by #{link_to_member @project, @wiki.user}, #{time_ago_in_words @wiki.created_at} ago
%p.time Last edited by #{link_to_member @project, @wiki.user}, #{time_ago_in_words @wiki.created_at} ago