0
@@ -12,7 +12,6 @@
0
 #  favicon       :string(255)     
0
 #  time_zone     :string(255)     default("UTC")
0
 #  private       :boolean(1)      
0
-#  login_message :string(255)     default("You are not logged in")
0
 #
0
 
0
 class Setting < ActiveRecord::Base
0
0
@@ -27,14 +26,13 @@
0
   TITLE = 'El Dorado'
0
   TAGLINE = 'A full-stack community web application written in Ruby/Rails'
0
   FOOTER = '<p style="text-align:right;margin:0;">Powered by <a href="http://almosteffortless.com/eldorado/">El Dorado</a> | <a href="http://almosteffortless.com">&aelig;</a></p>'
0
-  LOGIN_MESSAGE = 'You are not logged in'
0
   
0
   def theme
0
     read_attribute(:theme) # not sure why this is needed, but tests are failing without it
0
   end
0
   
0
   def self.defaults
0
-    Setting.new(:title => TITLE, :tagline => TAGLINE, :footer => FOOTER, :login_message => LOGIN_MESSAGE).save
0
+    Setting.new(:title => TITLE, :tagline => TAGLINE, :footer => FOOTER).save
0
   end
0
   
0
   def to_s

0
@@ -7,8 +7,6 @@
0
       <p><%= f.text_field :title, :style => "width:66%" %></p>
0
       <p class="label"><label for="setting_tagline"><%= 'Tagline'[:tagline] %></label></p>
0
       <p><%= f.text_field :tagline, :style => "width:66%" %></p>
0
-      <p class="label"><label for="setting_login_message"><%= 'Login Message'[:login_message] %></label></p>
0
-      <p><%= f.text_field :login_message, :style => "width:66%;" %></p>
0
       <p class="label"><label for="setting_announcement"><%= 'Announcement'[:announcement] %></label></p>
0
       <p><%= f.text_area :announcement, :rows => '3', :style => "width:66%;" %></p>
0
       <p class="label"><label for="setting_footer"><%= 'Footer'[:footer] %></label></p>

0
@@ -4,7 +4,7 @@
0
       <%= 'Logged in as'[:logged_in_as] %> <b><%= link_to h(current_user.login), current_user %></b> | 
0
       <%= 'Last visit'[:last_visit_was] %> <%= time_ago_or_time_stamp(session[:online_at]) %>.
0
     <% else %>
0
-      <%= @settings.login_message %>
0
+      <%= "You are not logged in."[:not_logged_in] %>
0
     <% end %>
0
   </p>
0
   <p class="nav-right">

0
@@ -1 +1,10 @@
0
+class RemoveLoginMessageFromSettings < ActiveRecord::Migration
0
+  def self.up
0
+    remove_column :settings, :login_message
0
+  end
0
+
0
+  def self.down
0
+    add_column :settings, :login_message
0
+  end
0
+end

0
@@ -101,6 +101,7 @@
0
 new_topic: Nieuw Topic
0
 next_page: Volgende Pagina
0
 next: Volgende
0
+not_logged_in: Je bent niet ingelogd.
0
 now: Nu
0
 offline: Offline
0
 of: van

0
@@ -21,11 +21,9 @@
0
   title: 'El Dorado'
0
   time_zone: 'US/Central'
0
   private: false
0
-  login_message: 'You are not logged in'
0
 private:
0
   id: 2
0
   title: 'El Dorado'
0
   time_zone: 'US/Central'
0
   private: true
0
-  login_message: 'You are not logged in'