From 4fe18cb8f4278956a37ed7c8ee507b9e7b851893 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Thu, 25 Sep 2014 15:19:30 +0100
Subject: Tweak reporting form i18n and style.

Factor out "(public)" to its own string, and only remove the label top
margin if it's an immediate child (otherwise labels inside divs halfway
down lose their margin).
---
 templates/web/fixmystreet/report/new/fill_in_details_form.html | 4 ++--
 web/cobrands/sass/_base.scss                                   | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html
index 6ad5484e0..6e64b8d1b 100644
--- a/templates/web/fixmystreet/report/new/fill_in_details_form.html
+++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html
@@ -57,13 +57,13 @@
             <p class='form-error'>[% field_errors.bodies %]</p>
           [% END %]
 
-            <label for="form_title">[% loc('One-line summary <span class="muted">(public)</span>') %]</label>
+            <label for="form_title">[% loc('One-line summary') %] <span class="muted">[% loc('(public)') %]</span></label>
           [% IF field_errors.title %]
             <p class='form-error'>[% field_errors.title %]</p>
           [% END %]
             <input type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('What’s the issue, and where is it?') %]" required>
 
-            <label for="form_detail">[% loc('Description <span class="muted">(public)</span>') %]</label>
+            <label for="form_detail">[% loc('Description') %] <span class="muted">[% loc('(public)') %]</span></label>
           [% IF field_errors.detail %]
             <p class='form-error'>[% field_errors.detail %]</p>
           [% END %]
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 477bb27c1..0ddc83c25 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -1359,10 +1359,8 @@ label .muted {
   }
 }
 
-#problem_form {
-  label:first-child {
-    margin-top: 0;
-  }
+#problem_form > label:first-child {
+  margin-top: 0;
 }
 
 
-- 
cgit v1.2.3