Wiki pages page

Dmitriy Zaporozhets
1 parent 8ffb6126
Showing 5 changed files with 32 additions and 2 deletions Show diff stats
app/controllers/wikis_controller.rb
app/views/wikis/history.html.haml
app/views/wikis/pages.html.haml
app/views/wikis/show.html.haml
config/routes.rb
@@ -6,6 +6,10 @@ class WikisController &lt; ApplicationController
   before_filter :authorize_admin_wiki!, :only => :destroy
   layout "project"
  
+  def pages
+    @wikis = @project.wikis.group(:slug).order("created_at")
+  end
+
   def show
     if params[:old_page_id]
       @wiki = @project.wikis.find(params[:old_page_id])
-%h3.page_title Versions
+%h3.page_title
+  %span.cgray History for
+  = @wikis.last.title
 %br
 %table.admin-table
   %thead
@@ -0,0 +1,18 @@
+%h3.page_title All Pages
+%br
+%table.admin-table
+  %thead
+    %tr
+      %th Title
+      %th slug
+      %th created by
+  %tbody
+    - @wikis.each_with_index do |wiki_page, i|
+      %tr
+        %td
+          = link_to wiki_page.title, project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id)
+          (#{time_ago_in_words(wiki_page.created_at)}
+          ago)
+        %td= wiki_page.slug
+        %td= wiki_page.user.name
+
-%h3
+%h3.page_title
   = @wiki.title
   %span.right
+    = link_to pages_project_wikis_path(@project), :class => "btn small grouped" do
+      Pages
     - if can? current_user, :write_wiki, @project
       = link_to history_project_wiki_path(@project, @wiki), :class => "btn small grouped" do
         History
@@ -98,6 +98,10 @@ Gitlab::Application.routes.draw do
     end
  
     resources :wikis, :only => [:show, :edit, :destroy, :create] do
+      collection do
+        get :pages
+      end
+
       member do
         get "history"
       end
...	...	@@ -6,6 +6,10 @@ class WikisController < ApplicationController
6	6	before_filter :authorize_admin_wiki!, :only => :destroy
7	7	layout "project"
8	8
	9	+ def pages
	10	+ @wikis = @project.wikis.group(:slug).order("created_at")
	11	+ end
	12	+
9	13	def show
10	14	if params[:old_page_id]
11	15	@wiki = @project.wikis.find(params[:old_page_id])
...	...
1		-%h3.page_title Versions
	1	+%h3.page_title
	2	+ %span.cgray History for
	3	+ = @wikis.last.title
2	4	%br
3	5	%table.admin-table
4	6	%thead
...	...
...	...	@@ -0,0 +1,18 @@
	1	+%h3.page_title All Pages
	2	+%br
	3	+%table.admin-table
	4	+ %thead
	5	+ %tr
	6	+ %th Title
	7	+ %th slug
	8	+ %th created by
	9	+ %tbody
	10	+ - @wikis.each_with_index do \|wiki_page, i\|
	11	+ %tr
	12	+ %td
	13	+ = link_to wiki_page.title, project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id)
	14	+ (#{time_ago_in_words(wiki_page.created_at)}
	15	+ ago)
	16	+ %td= wiki_page.slug
	17	+ %td= wiki_page.user.name
	18	+
...	...
1		-%h3
	1	+%h3.page_title
2	2	= @wiki.title
3	3	%span.right
	4	+ = link_to pages_project_wikis_path(@project), :class => "btn small grouped" do
	5	+ Pages
4	6	- if can? current_user, :write_wiki, @project
5	7	= link_to history_project_wiki_path(@project, @wiki), :class => "btn small grouped" do
6	8	History
...	...
...	...	@@ -98,6 +98,10 @@ Gitlab::Application.routes.draw do
98	98	end
99	99
100	100	resources :wikis, :only => [:show, :edit, :destroy, :create] do
	101	+ collection do
	102	+ get :pages
	103	+ end
	104	+
101	105	member do
102	106	get "history"
103	107	end
...	...