use submodule for geoapi gem in dev

stefl · Jan 3, 2010 · bda461f · bda461f
1 parent 2857ff1
commit bda461f
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 50 deletions.
diff --git a/app/stylesheets/screen.sass b/app/stylesheets/screen.sass
@@ -24,10 +24,13 @@ form.bp
 
 // Page layout can be done using mixins applied to your semantic classes and IDs:
 body.three-col
+  padding: 1.5em
   #container
     +container
   #header, #footer
     +column(!blueprint_grid_columns)
+  #comments
+    min-height: 300px
   #sidebar
     // One third of the grid columns, rounding down. With 24 cols, this is 8.
     !sidebar_columns = floor(!blueprint_grid_columns / 3)

diff --git a/app/views/entities/show.html.haml b/app/views/entities/show.html.haml
@@ -1,14 +1,20 @@
 - @page_title = @entity.name
 
-= render :partial=>"geometry/geometry", :object=>@entity.geom
+/= render :partial=>"geometry/geometry", :object=>@entity.geom
 
 = render :partial=>"shared/map" 
 
-:plain
-  <script>
-  var idcomments_acct = '773cf2ce889c6eee2ff788c36e6ddb1d';
-  var idcomments_post_id;
-  var idcomments_post_url;
-  </script>
-  <span id="IDCommentsPostTitle" style="display:none"></span>
-  <script type='text/javascript' src='http://www.intensedebate.com/js/genericCommentWrapperV2.js'></script>
+- unless @entity.flickr_view_entries.blank?
+  %h2
+    Photos near here
+    = render :partial=>"shared/flickr", :collection=>@entity.flickr_view_entries
+
+#comments
+  :plain
+    <script>
+    var idcomments_acct = '773cf2ce889c6eee2ff788c36e6ddb1d';
+    var idcomments_post_id;
+    var idcomments_post_url;
+    </script>
+    <span id="IDCommentsPostTitle" style="display:none"></span>
+    <script type='text/javascript' src='http://www.intensedebate.com/js/genericCommentWrapperV2.js'></script>
diff --git a/app/views/shared/_flickr.html.haml b/app/views/shared/_flickr.html.haml
@@ -0,0 +1 @@
+Entry
diff --git a/app/views/shared/_header.html.haml b/app/views/shared/_header.html.haml
@@ -1,10 +1,17 @@
 %h1.logo
+
+  Your
   = link_to "Geopinion", home_path
-%h2
-  Current location:
-  = session[:lng]
-  ,
-  = session[:lat]
+
+  %span.locale
+    on Moseley and Kings Heath
+
+- if 1 == 0
+  %h2
+    Current location:
+    = session[:lng]
+    ,
+    = session[:lat]
 
 
 %h1.page_title

diff --git a/app/views/shared/_map.html.haml b/app/views/shared/_map.html.haml
@@ -1,3 +1,3 @@
 = @map.to_html
-#map{:style=>"width: 500px; height: 500px;"}
+#map{:style=>"width: 630px; height: 300px;"}
   = @map.div
diff --git a/public/stylesheets/compiled/screen.css b/public/stylesheets/compiled/screen.css
@@ -418,39 +418,45 @@ form.bp textarea {
   width: 390px;
   height: 250px; }
 
-/* line 27, ../../../app/stylesheets/screen.sass */
-body.three-col #container {
-  width: 950px;
-  margin: 0 auto;
-  overflow: hidden;
-  display: inline-block; }
-  /* line 5, ../../../../../Library/Ruby/Gems/1.8/gems/compass-0.8.17/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass */
+/* line 26, ../../../app/stylesheets/screen.sass */
+body.three-col {
+  padding: 1.5em; }
+  /* line 28, ../../../app/stylesheets/screen.sass */
   body.three-col #container {
-    display: block; }
-/* line 29, ../../../app/stylesheets/screen.sass */
-body.three-col #header, body.three-col #footer {
-  display: inline;
-  float: left;
-  margin-right: 10px;
-  width: 950px; }
-  /* line 101, ../../../../../Library/Ruby/Gems/1.8/gems/compass-0.8.17/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass */
-  * html body.three-col #header, * html body.three-col #footer {
-    overflow-x: hidden; }
-/* line 31, ../../../app/stylesheets/screen.sass */
-body.three-col #sidebar {
-  display: inline;
-  float: left;
-  margin-right: 10px;
-  width: 310px; }
-  /* line 101, ../../../../../Library/Ruby/Gems/1.8/gems/compass-0.8.17/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass */
-  * html body.three-col #sidebar {
-    overflow-x: hidden; }
-/* line 35, ../../../app/stylesheets/screen.sass */
-body.three-col #content {
-  display: inline;
-  float: left;
-  margin-right: 0;
-  width: 630px; }
-  /* line 101, ../../../../../Library/Ruby/Gems/1.8/gems/compass-0.8.17/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass */
-  * html body.three-col #content {
-    overflow-x: hidden; }
+    width: 950px;
+    margin: 0 auto;
+    overflow: hidden;
+    display: inline-block; }
+    /* line 5, ../../../../../Library/Ruby/Gems/1.8/gems/compass-0.8.17/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass */
+    body.three-col #container {
+      display: block; }
+  /* line 30, ../../../app/stylesheets/screen.sass */
+  body.three-col #header, body.three-col #footer {
+    display: inline;
+    float: left;
+    margin-right: 10px;
+    width: 950px; }
+    /* line 101, ../../../../../Library/Ruby/Gems/1.8/gems/compass-0.8.17/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass */
+    * html body.three-col #header, * html body.three-col #footer {
+      overflow-x: hidden; }
+  /* line 32, ../../../app/stylesheets/screen.sass */
+  body.three-col #comments {
+    min-height: 300px; }
+  /* line 34, ../../../app/stylesheets/screen.sass */
+  body.three-col #sidebar {
+    display: inline;
+    float: left;
+    margin-right: 10px;
+    width: 310px; }
+    /* line 101, ../../../../../Library/Ruby/Gems/1.8/gems/compass-0.8.17/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass */
+    * html body.three-col #sidebar {
+      overflow-x: hidden; }
+  /* line 38, ../../../app/stylesheets/screen.sass */
+  body.three-col #content {
+    display: inline;
+    float: left;
+    margin-right: 0;
+    width: 630px; }
+    /* line 101, ../../../../../Library/Ruby/Gems/1.8/gems/compass-0.8.17/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass */
+    * html body.three-col #content {
+      overflow-x: hidden; }