locomotive_cms 0.0.4.beta5 → 0.0.4.beta7

data/app/views/admin/current_sites/edit.html.haml

@@ -9,7 +9,7 @@
 
 %p!= t('.help')
 
-= semantic_form_for @site, :as => :current_site, :url => admin_current_site_url, :html => { :class => 'save-with-shortcut' } do |f|
+= semantic_form_for @site, :url => admin_current_site_url, :html => { :class => 'save-with-shortcut' } do |f|
 
   = render 'form', :f => f
 

data/app/views/admin/errors/no_page.html.haml

@@ -0,0 +1 @@
+No Page!

data/app/views/admin/errors/no_site.html.haml

@@ -0,0 +1 @@
+No Site!

data/app/views/admin/imports/new.html.haml

@@ -18,4 +18,15 @@
           %p.inline-errors= @error
         %p.inline-hints= t('formtastic.hints.import.source')
 
+      %li.input.toggle
+        = label_tag 'samples', t('formtastic.labels.import.new.samples')
+        = check_box_tag 'samples'
+        %p.inline-hints= t('formtastic.hints.import.samples')
+
+      %li.input.toggle
+        = label_tag 'reset', t('formtastic.labels.import.new.reset')
+        = check_box_tag 'reset'
+        %p.inline-hints= t('formtastic.hints.import.reset')
+
+
   = render 'admin/shared/form_actions', :button_label => :send

data/app/views/admin/imports/show.html.haml

@@ -1,5 +1,5 @@
 - content_for :head do
-  = javascript_include_tag 'admin/plugins/json2', 'admin/plugins/smartupdater', 'admin/import'
+  = include_javascripts :import
 
 - title t('.title')
 

data/app/views/admin/installation/step_1.html.haml

@@ -0,0 +1,24 @@
+- content_for :head_title do
+  = t('admin.installation.common.title')
+
+- title t('.title')
+
+- content_for :head do
+  = include_stylesheets :installation
+
+.inner
+  %p.explanations
+    = t('.explanations')
+
+  %dl
+    %dt!= t('.database.label', :name => Mongoid.config.database.name)
+    %dd
+      %p.notes!= t('.database.notes')
+
+    %dt!= t('.default_domain.label', :name => Locomotive.config.default_domain)
+    %dd
+      %p.notes!= t('.default_domain.notes', :domain => Locomotive.config.default_domain)
+
+
+.footer
+  = next_installation_step_link(2)

data/app/views/admin/installation/step_2.html.haml

@@ -0,0 +1,26 @@
+- content_for :head_title do
+  = t('admin.installation.common.title')
+
+- title t('.title')
+
+- content_for :head do
+  = include_stylesheets :installation
+
+- if @step_done.blank?
+  = semantic_form_for(@account, :url => admin_installation_step_url(2)) do |f|
+    .inner
+      = f.inputs do
+        = f.input :name, :label => t('.name'), :required => false
+        = f.input :email, :label => t('.email'), :required => false
+        = f.input :password, :label => t('.password'), :required => false
+        = f.input :password_confirmation, :label => t('.password_confirmation'), :required => false
+
+    .footer
+      = box_button_tag t('.next')
+- else
+  .inner
+    %p.done
+      != @step_done
+
+  .footer
+    = next_installation_step_link(3)

data/app/views/admin/installation/step_3.html.haml

@@ -0,0 +1,23 @@
+- content_for :head_title do
+  = t('admin.installation.common.title')
+
+- title t('.title')
+
+- content_for :head do
+  = include_stylesheets :installation
+
+= semantic_form_for(@site, :url => admin_installation_step_url(3), :html => { :multipart => true }) do |f|
+  .inner
+    %p.explanations
+      != t('.explanations')
+
+    = f.inputs do
+      = f.input :name, :required => false
+      = f.input :subdomain, :required => false
+
+      %li{ :class => 'string optional', :id => 'zipfile_input' }
+        %label{ :for => 'zipfile' }= t('formtastic.labels.import.new.source')
+        = file_field_tag 'zipfile'
+
+  .footer
+    = box_button_tag t('.next')

data/app/views/admin/layouts/box.html.haml

