File tree 6 files changed +8
-8
lines changed
6 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 12
12
"angular-cookies" : " ~1.4.0" ,
13
13
"angular-sanitize" : " ~1.4.0" ,<% if (filters.ngroute) { %>
14
14
"angular-route" : " ~1.4.0" ,<% } if (filters.uibootstrap) { %>
15
- "angular-bootstrap" : " ~0.13.0 " ,<% } %>
15
+ "angular-bootstrap" : " ~1.1.2 " ,<% } %>
16
16
"font-awesome" : " >=4.1.0" ,
17
17
"lodash" : " ~2.4.1" <% if(filters.socketio) { %>,
18
18
"angular-socket-io" : " ~0.7.0" <% } if (filters.uirouter) { %>,
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ <h1>'Allo, 'Allo!</h1>
11
11
< div class ="col-lg-12 ">
12
12
< h1 class ="page-header "> Features:</ h1 >
13
13
< ul class ="nav nav-tabs nav-stacked col-md-4 col-lg-4 col-sm-6 " ng-repeat ="thing in main.awesomeThings ">
14
- < li > < a href ="# " tooltip ="{{thing.info}} "> {{thing.name}}< % if (filters.socketio) { %> < button type ="button " class ="close " ng-click ="main.deleteThing(thing) "> ×</ button > < % } %> </ a > </ li >
14
+ < li > < a href ="# " uib- tooltip ="{{thing.info}} "> {{thing.name}}< % if (filters.socketio) { %> < button type ="button " class ="close " ng-click ="main.deleteThing(thing) "> ×</ button > < % } %> </ a > </ li >
15
15
</ ul >
16
16
</ div >
17
17
</ div > < % if (filters.socketio) { %>
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ header#banner.hero-unit
10
10
h1.page-header Features:
11
11
ul.nav.nav-tabs.nav-stacked.col-md-4.col-lg-4.col-sm-6 ( ng-repeat ='thing in main.awesomeThings' )
12
12
li
13
- a( href ='#' , tooltip ='{{thing.info}}' )
13
+ a( href ='#' , uib- tooltip ='{{thing.info}}' )
14
14
| {{thing.name}}<% if (filters.socketio) { %>
15
15
button.close ( type ='button' , ng-click ='main.deleteThing(thing)' ) × <% } %> <% if (filters.socketio) { %>
16
16
Original file line number Diff line number Diff line change 1
1
'use strict' ;
2
2
3
3
angular . module ( '<%= scriptAppName %>' )
4
- . factory ( 'Modal' , function ( $rootScope , $modal ) {
4
+ . factory ( 'Modal' , function ( $rootScope , $uibModal ) {
5
5
/**
6
6
* Opens a modal
7
7
* @param {Object } scope - an object to be merged with modal's scope
8
8
* @param {String } modalClass - (optional) class(es) to be applied to the modal
9
- * @return {Object } - the instance $modal .open() returns
9
+ * @return {Object } - the instance $uibModal .open() returns
10
10
*/
11
11
function openModal ( scope = { } , modalClass = 'modal-default' ) {
12
12
var modalScope = $rootScope . $new ( ) ;
13
13
14
14
angular . extend ( modalScope , scope ) ;
15
15
16
- return $modal . open ( {
16
+ return $uibModal . open ( {
17
17
templateUrl : 'components/modal/modal.html' ,
18
18
windowClass : modalClass ,
19
19
scope : modalScope
Original file line number Diff line number Diff line change 9
9
</ button >
10
10
< a href ="/ " class ="navbar-brand "> < %= lodash.slugify(lodash.humanize(appname)) %> </ a >
11
11
</ div >
12
- < div collapse ="nav.isCollapsed " class ="navbar-collapse collapse " id ="navbar-main ">
12
+ < div uib- collapse ="nav.isCollapsed " class ="navbar-collapse collapse " id ="navbar-main ">
13
13
< ul class ="nav navbar-nav ">
14
14
< li ng-repeat ="item in nav.menu " < % if (filters.uirouter) { %> ui-sref-active="active"< % } else { %> ng-class="{active: nav.isActive(item.link)}"< % } %> >
15
15
< a < % if (filters.uirouter) { %> ui-sref="{{item.state}}"< % } else { %> ng-href="{{item.link}}"< % } %> > {{item.title}}</ a >
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ div.navbar.navbar-default.navbar-static-top(ng-controller='NavbarController')
8
8
span.icon-bar
9
9
a.navbar-brand ( href ='/' ) <%= lodash.slugify(lodash.humanize(appname)) %>
10
10
11
- div#navbar-main .navbar-collapse.collapse ( collapse ='nav.isCollapsed' )
11
+ div#navbar-main .navbar-collapse.collapse ( uib- collapse ='nav.isCollapsed' )
12
12
ul.nav.navbar-nav
13
13
li( ng-repeat ='item in nav.menu' , <% if (filters.uirouter ) { %>ui-sref-active ='active' < % } else { %>ng-class ='{active: nav.isActive(item.link)}' < % } % > )
14
14
a( <% if (filters.uirouter ) { %>ui-sref ='{{item.state}}' < % } else { %>ng-href ='{{item.link}}' < % } % > ) {{item.title}}<% if (filters.auth) { %>
You can’t perform that action at this time.
0 commit comments