From 8a823fcbde6ab95b3c0479227ae0f6ce46358802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20DE=20CESARE?=
 <jeremy.de-cesare@ext.ovh.com>
Date: Mon, 8 Jan 2018 14:30:33 +0100
Subject: [PATCH] feat(bulk): feedback

---
 ...elephony-line-calls-simultaneousLines.html | 93 ++++++++++++-------
 1 file changed, 57 insertions(+), 36 deletions(-)

diff --git a/client/app/telecom/telephony/line/calls/simultaneousLines/telecom-telephony-line-calls-simultaneousLines.html b/client/app/telecom/telephony/line/calls/simultaneousLines/telecom-telephony-line-calls-simultaneousLines.html
index 2a902bd11..0601490fd 100644
--- a/client/app/telecom/telephony/line/calls/simultaneousLines/telecom-telephony-line-calls-simultaneousLines.html
+++ b/client/app/telecom/telephony/line/calls/simultaneousLines/telecom-telephony-line-calls-simultaneousLines.html
@@ -50,29 +50,46 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
                         </div>
                     </div>
 
-                    <div class="row mb-3"
-                         data-ng-if="LineSimultaneousLinesCtrl.showDoRemoveButtons">
-                        <div class="col-xs-6">
-                            <button type="button"
-                                    role="button"
-                                    class="btn btn-default"
-                                    data-ng-disabled="LineSimultaneousLinesCtrl.loading.save"
-                                    data-ng-click="LineSimultaneousLinesCtrl.cancelRemove()">
-                                <span data-translate="telephony_line_actions_line_calls_simultaneous_remove_cancel"></span>
-                            </button>
+
+                    <div data-ng-if="LineSimultaneousLinesCtrl.showDoRemoveButtons">
+
+                        <div class="row mb-3 col">
+                            <div class="col-xs-12">
+                                <telephony-bulk-action data-billing-account="{{ LineSimultaneousLinesCtrl.bulkDatas.billingAccount }}"
+                                                       data-service-name="{{ LineSimultaneousLinesCtrl.bulkDatas.serviceName }}"
+                                                       data-custom-class="link d-block pl-0 mb-3"
+                                                       data-bulk-infos="LineSimultaneousLinesCtrl.bulkDatas.infos"
+                                                       data-filter-services="LineSimultaneousLinesCtrl.filterServices"
+                                                       data-get-bulk-params="LineSimultaneousLinesCtrl.getBulkParams"
+                                                       data-on-success="LineSimultaneousLinesCtrl.onBulkSuccess"
+                                                       data-on-error="LineSimultaneousLinesCtrl.onBulkError">
+                                </telephony-bulk-action>
+                            </div>
                         </div>
-                        <div class="col-xs-6">
-                            <button type="button"
-                                    role="button"
-                                    class="btn btn-primary float-right"
-                                    data-ng-disabled="LineSimultaneousLinesCtrl.loading.save"
-                                    data-ng-click="LineSimultaneousLinesCtrl.doRemoveSimultaneousLines()">
-                                <oui-spinner class="mr-2"
-                                             data-ng-if="LineSimultaneousLinesCtrl.loading.save"
-                                             data-size="s">
-                                </oui-spinner>
-                                <span data-translate="telephony_line_actions_line_calls_simultaneous_remove_validate"></span>
-                            </button>
+
+                        <div class="row mb-3">
+                            <div class="col-xs-6">
+                                <button type="button"
+                                        role="button"
+                                        class="btn btn-default"
+                                        data-ng-disabled="LineSimultaneousLinesCtrl.loading.save"
+                                        data-ng-click="LineSimultaneousLinesCtrl.cancelRemove()">
+                                    <span data-translate="telephony_line_actions_line_calls_simultaneous_remove_cancel"></span>
+                                </button>
+                            </div>
+                            <div class="col-xs-6">
+                                <button type="button"
+                                        role="button"
+                                        class="btn btn-primary float-right"
+                                        data-ng-disabled="LineSimultaneousLinesCtrl.loading.save"
+                                        data-ng-click="LineSimultaneousLinesCtrl.doRemoveSimultaneousLines()">
+                                    <oui-spinner class="mr-2"
+                                                 data-ng-if="LineSimultaneousLinesCtrl.loading.save"
+                                                 data-size="s">
+                                    </oui-spinner>
+                                    <span data-translate="telephony_line_actions_line_calls_simultaneous_remove_validate"></span>
+                                </button>
+                            </div>
                         </div>
                     </div>
 