@@ -0,0 +1,21 @@
+!!! XML
+!!!
+%html{ :xmlns => 'http://www.w3.org/1999/xhtml'  }
+  %head
+    %title= yield(:head_title) || escape_once("#{Locomotive.config.name} — #{current_site.name}")
+
+    = include_javascripts :box
+    = include_stylesheets :box, :media => 'screen'
+
+    / [if IE]
+      = include_stylesheets :ie, :media => 'screen'
+
+    = yield :head
+
+  %body{ :class => controller.controller_name }
+    #wrapper
+      #light.container
+        #panel.container
+          %h1!= title
+
+          = yield

data/app/views/admin/layouts/error.html.haml

@@ -0,0 +1 @@
+= yield

data/app/views/admin/my_accounts/edit.html.haml

@@ -1,7 +1,7 @@
 - title link_to(@account.name.blank? ? @account.name_was : @account.name, '#', :rel => 'my_account_name', :title => t('.ask_for_name'), :class => 'editable')
 
 - content_for :head do
-  = javascript_include_tag 'admin/account'
+  = include_javascripts :account
 
 - content_for :submenu do
   = render 'admin/shared/menu/settings'

data/app/views/admin/pages/_form.html.haml

@@ -1,7 +1,6 @@
 - content_for :head do
-  = javascript_include_tag 'admin/plugins/tiny_mce/tinymce', 'admin/plugins/codemirror/codemirror', 'admin/pages', 'admin/editable_elements'
-  = stylesheet_link_tag 'admin/editable_elements'
-  = image_picker_include_tags
+  = include_javascripts :image_picker, :edit_page
+  = include_stylesheets :editable_elements, :fancybox
 
 = f.foldable_inputs :name => :information do
 

data/app/views/admin/pages/index.html.haml

@@ -1,7 +1,7 @@
 - title t('.title')
 
 - content_for :head do
-  = javascript_include_tag 'admin/pages'
+  = include_javascripts :pages
 
 - content_for :submenu do
   = render 'admin/shared/menu/contents'

data/app/views/admin/passwords/edit.html.haml

@@ -5,7 +5,7 @@
   = f.hidden_field :reset_password_token
 
   .inner
-    = login_flash_message
+    = box_flash_message
 
     = f.inputs do
       = f.input :password, :label => t('.password'), :required => false
@@ -15,4 +15,4 @@
       = link_to preserve(t('.link')), new_admin_session_path
 
   .footer
-    = login_button_tag t('admin.buttons.change_password')
+    = box_button_tag t('admin.buttons.change_password')

data/app/views/admin/passwords/new.html.haml

@@ -5,7 +5,7 @@
   = f.hidden_field :reset_password_token
 
   .inner
-    = login_flash_message
+    = box_flash_message
 
     = f.inputs do
       = f.input :email, :label => t('.email'), :required => false
@@ -14,4 +14,4 @@
       = link_to preserve(t('.link')), new_admin_session_path
 
   .footer
-    = login_button_tag t('admin.buttons.send_password')
+    = box_button_tag t('admin.buttons.send_password')

data/app/views/admin/sessions/new.html.haml

@@ -4,7 +4,7 @@
   = f.hidden_field :remember_me, :value => 'true'
 
   .inner
-    = login_flash_message
+    = box_flash_message
 
     = f.inputs do
       = f.input :email, :label => t('.email'), :required => false
@@ -14,4 +14,4 @@
       = link_to t('.link'), new_admin_password_path
 
   .footer
-    = login_button_tag t('admin.buttons.login')
+    = box_button_tag t('admin.buttons.login')

data/app/views/admin/shared/_head.html.haml

@@ -4,13 +4,12 @@
 
 %meta{ :name => 'locale', :content => I18n.locale }
 
-= stylesheet_link_tag 'admin/blueprint/screen', :media => 'screen'
-/ [if IE]
-  = stylesheet_link_tag 'admin/blueprint/ie', :media => 'screen'
+= include_javascripts :common
 
