Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

New message form and checkbox papercuts

Browse source
This commit is contained in:
wvengen 2015-04-11 02:32:30 +02:00
parent f47e0b5b2a
commit 08c8d25a9d
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/bootstrap_and_overrides.css.less vendored
View file

@ -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 // it's a bit distracting
.icon-asterisk { .icon-asterisk {

3
config/locales/en.yml
View file

@ -1124,6 +1124,7 @@ en:
reply_indent: "> %{line}" reply_indent: "> %{line}"
reply_subject: 'Re: %{subject}' reply_subject: 'Re: %{subject}'
new: new:
hint_private: Message doesn’t show in Foodsoft mail inbox
list: list:
desc: 'Please send messages to all using the mailing-list: %{list}' desc: 'Please send messages to all using the mailing-list: %{list}'
mail: for example with an email to %{email}. mail: for example with an email to %{email}.
@ -1446,8 +1447,6 @@ en:
unit: e.g. KG or 1L or 500g unit: e.g. KG or 1L or 500g
article_category: article_category:
description: comma-separated list of category names recognised at import/synchronisation description: comma-separated list of category names recognised at import/synchronisation
message:
private: Message doesn’t show in Foodsoft mail inbox
order_article: 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! 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 update_global_price: Also update the price of future orders

2
plugins/messages/app/views/messages/new.haml
View file

@ -45,7 +45,7 @@
#recipients #recipients
= f.input :recipient_tokens, :input_html => { 'data-pre' => User.where(id: @message.recipients_ids).map(&:token_attributes).to_json } = 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 :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 :subject, input_html: {class: 'input-xxlarge'}
= f.input :body, input_html: {class: 'input-xxlarge', rows: 13} = f.input :body, input_html: {class: 'input-xxlarge', rows: 13}
.form-actions .form-actions

5
plugins/messages/config/locales/en.yml
View file

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