0
@@ -27,7 +27,7 @@
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
+  LOGIN_MESSAGE = 'This is a private site.'
0
   
0
   def theme
0
     read_attribute(:theme) # not sure why this is needed, but tests are failing without it

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
@@ -18,6 +16,8 @@
0
       <p><%= f.check_box :private %> <label for="setting_private"><%= 'Private'[:private] %></label>&nbsp; 
0
         <span class="detail"><%= 'Require login for all actions, including creating new users. (Uploaded files will still be publicly accessible.)'[:private_subtext] %></span>
0
       </p>
0
+      <p class="label"><label for="setting_login_message"><%= 'Private Site Message'[:private_site_message] %></label></p>
0
+      <p><%= f.text_field :login_message, :style => "width:66%;" %></p>
0
       <p class="label"><label for="setting_time_zone"><%= 'Default Timezone'[:default_timezone] %></label></p>
0
       <p><%= time_zone_select 'settings', 'time_zone', TZInfo::Timezone.all.sort, :model => TZInfo::Timezone %></p>
0
       <p class="label"><label for="setting_language"><%= 'Default Language'[:default_language] %></label></p>

0
@@ -4,7 +4,11 @@
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
+      <% if @settings.private %>
0
+        <%= @settings.login_message %>
0
+      <% else %>
0
+        <%= "You're not logged in."[:not_logged_in] %>
0
+      <% end %>
0
     <% end %>
0
   </p>
0
   <p class="nav-right">

0
@@ -9,7 +9,7 @@
0
 #
0
 # It's strongly recommended to check this file into your version control system.
0
 
0
-ActiveRecord::Schema.define(:version => 86) do
0
+ActiveRecord::Schema.define(:version => 85) do
0
 
0
   create_table "avatars", :force => true do |t|
0
     t.integer  "parent_id"
0
@@ -109,8 +109,9 @@
0
     t.text    "footer"
0
     t.string  "theme"
0
     t.string  "favicon"
0
-    t.string  "time_zone",    :default => "UTC"
0
-    t.boolean "private",      :default => false
0
+    t.string  "time_zone",     :default => "UTC"
0
+    t.boolean "private",       :default => false
0
+    t.string  "login_message"
0
     t.string  "language"
0
   end
0
 

0
@@ -122,6 +122,7 @@
0
 prev_page: Vorige Pagina
0
 prev: Vorige
0
 private: Privé
0
+private_site_message: Privé Site Bericht
0
 private_subtext: Vereis login en sluit publieke registratie. 
0
 profile: Profiel
0
 profile_updated: Profiel Aangepast
0
0
0
@@ -143,20 +144,20 @@
0
 settings: Instellingen
0
 signature: Handtekening
0
 size: Grootte
0
+tagline: Slogan
0
+themes_must_be_smaller_than: Stijl mag niet groter zijn dan {size}.
0
+themes: Stijlen
0
+this_topic_is_locked: Dit Topic Is Gesloten
0
+timezone: Tijdzone
0
 title_categories: Categoriën
0
 title_events: Kalender
0
 title_forums: Forum
0
 title_headers: Logos
0
 title_home: Start
0
 title_messages: Chat
0
+title: Titel
0
 title_uploads: Bestanden
0
 title_users: Gebruikers
0
-tagline: Slogan
0
-themes_must_be_smaller_than: Stijl mag niet groter zijn dan {size}.
0
-themes: Stijlen
0
-this_topic_is_locked: Dit Topic Is Gesloten
0
-timezone: Tijdzone
0
-title: Titel
0
 today: Vandaag
0
 today: Vandaag
0
 topics: Topics