refactor for assets and adding spinner to active list

2012-09-03 13:19:18 +02:00
parent 39449f240a
commit ccbe655a32
13 changed files with 5 additions and 3 deletions
@@ -10,7 +10,7 @@ html lang="en"
    /! Le HTML5 shim, for IE6-8 support of HTML elements
    /[if lt IE 9]
      = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
-    = stylesheet_link_tag "phone/application", :media => "all"
+    = stylesheet_link_tag "user/application", :media => "all"
    link href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
    link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"
    link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
@@ -11,7 +11,7 @@ html lang="en"
    /[if lt IE 9]
      = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
    = stylesheet_link_tag "supplier/application", :media => "all"
-    = stylesheet_link_tag "tablet/application", :media => "all"
+    = stylesheet_link_tag "supplier/application", :media => "all"
    link href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
    link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"
    link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
@@ -12,6 +12,8 @@
        th= Order.model_name.human
        th.currency= Product.human_attribute_name(:price)
    tbody
+      tr
+        td colspan=2 = slider_image
    tfoot
 - content_for :footer do
  javascript:
@@ -72,7 +72,7 @@ module Qrammer

    # Enable the asset pipeline
    config.assets.enabled = true
-    #config.assets.precompile += ['tablet/application.css']
+    config.assets.precompile += ['supplier/application.css', 'user/application.css', 'qr_sheet/application.css']

    # Version of your assets, change this if you want to expire all your assets
    config.assets.version = '1.0'