From 50f5272e569d5295d46ccc5dc1aa8ca9ac6a9e00 Mon Sep 17 00:00:00 2001
From: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
Date: Mon, 21 Mar 2016 16:54:56 -0300
Subject: [PATCH] Update angular-bootsrap module to latest version

---
 bower.json                                              | 2 +-
 src/app/layout/language-selector/language-selector.html | 6 +++---
 src/app/layout/navbar/navbar.html                       | 6 +++---
 src/app/layout/navbar/navbar.ts                         | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bower.json b/bower.json
index af6cf93..8bb8606 100644
--- a/bower.json
+++ b/bower.json
@@ -11,7 +11,7 @@
     "restangular": "~1.5.2",
     "angular-ui-router": "~0.2.18",
     "bootstrap-sass": "~3.3.6",
-    "angular-bootstrap": "~0.13.4",
+    "angular-bootstrap": "~1.1.0",
     "malarkey": "yuanqing/malarkey#~1.3.1",
     "angular-toastr": "~1.7.0",
     "moment": "~2.10.6",
diff --git a/src/app/layout/language-selector/language-selector.html b/src/app/layout/language-selector/language-selector.html
index 9499df5..452acaf 100644
--- a/src/app/layout/language-selector/language-selector.html
+++ b/src/app/layout/language-selector/language-selector.html
@@ -1,8 +1,8 @@
-<li class="dropdown profile-menu" dropdown>
-  <a href="#" class="dropdown-toggle" aria-expanded="false" dropdown-toggle>
+<li class="dropdown profile-menu" uib-dropdown>
+  <a href="#" class="dropdown-toggle" aria-expanded="false" uib-dropdown-toggle>
     <span>{{"language.selector" | translate}}</span> <b class="caret"></b>
   </a>
-  <ul class="dropdown-menu" dropdown-menu>
+  <ul class="dropdown-menu" uib-dropdown-menu>
     <li ng-repeat="(language, description) in ctrl.availableLanguages()"
       class="language language-{{language}}" ng-class="{'active': language==ctrl.currentLanguage()}">
       <a href="#" ng-click="ctrl.changeLanguage(language)">
diff --git a/src/app/layout/navbar/navbar.html b/src/app/layout/navbar/navbar.html
index ed5742f..bec9b4a 100644
--- a/src/app/layout/navbar/navbar.html
+++ b/src/app/layout/navbar/navbar.html
@@ -21,12 +21,12 @@
           <a ng-href="#" ng-click="ctrl.openLogin()">{{"navbar.login" | translate}}</a>
         </li>
 
-        <li class="dropdown profile-menu" ng-show="ctrl.currentUser" dropdown>
-          <a href="#" class="dropdown-toggle" aria-expanded="false" dropdown-toggle>
+        <li class="dropdown profile-menu" ng-show="ctrl.currentUser" uib-dropdown>
+          <a href="#" class="dropdown-toggle" aria-expanded="false" uib-dropdown-toggle>
             <noosfero-profile-image [profile]="ctrl.currentUser.person" class="profile-image"></noosfero-profile-image>
             <span ng-bind="ctrl.currentUser.person.name"></span> <b class="caret"></b>
           </a>
-          <ul class="dropdown-menu" dropdown-menu>
+          <ul class="dropdown-menu" uib-dropdown-menu>
               <li>
                   <a ui-sref="main.profile.info({profile: ctrl.currentUser.person.identifier})"><i class="fa fa-fw fa-user"></i> {{"navbar.profile" | translate}}</a>
               </li>
diff --git a/src/app/layout/navbar/navbar.ts b/src/app/layout/navbar/navbar.ts
index 6ebd4da..a6ce473 100644
--- a/src/app/layout/navbar/navbar.ts
+++ b/src/app/layout/navbar/navbar.ts
@@ -10,7 +10,7 @@ import {SessionService, AuthService, AuthController, IAuthEvents, AUTH_EVENTS} f
     directives: [LanguageSelectorComponent],
     providers: [AuthService, SessionService]
 })
-@Inject("$modal", AuthService, "SessionService", "$scope", "$state")
+@Inject("$uibModal", AuthService, "SessionService", "$scope", "$state")
 export class Navbar {
 
     private currentUser: noosfero.User;
@@ -19,7 +19,7 @@ export class Navbar {
      *
      */
     constructor(
-        private $modal: any,
+        private $uibModal: any,
         private authService: AuthService,
         private session: SessionService,
         private $scope: ng.IScope,
@@ -42,7 +42,7 @@ export class Navbar {
     }
 
     openLogin() {
-        this.modalInstance = this.$modal.open({
+        this.modalInstance = this.$uibModal.open({
             templateUrl: 'app/login/login.html',
             controller: AuthController,
             controllerAs: 'vm',
--
libgit2 0.21.2