kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge wiki, wall & snippets under one tab - writeboards

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-14 22:24:27 +02:00
parent 753ecbdcec
commit a685624d27
14 changed files with 128 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/sections/notes.scss
View file

@ -284,6 +284,6 @@ ul.notes {
margin-top: 8px;
margin-left: 15px;
@extend .pull-left;
@extend .span4;
width: 35%;
}
}

12
app/helpers/tab_helper.rb
View file

@ -73,11 +73,19 @@ module TabHelper
end
def project_tab_class
[:files, :edit].each do |action|
return "active" if current_page?(controller: "projects", action: :edit, id: @project)
if ['services', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name
"active"
end
end
def project_writeboards_tab_class
[:files, :wall].each do |action|
return "active" if current_page?(controller: "projects", action: action, id: @project)
end
if ['snippets', 'services', 'hooks', 'deploy_keys', 'team_members'].include? controller.controller_name
if ['wikis', 'snippets'].include? controller.controller_name
"active"
end
end

2
app/views/hooks/index.html.haml
View file

@ -18,7 +18,7 @@
.input
= f.text_field :url, class: "text_field xxlarge"
 
= f.submit "Add Web Hook", class: "btn btn-primary"
= f.submit "Add Web Hook", class: "btn btn-create"
%hr
-if @hooks.any?

10
app/views/layouts/project_resource.html.haml
View file

@ -35,17 +35,11 @@
Merge Requests
%span.count.merge_counter= @project.merge_requests.opened.count
- if @project.wall_enabled
= nav_link(path: 'projects#wall') do
= link_to 'Wall', wall_project_path(@project)
- if @project.wiki_enabled
= nav_link(controller: :wikis) do
= link_to 'Wiki', project_wiki_path(@project, :index)
= nav_link(html_options: {class: "#{project_writeboards_tab_class}"}) do
= link_to 'Writeboards', project_wiki_path(@project, :index)
- 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

41
app/views/projects/files.html.haml
View file

@ -1,22 +1,25 @@
= render "project_head"
- unless @notes.empty?
%table
%thead
%tr
%th File name
%th
.row
.span3
= render 'writeboards/nav'
.span9
- 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

8
app/views/projects/wall.html.haml
View file

@ -1,2 +1,6 @@
%div.wall_page
= render "notes/reversed_notes_with_form"
.row
.span3
= render 'writeboards/nav'
.span9
%div.wall_page
= render "notes/reversed_notes_with_form"

1
app/views/snippets/edit.html.haml
View file

@ -1,2 +1 @@
= render "projects/project_head"
= render "snippets/form"

42
app/views/snippets/index.html.haml
View file

@ -1,21 +1,23 @@
= render "projects/project_head"
.row
.span3
= render 'writeboards/nav'
.span9
%h3.page_title
Snippets
%small share code pastes with others out of git repository
%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
app/views/snippets/new.html.haml
View file

@ -1,2 +1 @@
= render "projects/project_head"
= render "snippets/form"

2
app/views/snippets/show.html.haml
View file

@ -1,5 +1,3 @@
= render "projects/project_head"
%h3.page_title
= @snippet.title
%small= @snippet.file_name

2
app/views/wikis/edit.html.haml
View file

@ -5,4 +5,4 @@
.pull-right
- if can? current_user, :admin_wiki, @project
= link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete, class: "btn btn-small btn-remove" do
Delete this page
Delete this page

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

@ -1,20 +1,24 @@
%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)
.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)

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

@ -1,23 +1,27 @@
%h3.page_title
= @wiki.title
%span.pull-right
= link_to pages_project_wikis_path(@project), class: "btn btn-small grouped" do
Pages
- if can? current_user, :write_wiki, @project
= link_to history_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
History
= link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
%i.icon-edit
Edit
%br
- if @wiki != @most_recent_wiki
.warning_message
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)}.
.row
.span3
= render 'writeboards/nav'
.span9
%h3.page_title
= @wiki.title
%span.pull-right
= link_to pages_project_wikis_path(@project), class: "btn btn-small grouped" do
Pages
- if can? current_user, :write_wiki, @project
= link_to history_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
History
= link_to edit_project_wiki_path(@project, @wiki), class: "btn btn-small grouped" do
%i.icon-edit
Edit
%br
- if @wiki != @most_recent_wiki
.warning_message
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_content.wiki
= preserve do
= markdown @wiki.content
.file_holder
.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

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

@ -0,0 +1,14 @@
%ul.nav.nav-pills.nav-stacked
- 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"