1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-17 06:52:27 +01:00

add HTML in event description

This commit is contained in:
Sylvain 2016-10-26 16:33:21 +02:00
parent 1449ca2b82
commit 42f7b3c75c
3 changed files with 12 additions and 2 deletions

View File

@ -2,6 +2,7 @@
## next release ## next release
- Ability to use HTML in event's descriptions using a WYSIWYG editor
- Fix a bug: statistics graphs were not showing - Fix a bug: statistics graphs were not showing
## v2.4.1 2016 October 11 ## v2.4.1 2016 October 11

View File

@ -40,7 +40,16 @@
<div class="form-group" ng-class="{'has-error': eventForm['event[description]'].$dirty && eventForm['event[description]'].$invalid}"> <div class="form-group" ng-class="{'has-error': eventForm['event[description]'].$dirty && eventForm['event[description]'].$invalid}">
<label for="description" class="col-sm-3 control-label">{{ 'description' | translate }} *</label> <label for="description" class="col-sm-3 control-label">{{ 'description' | translate }} *</label>
<div class="col-sm-9"> <div class="col-sm-9">
<textarea ng-model="event.description" rows="16" class="form-control" id="event_description" placeholder="" name="event[description]" required></textarea> <input type="hidden"
name="event[description]"
ng-value="event.description" />
<summernote ng-model="event.description"
id="event_description"
placeholder=""
config="summernoteOpts"
name="event[description]"
required>
</summernote>
<span class="help-block" ng-show="eventForm['event[description]'].$dirty && eventForm['event[description]'].$error.required" translate>{{ 'description_is_required' }}</span> <span class="help-block" ng-show="eventForm['event[description]'].$dirty && eventForm['event[description]'].$error.required" translate>{{ 'description_is_required' }}</span>
</div> </div>
</div> </div>

View File

@ -36,7 +36,7 @@
</div> </div>
<h3 translate>{{ 'event_description' }}</h3> <h3 translate>{{ 'event_description' }}</h3>
<p ng-bind-html="event.description | breakFilter"></p> <p ng-bind-html="event.description | toTrusted"></p>
</div> </div>