fixing assets (wip)

.gitignore

@@ -35,4 +35,4 @@ permanent
 doc/bushido
 *.swp
 .sass-cache/
-
+spec/dummy/tmp/

app/assets/stylesheets/locomotive/box.css

@@ -1,18 +1,18 @@
-body { background: #000 url(/assets/locomotive//background/body.png) repeat 0 0; }
+body { background: #000 url(/assets/locomotive/background/body.png) repeat 0 0; }
 
 #wrapper {
-  background: transparent url(/assets/locomotive//box/wrapper_bg.png) repeat-x 0 0;
+  background: transparent url(/assets/locomotive/box/wrapper_bg.png) repeat-x 0 0;
   min-height: 400px;
 }
 
 #light {
-  background: transparent url(/assets/locomotive//box/light_bg.png) no-repeat center 0;
+  background: transparent url(/assets/locomotive/box/light_bg.png) no-repeat center 0;
   min-height: 400px;
   padding-top: 100px;
 }
 
 #panel {
-  background: transparent url(/assets/locomotive//box/top_panel_bg.png) no-repeat center 0;
+  background: transparent url(/assets/locomotive/box/top_panel_bg.png) no-repeat center 0;
   width: 356px;
   height: 344px;
   padding: 9px 0px 0 0px;
@@ -29,7 +29,7 @@ body { background: #000 url(/assets/locomotive//background/body.png) repeat 0 0;
 }
 
 #panel .inner {
-  background: transparent url(/assets/locomotive//box/content_panel_bg.png) repeat-y center 0;
+  background: transparent url(/assets/locomotive/box/content_panel_bg.png) repeat-y center 0;
   padding: 5px 0px 20px 0px;
 }
 
@@ -57,7 +57,7 @@ body { background: #000 url(/assets/locomotive//background/body.png) repeat 0 0;
 }
 
 #panel fieldset ol li input {
-  background: white url(/assets/locomotive//box/input_bg.png) no-repeat 0 0;
+  background: white url(/assets/locomotive/box/input_bg.png) no-repeat 0 0;
   width: 246px;
   padding: 7px;
   border: 0px;
@@ -103,7 +103,7 @@ body { background: #000 url(/assets/locomotive//background/body.png) repeat 0 0;
 }
 
 #panel div.footer {
-  background: transparent url(/assets/locomotive//box/bottom_panel_bg.png) no-repeat center 0;
+  background: transparent url(/assets/locomotive/box/bottom_panel_bg.png) no-repeat center 0;
   text-align: right;
   margin: 0px 0px 0 0px;
   padding: 22px 0;
@@ -111,7 +111,7 @@ body { background: #000 url(/assets/locomotive//background/body.png) repeat 0 0;
 
 #panel div.footer .button {
   display: inline-block;
-  background: transparent url(/assets/locomotive//box/buttons/left_bg.png) no-repeat 0 0;
+  background: transparent url(/assets/locomotive/box/buttons/left_bg.png) no-repeat 0 0;
   margin: 0 38px 0 0;
   padding: 0px 0px 0px 2px;
   font-size: 1.1em;
@@ -123,7 +123,7 @@ body { background: #000 url(/assets/locomotive//background/body.png) repeat 0 0;
 
 #panel div.footer .button span {
   display: inline-block;
-  background: transparent url(/assets/locomotive//box/buttons/right_bg.png) no-repeat right top;
+  background: transparent url(/assets/locomotive/box/buttons/right_bg.png) no-repeat right top;
   position: relative;
   top: -1px;
   padding: 3px 9px 9px 4px;

app/assets/stylesheets/locomotive_installation.css

@@ -0,0 +1,9 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require ./locomotive/blueprint/screen.css
+ *= require ./locomotive/box.css
+ *= require ./locomotive/installation.css
+*/

app/controllers/locomotive/base_controller.rb

@@ -20,6 +20,7 @@ module Locomotive
     helper_method :sections, :current_site_url, :site_url, :page_url, :current_ability
 
     # https://rails.lighthouseapp.com/projects/8994/tickets/1905-apphelpers-within-plugin-not-being-mixed-in
+    helper Locomotive::BaseHelper, Locomotive::BoxHelper
     # Dir[File.dirname(__FILE__) + "/../../helpers/**/*_helper.rb"].each do |file|
     #   helper "locomotive/#{File.basename(file, '.rb').gsub(/_helper$/, '')}"
     # end

app/views/locomotive/installation/step_1.html.haml

@@ -3,8 +3,8 @@
 
 - title t('.title')
 
-- content_for :head do
+/ - content_for :head do
-  = include_stylesheets :installation
+/   = include_stylesheets :installation
 
 - if @step_done.blank?
   = semantic_form_for(@account, :url => installation_step_url(1)) do |f|

app/views/locomotive/layouts/box.html.haml

@@ -4,11 +4,18 @@
   %head
     %title= yield(:head_title) || escape_once("#{Locomotive.config.name} — #{current_site.name}")
 
-    = include_javascripts :box
+    / = javascript_include_tag  'locomotive/box.js'
-    = include_stylesheets :box, :media => 'screen'
+    = stylesheet_link_tag     :locomotive_installation, :media => 'screen'
+    / = stylesheet_link_tag     'locomotive/foo', :debug => true #, :media => 'screen'
 
-    / [if IE]
+    / / [if IE]
-      = include_stylesheets :ie, :media => 'screen'
+    /   = stylesheet_link_tag   'blueprint/ie', :media => 'screen'
+
+    / = include_javascripts :box
+    / = include_stylesheets :box, :media => 'screen'
+    /
+    / / [if IE]
+    /   = include_stylesheets :ie, :media => 'screen'
 
     = yield :head
 

config/routes.rb

@@ -31,7 +31,7 @@ Locomotive::Engine.routes.draw do
     get :all, :action => 'index', :on => :collection, :defaults => { :all => true }
   end
 
-  resources :assets
+  # resources :assets # TODO: conflict name
 
   resources :content_types
 

spec/dummy/config/application.rb

@@ -3,9 +3,10 @@ require File.expand_path('../boot', __FILE__)
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
 require 'active_resource/railtie'
+require 'sprockets/railtie'
 
 Bundler.require
-require "locomotive"
+require 'locomotive'
 
 module Dummy
   class Application < Rails::Application
@@ -24,7 +25,7 @@ module Dummy
     # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # Run 'rake -D time' for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
@@ -32,7 +33,7 @@ module Dummy
     # config.i18n.default_locale = :de
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]