New message form and checkbox papercuts

foodcoops · Apr 11, 2015 · 08c8d25 · 08c8d25
1 parent f47e0b5
commit 08c8d25
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -352,6 +352,10 @@ label {
     }
   }
 }
+// fix checkbox form height
+.controls > label.checkbox { margin-top: 5px; }
+.settings-group .controls > label.checkbox { margin-top: 0; }
+
 
 // it's a bit distracting
 .icon-asterisk {

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1124,6 +1124,7 @@ en:
       reply_indent: "> %{line}"
       reply_subject: 'Re: %{subject}'
     new:
+      hint_private: Message doesn’t show in Foodsoft mail inbox
       list:
         desc: 'Please send messages to all using the mailing-list: %{list}'
         mail: for example with an email to %{email}.
@@ -1446,8 +1447,6 @@ en:
         unit: e.g. KG or 1L or 500g
       article_category:
         description: comma-separated list of category names recognised at import/synchronisation
-      message:
-        private: Message doesn’t show in Foodsoft mail inbox
       order_article:
         units_to_order: If you change the total amount of delivered units, you also have to change individual group amounts by clicking on the article name. They will not be automatically recalculated and so ordergroups may be accounted for articles that were not delivered!
         update_global_price: Also update the price of future orders

diff --git a/plugins/messages/app/views/messages/new.haml b/plugins/messages/app/views/messages/new.haml
@@ -45,7 +45,7 @@
   #recipients
     = f.input :recipient_tokens, :input_html => { 'data-pre' => User.where(id: @message.recipients_ids).map(&:token_attributes).to_json }
     = f.input :group_id, :as => :select, :collection => Group.undeleted.order('type DESC', 'name ASC').reject { |g| g.memberships.empty? }
-  = f.input :private
+  = f.input :private, inline_label: t('.hint_private')
   = f.input :subject, input_html: {class: 'input-xxlarge'}
   = f.input :body, input_html: {class: 'input-xxlarge', rows: 13}
   .form-actions

diff --git a/plugins/messages/config/locales/en.yml b/plugins/messages/config/locales/en.yml
@@ -52,6 +52,7 @@ en:
       reply_indent: ! '> %{line}'
       reply_subject: ! 'Re: %{subject}'
     new:
+      hint_private: Message doesn’t show in Foodsoft mail inbox
       list:
         desc: ! 'Please send messages to all using the mailing-list: %{list}'
         mail: for example with an email to %{email}.
@@ -84,7 +85,3 @@ en:
 '
   navigation:
     messages: Messages
-  simple_form:
-    hints:
-      message:
-        private: Message doesn’t show in Foodsoft mail inbox