-= stylesheet_link_tag 'admin/layout', 'admin/jquery/ui', 'admin/plugins/toggle', 'admin/plugins/selectmenu', 'admin/menu', 'admin/plugins/toggle','admin/buttons', 'admin/formtastic', 'admin/formtastic_changes', 'admin/application', :media => 'screen', :cache => Rails.env.production? && !Locomotive.heroku?
+= include_stylesheets :common, :media => 'screen'
 
-= javascript_include_tag 'admin/jquery', 'admin/jquery.ui', 'admin/rails', 'admin/utils', 'admin/plugins/subscribe', 'admin/plugins/shortcut', 'admin/plugins/toggle', 'admin/plugins/growl', 'admin/plugins/cookie', 'admin/plugins/selectmenu', 'admin/application', 'admin/locales/datepicker_fr', :cache => Rails.env.production? && !Locomotive.heroku?
+/ [if IE]
+  = include_stylesheets :ie, :media => 'screen'
 
 %script{ :type => 'text/javascript' }
   = find_and_preserve(growl_message)

data/app/views/admin/sites/_form.html.haml

@@ -1,5 +1,5 @@
 - content_for :head do
-  = javascript_include_tag 'admin/site'
+  = include_javascripts :site
 
 = f.foldable_inputs :name => :information, :style => "#{'display: none' unless @site.new_record?}" do
   = f.input :name, :required => false
@@ -18,7 +18,7 @@
     %li{ :class => "item added #{'last' if index == @site.domains.size - 1}"}
       %em
         http://
-      = text_field_tag 'site[domains][]', name
+      = text_field_tag 'site[domains][]', name, :class => 'string label void domain'
        
       = error_on_domain(@site, name)
       %span.actions
@@ -27,7 +27,7 @@
   %li.item.template
     %em
       http://
-    = text_field_tag 'label', t('formtastic.hints.site.domain_name'), :class => 'string label void'
+    = text_field_tag 'label', t('formtastic.hints.site.domain_name'), :class => 'string label void domain'
      
     %span.actions
       = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')

data/app/views/admin/snippets/_form.html.haml

@@ -1,6 +1,6 @@
 - content_for :head do
-  = javascript_include_tag 'admin/plugins/codemirror/codemirror', 'admin/snippets.js'
-  = image_picker_include_tags
+  = include_javascripts :image_picker, :snippets
+  = include_stylesheets :fancybox
 
 = f.inputs :name => :information do
   = f.input :name

data/app/views/admin/theme_assets/_form.html.haml

@@ -1,6 +1,6 @@
 - content_for :head do
-  = javascript_include_tag 'admin/plugins/codemirror/codemirror', 'admin/theme_assets.js'
-  = image_picker_include_tags
+  = include_javascripts :image_picker, :theme_assets
+  = include_stylesheets :fancybox
 
 = f.hidden_field :performing_plain_text
 

data/app/views/admin/theme_assets/index.html.haml

@@ -12,7 +12,7 @@
 
 %h3!= t('.snippets')
 - if @snippets.empty?
-  %p.no-items!= t('.no_items', :url => new_admin_snippet_url)
+  %p.no-items!= t('admin.snippets.index.no_items', :url => new_admin_snippet_url)
 - else
   %ul.list.theme-assets
     = render @snippets

data/config/application.rb

@@ -1,7 +1,5 @@
 require File.expand_path('../boot', __FILE__)
 
-# require 'rails/all'
-
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
@@ -47,6 +45,6 @@ module Locomotive
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters << :password
 
-    config.middleware.insert_after ::ActionDispatch::Static, '::Locomotive::Middlewares::Fonts', :path => %r{^/fonts}
+    config.middleware.insert_after Rack::Lock, '::Locomotive::Middlewares::Fonts', :path => %r{^/fonts}
   end
 end

data/config/assets.yml

