From 01b0cde69b2724cb729fb05f8ceedc86e9d7fb5b Mon Sep 17 00:00:00 2001 From: did Date: Tue, 5 Jul 2011 18:41:14 +0200 Subject: [PATCH] revert to the default site configuration (multi_sites disabled) --- config/initializers/locomotive.rb | 20 ++++++++++---------- doc/TODO | 4 ++-- doc/changelogs/20110704.txt | 1 + 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/config/initializers/locomotive.rb b/config/initializers/locomotive.rb index b9222ebc..ff9966b1 100644 --- a/config/initializers/locomotive.rb +++ b/config/initializers/locomotive.rb @@ -7,16 +7,16 @@ Locomotive.configure do |config| # your own domain name (ex: locomotivehosting.com). # # Ex: - config.multi_sites do |multi_sites| - # each new website you add will have a default entry based on a subdomain - # and the multi_site_domain value (ex: website_1.locomotivehosting.com). - multi_sites.domain = 'example.com' #'myhostingplatform.com' - - # define the reserved subdomains - # Ex: - multi_sites.reserved_subdomains = %w(www admin email blog webmail mail support help site sites) - end - # config.multi_sites = false + # config.multi_sites do |multi_sites| + # # each new website you add will have a default entry based on a subdomain + # # and the multi_site_domain value (ex: website_1.locomotivehosting.com). + # multi_sites.domain = 'example.com' #'myhostingplatform.com' + # + # # define the reserved subdomains + # # Ex: + # multi_sites.reserved_subdomains = %w(www admin email blog webmail mail support help site sites) + # end + config.multi_sites = false # configure the hosting target for the production environment. Locomotive can be installed in: # - your own server diff --git a/doc/TODO b/doc/TODO index d13c21f1..5043677e 100644 --- a/doc/TODO +++ b/doc/TODO @@ -65,9 +65,9 @@ x export site x rake task to import a remote template x MERGE x remove withelist for assets since we've got now roles -- admin role is not correctly set when creating a new website -- test and/or convert existing templates (the 2 of the themes section) +x admin role is not correctly set when creating a new website - the required star for file field is not shown +- test and/or convert existing templates (the 2 of the themes section) - tooltip to explain the difference between 1.) Admin 2.) Author 3.) Designer? - overide sort for contents diff --git a/doc/changelogs/20110704.txt b/doc/changelogs/20110704.txt index 4fd08cea..24cdb8e5 100644 --- a/doc/changelogs/20110704.txt +++ b/doc/changelogs/20110704.txt @@ -24,4 +24,5 @@ Here is a pretty exhaustive list of what the BIG MERGE includes: - better hints for the theme asset new/edit action - slight modifications on forms: separator between fields, text shadow, error message redesigned, ...etc - quick link to edit directly a model from the submenu +- new sites picker (if the multi_sites mode is enabled and correctly set up) - a lot of internal refactoring as well as a ton of bug corrections \ No newline at end of file