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

Few improvements to wiki module.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-05-07 18:15:14 +02:00
parent dafbb077b6
commit 7e4409bc11
6 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/pages_controller.rb
View file

@ -41,8 +41,8 @@ class PagesController < ApplicationController
respond_to do |format| respond_to do |format|
if @page.save if @page.save
flash[:notice] = 'Page was successfully created.' flash[:notice] = 'Seite wurde angelegt.'
format.html { redirect_to(@page) } format.html { redirect_to(wiki_page_path(@page.permalink)) }
format.xml { render :xml => @page, :status => :created, :location => @page } format.xml { render :xml => @page, :status => :created, :location => @page }
else else
format.html { render :action => "new" } format.html { render :action => "new" }
@ -58,8 +58,8 @@ class PagesController < ApplicationController
respond_to do |format| respond_to do |format|
if @page.update_attributes(params[:page]) if @page.update_attributes(params[:page])
flash[:notice] = 'Page was successfully updated.' flash[:notice] = 'Seite wurde aktualisiert.'
format.html { redirect_to(@page) } format.html { redirect_to(wiki_page_path(@page.permalink)) }
format.xml { head :ok } format.xml { head :ok }
else else
format.html { render :action => "edit" } format.html { render :action => "edit" }

2
app/views/layouts/_main_tabnav.html.erb
View file

@ -18,7 +18,7 @@
}, },
{ :name => "Wiki", :url => "/pages", :active => ["pages", "wiki"], { :name => "Wiki", :url => "/pages", :active => ["pages", "wiki"],
:subnav => [ :subnav => [
{ :name => "Alle Seiten", :url => "pages/all" } { :name => "Alle Seiten", :url => "/pages/all" }
] ]
}, },
{ :name => "Bestellungen", :url => u.ordergroup ? "/ordering/" : "/orders", { :name => "Bestellungen", :url => u.ordergroup ? "/ordering/" : "/orders",

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

@ -8,5 +8,5 @@
%th zuletzt aktualisiert %th zuletzt aktualisiert
- for page in @pages - for page in @pages
%tr %tr
%td= link_to page.title, page %td= link_to page.title, wiki_page_path(page.permalink)
%td= format_date page.updated_at %td= format_date page.updated_at

3
public/stylesheets/main.css
View file

@ -434,3 +434,6 @@ ul.autocomplete .informal {
position: relative; position: relative;
top: -1em; top: -1em;
left: 5%; } left: 5%; }
a.new_wiki_link {
color: grey; }

3
public/stylesheets/print.css
View file

@ -435,6 +435,9 @@ ul.autocomplete .informal {
top: -1em; top: -1em;
left: 5%; } left: 5%; }
a.new_wiki_link {
color: grey; }
#logininfo, #header, #footer { #logininfo, #header, #footer {
display: none; } display: none; }

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

@ -481,3 +481,7 @@ ul.autocomplete
position: relative position: relative
top: -1em top: -1em
left: 5% left: 5%
// *** wiki
a.new_wiki_link
color: grey