Merge pull request #451 from jembi/ohm-517-fix-channels-modal

OHM-517 Fix tabs on channels modal
jembi · Oct 30, 2017 · 187dc79 · 187dc79
2 parents 4824737 + a353836
commit 187dc79
Showing 1 changed file with 26 additions and 28 deletions.
diff --git a/app/views/channelsmodal.html b/app/views/channelsmodal.html
@@ -16,52 +16,50 @@ <h4 class="modal-title" id="addChannelLabel">
   </div>
 
   <fieldset>
-    <tabset justified="true">
+    <uib-tabset justified="true">
       <!-- ************* TAB FOR CHANNEL BASIC INFO ************** -->
-      <tab ng-controller="channelBasicInfoCtrl" class="{{ngError.basicInfoTab === true ? 'has-error-tab' : ''}}" active="selectedTab.basicInfo">
-        <tab-heading><i class="glyphicon glyphicon-warning-sign" style="display: none"></i>Basic Info</tab-heading>
+      <uib-tab class="{{ngError.basicInfoTab === true ? 'has-error-tab' : ''}}" active="selectedTab.basicInfo">
+        <uib-tab-heading><i class="glyphicon glyphicon-warning-sign" style="display: none"></i>Basic Info</uib-tab-heading>
         <h3>Basic Info</h3>
-        <div ng-include="'views/partials/channels-tab-basic-info.html'"></div>
-      </tab>
+        <div ng-controller="channelBasicInfoCtrl" ng-include="'views/partials/channels-tab-basic-info.html'"></div>
+      </uib-tab>
 
       <!-- ************* TAB FOR CHANNEL REQUEST MATCHING ************** -->
-      <tab ng-controller="channelRequestMatchingCtrl" class="{{ngError.requestMatchingTab === true ? 'has-error-tab' : ''}}" active="selectedTab.requestMatching">
-        <tab-heading><i class="glyphicon glyphicon-warning-sign" style="display: none"></i>Request Matching</tab-heading>
+      <uib-tab class="{{ngError.requestMatchingTab === true ? 'has-error-tab' : ''}}" active="selectedTab.requestMatching">
+        <uib-tab-heading><i class="glyphicon glyphicon-warning-sign" style="display: none"></i>Request Matching</uib-tab-heading>
         <h3>Request Matching</h3>
-        <div ng-include="'views/partials/channels-tab-request-matching.html'"></div>
-      </tab>
+        <div ng-controller="channelRequestMatchingCtrl" ng-include="'views/partials/channels-tab-request-matching.html'"></div>
+      </uib-tab>
 
       <!-- ************* TAB FOR CHANNEL ROUTES ************** -->
-      <tab ng-controller="channelRoutesCtrl" class="{{ngError.routesTab === true ? 'has-error-tab' : ''}}" active="selectedTab.routes">
-        <tab-heading><i class="glyphicon glyphicon-warning-sign" style="display: none"></i>Routes</tab-heading>
+      <uib-tab class="{{ngError.routesTab === true ? 'has-error-tab' : ''}}" active="selectedTab.routes">
+        <uib-tab-heading><i class="glyphicon glyphicon-warning-sign" style="display: none"></i>Routes</uib-tab-heading>
         <h3>Routes</h3>
-        <div ng-include="'views/partials/channels-tab-routes.html'"></div>
-      </tab>
+        <div ng-controller="channelRoutesCtrl" ng-include="'views/partials/channels-tab-routes.html'"></div>
+      </uib-tab>
 
       <!-- ************* TAB FOR CHANNEL DATA CONTROL ************** -->
-      <tab ng-controller="channelDataControlCtrl" class="{{ngError.dataControlTab === true ? 'has-error-tab' : ''}}" active="selectedTab.dataControl">
-        <tab-heading><i class="glyphicon glyphicon-warning-sign" style="display: none"></i>Data Control</tab-heading>
+      <uib-tab class="{{ngError.dataControlTab === true ? 'has-error-tab' : ''}}" active="selectedTab.dataControl">
+        <uib-tab-heading><i class="glyphicon glyphicon-warning-sign" style="display: none"></i>Data Control</uib-tab-heading>
         <h3>Data Control</h3>
-        <div ng-include="'views/partials/channels-tab-data-control.html'"></div>
-      </tab>
+        <div ng-controller="channelDataControlCtrl" ng-include="'views/partials/channels-tab-data-control.html'"></div>
+      </uib-tab>
 
       <!-- ************* TAB FOR CHANNEL ACCESS CONTROL ************** -->
-      <tab ng-controller="channelUserAccessCtrl" class="{{ngError.userAccessTab === true ? 'has-error-tab' : ''}}" active="selectedTab.accessControl">
-        <tab-heading><i class="glyphicon glyphicon-warning-sign" style="display: none"></i>User Access</tab-heading>
+      <uib-tab class="{{ngError.userAccessTab === true ? 'has-error-tab' : ''}}" active="selectedTab.accessControl">
+        <uib-tab-heading><i class="glyphicon glyphicon-warning-sign" style="display: none"></i>User Access</uib-tab-heading>
         <h3>User Access</h3>
-        <div ng-include="'views/partials/channels-tab-user-access.html'"></div>
-      </tab>
-
-
+        <div ng-controller="channelUserAccessCtrl" ng-include="'views/partials/channels-tab-user-access.html'"></div>
+      </uib-tab>
 
       <!-- ************* TAB FOR CHANNEL ALERTS ************** -->
-      <tab ng-controller="channelAlertsCtrl" class="{{ngError.alertsTab === true ? 'has-error-tab' : ''}}" active="selectedTab.alerts">
-        <tab-heading>Alerts</tab-heading>
+      <uib-tab class="{{ngError.alertsTab === true ? 'has-error-tab' : ''}}" active="selectedTab.alerts">
+        <uib-tab-heading>Alerts</uib-tab-heading>
         <h3>Alerts</h3>
-        <div ng-include="'views/partials/channels-tab-alerts.html'"></div>
-      </tab>
+        <div ng-controller="channelAlertsCtrl" ng-include="'views/partials/channels-tab-alerts.html'"></div>
+      </uib-tab>
 
-    </tabset>
+    </uib-tabset>
   </fieldset>
 </div>