@@ -124,6 +141,19 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
                             </div>
                         </div>
 
+                        <div class="col-xs-12">
+                            <telephony-bulk-action data-billing-account="{{ LineSimultaneousLinesCtrl.bulkDatas.billingAccount }}"
+                                                   data-service-name="{{ LineSimultaneousLinesCtrl.bulkDatas.serviceName }}"
+                                                   data-custom-class="link d-block pl-0 mb-3"
+                                                   data-bulk-infos="LineSimultaneousLinesCtrl.bulkDatas.infos"
+                                                   data-ng-disabled="!LineSimultaneousLinesCtrl.contractsAccepted"
+                                                   data-filter-services="LineSimultaneousLinesCtrl.filterServices"
+                                                   data-get-bulk-params="LineSimultaneousLinesCtrl.getBulkParams"
+                                                   data-on-success="LineSimultaneousLinesCtrl.onBulkSuccess"
+                                                   data-on-error="LineSimultaneousLinesCtrl.onBulkError">
+                            </telephony-bulk-action>
+                        </div>
+
                         <div class="col-xs-12 mb-3"
                              data-ng-if="!LineSimultaneousLinesCtrl.prices.url">
                              <button type="button"
@@ -153,25 +183,16 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
                     </div>
                 </form>
 
-                <telephony-bulk-action data-billing-account="{{ LineSimultaneousLinesCtrl.bulkDatas.billingAccount }}"
-                                       data-service-name="{{ LineSimultaneousLinesCtrl.bulkDatas.serviceName }}"
-                                       data-custom-class="link d-block pl-0 mb-3"
-                                       data-bulk-infos="LineSimultaneousLinesCtrl.bulkDatas.infos"
-                                       data-ng-disabled="!LineSimultaneousLinesCtrl.contractsAccepted && !LineSimultaneousLinesCtrl.showDoRemoveButtons"
-                                       data-filter-services="LineSimultaneousLinesCtrl.filterServices"
-                                       data-get-bulk-params="LineSimultaneousLinesCtrl.getBulkParams"
-                                       data-on-success="LineSimultaneousLinesCtrl.onBulkSuccess"
-                                       data-on-error="LineSimultaneousLinesCtrl.onBulkError">
-                </telephony-bulk-action>
+
             </div>
         </div>
 
-        <div ng-if="LineSimultaneousLinesCtrl.showBulkOrderSummary">
+        <div data-ng-if="LineSimultaneousLinesCtrl.showBulkOrderSummary">
             <div class="widget-presentation">
                 <h2 class="widget-presentation-title"
                     data-translate="telephony_line_actions_line_calls_simultaneous_line_summary">
                 </h2>
-                <div ng-repeat="bulkOrder in LineSimultaneousLinesCtrl.bulkOrders track by bulkOrder.orderId">
+                <div class=form-group data-ng-repeat="bulkOrder in LineSimultaneousLinesCtrl.bulkOrders track by bulkOrder.orderId">
                     <div class="col-xs-12">
                         <div class="form-group mb-3">
                             <label class="col-xs-3 control-label text-left p-0"
@@ -191,7 +212,7 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
                                 <a target="_blank" title="{{'telephony_line_actions_line_calls_simultaneous_order' | translate}}"
                                 data-ng-href="{{bulkOrder.url}}">
                                     <span data-translate="telephony_line_actions_line_calls_simultaneous_line_order_click"></span>
-                                    <i class="ovh-font ovh-font-newtab ml-1"></i>
+                                    <span class="ovh-font ovh-font-newtab ml-1"></span>
                                 </a>
                             </div>
                         </div>
@@ -203,7 +224,7 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
                                 title="{{'telephony_line_actions_line_calls_simultaneous_order' | translate}}"
                                 data-ng-href="{{LineSimultaneousLinesCtrl.prices.url}}">
                                 <span data-translate="telephony_line_actions_line_calls_simultaneous_url"></span>
-                                <i class="ovh-font ovh-font-newtab ml-1"></i>
+                                <span class="ovh-font ovh-font-newtab ml-1"></span>
                             </a>
                         </div>
                     </div>