From e9d37f395f457fc8c3b0acae3859056c5fad6a67 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 16 Jul 2013 21:06:04 +1000 Subject: [PATCH] hmm I totally missed that it was already there --- app/models/site_content.rb | 1 - app/views/static/login.html.erb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/site_content.rb b/app/models/site_content.rb index 1fbcbb5f462..a247b861bff 100644 --- a/app/models/site_content.rb +++ b/app/models/site_content.rb @@ -20,7 +20,6 @@ class SiteContent < ActiveRecord::Base add_content_type :login_required_welcome_message, default_18n_key: 'login_required.welcome_message' add_content_type :privacy_policy, allow_blank: true add_content_type :faq, allow_blank: true - add_content_type :login_required, default_18n_key: 'login_required.welcome_message' def site_content_type @site_content_type ||= SiteContent.content_types.find {|t| t.content_type == content_type.to_sym} diff --git a/app/views/static/login.html.erb b/app/views/static/login.html.erb index cf1503c5525..4971cd49c7c 100644 --- a/app/views/static/login.html.erb +++ b/app/views/static/login.html.erb @@ -1 +1 @@ -<%= PrettyText.cook(SiteContent.content_for(:login_required)).html_safe %> +<%= markdown_content(:login_required_welcome_message) %>