layout/layout.haml @@ -1,7 +1,8 @@ class AccountController < Ramaze::Controller helper :simple_captcha, :identity, :user engine :Haml - layout '/layout' + layout 'layout' + map_layouts '/' def login if request[:fail] == 'session' @@ -28,9 +29,9 @@ class AccountController < Ramaze::Controller # site. def after_login if logged_in? - answer R(SpamController, :list_pending) + answer SpamController.r(:list_pending) else - redirect Rs(:login, :fail => :session) + redirect r(:login, :fail => :session) end end @@ -40,7 +41,7 @@ class AccountController < Ramaze::Controller if $rapaste[:users].include?(@oid) session[:user] = @oid flash[:good] = flash[:success] - redirect R(SpamController, :list_pending) + redirect SpamController.r(:list_pending) else flash[:bad] = "None of our users belongs to this OpenID" end controller/account.rb @@ -91,7 +91,7 @@ class PasteController < Ramaze::Controller # TODO: the behaviour of forking a private paste isn't implemented yet, # suggestions welcome def fork(id, digest = nil) - redirect Rs(:fork => id, :digest => digest) + redirect r(:/, :fork => id, :digest => digest) end # TODO: implement this using something like session[:pastes] @@ -157,6 +157,6 @@ class PasteController < Ramaze::Controller :text => text ) - redirect Rs(:list) + redirect r(:list) end end controller/paste.rb @@ -2,7 +2,8 @@ class SpamController < Ramaze::Controller map '/spam' helper :paginate, :formatting, :aspect engine :Haml - layout '/layout' + layout 'layout' + map_layouts '/' before_all do redirect_referrer unless $rapaste[:users].include?(session[:openid_identity]) @@ -51,7 +52,7 @@ class SpamController < Ramaze::Controller session[:undo] << request.params session[:undo].shift until session[:undo].size < 10 # keep it reasonable - flash[:good] = "Categorized this page, #{A('undo?', :href => Rs(:undo))}" + flash[:good] = "Categorized this page, #{a('undo?', :undo)}" redirect_referrer end @@ -64,7 +65,7 @@ class SpamController < Ramaze::Controller paste.save end - flash[:good] = "Undo successful, want to #{A('undo further?', :href => Rs(:undo))}" + flash[:good] = "Undo successful, want to #{a('undo further?', :undo)}" else flash[:bad] = "Nothing to undo" end controller/spam.rb @@ -44,21 +44,19 @@ class Paste < Sequel::Model $rapaste_syntaxes[syntax] end - include Ramaze::Helper::Link - def link(name) ident = [id] ident << digest if private case name when :fork, :delete - A(name.to_s.capitalize, :href => R(PasteController, name, *ident)) + PasteController.a(name.to_s.capitalize, name, *ident)) when :href - R(PasteController, *ident) + PasteController.r(*ident) else file = "#{ident * '/'}.#{name}" title = "#{id}.#{name}" - A(title, :href => R(PasteController, file)) + PasteController.a(title, file) end end model/paste.rb @@ -1,5 +1,5 @@ .login - %form{:method => :POST, :action => Rs(:login)} + %form{:method => :POST, :action => r(:login)} %fieldset %legend= "#{$rapaste[:title]} Login" %label{:for => :url} Identity URL: view/account/login.haml @@ -3,13 +3,13 @@ .flashbox= flashbox = "There are #@count unapproved pastes" -%a{:href => Rs(:list_spammy)} Search for obvious spam (slow) +%a{:href => r(:list_spammy)} Search for obvious spam (slow) -%form{:method => :GET, :action => Rs(:search)} +%form{:method => :GET, :action => r(:search)} Search this list: %input{:type => :input, :name => :q} -%form{:method => :POST, :action => Rs(:mark)} +%form{:method => :POST, :action => r(:mark)} %table{:style => 'margin-left: auto; margin-right: auto;'} %tr %td Spam view/spam/list_pending.haml @@ -3,13 +3,13 @@ .flashbox= flashbox = "There are #@count spammy unapproved pastes" -%a{:href => Rs(:list_pending)} List all pending += a('List all pending', :list) -%form{:method => :GET, :action => Rs(:search)} +%form{:method => :GET, :action => r(:search)} Search this list: %input{:type => :input, :name => :q} -%form{:method => :POST, :action => Rs(:mark)} +%form{:method => :POST, :action => r(:mark)} %table{:style => 'margin-left: auto; margin-right: auto;'} %tr %td Spam view/spam/list_spammy.haml @@ -3,13 +3,13 @@ .flashbox= flashbox = "There are #@count results in inside unapproved pastes." -%a{:href => Rs(:list_pending)} List all pending +%a{:href => r(:list_pending)} List all pending -%form{:method => :GET, :action => Rs(:search)} +%form{:method => :GET, :action => r(:search)} Search this list: %input{:type => :input, :name => :q} -%form{:method => :POST, :action => Rs(:mark)} +%form{:method => :POST, :action => r(:mark)} %table{:style => 'margin-left: auto; margin-right: auto;'} %tr %td Spam view/spam/search.haml view/layout.haml a3ac46806f84b3c4d7885095ac386e55d7f095f9 Michael Fellinger m.fellinger@gmail.com http://github.com/manveru/rapaste/commit/9bbeec1f84cf5964f11938b24800b3337138dac7 9bbeec1f84cf5964f11938b24800b3337138dac7 2009-04-27T07:00:08-07:00 2009-04-27T07:00:08-07:00 Finish port to new ramaze d45834f91edb4c72984dfc7ca515f5698eed6d75 Michael Fellinger m.fellinger@gmail.com