rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Code Issues Releases Activity

add textual indications about empty fields in coupon form

Browse Source
This commit is contained in:
Sylvain 2016-09-01 14:54:24 +02:00
parent 670e9371d8
commit 9aef331596
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/controllers/machines.coffee.erb
View File

@ -742,7 +742,7 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
##
##
# Triggered when fullCalendar tries to graphicaly render an event block.
# Append the event tag into the block, just after the event title.
# @see http://fullcalendar.io/docs/event_rendering/eventRender/

8
app/assets/templates/admin/coupons/_form.html.erb
View File

@ -68,6 +68,10 @@
<button type="button" class="btn btn-default" ng-click="toggleDatePicker($event)" ng-disabled="mode == 'EDIT'"><i class="fa fa-calendar"></i></button>
</span>
</div>
<span class="help-block text-info text-xs">
<i class="fa fa-lightbulb-o"></i> {{ 'leave_empty_for_no_limit' | translate }}
</span>
</div>
<div class="form-group" ng-class="{'has-error': couponForm['coupon[max_usages]'].$dirty && couponForm['coupon[max_usages]'].$invalid}">
@ -79,6 +83,10 @@
ng-disabled="mode == 'EDIT'"
min="0"/>
<span class="help-block error" ng-show="couponForm['coupon[max_usages]'].$dirty && couponForm['coupon[max_usages]'].$error.min" translate>{{ 'max_usages_must_be_equal_or_greater_than_0' }}</span>
<span class="help-block text-info text-xs">
<i class="fa fa-lightbulb-o"></i> {{ 'leave_empty_for_no_limit' | translate }}
</span>
</div>
<div class="form-group">

1
config/locales/app.shared.en.yml
View File

@ -345,6 +345,7 @@ en:
forever: "Each use"
validity_per_user_is_required: "Validity per user is required."
valid_until: "Valid until (included)"
leave_empty_for_no_limit: "Do not specify any limit by leaving the field empty."
max_usages: "Maximum usages allowed"
max_usages_must_be_equal_or_greater_than_0: "The maximum usages allowed must be greater than 0."
enabled: "Active"

1
config/locales/app.shared.fr.yml
View File

@ -345,6 +345,7 @@ fr:
forever: "À chaque utilisation"
validity_per_user_is_required: "La validité par utilisateur est requise."
valid_until: "Valable jusqu'au (inclus)"
leave_empty_for_no_limit: "Laissez vide pour ne pas spécifier de limite."
max_usages: "Nombre maximum d'utilisations autorisées"
max_usages_must_be_equal_or_greater_than_0: "Le nombre d'utilisations maximum doit être supérieur ou égal à 0."
enabled: "Activé"