From 4bd266ca036b9a11ea37432fdc97485ca2c674d1 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Sun, 13 Nov 2011 14:55:15 +0100
Subject: Make tourdates a bit nicer.

---
 src/_helpers/band_helper.rb      | 30 +++++++++++++++++++++++++++++-
 src/news.haml                    | 12 ++++++------
 src/stylesheets/application.sass | 11 +++++++++++
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/_helpers/band_helper.rb b/src/_helpers/band_helper.rb
index 0380184..812892d 100644
--- a/src/_helpers/band_helper.rb
+++ b/src/_helpers/band_helper.rb
@@ -1,9 +1,37 @@
 puts "Loading BandHelper..."
 
 module BandHelper
+
   def bandlinks_all
     "#{link('Exeloume', 'http://www.facebook.com/exeloume')}, " +
     "#{link('Imbalance', 'http://www.imbalance.no')} og " +
     "#{link('Ninth Circle', 'http://www.ninthcircle.no')}"
   end
-end
\ No newline at end of file
+
+  def tourdate(date, venue, town, comments = "")
+    rendered_date = tag "span", :class => "date" do
+      date
+    end
+
+    rendered_venue = tag "span", :class => "venue" do
+      venue
+    end
+
+    rendered_town = tag "span", :class => "town" do
+      town
+    end
+
+    output = "#{rendered_date}: #{rendered_venue}, #{rendered_town}"
+
+    unless comments.empty?
+      rendered_comments = tag "span", :class => "comments" do
+        "(#{comments})"
+      end
+      output += " #{rendered_comments}"
+    end
+
+    tag "li", :class => "tour_entry" do
+      output
+    end
+  end
+end
diff --git a/src/news.haml b/src/news.haml
index 0797712..02ab8a3 100644
--- a/src/news.haml
+++ b/src/news.haml
@@ -6,12 +6,12 @@
         De første datoene for 'Thrash and Burn Tour 2012' er nå klare. Flere datoer vil bli sluppet etter hvert,
         men her er altså de som i første omgang kan vente seg besøk av turnéen:
       %ul
-        %li Fre 10. feb: Fru Lundgreens, Trondheim
-        %li Fre 17. feb: 1880/Bizarre, Bergen (fri alder)
-        %li Lør 18. feb: På Hjørnet, Kristansand
-        %li Tir 21. feb: Radar, Asker (fri alder)
-        %li Tor 23. feb: Buddy's Drammen
-        %li Fre 24. feb: Teknikernes Hus, Horten
+        = tourdate("Fre 10. feb", "Fru Lundgreens", "Trondheim")
+        = tourdate("Fre 17. feb", "1880/Bizarre", "Bergen", "fri alder")
+        = tourdate("Lør 18. feb", "På Hjørnet", "Kristansand")
+        = tourdate("Tir 21. feb", "Radar", "Asker", "fri alder")
+        = tourdate("Tor 23. feb", "Buddy's", "Drammen")
+        = tourdate("Fre 24. feb", "Teknikernes Hus", "Horten")
 
     %div.newsitem
       %h1 01. sept, 2011: Thrash and Burn Tour 2012
diff --git a/src/stylesheets/application.sass b/src/stylesheets/application.sass
index 24036ef..00350f9 100644
--- a/src/stylesheets/application.sass
+++ b/src/stylesheets/application.sass
@@ -108,3 +108,14 @@ $button-height: $sharebar-height - 5px
   border: 1px solid rgba(0, 0, 0, 0.8)
   padding-bottom: 10px
   margin-bottom: 10px
+
+.tour_entry
+  .date
+    width: 5em
+    display: inline-block
+  .venue
+    font-weight: bold
+  .comments
+    font-style: italic
+    font-size: 80%
+    color: green
-- 
cgit v1.2.3