Use wiki tab for wiki, wall, snippets
This commit is contained in:
Dmitriy Zaporozhets
parent
39bbdc468f
commit
35ad4fe7db
10 changed files with 87 additions and 111 deletions
|
|
@ -53,12 +53,6 @@ $ ->
|
|||
$('.trigger-submit').on 'change', ->
|
||||
$(@).parents('form').submit()
|
||||
|
||||
# Wiki resizer
|
||||
$('.wiki-fullscreen').on 'click', ->
|
||||
$('.writeboards-menu').toggleClass('hide')
|
||||
$('.writeboards-content').toggleClass('span9').toggleClass('span12')
|
||||
|
||||
|
||||
# Flash
|
||||
if (flash = $(".flash-container")).length > 0
|
||||
flash.click -> $(@).fadeOut()
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ module TabHelper
|
|||
end
|
||||
end
|
||||
|
||||
def project_writeboards_tab_class
|
||||
def project_wiki_tab_class
|
||||
[:files, :wall].each do |action|
|
||||
return "active" if current_page?(controller: "projects", action: action, id: @project)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
Merge Requests
|
||||
%span.count.merge_counter= @project.merge_requests.opened.count
|
||||
|
||||
= nav_link(html_options: {class: "#{project_writeboards_tab_class}"}) do
|
||||
= nav_link(html_options: {class: "#{project_wiki_tab_class}"}) do
|
||||
= link_to 'Wiki', project_wiki_path(@project, :index)
|
||||
|
||||
- if can? current_user, :admin_project, @project
|
||||
|
|
|
|||
|
|
@ -1,25 +1,22 @@
|
|||
.row
|
||||
.span3
|
||||
= render 'writeboards/nav'
|
||||
.span9
|
||||
- unless @notes.empty?
|
||||
%table
|
||||
%thead
|
||||
%tr
|
||||
%th File name
|
||||
%th
|
||||
= 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
|
||||
- @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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
.row
|
||||
.span3
|
||||
= render 'writeboards/nav'
|
||||
.span9
|
||||
%div.wall_page
|
||||
= render "notes/reversed_notes_with_form"
|
||||
= render 'wikis/nav'
|
||||
%div.wall_page
|
||||
= render "notes/reversed_notes_with_form"
|
||||
|
|
|
|||
|
|
@ -1,23 +1,20 @@
|
|||
.row
|
||||
.span3
|
||||
= render 'writeboards/nav'
|
||||
.span9
|
||||
%h3.page_title
|
||||
Snippets
|
||||
%small share code pastes with others out of git repository
|
||||
= render 'wikis/nav'
|
||||
%h3.page_title
|
||||
Snippets
|
||||
%small share code pastes with others out of git repository
|
||||
|
||||
- if can? current_user, :write_snippet, @project
|
||||
= link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
|
||||
Add new snippet
|
||||
%br
|
||||
%table
|
||||
%thead
|
||||
%tr
|
||||
%th Title
|
||||
%th File Name
|
||||
%th Expires At
|
||||
= render @snippets
|
||||
- if @snippets.empty?
|
||||
%tr
|
||||
%td{colspan: 3}
|
||||
%h3.nothing_here_message Nothing here.
|
||||
- if can? current_user, :write_snippet, @project
|
||||
= link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
|
||||
Add new snippet
|
||||
%br
|
||||
%table
|
||||
%thead
|
||||
%tr
|
||||
%th Title
|
||||
%th File Name
|
||||
%th Expires At
|
||||
= render @snippets
|
||||
- if @snippets.empty?
|
||||
%tr
|
||||
%td{colspan: 3}
|
||||
%h3.nothing_here_message Nothing here.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%ul.nav.nav-pills.nav-stacked
|
||||
%ul.nav.nav-tabs
|
||||
- if @project.wiki_enabled
|
||||
= nav_link(controller: 'wikis') do
|
||||
= link_to 'Wiki', project_wiki_path(@project, :index)
|
||||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ describe "Gitlab Flavored Markdown" do
|
|||
end
|
||||
|
||||
it "should NOT render title in wikis#show" do
|
||||
within(".content h3") do # page title
|
||||
within(".content .file_title") do # page title
|
||||
page.should have_content("Circumvent ##{issue.id}")
|
||||
page.should_not have_link("##{issue.id}")
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue