locomotive_cms 0.0.4.beta12 → 0.0.4

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

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

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

@@ -0,0 +1,15 @@
+- title t('.title')
+
+- content_for :submenu do
+  = render 'admin/shared/menu/settings'
+
+- content_for :buttons do
+  = admin_button_tag :new, new_admin_snippet_url, :class => 'new'
+
+%p!= t('.help')
+
+- if @snippets.empty?
+  %p.no-items!= t('.no_items', :url => new_admin_snippet_url)
+- else
+  %ul#snippets-list.list
+    = render @snippets

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

@@ -1,6 +1,6 @@
 - content_for :head do
-  = include_javascripts :image_picker, :theme_assets
-  = include_stylesheets :fancybox
+  = javascript_include_tag 'admin/plugins/codemirror/codemirror', 'admin/theme_assets.js'
+  = image_picker_include_tags
 
 = 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('admin.snippets.index.no_items', :url => new_admin_snippet_url)
+  %p.no-items!= t('.no_items', :url => new_admin_snippet_url)
 - else
   %ul.list.theme-assets
     = render @snippets

data/app/views/home/show.html.haml

@@ -0,0 +1,4 @@
+%h2 Locomotive rocks !!!
+
+%p
+  = flash[:error]

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

@@ -0,0 +1,19 @@
+!!! XML
+!!!
+%html{ :xmlns => 'http://www.w3.org/1999/xhtml'  }
+  %head
+    %title= escape_once("#{Locomotive.config.name} — #{current_site.name}")
+
+    = javascript_include_tag 'admin/jquery'
+
+    = stylesheet_link_tag 'admin/blueprint/screen', 'admin/box', :media => 'screen', :cache => Rails.env.production? && !Locomotive.config.heroku
+    / [if IE]
+      = stylesheet_link_tag('admin/blueprint/ie', :media => 'screen')
+
+  %body
+    #wrapper
+      #light.container
+        #panel.container
+          %h1= title
+
+          = yield

data/app/views/layouts/application.html.haml

@@ -0,0 +1,7 @@
+!!! XML
+!!!
+%html{ :xmlns => 'http://www.w3.org/1999/xhtml'  }
+  %head
+  %body
+    %h1 Welcome to Locomotive
+    = yield

data/config/application.rb

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

data/config/environments/development.rb

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

data/config/environments/production.rb

@@ -45,4 +45,4 @@ Locomotive::Application.configure do
   config.i18n.fallbacks = true
 
   config.active_support.deprecation = :notify
-end
+end

data/config/environments/test.rb

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

data/config/initializers/locomotive.rb

@@ -4,12 +4,6 @@ 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.
-  # 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.
@@ -31,12 +25,4 @@ 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: <a href='%{url}'>%{url}</a>"
+        help: "This asset is accessible from the following url: <strong>%{url}</strong>"
       form:
         picker_link: Insert a file into the code
         choose_file: Choose file
@@ -220,7 +220,6 @@ en:
         new_item: new item
       form:
         order_by:
-          created_at: 'By "created at" date'
           updated_at: 'By "updated at" date'
           position_in_list: Manually
 
@@ -267,33 +266,6 @@ 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/support/themes\">here</a>."
-        next: Create site
-
-
   formtastic:
     titles:
       information: General information
@@ -326,8 +298,6 @@ en:
       import:
         new:
           source: File
-          samples: Copy samples
-          reset: Reset site
 
     hints:
       page:
@@ -350,6 +320,4 @@ 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: "L'url du fichier est <a href='%{url}'>%{url}</a>"
+        help: "Vous pouvez insérer le raccourci suivant dans vos feuilles de style: <strong>%{shortcut_url}</strong> OU utiliser directement l'url : %{url}"
       form:
         choose_file: Choisir fichier
         choose_plain_text: Passer en mode texte
@@ -219,7 +219,6 @@ 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
 
@@ -266,34 +265,6 @@ 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/support/themes\">ici</a>."
-        next: Créer site
-
   formtastic:
     titles:
       information: Informations générales
@@ -326,8 +297,6 @@ fr:
       import:
         new:
           source: Fichier
-          samples: Copier contenu
-          reset: Remettre à zéro
 
     hints:
       page:
@@ -350,5 +319,3 @@ 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/default_en.yml

@@ -13,7 +13,6 @@ en:
         array_too_short: "is too small (minimum element number is %{count})"
         liquid_syntax: "Liquid Syntax error, please check the syntax"
         liquid_extend: "The page extends a template which does not exist"
-        invalid_theme_file: "can't be blank or isn't a zip file"
 
   attributes:
     defaults:

data/config/locales/default_fr.yml

@@ -34,7 +34,6 @@ fr:
       array_too_short: "est trop petit (le nombre minimum d'éléments est %{count})"
       liquid_syntax: "Erreur de syntaxe dans les sections de page, veuillez vérifier la syntaxe"
       liquid_extend: "La page étend le contenu d'une page qui n'existe pas"
-      invalid_theme_file: "doit être rempli ou n'est pas un fichier zip"
 
   attributes:
     defaults:

data/config/locales/flash.en.yml

@@ -111,6 +111,5 @@ 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,6 +111,5 @@ 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

@@ -17,16 +17,8 @@ test:
 # set these environment variables on your prod server
 production:
   <<: *defaults
-  database: locomotive_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'] %>
-
+  host: <%= ENV['MONGOID_HOST'] %>
+  port: <%= ENV['MONGOID_PORT'] %>
+  username: <%= ENV['MONGOID_USERNAME'] %>
+  password: <%= ENV['MONGOID_PASSWORD'] %>
+  database: <%= ENV['MONGOID_DATABASE'] %>

data/config/routes.rb

@@ -2,7 +2,7 @@
 Rails.application.routes.draw do
 
   constraints(Locomotive::Routing::DefaultConstraint) do
-    root :to => 'admin/sessions#new'
+    root :to => 'home#show'
   end
 
   # admin authentication
@@ -52,11 +52,6 @@ Rails.application.routes.draw do
     resources :cross_domain_sessions, :only => [:new, :create]
 
     resource :import, :only => [:new, :show, :create]
-
-    # installation guide
-    match '/installation' => 'installation#show', :defaults => { :step => 1 }, :as => :installation
-    match '/installation/:step' => 'installation#show', :as => :installation_step
-
   end
 
   # sitemap

data/lib/generators/locomotive/copy_assets/copy_assets_generator.rb

@@ -0,0 +1,14 @@
+module Locomotive
+  class CopyAssetsGenerator < Rails::Generators::Base
+
+    def self.source_root
+      @_locomotive_source_root ||= File.expand_path('../../../../../', __FILE__)
+      @_locomotive_source_root
+    end
+
+    def copy_public_files
+      directory 'public', 'public', :recursive => true
+    end
+
+  end
+end

data/lib/generators/locomotive/install/install_generator.rb

@@ -1,29 +1,21 @@
 module Locomotive
   class InstallGenerator < Rails::Generators::Base
 
-    source_root File.expand_path('../../../../../', __FILE__)
-
-    def copy_mongoid_config
-      copy_file 'config/mongoid.yml', 'config/mongoid.yml'
-    end
-
-    def copy_assets
-      directory 'public', 'public', :recursive => true
-      copy_file 'config/assets.yml', 'config/assets.yml'
+    def self.source_root
+      @_locomotive_source_root ||= File.expand_path('../templates', __FILE__)
     end
 
-    def copy_initializers
-      copy_file 'config/initializers/carrierwave.rb', 'config/initializers/carrierwave.rb'
-
-      @source_paths = nil # reset it for the find_in_source_paths method
-
-      Locomotive::InstallGenerator.source_root(File.expand_path('../templates', __FILE__))
-
+    def copy_initializer
       template 'locomotive.rb', 'config/initializers/locomotive.rb'
     end
 
-    def remove_index_html
-      remove_file 'public/index.html'
+    def seed_db
+      append_file 'db/seeds.rb', %{
+# Uncomment the following lines if you want to create the first website / account
+#account = Account.create! :name => 'Admin', :email => 'admin@example.com', :password => 'locomotive', :password_confirmation => 'locomotive'
+#site = Site.new :name => 'Locomotive test website', :subdomain => 'test'
+#site.memberships.build :account => account, :admin => true
+#site.save!}
     end
 
     def show_readme

data/lib/generators/locomotive/install/templates/README

@@ -1,27 +1,17 @@
 ===============================================================================
 
-The Locomotive Engine has been correctly installed in your Rails application.
-
-  1. Edit the main config files:
-
-    - config/initializers/locomotive.rb
-    - config/initializers/carrierwave.rb
-    - config/mongoid.yml
-
-  2. Launch the server
-
-    > unicorn_rails
-
-  3. Open your browser
-
-    > open localhost:8080
-
-  4. Follow the installation wizzard steps
-
-  5. Enjoy !
-
-  Note: If you want to use DelayedJob, be sure to launch it:
-
-    > rake jobs:work
+Locomotive initializer has been added to your application. Your db/seeds.rb file has also been updated.
+
+  1. Take a look at this to match your environment.
+  
+  2. Uncomment added code in db/seeds.rb if necessary
+  
+Note: do not forget to run rake db:seed if you modify your db/seeds.rb file.
+  
+Once it is done, the next step is to install assets:
+
+  bundle exec rails g locomotive:copy_assets
+  
+Fire your application server and launch a browser !
 
 ===============================================================================