summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2014-01-27 10:30:11 -0800
committerjessib <jessib@riseup.net>2014-01-27 10:30:11 -0800
commit7e0573f3347dca6323eae05127849431ecbceb77 (patch)
tree8a6ff58fdcc93493b5a8f332350b0a9292119906 /config
parent3bfbf0ad20bb5b8e4689fda287cd47738571d10d (diff)
parentd578c07e196cd9758fbf1752a9bb8477c260bb30 (diff)
Merge branch 'develop' into feature/messages_api
Conflicts: users/config/locales/en.yml
Diffstat (limited to 'config')
-rw-r--r--config/initializers/markdown_handler.rb19
-rw-r--r--config/locales/en.yml5
-rw-r--r--config/routes.rb9
3 files changed, 33 insertions, 0 deletions
diff --git a/config/initializers/markdown_handler.rb b/config/initializers/markdown_handler.rb
new file mode 100644
index 0000000..b9e73ba
--- /dev/null
+++ b/config/initializers/markdown_handler.rb
@@ -0,0 +1,19 @@
+#
+# This adds support for markdown in views. Just name the template with ".md"
+# erb expansion is supported.
+#
+
+require 'rdiscount'
+
+module MarkdownHandler
+ def self.erb
+ @erb ||= ActionView::Template.registered_template_handler(:erb)
+ end
+
+ def self.call(template)
+ compiled_source = erb.call(template)
+ "RDiscount.new(begin;#{compiled_source};end, :generate_toc, :smart, :autolink).to_html"
+ end
+end
+
+ActionView::Template.register_template_handler :md, MarkdownHandler
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 63f1c3e..96c47ca 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1 +1,6 @@
en:
+ privacy_policy: Privacy Policy
+ terms_of_service: Terms of Service
+ pricing: Pricing
+ about: About Us
+ contact: Contact \ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index b3e24b9..f8bb8fb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,5 +6,14 @@ LeapWeb::Application.routes.draw do
root :to => "home#index"
get '(:locale)' => 'home#index', :locale => MATCH_LOCALE, :as => 'home'
+ scope "(:locale)", :locale => MATCH_LOCALE, :controller => 'pages', :action => 'show' do
+ get 'privacy-policy', :as => 'privacy_policy'
+ get 'terms-of-service', :as => 'terms_of_service'
+ get 'about', :as => 'about'
+ get 'contact', :as => 'contact'
+ get 'pricing', :as => 'pricing'
+ get 'bye', :as => 'bye'
+ end
+
get '/provider.json' => 'static_config#provider'
end