Commit a7d21c433427ee01994dd2bb2b9bcdcb5a5a625b
Exists in
master
and in
1 other branch
Merge branch 'ngforward' of softwarepublico.gov.br:noosfero-themes/angular-theme into ngforward
Showing
4 changed files
with
10 additions
and
10 deletions
Show diff stats
bower.json
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | "restangular": "~1.5.2", | 11 | "restangular": "~1.5.2", |
12 | "angular-ui-router": "~0.2.18", | 12 | "angular-ui-router": "~0.2.18", |
13 | "bootstrap-sass": "~3.3.6", | 13 | "bootstrap-sass": "~3.3.6", |
14 | - "angular-bootstrap": "~0.13.4", | 14 | + "angular-bootstrap": "~1.1.0", |
15 | "malarkey": "yuanqing/malarkey#~1.3.1", | 15 | "malarkey": "yuanqing/malarkey#~1.3.1", |
16 | "angular-toastr": "~1.7.0", | 16 | "angular-toastr": "~1.7.0", |
17 | "moment": "~2.10.6", | 17 | "moment": "~2.10.6", |
src/app/layout/language-selector/language-selector.html
1 | -<li class="dropdown profile-menu" dropdown> | ||
2 | - <a href="#" class="dropdown-toggle" aria-expanded="false" dropdown-toggle> | 1 | +<li class="dropdown profile-menu" uib-dropdown> |
2 | + <a href="#" class="dropdown-toggle" aria-expanded="false" uib-dropdown-toggle> | ||
3 | <span>{{"language.selector" | translate}}</span> <b class="caret"></b> | 3 | <span>{{"language.selector" | translate}}</span> <b class="caret"></b> |
4 | </a> | 4 | </a> |
5 | - <ul class="dropdown-menu" dropdown-menu> | 5 | + <ul class="dropdown-menu" uib-dropdown-menu> |
6 | <li ng-repeat="(language, description) in ctrl.availableLanguages()" | 6 | <li ng-repeat="(language, description) in ctrl.availableLanguages()" |
7 | class="language language-{{language}}" ng-class="{'active': language==ctrl.currentLanguage()}"> | 7 | class="language language-{{language}}" ng-class="{'active': language==ctrl.currentLanguage()}"> |
8 | <a href="#" ng-click="ctrl.changeLanguage(language)"> | 8 | <a href="#" ng-click="ctrl.changeLanguage(language)"> |
src/app/layout/navbar/navbar.html
@@ -21,12 +21,12 @@ | @@ -21,12 +21,12 @@ | ||
21 | <a ng-href="#" ng-click="ctrl.openLogin()">{{"navbar.login" | translate}}</a> | 21 | <a ng-href="#" ng-click="ctrl.openLogin()">{{"navbar.login" | translate}}</a> |
22 | </li> | 22 | </li> |
23 | 23 | ||
24 | - <li class="dropdown profile-menu" ng-show="ctrl.currentUser" dropdown> | ||
25 | - <a href="#" class="dropdown-toggle" aria-expanded="false" dropdown-toggle> | 24 | + <li class="dropdown profile-menu" ng-show="ctrl.currentUser" uib-dropdown> |
25 | + <a href="#" class="dropdown-toggle" aria-expanded="false" uib-dropdown-toggle> | ||
26 | <noosfero-profile-image [profile]="ctrl.currentUser.person" class="profile-image"></noosfero-profile-image> | 26 | <noosfero-profile-image [profile]="ctrl.currentUser.person" class="profile-image"></noosfero-profile-image> |
27 | <span ng-bind="ctrl.currentUser.person.name"></span> <b class="caret"></b> | 27 | <span ng-bind="ctrl.currentUser.person.name"></span> <b class="caret"></b> |
28 | </a> | 28 | </a> |
29 | - <ul class="dropdown-menu" dropdown-menu> | 29 | + <ul class="dropdown-menu" uib-dropdown-menu> |
30 | <li> | 30 | <li> |
31 | <a ui-sref="main.profile.info({profile: ctrl.currentUser.person.identifier})"><i class="fa fa-fw fa-user"></i> {{"navbar.profile" | translate}}</a> | 31 | <a ui-sref="main.profile.info({profile: ctrl.currentUser.person.identifier})"><i class="fa fa-fw fa-user"></i> {{"navbar.profile" | translate}}</a> |
32 | </li> | 32 | </li> |
src/app/layout/navbar/navbar.ts
@@ -10,7 +10,7 @@ import {SessionService, AuthService, AuthController, IAuthEvents, AUTH_EVENTS} f | @@ -10,7 +10,7 @@ import {SessionService, AuthService, AuthController, IAuthEvents, AUTH_EVENTS} f | ||
10 | directives: [LanguageSelectorComponent], | 10 | directives: [LanguageSelectorComponent], |
11 | providers: [AuthService, SessionService] | 11 | providers: [AuthService, SessionService] |
12 | }) | 12 | }) |
13 | -@Inject("$modal", AuthService, "SessionService", "$scope", "$state") | 13 | +@Inject("$uibModal", AuthService, "SessionService", "$scope", "$state") |
14 | export class Navbar { | 14 | export class Navbar { |
15 | 15 | ||
16 | private currentUser: noosfero.User; | 16 | private currentUser: noosfero.User; |
@@ -19,7 +19,7 @@ export class Navbar { | @@ -19,7 +19,7 @@ export class Navbar { | ||
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | constructor( | 21 | constructor( |
22 | - private $modal: any, | 22 | + private $uibModal: any, |
23 | private authService: AuthService, | 23 | private authService: AuthService, |
24 | private session: SessionService, | 24 | private session: SessionService, |
25 | private $scope: ng.IScope, | 25 | private $scope: ng.IScope, |
@@ -42,7 +42,7 @@ export class Navbar { | @@ -42,7 +42,7 @@ export class Navbar { | ||
42 | } | 42 | } |
43 | 43 | ||
44 | openLogin() { | 44 | openLogin() { |
45 | - this.modalInstance = this.$modal.open({ | 45 | + this.modalInstance = this.$uibModal.open({ |
46 | templateUrl: 'app/login/login.html', | 46 | templateUrl: 'app/login/login.html', |
47 | controller: AuthController, | 47 | controller: AuthController, |
48 | controllerAs: 'vm', | 48 | controllerAs: 'vm', |