@@ -0,0 +1,94 @@
+embed_assets: off
+
+s3_bucket: <%= ENV['S3_BUCKET'] %>
+s3_access_key_id: <%= ENV['S3_ACCESS_KEY_ID'] %>
+s3_secret_access_key: <%= ENV['S3_SECRET_ACCESS_KEY'] %>
+
+javascripts:
+  box:
+    - public/javascripts/admin/jquery.js
+  common:
+    - public/javascripts/admin/jquery.js
+    - public/javascripts/admin/jquery.ui.js
+    - public/javascripts/admin/rails.js
+    - public/javascripts/admin/utils.js
+    - public/javascripts/admin/plugins/subscribe.js
+    - public/javascripts/admin/plugins/shortcut.js
+    - public/javascripts/admin/plugins/toggle.js
+    - public/javascripts/admin/plugins/growl.js
+    - public/javascripts/admin/plugins/cookie.js
+    - public/javascripts/admin/plugins/selectmenu.js
+    - public/javascripts/admin/locales/datepicker_fr.js
+    - public/javascripts/admin/application.js
+  custom_fields:
+    - public/javascripts/admin/plugins/fancybox.js
+    - public/javascripts/admin/custom_fields.js
+  edit_custom_fields:
+    - public/javascripts/admin/plugins/tiny_mce/tinymce.js
+    - public/javascripts/admin/plugins/json2.js
+    - public/javascripts/admin/plugins/fancybox.js
+    - public/javascripts/admin/custom_fields/category.js
+  asset_collections:
+    - public/javascripts/admin/plugins/fancybox.js
+    - public/javascripts/admin/custom_fields.js
+    - public/javascripts/admin/asset_collections.js
+  assets:
+    - public/javascripts/admin/assets.js
+  contents:
+    - public/javascripts/admin/plugins/tiny_mce/tinymce.js
+    - public/javascripts/admin/contents.js
+  content_types:
+    - public/javascripts/admin/content_types.js
+  site:
+    - public/javascripts/admin/site.js
+  import:
+    - public/javascripts/admin/plugins/json2.js
+    - public/javascripts/admin/plugins/smartupdater.js
+    - public/javascripts/admin/import.js
+  account:
+    - public/javascripts/admin/account.js
+  pages:
+    - public/javascripts/admin/pages.js
+  edit_page:
+    - public/javascripts/admin/plugins/tiny_mce/tinymce.js
+    - public/javascripts/admin/editable_elements.js
+    - public/javascripts/admin/pages.js
+  image_picker:
+    - public/javascripts/admin/plugins/json2.js
+    - public/javascripts/admin/plugins/scrollTo.js
+    - public/javascripts/admin/plugins/codemirror/codemirror.js
+    - public/javascripts/admin/plugins/fancybox.js
+    - public/javascripts/admin/plugins/plupload/plupload.full.js
+    - public/javascripts/admin/plugins/imagepicker.js
+  snippets:
+    - public/javascripts/admin/snippets.js
+  theme_assets:
+    - public/javascripts/admin/theme_assets.js
+
+stylesheets:
+  ie:
+    - public/stylesheets/admin/blueprint/ie.css
+  box:
+    - public/stylesheets/admin/blueprint/screen.css
+    - public/stylesheets/admin/box.css
+  common:
+    - public/stylesheets/admin/blueprint/screen.css
+    - public/stylesheets/admin/layout.css
+    - public/stylesheets/admin/jquery/ui.css
+    - public/stylesheets/admin/plugins/toggle.css
+    - public/stylesheets/admin/plugins/selectmenu.css
+    - public/stylesheets/admin/menu.css
+    - public/stylesheets/admin/buttons.css
+    - public/stylesheets/admin/formtastic.css
+    - public/stylesheets/admin/formtastic_changes.css
+    - public/stylesheets/admin/application.css
+  fancybox:
+    - public/stylesheets/admin/plugins/fancybox.css
+    - public/stylesheets/admin/fancybox_changes.css
+  custom_fields:
+    - public/stylesheets/admin/plugins/fancybox.css
+    - public/stylesheets/admin/box.css
+  installation:
+    - public/stylesheets/admin/installation.css
+  editable_elements:
+    - public/stylesheets/admin/editable_elements.css

data/config/environments/development.rb

@@ -27,9 +27,4 @@ Locomotive::Application.configure do
     :port => 1025,
     :domain => "example.com"
   }
-end
-
-CarrierWave.configure do |config|
-  config.storage = :file
-  config.root = File.join(Rails.root, 'public')
 end

