github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor stuff

Browse Source
This commit is contained in:
dinedine 2011-01-03 14:44:38 +01:00
parent 572ee360a1
commit 56a7a09903
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -174,7 +174,7 @@ GEM
rack (1.2.1)
rack-mount (0.6.13)
rack (>= 1.0.0)
rack-test (0.5.6)
rack-test (0.5.7)
rack (>= 1.0)
rails (3.0.3)
actionmailer (= 3.0.3)

3
config/initializers/locomotive.rb
View File

@ -8,7 +8,8 @@ Locomotive.configure do |config|
# If you use locomotive for a single site in Heroku, use "heroku.com" as default domain name.
# Your heroku app name (<app_name>.heroku.name) will be used as the sub domain name in Locomotive
# during the installation wizzard.
# ex: config.default_domain = Rails.env.production? ? 'heroku.com' : 'example.com'
# Ex:
# config.default_domain = Rails.env.production? ? 'heroku.com' : 'example.com'
config.default_domain = 'example.com'
# configure how many items we display in sub menu in the "Contents" section.

2
config/locales/admin_ui_en.yml
View File

@ -290,7 +290,7 @@ en:
next: Create account
step_3:
title: "Step 3/3 &mdash; Create first site"
explanations: "This is the last step of the installation. You can upload a theme as a zip file. We have free available themes <a href=\"http://www.locomotivecms.com/docs/themes\">here</a>."
explanations: "This is the last step of the installation. You can upload a theme as a zip file. We have free available themes <a href=\"http://www.locomotivecms.com/support/themes\">here</a>."
next: Create site

2
config/locales/admin_ui_fr.yml
View File

@ -291,7 +291,7 @@ fr:
next: Créer compte
step_3:
title: "Étape 3/3 &mdash; Créer premier site"
explanations: "C'est la dernière étape de l'installation. Vous pouvez uploader un theme sous forme d'un fichier zip. Nous avons quelques themes disponibles <a href=\"http://www.locomotivecms.com/docs/themes\">ici</a>."
explanations: "C'est la dernière étape de l'installation. Vous pouvez uploader un theme sous forme d'un fichier zip. Nous avons quelques themes disponibles <a href=\"http://www.locomotivecms.com/support/themes\">ici</a>."
next: Créer site
formtastic:

23
config/mongoid.yml
View File

@ -8,18 +8,25 @@ defaults: &defaults
development:
<<: *defaults
database: locomotive_dev
database: locomotive_staging_dev
test:
<<: *defaults
database: locomotive_test
database: locomotive_staging_test
# set these environment variables on your prod server
production:
<<: *defaults
database: locomotive_prod
host: <%= ENV['MONGOID_HOST'] %>
port: <%= ENV['MONGOID_PORT'] %>
username: <%= ENV['MONGOID_USERNAME'] %>
password: <%= ENV['MONGOID_PASSWORD'] %>
database: <%= ENV['MONGOID_DATABASE'] %>
database: locomotive_staging_prod
# other settings for production
# host: <%= ENV['MONGOID_HOST'] %>
# port: <%= ENV['MONGOID_PORT'] %>
# username: <%= ENV['MONGOID_USERNAME'] %>
# password: <%= ENV['MONGOID_PASSWORD'] %>
# database: <%= ENV['MONGOID_DATABASE'] %>
# heroku
# uri: <%= ENV['MONGOHQ_URL'] %>

3
lib/generators/locomotive/install/templates/locomotive.rb
View File

@ -6,7 +6,8 @@ Locomotive.configure do |config|
# If you use locomotive for a single site in Heroku, use "heroku.com" as default domain name.
# Your heroku app name (<app_name>.heroku.name) will be used as the sub domain name in Locomotive
# during the installation wizzard.
# ex: config.default_domain = Rails.env.production? ? 'heroku.com' : 'example.com'
# Ex:
# config.default_domain = Rails.env.production? ? 'heroku.com' : 'example.com'
config.default_domain = 'example.com'
# configure how many items we display in sub menu in the "Contents" section.