Merge pull request #47 from pikesley/layout-fixes

Layout fixes
pikesley · Dec 2, 2013 · b5306d7 · b5306d7
2 parents 19cbd23 + 5f2dbff
commit b5306d7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/lib/uncle_clive.rb b/lib/uncle_clive.rb
@@ -14,17 +14,24 @@
 class Spectrum < Sinatra::Base
   use Rack::GoogleAnalytics, :tracker => 'UA-20895204-11'
 
+  @@locals = {
+      :bootstrap_theme   => '../lavish-bootstrap.css',
+      :additional_styles => [
+          '../sinclair.css'
+      ],
+      :github            => {
+          :user    => 'pikesley',
+          :project => 'uncle-clive',
+          :ribbon  => 'right_darkblue_121621'
+      }
+  }
+
   get '/' do
-    haml :readme, :locals => {
-        :bootstrap_theme => '../lavish-bootstrap.css',
-        :title           => '© 1982 Sinclair Research Ltd.',
-        :text            => markdown(File.read('README.md')),
-        :github          => {
-            :user    => 'pikesley',
-            :project => 'uncle-clive',
-            :ribbon  => 'right_darkblue_121621'
+    haml :readme, :locals => @@locals.merge(
+        {
+            :title => '© 1982 Sinclair Research Ltd.'
         }
-    }
+    )
   end
 
   get '/:text' do
@@ -64,16 +71,12 @@ def respond text, gitfiti = false
 
         when 'text/html'
           cs.formatter = UncleClive::Formatters::HTMLTableFormatter.new
-          halt haml :tabliser, :locals => {
-              :bootstrap_theme => '../lavish-bootstrap.css',
-              :title           => params[:text],
-              :table           => cs[params[:text]],
-              :github          => {
-                  :user    => 'pikesley',
-                  :project => 'uncle-clive',
-                  :ribbon  => 'right_darkblue_121621'
+          halt haml :tabliser, :locals => @@locals.merge(
+              {
+                  :title => params[:text],
+                  :table => cs[params[:text]]
               }
-          }
+          )
 
         when 'text/plain'
           cs.formatter    = UncleClive::Formatters::TextFormatter.new

diff --git a/lib/views/layout.haml b/lib/views/layout.haml
@@ -3,6 +3,10 @@
   %head
     %title= title
     %link{:rel => 'stylesheet', :href => '//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css', :type => "text/css"}
+    -if defined? additional_styles
+      -additional_styles.each do |style|
+        %link{:rel => 'stylesheet', :href => style, :type => "text/css"}
+
     -if defined? bootstrap_theme
       %link{:rel => 'stylesheet', :href => bootstrap_theme, :type => "text/css"}
 

diff --git a/lib/views/readme.haml b/lib/views/readme.haml
@@ -1 +1 @@
-#readme~ text
+#readme~ markdown(File.read('README.md'))