data/config/environments/production.rb

@@ -45,6 +45,4 @@ Locomotive::Application.configure do
   config.i18n.fallbacks = true
 
   config.active_support.deprecation = :notify
-end
-
-# TODO: Put your carrierwave config down here
+end

data/config/environments/test.rb

@@ -32,8 +32,4 @@ Locomotive::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-end
-
-CarrierWave.configure do |config|
-  config.storage = :file
-end
+end

data/config/initializers/carrierwave.rb

@@ -0,0 +1,17 @@
+CarrierWave.configure do |config|
+
+  case Rails.env.to_sym
+
+  when :development
+    config.storage = :file
+    config.root = File.join(Rails.root, 'public')
+
+  when :production
+    config.storage = :s3
+    config.s3_access_key_id = ENV['S3_KEY_ID']
+    config.s3_secret_access_key = ENV['S3_SECRET_KEY']
+    config.s3_bucket = ENV['S3_BUCKET']
+    # config.s3_cname = 'ENV['S3_CNAME']
+  end
+
+end

data/config/initializers/locomotive.rb

@@ -4,6 +4,10 @@ Locomotive.configure do |config|
   # if not defined, locomotive will use example.com as main domain name. Remove prefix www from your domain name.
   # Ex:
   # config.default_domain = Rails.env.production? ? 'mydomain.com' : 'example.com'
+  #
+  # 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.
   config.default_domain = 'example.com'
 
   # configure how many items we display in sub menu in the "Contents" section.
@@ -25,4 +29,12 @@ Locomotive.configure do |config|
   # Ex:
   # config.heroku = { :name => '<my heroku app name>', :login => 'john@doe.net', :password => 'easy' }
   config.heroku = false
+
+  # Locomotive uses the DelayedJob gem for the theme import module.
+  # In case you want to deploy to Heroku, you will have to pay for an extra dyno.
+  # If you do not mind about importing theme without DelayedJob, disable it.
+  config.delayed_job = false
+
+  # default locale (for now, only en and fr are supported)
+  config.default_locale = :en
 end

data/config/locales/admin_ui_en.yml

@@ -174,7 +174,7 @@ en:
         help: "You have the choice to either upload any file or to copy/paste a stylesheet or a javascript in plain text."
       edit:
         title: "Editing %{file}"
-        help: "This asset is accessible from the following url: <strong>%{url}</strong>"
+        help: "This asset is accessible from the following url: <a href='%{url}'>%{url}</a>"
       form:
         picker_link: Insert a file into the code
         choose_file: Choose file
@@ -220,6 +220,7 @@ en:
         new_item: new item
       form:
         order_by:
+          created_at: 'By "created at" date'
           updated_at: 'By "updated at" date'
           position_in_list: Manually
 
@@ -266,6 +267,33 @@ en:
           success: "Your site was successfully updated."
           failure: "The import did not work."
 
+    installation:
+      common:
+        title: First Locomotive Installation
+        next: Next
+      step_1:
+        title: Step 1/3
+        explanations: Here is the first step of the Locomotive installation. Please read carefully what is written below.
+        database:
+          label: "Database name: <em>%{name}</em>"
+          notes: "All the mongodb connection settings can be found in the <b>config/mongoid.yml</b> file of your application."
+        default_domain:
+          label: "Default domain name: <em>%{name}</em>"
+          notes: "Basically, Locomotive is a multi websites platform. Each site instance has a default entry, also called subdomain and based on the default domain name. Obviously, you are free to map other domains to your site instance working like aliases. <br/>The default domain name value can be found in the <b>config/initializers/locomotive.rb</b> file."
+      step_2:
+        title: "Step 2/3 &mdash; Create account"
+        name: Account name
+        email: Email
+        password: Password
+        password_confirmation: Password confirmation
+        done: "You have already added an account:<br/><strong>%{name}</strong>, <em>%{email}</em>"
+        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>."
+        next: Create site
+
+
   formtastic:
     titles:
       information: General information
@@ -298,6 +326,8 @@ en:
       import:
         new:
           source: File
+          samples: Copy samples
+          reset: Reset site
 
     hints:
       page:
@@ -320,4 +350,6 @@ en:
           hint: "Text displayed in the model form just below the field"
       import:
         source: "A zipfile containing a database.yml along with assets and templates"
+        samples: "If enabled, the import process will also copy contents and assets"
+        reset: "If enabled, all the data of your site will be destroyed before importing the new site"
 

data/config/locales/admin_ui_fr.yml

@@ -174,7 +174,7 @@ fr:
         help: "Vous avez le choix de soit uploader n'importe quel fichier ou bien soit de copier/coller du code css ou javascript."
       edit:
         title: "Edition %{file}"
-        help: "Vous pouvez insérer le raccourci suivant dans vos feuilles de style: <strong>%{shortcut_url}</strong> OU utiliser directement l'url : %{url}"
+        help: "L'url du fichier est <a href='%{url}'>%{url}</a>"
       form:
         choose_file: Choisir fichier
         choose_plain_text: Passer en mode texte
@@ -219,6 +219,7 @@ fr:
         new_item: nouvel élément
       form:
         order_by:
+          created_at: 'Par date création'
           updated_at: 'Par date de mise à jour'
           position_in_list: Manuellement
 
@@ -265,6 +266,34 @@ fr:
           success: "Votre site a été mis à jour avec succès."
           failure: "L'import n'a pas fonctionné."
 
+    installation:
+      common:
+        title: Première installation de Locomotive
+        next: Suivant
+      step_1:
+        title: "Étape 1/3"
+        explanations: "Voici la première étape de l'installation de Locomotive. Veuillez lire attentivement ce qui est écrit ci-dessous."
+        database:
+          label: "Nom base de données: <em>%{name}</em>"
+          notes: "Les paramètres de la connection à MongoDB se trouvent dans le fichier <b>config/mongoid.yml</b> de votre application."
+        default_domain:
+          label: "Nom du domaine par défaut: <em>%{name}</em>"
+          notes:
+            "Locomotive est une plate-forme multi-sites. Chaque instance de site a une entrée par défaut appelée aussi sous-domaine et qui est aussi fonction du nom de domaine par défaut. Evidemment, vous êtes libres d'associer d'autres noms de domaines, sortes d'alias.
+            <br/>La valeur du nom de domaine par défaut se trouve dans le fichier <b>config/initializers/locomotive.rb</b>."
+      step_2:
+        title: "Étape 2/3 &mdash; Créer un compte"
+        name: Nom du compte
+        email: E-mail
+        password: Mot de passe
+        password_confirmation: Confirmation mot de passe
+        done: "Vous avez déjà ajouté un compte:<br/><strong>%{name}</strong>, <em>%{email}</em>"
+        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>."
+        next: Créer site
+
   formtastic:
     titles:
       information: Informations générales
@@ -297,6 +326,8 @@ fr:
       import:
         new:
           source: Fichier
+          samples: Copier contenu
+          reset: Remettre à zéro
 
     hints:
       page:
@@ -319,3 +350,5 @@ fr:
           hint: "Texte affiché dans le formulaire de l'élément juste en dessous du champ."
       import:
         source: "Un fichier zip contenant database.yml, les fichiers du thème et les templates de page"
+        samples: "Si activé, les contenus et les média seront aussi copiés lors de l'import"
+        reset: "Si activé, toutes les données de votre site seront détruites avant l'import du nouveau site"

data/config/locales/flash.en.yml

@@ -111,5 +111,6 @@ en:
 
       imports:
         create:
+          done: "Your site was successfully updated."
           notice: "Your site is being updated."
           alert: "The import was not done."

data/config/locales/flash.fr.yml

@@ -111,5 +111,6 @@ fr:
 
       imports:
         create:
+          done: "Votre site a été mis à jour"
           notice: "Votre site est en train d'être mis à jour"
           alert: "L'import n'a pas pu se faire"

data/config/mongoid.yml

@@ -8,8 +8,7 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  # database: locomotive_dev
-  database: locomotive_hosting_production
+  database: locomotive_dev
 
 test:
   <<: *defaults
@@ -18,6 +17,7 @@ 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'] %>