From 45acee7f4b65b73c4f5703d1f2381c3e68eebf6c Mon Sep 17 00:00:00 2001 From: Andy Cochran Date: Fri, 14 Feb 2014 13:14:52 -0500 Subject: [PATCH 1/2] add view-on-map-btn to List View, unlink place name, simplify font styles, less jarring comment count link --- src/sa_web/jstemplates/place-detail.html | 11 +++++++--- src/sa_web/static/css/default.css | 26 ++++++++++-------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/sa_web/jstemplates/place-detail.html b/src/sa_web/jstemplates/place-detail.html index 778ec748a..15819654f 100644 --- a/src/sa_web/jstemplates/place-detail.html +++ b/src/sa_web/jstemplates/place-detail.html @@ -1,7 +1,7 @@ {{> place-detail-promotion-bar }}
-

{{ name }}

+

{{ name }}

{{#_}} {{#if submitter}} @@ -17,7 +17,12 @@

{{ name }}

- {{ survey_count }} {{ survey_label_by_count }} + + {{ survey_count }} {{ survey_label_by_count }} + + {{^if survey_config}} + View On Map + {{/if}}
@@ -37,5 +42,5 @@

{{ name }}

{{#if survey_config}} -
+
{{/if}} diff --git a/src/sa_web/static/css/default.css b/src/sa_web/static/css/default.css index 88523cc41..40e246b66 100644 --- a/src/sa_web/static/css/default.css +++ b/src/sa_web/static/css/default.css @@ -763,15 +763,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 */ @@ -1004,8 +999,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 { @@ -1014,8 +1009,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; @@ -1032,9 +1026,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; @@ -1056,6 +1047,11 @@ ul.recent-points { display: block; } +.view-on-map-btn { + margin: 1em 0; + float: left; +} + /* =Footer -------------------------------------------------------------- */ From bb33cf5483092bfce4f974836e2260e612c37698 Mon Sep 17 00:00:00 2001 From: Andy Cochran Date: Fri, 14 Feb 2014 13:19:24 -0500 Subject: [PATCH 2/2] bump version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0c7d5f5f5..9ac380418 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.11.4 +3.11.5