Skip to content

MOBILE-2367 feedback: Apply format text for multilang #1249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2018
Merged

MOBILE-2367 feedback: Apply format text for multilang #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion www/addons/mod/feedback/templates/attempt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h2>{{ 'mma.mod_feedback.response_nr' |translate }}: {{attempt.number}} ({{ 'mma
<p ng-if="attempt.timemodified">{{attempt.timemodified * 1000 | mmFormatDate:"dffulldate"}}</p>
</div>
<div ng-if="items && items.length" ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0}">
<p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>{{ item.name }}</p>
<p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span><mm-format-text watch="true">{{ item.name }}</mm-format-text></p>
<p ng-if="item.submittedValue"><mm-format-text watch="true" component="{{component}}" component-id="{{componentId}}">{{ item.submittedValue }}</mm-format-text></p>
</div>
</div>
Expand Down
15 changes: 11 additions & 4 deletions www/addons/mod/feedback/templates/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
</div>
<div class="list" ng-if="items && items.length">
<div ng-repeat="item in items track by $index" class="item item-text-wrap" ng-class="{'item-input item-stacked-label' : item.hasvalue, 'item-divider': item.typ == 'pagebreak', 'item-stable': item.dependitem > 0, 'mm-error-item': item.isEmpty || item.hasError}">
<p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>{{ item.name }}</p>
<p class="item-heading" mm-mark-required="{{item.required}}" ng-if="item.name"><span ng-if="item.itemnumber">{{item.itemnumber}}. </span>
<mm-format-text watch="true">{{ item.name }}</mm-format-text>
</p>
<div class="item-text-wrap" ng-class="item.class" ng-if="item.template" ng-include="item.template"></div>
</div>
</div>
Expand All @@ -35,15 +37,20 @@
</script>

<script type="text/ng-template" id="multichoice-r">
<ion-radio ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-radio>
<ion-radio ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-value="option.value" ng-repeat="option in item.choices">
<mm-format-text watch="true">{{option.label}}</mm-format-text>
</ion-radio>
</script>

<script type="text/ng-template" id="multichoice-c">
<ion-checkbox ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="option.checked" ng-value="option.value" ng-repeat="option in item.choices">{{option.label}}</ion-checkbox>
<ion-checkbox ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="option.checked" ng-value="option.value" ng-repeat="option in item.choices">
<mm-format-text watch="true">{{option.label}}</mm-format-text>
</ion-checkbox>
</script>

<script type="text/ng-template" id="multichoice-d">
<select ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="item.value" ng-options="option.value as option.label for option in item.choices" mm-ios-select-fix>
<select ng-required="{{item.required}}" name="{{item.typ}}_{{item.id}}" ng-model="item.value" mm-ios-select-fix>
<option ng-value="option.value" ng-repeat="option in item.choices"><mm-format-text watch="true">{{option.label}}</mm-format-text></option>
</select>
</script>

Expand Down
6 changes: 4 additions & 2 deletions www/addons/mod/feedback/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,10 @@
</div>
<div class="list" ng-if="items && items.length">
<div ng-repeat="item in items track by $index" class="item item-text-wrap">
<p class="item-heading">{{item.number}}. {{ item.name }}</p>
<p>{{ item.label }}</p>
<p class="item-heading">{{item.number}}.
<mm-format-text watch="true">{{ item.name }}</mm-format-text>
</p>
<p><mm-format-text watch="true">{{ item.label }}</mm-format-text></p>
<div ng-if="item.template" ng-include="item.template"></div>
</div>

Expand Down