Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Redirect /pages/id to /wiki/permalink

Browse source
This commit is contained in:
Benjamin Meichsner 2009-09-28 15:31:20 +02:00
parent eca24d30f2
commit 7c192bbad3
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/pages_controller.rb
View file

@ -11,7 +11,17 @@ class PagesController < ApplicationController
end end
def show def show
if params[:permalink]
@page = Page.find_by_permalink(params[:permalink]) @page = Page.find_by_permalink(params[:permalink])
elsif params[:id]
page = Page.find_by_id(params[:id])
if page.nil?
flash[:error] = "Seite existiert nicht!"
redirect_to all_pages_path and return
else
redirect_to wiki_page_path(page.permalink) and return
end
end
if @page.nil? if @page.nil?
redirect_to new_page_path(:title => params[:permalink]) redirect_to new_page_path(:title => params[:permalink])

4
app/views/pages/all.html.haml
View file

@ -6,7 +6,9 @@
%h1 Alle Wikiseiten %h1 Alle Wikiseiten
%p= link_to "Neue Seite anlegen", new_page_path
#sidebar
#sidebar-links= link_to "Neue Seite anlegen", new_page_path
%table %table
%tr %tr

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

@ -14,7 +14,7 @@
= @page.title = @page.title
#sidebar #sidebar
#page-versions #sidebar-links
= link_to "Bearbeiten", edit_page_path(@page) = link_to "Bearbeiten", edit_page_path(@page)
= link_to_function "Versionen (#{@page.versions.count})", "Element.toggle('versions')" = link_to_function "Versionen (#{@page.versions.count})", "Element.toggle('versions')"
- unless @page.children.empty? - unless @page.children.empty?

8
public/stylesheets/main.css
View file

@ -443,7 +443,6 @@ ul.autocomplete .informal {
top: -1em; top: -1em;
left: 5%; } left: 5%; }
<<<<<<< HEAD:public/stylesheets/main.css
.stats-bar { .stats-bar {
height: 20px; height: 20px;
min-width: 10px; min-width: 10px;
@ -452,10 +451,6 @@ ul.autocomplete .informal {
text-align: center; text-align: center;
margin: 0 10px 10px 0; } margin: 0 10px 10px 0; }
.wiki_show h1, .wiki_version h1, .wiki_new h1, .wiki_edit h1, .wiki_all h1 {
padding-left: 0;
padding-top: 10px; }
=======
#wiki_content { #wiki_content {
border-style: none; border-style: none;
color: black; color: black;
@ -499,7 +494,6 @@ ul.autocomplete .informal {
margin: 0.3em 0 0 3.2em; margin: 0.3em 0 0 3.2em;
padding: 0; padding: 0;
list-style-image: none; } list-style-image: none; }
>>>>>>> wiki:public/stylesheets/main.css
a.new_wiki_link { a.new_wiki_link {
color: grey; } color: grey; }
@ -536,7 +530,7 @@ a.new_wiki_link {
float: right; float: right;
width: 290px; width: 290px;
margin-top: -60px; } margin-top: -60px; }
#sidebar #page-versions { #sidebar #sidebar-links {
margin-bottom: 18px; margin-bottom: 18px;
text-align: right; } text-align: right; }
#sidebar #subpages { #sidebar #subpages {

8
public/stylesheets/print.css
View file

@ -443,7 +443,6 @@ ul.autocomplete .informal {
top: -1em; top: -1em;
left: 5%; } left: 5%; }
<<<<<<< HEAD:public/stylesheets/print.css
.stats-bar { .stats-bar {
height: 20px; height: 20px;
min-width: 10px; min-width: 10px;
@ -452,10 +451,6 @@ ul.autocomplete .informal {
text-align: center; text-align: center;
margin: 0 10px 10px 0; } margin: 0 10px 10px 0; }
.wiki_show h1, .wiki_version h1, .wiki_new h1, .wiki_edit h1, .wiki_all h1 {
padding-left: 0;
padding-top: 10px; }
=======
#wiki_content { #wiki_content {
border-style: none; border-style: none;
color: black; color: black;
@ -499,7 +494,6 @@ ul.autocomplete .informal {
margin: 0.3em 0 0 3.2em; margin: 0.3em 0 0 3.2em;
padding: 0; padding: 0;
list-style-image: none; } list-style-image: none; }
>>>>>>> wiki:public/stylesheets/print.css
a.new_wiki_link { a.new_wiki_link {
color: grey; } color: grey; }
@ -536,7 +530,7 @@ a.new_wiki_link {
float: right; float: right;
width: 290px; width: 290px;
margin-top: -60px; } margin-top: -60px; }
#sidebar #page-versions { #sidebar #sidebar-links {
margin-bottom: 18px; margin-bottom: 18px;
text-align: right; } text-align: right; }
#sidebar #subpages { #sidebar #subpages {

2
public/stylesheets/sass/main.sass
View file

@ -577,7 +577,7 @@ a.new_wiki_link
float: right float: right
width: 290px width: 290px
margin-top: -60px margin-top: -60px
#page-versions #sidebar-links
margin-bottom: 18px margin-bottom: 18px
text-align: right text-align: right
#subpages #subpages