diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb index 1fa38034c660947bfa9ece5d1c48cffcfd90ddb9..993abcf8727d3392c44eeeb334b8384b901094f6 100644 --- a/app/controllers/wikis_controller.rb +++ b/app/controllers/wikis_controller.rb @@ -6,6 +6,10 @@ class WikisController < 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]) diff --git a/app/views/wikis/history.html.haml b/app/views/wikis/history.html.haml index 2e46a90ef516445abef4f8a0ca66914f0b22a0ba..f82c681fcdee7a3cbf084ed75221bfa5b3d82a05 100644 --- a/app/views/wikis/history.html.haml +++ b/app/views/wikis/history.html.haml @@ -1,4 +1,6 @@ -%h3.page_title Versions +%h3.page_title + %span.cgray History for + = @wikis.last.title %br %table.admin-table %thead diff --git a/app/views/wikis/pages.html.haml b/app/views/wikis/pages.html.haml new file mode 100644 index 0000000000000000000000000000000000000000..c84621193d57ca4d81154b93ef80b8c35de0e5d8 --- /dev/null +++ b/app/views/wikis/pages.html.haml @@ -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 + diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml index 3e92275102c43166b9e3d1405b2d0489581c45d9..579aeb4179622dc6d1dcb292e84668a324d59555 100644 --- a/app/views/wikis/show.html.haml +++ b/app/views/wikis/show.html.haml @@ -1,6 +1,8 @@ -%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 diff --git a/config/routes.rb b/config/routes.rb index 11430baf30e9cae6745adff047e8318889aa6dcf..7ece304450d37c9153b1a4b7cd152c1795e669de 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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