Skip to content

Commit 96ada20

Browse files
authored
fix(sms.templates): prevent long overflowing text on modal
ref: ovh-ux/ovh-manager-telecom#121
1 parent 14a5d45 commit 96ada20

File tree

2 files changed

+37
-70
lines changed

2 files changed

+37
-70
lines changed
Lines changed: 33 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,36 @@
1-
<form name="removeSmsTemplateForm"
2-
id="removeSmsTemplateForm"
3-
data-ng-submit="TemplateRemoveCtrl.remove()">
4-
5-
<div class="modal-header">
6-
<button
7-
type="button"
8-
class="close float-right"
9-
aria-label="{{ ::'sms_cancel' | translate }}"
10-
data-ng-click="TemplateRemoveCtrl.cancel()">
11-
<span aria-hidden="true">&times;</span>
12-
</button>
13-
</div>
14-
15-
<div class="modal-body"
16-
data-ng-if="!TemplateRemoveCtrl.loading.removeTemplate && !TemplateRemoveCtrl.removed">
17-
<h3 class="modal-title"
18-
data-translate="sms_sms_templates_remove">
19-
</h3>
20-
<dl class="dl-horizontal">
21-
<!-- NAME -->
22-
<dt data-translate="sms_sms_templates_list_title_name"></dt>
23-
<dd data-ng-bind="TemplateRemoveCtrl.template.name"></dd>
24-
25-
<!-- DATETIME -->
26-
<dt data-translate="sms_sms_templates_list_title_date"></dt>
27-
<dd data-ng-bind="TemplateRemoveCtrl.template.datetime | date:'shortDate'"></dd>
28-
29-
<!-- ACTIVITY -->
30-
<dt data-translate="sms_sms_templates_list_title_type"></dt>
31-
<dd data-ng-bind="TemplateRemoveCtrl.template.activity"></dd>
32-
33-
<!-- DESCRIPTION -->
34-
<dt data-translate="sms_sms_templates_list_title_description"></dt>
35-
<dd data-ng-bind="TemplateRemoveCtrl.template.description"></dd>
36-
</dl>
37-
</div>
38-
39-
<div class="modal-body text-center"
40-
data-ng-if="TemplateRemoveCtrl.loading.removeTemplate && !TemplateRemoveCtrl.removed">
41-
<oui-spinner></oui-spinner>
42-
<h4 data-translate="sms_sms_templates_removing"></h4>
43-
</div>
44-
45-
<div class="modal-body"
46-
data-ng-if="TemplateRemoveCtrl.removed">
47-
<tuc-success-drawing-check data-draw-success-check="TemplateRemoveCtrl.removed">
1+
<oui-modal data-heading="{{:: 'sms_sms_templates_remove' | translate }}"
2+
data-primary-action="$ctrl.remove()"
3+
data-primary-label="{{:: 'submit' | translate }}"
4+
data-primary-disabled="$ctrl.loading.removeTemplate || $ctrl.removed"
5+
data-secondary-action="$ctrl.cancel()"
6+
data-secondary-label="{{:: 'cancel' | translate }}"
7+
data-secondary-disabled="$ctrl.loading.removeTemplate || $ctrl.removed"
8+
data-on-dismiss="$ctrl.cancel()"
9+
data-loading="$ctrl.loading.removeTemplate && !$ctrl.removed">
10+
<dl class="dl-horizontal"
11+
data-ng-if="!$ctrl.loading.removeTemplate && !$ctrl.removed">
12+
<!-- NAME -->
13+
<dt data-translate="sms_sms_templates_list_title_name"></dt>
14+
<dd class="word-break"
15+
data-ng-bind="::$ctrl.template.name"></dd>
16+
17+
<!-- DATETIME -->
18+
<dt data-translate="sms_sms_templates_list_title_date"></dt>
19+
<dd data-ng-bind="::$ctrl.template.datetime | date:'shortDate'"></dd>
20+
21+
<!-- ACTIVITY -->
22+
<dt data-translate="sms_sms_templates_list_title_type"></dt>
23+
<dd data-ng-bind="::$ctrl.template.activity"></dd>
24+
25+
<!-- DESCRIPTION -->
26+
<dt data-translate="sms_sms_templates_list_title_description"></dt>
27+
<dd class="word-break"
28+
data-ng-bind="::$ctrl.template.description"></dd>
29+
</dl>
30+
31+
<div data-ng-if="$ctrl.removed">
32+
<tuc-success-drawing-check data-draw-success-check="$ctrl.removed">
4833
<h4 data-translate="sms_sms_templates_removed"></h4>
4934
</tuc-success-drawing-check>
5035
</div>
51-
52-
<div class="modal-footer">
53-
<button
54-
type="button"
55-
class="btn btn-default"
56-
data-ng-click="TemplateRemoveCtrl.cancel()"
57-
data-ng-disabled="TemplateRemoveCtrl.loading.removeTemplate || TemplateRemoveCtrl.removed"
58-
data-translate="sms_cancel">
59-
</button>
60-
<button
61-
type="submit"
62-
class="btn btn-primary"
63-
data-ng-disabled="removeSmsTemplateForm.$invalid ||
64-
TemplateRemoveCtrl.loading.removeTemplate ||
65-
TemplateRemoveCtrl.removed"
66-
data-translate="sms_submit">
67-
</button>
68-
</div>
69-
</form>
36+
</oui-modal>

packages/manager/sms/src/sms/templates/telecom-sms-sms-templates.controller.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,15 @@ export default class {
176176
}
177177

178178
/**
179-
* Opens a modal to remove a given template.
180-
* @param {Object} template
181-
*/
179+
* Opens a modal to remove a given template.
180+
* @param {Object} template
181+
*/
182182
remove(template) {
183183
const modal = this.$uibModal.open({
184184
animation: true,
185185
template: removeTemplate,
186186
controller: removeController,
187-
controllerAs: 'TemplateRemoveCtrl',
187+
controllerAs: '$ctrl',
188188
resolve: { template: () => pick(template, this.templateItemModel) },
189189
});
190190
modal.result.then(() => this.api.sms.templates.query({

0 commit comments

Comments
 (0)