styling

app/stylesheets/screen.sass

@@ -43,32 +43,56 @@ body
     :padding-bottom 1.5em
 
   #add_your_idea
-    :margin-top -6em
+    input[type=submit]
+      :background-color green
+      :color white
+      :font-weight bold
+      :font-size 75%
+      :cursor pointer
+      :padding 0.75em
+      :float right
+      :margin-top -0.4em
+      :margin-right 1.5em
+      :position relative
+      :border 4px solid #9b9
+      +border-radius(0.5em)
   #flash
-    :margin-top -3em
+    :margin-top -2.75em
+    :margin-left 1.75em
     :float left
     :font-size 125%    
     :padding 0.5em
+    :padding-top 0.33em
+    :padding-left 1em
+    :padding-right 1em
     +border-radius(10px)
     :border 0px
+    :font-weight bold
   #flash.notice
-    :color green
-    :background-color #afa
+    :color black
+    :background-color #bcb
   #flash.error
-    :color red
-    :background-color #faa
+    :color black
+    :background-color #bcb
   #intro
     :background-color #eee
     :margin-top 0
     :padding 3em
 
     h2
-      :line-height 200%
-      a
-        :font-weight bold
-        :color black !important
-        :text-decoration none
-        :font-size 125%
+      :padding 0
+      #what_do_you_think
+        a
+          :font-weight bold
+          :color black !important
+          :text-decoration none
+          :font-size 125%
+          :display block
+          :padding 0.75em
+          :margin-left -0.75em
+          :margin-right -0.75em
+          +border-radius(0.75em)
+
 
 
     +border-radius(3em)
@@ -78,6 +102,7 @@ body
       :margin 0
       :padding 0
       :text-indent 0
+      :margin-top -2.5em
       li
         :list-style-type decimal !important
         :list-style-position inside 
@@ -89,12 +114,19 @@ body
         :background-color #cdc
         :padding 1em
         :font-size 100%
+        +border-radius-top-right(2em)
+        +border-radius-bottom-right(2em)
 
-        +column(4)
+        +column(3)
+      li.get_heard
+        +border-radius(2em)
+        :background-color #aba
+        :color black
   #logo
     :padding-top 1.5em
-    :margin-left 1.5em
+    :margin-left 2em
     :display block
+    :font-size 250%
 
   #breadcrumb, #logo
     :line-height 150%
@@ -115,6 +147,7 @@ body
   #header
     .page_title
       :margin-left 1.5em
+      :margin-bottom 1.5em
       :display block
       :font-weight bold
 
@@ -123,6 +156,7 @@ body
     :padding-top 1.5em
     #footer_navigation li
       :display inline
+      :margin-right 1.5em
   #comments
     :min-height 300px
     :margin-bottom 3em
@@ -175,4 +209,6 @@ body
       :display none
     .idw-big
       :padding-left 0
-      :margin-left 0
+      :margin-left 0
+.quiet
+  :color #999

app/views/base/site_index.html.haml

@@ -2,7 +2,8 @@
   %h2
     We're Moseley Community Development Trust and we'd like to know
     %br
-    = link_to "How do you think our area could be better?", new_entity_path
+    #what_do_you_think
+      = link_to "How do you think our area could be better?", new_entity_path
 
 
   %ol.walkthrough
@@ -14,17 +15,16 @@
       3. Map it
     %li
       4. Discuss it
+    %li.get_heard
+      5. Get heard
 
 
 
-  #intro_text.indent{:style=>"clear: both; padding-top: 1.5em;"}
-    All of the ideas added here will be sent to the Council as our response to 
-
-    = link_to "their consultation", "/"
-    \. 
-
-#add_your_idea{:style=>"float: right;"}
-  = button_to "Add your idea", new_entity_path
+  /#intro_text.indent{:style=>"clear: both; padding-top: 1.5em;"}
+  /  All of the ideas added here will be sent to the Council as our response to 
+  /
+  /  = link_to "their consultation", "/"
+  /  \. 
   
 .colone{:style=>"clear: both;"}
   .box

app/views/entities/index.html.haml

@@ -1,6 +1,6 @@
 - @page_title = "Our ideas so far"
+- @breadcrumb = link_to "Home", entities_path
 
-= render :partial =>"shared/new_idea_button"
 
 = render :partial=>"shared/map" 
 

app/views/entities/new.html.haml

@@ -1,4 +1,6 @@
 - @page_title = "Add your idea"
+- @breadcrumb = link_to "Ideas", entities_path
+- @no_idea = true
 
 = render :partial=>"shared/map" 
 %h3{:style=>"margin-top: -4em; margin-left: 1.5em;"}

app/views/entities/show.html.haml

@@ -1,13 +1,8 @@
 - @page_title = @entity.name
 - @breadcrumb = link_to "Ideas", entities_path
-
-/= render :partial=>"geometry/geometry", :object=>@entity.geom
-
-= render :partial =>"shared/new_idea_button"
 
 = render :partial=>"shared/map" 
 
-
 - unless @entity.flickr_view_entries.blank?
   %h2
     Photos near here

app/views/layouts/application.html.haml

@@ -29,17 +29,17 @@
           = link_to "Geopinion", home_path
 
           %span.locale
-            on Moseley and Kings Heath
-
-
+            on Moseley & Kings Heath
+          - unless @no_idea
+            #add_your_idea{:style=>"float: right;"}
+              = button_to "Add your idea", new_entity_path
         %h1.page_title
-          = unless @breadcrumb.blank?
+          - unless @breadcrumb.blank?
             %span#breadcrumb
               = @breadcrumb
-              »
-              %br
+              = "»"
           = page_title
-            
+  
       #content
         = render :partial => "shared/messages"
                   

app/views/shared/_footer.html.haml

@@ -2,18 +2,18 @@
   %li
     © Stef
 
-  %li.quiet
+  %li
     %a{:href=>"http://steflewandowski.com", :title=>"Built by Stef"}
       ="Built by Stef"
 
   - if @rss_title && @rss_url
     %li#rss= link_to :rss.l, @rss_url, {:title => @rss_title}
 
-
-  %li.rendered_at
-    = "Rendered #{Time.now}"
-  #li.geoapi
+  %li.geoapi
     Using
     = link_to "GeoAPI", "http://geoapi.com"
   %li.open_source
-    = link_to 'GeoAPI source code', 'http://github.com/steflewandowski/geoapi'
+    = link_to 'Source code', 'http://github.com/steflewandowski/geoapi'  
+
+  %li.rendered_at.quiet
+    = "Rendered #{Time.now}"

config/environment.rb

@@ -50,4 +50,3 @@
   # config.i18n.default_locale = :de
 end
 
-ENV['GEOAPI_KEY'] = "p4MIOnORr3"

config/initializers/geo_api.rb

@@ -0,0 +1 @@
+ENV['GEOAPI_KEY'] = "p4MIOnORr3"