Skip to content

Commit f89cce9

Browse files
committed
Merge pull request eHealthAfrica#42 from tlvince/refactor/ui-router-breadcrumbs
Add breadcrumbs, closes eHealthAfrica#136
2 parents d85d35b + 40ca850 commit f89cce9

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

.vimrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ let g:syntastic_html_tidy_ignore_errors = [
77
\ , 'unescaped & which should be written as &'
88
\ , ' proprietary attribute "ng-'
99
\ , ' proprietary attribute "ui-'
10+
\ , ' proprietary attribute "tv-'
1011
\ , '<table> proprietary attribute "show-filter"'
1112
\ , '<td> proprietary attribute "sortable"'
1213
\ , '<td> proprietary attribute "filter"'

app/index.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
type="alert.type" close="closeAlert($index)"
3333
ng-bind="alert.message"></alert>
3434

35-
<div id="main_content" ui-view></div>
35+
<div tv-breadcrumbs ng-if="!$state.includes('home')"></div>
36+
37+
<div id="main_content" ui-view></div>
3638
</div>
3739
</section>
3840
<div id="footer_space"></div>
@@ -56,6 +58,7 @@
5658
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
5759
<script src="bower_components/ng-table/ng-table.js"></script>
5860
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
61+
<script src="bower_components/tv-breadcrumbs/dist/tv-breadcrumbs.min.js"></script>
5962
<!-- endbower -->
6063
<!-- endbuild -->
6164

app/scripts/app.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ angular.module('lmisChromeApp', [
77
'restangular',
88
'ui.bootstrap',
99
'ngTable',
10-
'ui.router'
10+
'ui.router',
11+
'tv.breadcrumbs'
1112
])
1213
.config(function(RestangularProvider, $compileProvider) {
1314
RestangularProvider.setBaseUrl('http://lmis.ehealth.org.ng/api/v1');
@@ -51,6 +52,9 @@ angular.module('lmisChromeApp', [
5152
});
5253
}, false);
5354

55+
// Convenience property to get the current state
56+
$rootScope.$state = $state;
57+
5458
// Default state
5559
$state.go('home.index.controlPanel');
5660
});

bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"ng-table": "0.3.1",
1616
"font-awesome": "https://github.com/FortAwesome/Font-Awesome.git#4.0.4-wip",
1717
"angular-indexedDB": "https://github.com/webcss/angular-indexedDB.git",
18-
"angular-ui-router": "0.2.8-bowratic-tedium"
18+
"angular-ui-router": "0.2.8-bowratic-tedium",
19+
"tv-breadcrumbs": "~0.1.1"
1920
},
2021
"devDependencies": {
2122
"angular-mocks": "1.2.12",

0 commit comments

Comments
 (0)