Fix assets and livereload when deploying

smgt · Dec 2, 2012 · 0c2be9b · 0c2be9b
1 parent 6c51ec9
commit 0c2be9b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,9 @@
 source :rubygems
 
+gem "rake"
 gem "redcarpet"
 gem "middleman", "~>3.0.6"
 gem "middleman-sprockets"
+
 gem "guard-livereload"
 gem "rack-livereload"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -94,6 +94,7 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
+    rake (10.0.2)
     rb-fsevent (0.9.2)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
@@ -129,4 +130,5 @@ DEPENDENCIES
   middleman (~> 3.0.6)
   middleman-sprockets
   rack-livereload
+  rake
   redcarpet
diff --git a/config.rb b/config.rb
@@ -1,6 +1,3 @@
-require "rack/livereload"
-
-use Rack::LiveReload
 
 ###
 # Compass
@@ -110,28 +107,29 @@ def stipendiat_year_tag(year)
 
 set :js_assets_paths, ["#{root}/components/", "#{root}/source/js/"]
 
-set :images_dir, 'img'
+set :images_dir, 'images'
 
 set :markdown_engine, :redcarpet
 set :markdown, :fenced_code_blocks => true,
                :autolink => true,
                :smartypants => true
 
 
+  activate :relative_assets
+
 # Build-specific configuration
 configure :build do
+
   # For example, change the Compass output style for deployment
   activate :minify_css
 
   # Minify Javascript on build
   activate :minify_javascript
 
-
   # Enable cache buster
   # activate :cache_buster
 
   # Use relative URLs
-  # activate :relative_assets
 
   # Compress PNGs after build
   # First: gem install middleman-smusher
@@ -141,3 +139,8 @@ def stipendiat_year_tag(year)
   # Or use a different image path
   # set :http_path, "/Content/images/"
 end
+
+configure :development do
+  require "rack/livereload"
+  use Rack::LiveReload
+end
diff --git a/source/index.html.erb b/source/index.html.erb
@@ -3,7 +3,7 @@ layout: layout
 title: Välkommen!
 body_class: frontpage
 ---
-<img src="/images/logo-black.png">
+<%= image_tag 'logo-black.png' %>
 <p>
 Stiftelse FRED MED JORDEN skall stimulera och stödja personer, i första hand kvinnor, som vårdar sig om modernäringen genom att yrkesmässigt driva jordbruk eller handelsträdgård enligt metoder som bygger på kunskap om och tillit till jorden egen förmåga att förse en odling med nödvändiga växtnäringsämnen, när dess mikrobiologiska liv tillföres vad det behöver för en allsidig utveckling, samt att stödja forskning inom detta område.
 </p>
diff --git a/source/layouts/layout.html.erb b/source/layouts/layout.html.erb
@@ -12,11 +12,9 @@
         <script type="text/javascript" src="//use.typekit.net/wiw7xkf.js"></script>
         <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
         <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
-        <link rel="stylesheet" href="/css/normalize.css">
-        <link rel="stylesheet" href="/css/main.css">
-        <link rel="stylesheet" href="/css/base.css">
-        <link rel="stylesheet" href="/css/facybox.css">
-        <script src="/js/modernizr.js"></script>
+        <%= favicon_tag 'favicon.ico' %>
+        <%= stylesheet_link_tag 'normalize','main','base','facybox' %>
+        <%= javascript_include_tag 'modernizr' %>
     </head>
     <body class="<%= current_page.data.body_class%>">
         <!--[if lt IE 7]>
@@ -33,7 +31,7 @@
               <li class="aktuellt"><a href="/aktuellt/">Aktuellt</a></li>
               <li class="historia"><a href="/historia/">Historia</a></li>
               <li class="stipendiater"><a href="/stipendiater/">Stipendiater</a></li>
-              <li class="logo"><a href="/"><img src="/images/logo-menu.png"></a></li>
+              <li class="logo"><a href="/"><%= image_tag "logo-menu.png" %></a></li>
               <li class="rapporter"><a href="/rapporter/">Rapporter</a></li>
               <li class="styrelsen"><a href="/styrelsen/">Styrelsen</a></li>
               <li class="ansok"><a href="/ansok/">Ansök</a></li>
@@ -47,7 +45,7 @@
           Flory Gates Stiftelse, Fred med Jorden 2012
         </div>
       </div>
-      <script src="/js/main.js"></script>
+      <%= javascript_include_tag "main" %>
       <!--
       <script type="text/javascript">
         var _gauges = _gauges || [];