Merge pull request #95 from openplans/list-view

List view
openplans · Feb 14, 2014 · 54ae3ca · 54ae3ca
2 parents 94270d4 + bb33cf5
commit 54ae3ca
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.11.4
+3.11.5
diff --git a/src/sa_web/jstemplates/place-detail.html b/src/sa_web/jstemplates/place-detail.html
@@ -1,7 +1,7 @@
         {{> place-detail-promotion-bar }}
 
         <header class="place-header clearfix">
-          <h1><a href="/place/{{ id }}">{{ name }}</a></h1>
+          <h1>{{ name }}</h1>
           <span class="place-submission-details">
             {{#_}}<strong class="point-submitter">
               {{#if submitter.avatar_url }}
@@ -26,7 +26,12 @@ <h1><a href="/place/{{ id }}">{{ name }}</a></h1>
 
             <time datetime="{{ created_datetime }}" class="response-date"><a href="/place/{{ id }}">{{ fromnow created_datetime }}</a></time>
 
-            <a href="/place/{{ id }}" class="submission-count">{{ survey_count }} <span class="submission-type">{{ survey_label_by_count }}</span></a>
+            <!-- TODO: make this scroll to #survey without page refresh -->
+            <span class="survey-count"><a href="/place/{{ id }}">{{ survey_count }} {{ survey_label_by_count }}</a></span>
+
+            {{^if survey_config}}
+            <a href="/place/{{ id }}" class="view-on-map-btn btn btn-small">View On Map</a>
+            {{/if}}
 
           </span>
         </header>
@@ -46,5 +51,5 @@ <h1><a href="/place/{{ id }}">{{ name }}</a></h1>
         </section>
 
         {{#if survey_config}}
-        <section class="survey"></section>
+        <section class="survey" id="survey"></section>
         {{/if}}
diff --git a/src/sa_web/static/css/default.css b/src/sa_web/static/css/default.css
@@ -774,15 +774,10 @@ a.close-btn span {
 .response-date a:hover {
   color: #00aaff;
 }
-.submission-count {
-  font-size: 0.875em;
-  font-weight: bold;
+.survey-count {
+  font-size: 0.75em;
   text-transform: uppercase;
-  float: left;
-}
-.submission-count .submission-type {
-  font-size: 0.875em;
-  font-weight: normal;
+  display: block;
 }
 
 /* Surveys */
@@ -1015,8 +1010,8 @@ ul.recent-points {
   padding: 1.25em 0 0;
 }
 .place-list > li {
-  margin: 0 0 1.25em 0;
-  padding: 0.75em 0 0 0;
+  margin: 0;
+  padding: 0.75em 0 1.25em 0;
   border-top: 1px solid #eeeeee;
 }
 .place-list .place-header {
@@ -1025,8 +1020,7 @@ ul.recent-points {
 .place-list .place-header:before, .place-list .place-header:after { display: none; }
 .place-list .place-header:after { clear: none; }
 .place-list .place-header h1 {
-  font-size: 1.625em;
-  margin-bottom: 0.75em;
+  font-size: 1.5em;
 }
 .place-list .place-submission-details {
   float: left;
@@ -1043,9 +1037,6 @@ ul.recent-points {
   float: left;
   margin-left: -3em;
 }
-.place-list .submission-count {
-  font-size: 1.25em;
-}
 .place-list .place-items {
   margin-right: 5em;
   margin-left: 16em;
@@ -1067,6 +1058,11 @@ ul.recent-points {
   display: block;
 }
 
+.view-on-map-btn {
+  margin: 1em 0;
+  float: left;
+}
+
 
 /* =Footer
 -------------------------------------------------------------- */