Commit d6ea8765782c80500bd1c7010244fe9b3f589feb
Exists in
master
and in
35 other branches
Merge branch 'ngforward' of softwarepublico.gov.br:noosfero-themes/angular-theme into ngforward
Showing
3 changed files
with
9 additions
and
7 deletions
Show diff stats
gulp/server.js
| @@ -36,6 +36,7 @@ function browserSyncInit(baseDir, browser) { | @@ -36,6 +36,7 @@ function browserSyncInit(baseDir, browser) { | ||
| 36 | browserSync.instance = browserSync.init({ | 36 | browserSync.instance = browserSync.init({ |
| 37 | startPath: '/', | 37 | startPath: '/', |
| 38 | server: server, | 38 | server: server, |
| 39 | + port: 3001, | ||
| 39 | browser: browser | 40 | browser: browser |
| 40 | }); | 41 | }); |
| 41 | } | 42 | } |
karma.conf.js
| @@ -110,8 +110,10 @@ module.exports = function (config) { | @@ -110,8 +110,10 @@ module.exports = function (config) { | ||
| 110 | ], | 110 | ], |
| 111 | 111 | ||
| 112 | coverageReporter: { | 112 | coverageReporter: { |
| 113 | - type: 'html', | ||
| 114 | - dir: 'coverage/' | 113 | + reporters:[ |
| 114 | + {type: 'html', dir:'coverage/'}, | ||
| 115 | + {type: 'text-summary'} | ||
| 116 | + ] | ||
| 115 | }, | 117 | }, |
| 116 | 118 | ||
| 117 | reporters: ['spec', "coverage"], | 119 | reporters: ['spec', "coverage"], |
| @@ -126,8 +128,7 @@ module.exports = function (config) { | @@ -126,8 +128,7 @@ module.exports = function (config) { | ||
| 126 | // It was not possible to do it there because karma doesn't let us now if we are | 128 | // It was not possible to do it there because karma doesn't let us now if we are |
| 127 | // running a single test or not | 129 | // running a single test or not |
| 128 | configuration.preprocessors = { | 130 | configuration.preprocessors = { |
| 129 | - 'src/**/*.js': ['sourcemap'], | ||
| 130 | - 'src/**/*.ts': ['sourcemap'] | 131 | + 'src/noosfero.js': ['sourcemap', 'coverage'] |
| 131 | }; | 132 | }; |
| 132 | // 'src/**/*.js': ['sourcemap'], | 133 | // 'src/**/*.js': ['sourcemap'], |
| 133 | // 'src/**/*.[sS]pec.ts': ['sourcemap'] | 134 | // 'src/**/*.[sS]pec.ts': ['sourcemap'] |
src/app/components/navbar/navbar.html
| 1 | <nav class="navbar navbar-static-top navbar-inverse"> | 1 | <nav class="navbar navbar-static-top navbar-inverse"> |
| 2 | <div class="container-fluid"> | 2 | <div class="container-fluid"> |
| 3 | <div class="navbar-header"> | 3 | <div class="navbar-header"> |
| 4 | - <button type="button" class="navbar-toggle collapsed" (ng-click)="isCollapsed = !isCollapsed"> | 4 | + <button type="button" class="navbar-toggle collapsed" ng-click="isCollapsed = !isCollapsed"> |
| 5 | <span class="sr-only">Toggle navigation</span> | 5 | <span class="sr-only">Toggle navigation</span> |
| 6 | <span class="icon-bar"></span> | 6 | <span class="icon-bar"></span> |
| 7 | <span class="icon-bar"></span> | 7 | <span class="icon-bar"></span> |
| @@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
| 18 | 18 | ||
| 19 | <ul class="nav navbar-nav navbar-right"> | 19 | <ul class="nav navbar-nav navbar-right"> |
| 20 | <li ng-show="!ctrl.currentUser"> | 20 | <li ng-show="!ctrl.currentUser"> |
| 21 | - <a ng-href="#" (ng-click)="ctrl.openLogin()">Login</a> | 21 | + <a ng-href="#" ng-click="ctrl.openLogin()">Login</a> |
| 22 | </li> | 22 | </li> |
| 23 | 23 | ||
| 24 | <li class="dropdown profile-menu" ng-show="ctrl.currentUser" dropdown> | 24 | <li class="dropdown profile-menu" ng-show="ctrl.currentUser" dropdown> |
| @@ -35,7 +35,7 @@ | @@ -35,7 +35,7 @@ | ||
| 35 | </li> | 35 | </li> |
| 36 | <li class="divider"></li> | 36 | <li class="divider"></li> |
| 37 | <li> | 37 | <li> |
| 38 | - <a href="#" (ng-click)="ctrl.logout()"><i class="fa fa-fw fa-power-off"></i> Log Out</a> | 38 | + <a href="#" ng-click="ctrl.logout()"><i class="fa fa-fw fa-power-off"></i> Log Out</a> |
| 39 | </li> | 39 | </li> |
| 40 | </ul> | 40 | </ul> |
| 41 | </li> | 41 | </li> |