Merg branch 'master' of github.com:maestrano/mno-enterprise-angular i…

…nto feature/335-multiple-recipients
maestrano · Jan 24, 2017 · ecfd950 · ecfd950
2 parents 9d57ae5 + 726f1d8
commit ecfd950
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/src/app/impac.config.coffee b/src/app/impac.config.coffee
@@ -5,26 +5,12 @@ angular.module 'mnoEnterpriseAngular'
 #======================================================================================
 .config((ImpacRoutesProvider, IMPAC_CONFIG) ->
   mnoHub = IMPAC_CONFIG.paths.mnohub_api
-  impacPrefix = "/impac"
 
   data =
     mnoHub: mnoHub
-    impacPrefix: impacPrefix
     impacApi: "#{IMPAC_CONFIG.protocol}://#{IMPAC_CONFIG.host}/api"
-    dashboards:
-      index: "#{mnoHub}#{impacPrefix}/dashboards"
-    widgets:
-      index: "#{mnoHub}#{impacPrefix}/widgets"
-      create: "#{mnoHub}#{impacPrefix}/dashboards/:dashboard_id/widgets"
     kpis:
-      index: "#{mnoHub}#{impacPrefix}/kpis"
-      create: "#{mnoHub}#{impacPrefix}/dashboards/:dashboard_id/kpis"
-      update: "#{mnoHub}#{impacPrefix}/kpis/:id"
-      del: "#{mnoHub}#{impacPrefix}/kpis/:id"
-    alerts:
-      index: "#{mnoHub}#{impacPrefix}/alerts"
-      create: "#{mnoHub}#{impacPrefix}/kpis/:kpi_id/alerts"
-      del: "#{mnoHub}#{impacPrefix}/alerts/:id"
+      index: "#{mnoHub}/impac/kpis"
 
   ImpacRoutesProvider.configureRoutes(data)
 )
@@ -34,11 +20,23 @@ angular.module 'mnoEnterpriseAngular'
 #======================================================================================
 .config((ImpacThemingProvider) ->
   options =
+    # link to the marketplace
     dataNotFoundConfig:
-      linkUrl: '#/marketplace'
+      linkUrl: '#!/marketplace'
+      linkTarget: '_self'
+    # remove useless messages
     dhbErrorsConfig:
       firstTimeCreated:
         note: ''
+    # configurations for the dashboard selector feature.
+    dhbSelectorConfig:
+      pdfModeEnabled: true
+    # kpis options
+    dhbKpisConfig:
+      enableKpis: false
+    # alert notifications options
+    alertsConfig:
+      enableAlerts: false
 
   ImpacThemingProvider.configure(options)
 )

diff --git a/src/app/views/company/team-list/modals/member-add-modal.html b/src/app/views/company/team-list/modals/member-add-modal.html
@@ -47,7 +47,7 @@ <h3>{{ 'mno_enterprise.templates.dashboard.teams.member_add_modal.title' | trans
   <div class="row">
     <div class="col-sm-12">
       <button class="btn btn-default" ng-click="memberAddModal.close()" ng-show="!memberAddModal.isLoading">{{ 'mno_enterprise.templates.dashboard.teams.member_add_modal.cancel' | translate }}</button>
-      <button class="btn btn-warning" ng-click="memberAddModal.proceed()" ng-disabled="memberAddModal.isLoading">
+      <button class="btn btn-warning" ng-if="memberAddModal.canAddUsers()" ng-click="memberAddModal.proceed()" ng-disabled="memberAddModal.isLoading">
         <span ng-show="memberAddModal.isLoading"><i class="fa fa-spinner fa-pulse fa-fw"></i></span> {{ 'mno_enterprise.templates.dashboard.teams.member_add_modal.add' | translate }}
       </button>
     </div>

diff --git a/src/app/views/company/teams/organization-teams.html b/src/app/views/company/teams/organization-teams.html
@@ -97,7 +97,7 @@
         <div class="col-xs-8 table-right">
           <div class="text-center" ng-show="!hasApps()">
             <p class="top-buffer-3">{{ 'mno_enterprise.templates.dashboard.teams.index.no_apps_warning' | translate }}</p>
-            <a type="button" class="btn btn-warning" href="#/marketplace">
+            <a type="button" class="btn btn-warning" ui-sref="home.marketplace">
               <i class="fa fa-plus"></i>
               {{ 'mno_enterprise.templates.dashboard.teams.index.add_app' | translate }}
             </a>

diff --git a/src/app/views/company/teams/organization-teams.less b/src/app/views/company/teams/organization-teams.less
@@ -38,7 +38,11 @@
     max-width: 100%;
     overflow-x: auto;
 
+    p {
+      color: @dashboard-cpy-teams-matrix-text-color;
+    }
   }
+
   table.permission-matrix.resellers-permissions {
     thead > tr th {
       height: 28px;