Merge branch 'master' of heroku.com:dpdim into live

# By Kenneth Nordahl
# Via Kenneth Nordahl
* 'master' of heroku.com:dpdim:
  Fixed ø for ø
  Work renamed to casestudies
  Work renamed to case studies
  Fixed the @title on articles
  Fixed a typo
  Design improvements
  Updated gems
  Updated typos
  Fixed a typo
  Added gosquare tracking

Conflicts:
	app/views/index.haml

Gemfile.lock

@@ -7,11 +7,11 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
-    daemons (1.1.8)
-    eventmachine (0.12.10)
+    daemons (1.1.9)
+    eventmachine (1.0.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    haml (3.1.6)
+    haml (3.1.7)
     hike (1.2.1)
     libv8 (3.3.10.4)
     multi_json (1.3.6)
@@ -20,19 +20,19 @@ GEM
     rack-protection (1.2.0)
       rack
     rdiscount (1.6.8)
-    sass (3.1.20)
-    sinatra (1.3.2)
+    sass (3.2.1)
+    sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     sinatra-content-for (0.1)
       sinatra
-    sprockets (2.4.5)
+    sprockets (2.5.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.10.1)
+    therubyracer (0.10.2)
       libv8 (~> 3.3.10)
     thin (1.4.1)
       daemons (>= 1.0.9)

app/assets/stylesheets/design.sass

@@ -37,7 +37,8 @@ h1 a
   //   color: #222
   //   &:hover
   //     color: #6363ff
-
+article
+  width: 100%
 
 
 // Header design

app/assets/stylesheets/typography.sass

@@ -76,7 +76,9 @@ p
   line-height: 20px
   line-height: 2rem
   font-weight: 300
-
+ul, ol
+  li
+    list-style-position: inside
 blockquote
   margin-left: 30px
   margin-left: 3rem

app/views/index.haml

@@ -3,15 +3,17 @@
     My name is Kenneth Dahlstrøm & I am a product designer currently working out of Halden, Norway. A perfectionist advocating a mobile first user experience built with the latest web technologies and technics.
 
   %p
-    <a href="/work" id="recent-work" class="button">Recent work</a>
+    <a href="/casestudies" id="recent-work" class="button">Recent work</a>
     <a href="mailto:kenneth@dpd.im" class="button">Send me an email</a>
 
+
+
   %blockquote
     %p
-      Kenneth joined our team in January 2012 as a senior consultant. In an impressive way he has adjusted our large government organization, suggested substantial technical improvements and realized those ideas in the form of our redesign web platform. Our new platform is available on everything from a smartphone to the large desktop in addition to specialized mobile and tablet gateway apps. He has a deep knowledge about the online product field. He is highly structured and focuses on simplifying the process for getting things done. He has impressively adjusted and made large-scale contribution to our complex CMS system and structure.
+      Kenneth joined our team in January 2012 as a senior consultant. In an impressive way he has adjusted to our large government organization, suggested substantial technical improvements and realized those ideas in the form of our redesigned web platform. Our new platform is available on everything from a smartphone to the large desktop in addition to specialized mobile and tablet gateway apps. He has a deep knowledge about the online product field. He is highly structured and focuses on simplifying the process for getting things done. He has impressively adjusted and made large-scale contribution to our complex CMS system and site structure.
     %p
       %cite
-        \- <a href="http://www.hiof.no/nor/hogskolen-i-ostfold/diverse/alle-ansatte?displayitem=5&module=admin">Tore-Petter Engen</a>, Chief Information Oficer, <a href="http://www.hiof.no/eng/english/">Østfold University College</a>.
+        \- <a href="http://www.hiof.no/nor/hogskolen-i-ostfold/diverse/alle-ansatte?displayitem=5&module=admin">Tore Petter Engen</a>, Chief Information Oficer, <a href="http://www.hiof.no/eng/english/">Østfold University College</a>.
 
 
 

app/views/layout.haml

@@ -47,13 +47,13 @@
 
   =# yield_content :some_key
 
-  %script
-    window.onload = function() {
-    -# js onload
-    #{ yield_content :js_onload }
-    };
-    -# other JS
-    #{ yield_content :js_footer }
+  -#%script
+  -#  window.onload = function() {
+  -#  -# js onload
+  -#  #{ yield_content :js_onload }
+  -#  };
+  -#  -# other JS
+  -#  #{ yield_content :js_footer }
 
   / :javascript
   /   var _gaq = _gaq || [];
@@ -65,6 +65,21 @@
   /     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   /   })();
 
-
+  :javascript
+    var GoSquared = {};
+    GoSquared.acct = "GSN-822854-O";
+    (function(w){
+      function gs(){
+        w._gstc_lt = +new Date;
+        var d = document, g = d.createElement("script");
+        g.type = "text/javascript";
+        g.src = "//d1l6p2sc9645hc.cloudfront.net/tracker.js";
+        var s = d.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(g, s);
+      }
+      w.addEventListener ?
+        w.addEventListener("load", gs, false) :
+        w.attachEvent("onload", gs);
+    })(window);
 
 </html>

config/routes.rb

@@ -20,7 +20,7 @@
   @content = RDiscount.new( File.open("content/articles/" + params["article"].gsub("-", "_").concat(".md")).read ).to_html
   doc_title = Nokogiri::HTML::DocumentFragment.parse( @content ).css('h1').inner_html()  
   @content = "<article>" + @content + "</article>"
-  @title = "#{doc_title} | KDN"
+  @title = "#{doc_title} | Dahlstr&oslash;m Product Design"
   haml @content
 end
 
@@ -40,5 +40,12 @@
 
 get '/work' do
   @work = RDiscount.new( File.open("content/work/index.md").read ).to_html
+  @title = "Case studies | Dahlstr&oslash;m Product Design"
+  haml @work
+end
+
+get '/casestudies' do
+  @work = RDiscount.new( File.open("content/work/index.md").read ).to_html
+  @title = "Case studies | Dahlstr&oslash;m Product Design"
   haml @work
 end