Skip to content

Commit 767b2b2

Browse files
chrisoberlechrisoberle
committed
removed named views. added body padding
1 parent 57d0e41 commit 767b2b2

File tree

6 files changed

+81
-39
lines changed

6 files changed

+81
-39
lines changed

‎app/app.js‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,17 @@ myApp.config(function($stateProvider, $urlRouterProvider){
3232
$stateProvider
3333
.state('view1', {
3434
url: "/view1",
35-
views: {
36-
'body': {
37-
templateUrl: "/app/views/view1.html",
38-
controller: "View1Controller"
39-
}
40-
}
35+
templateUrl: "/app/views/view1.html",
36+
controller: "View1Controller"
4137
})
4238
.state('view2', {
4339
url: "/view2",
44-
views: {
45-
'body': {
46-
templateUrl: "/app/views/view2.html",
47-
controller: "View2Controller"
48-
}
49-
}
40+
templateUrl: "/app/views/view2.html",
41+
controller: "View2Controller"
5042
})
5143
.state('accordion', {
5244
url: "/accordion",
53-
views: {
54-
'body': {
55-
templateUrl: "/app/views/accordion.html",
56-
controller: "AccordionController"
57-
}
58-
}
45+
templateUrl: "/app/views/accordion.html",
46+
controller: "AccordionController"
5947
})
6048
});

‎app/controllers.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ appControllers.controller('View2Controller', ['$scope', '$location',
1313
]);
1414

1515
appControllers.controller('AccordionController', function ($scope) {
16+
console.log('AccordionController');
17+
18+
1619
$scope.oneAtATime = true;
1720

1821
$scope.groups = [

‎app/index.html‎

Lines changed: 63 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,86 @@
1818
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
1919
-->
2020
<script src="bower_components/html5-boilerplate/js/vendor/modernizr-2.6.2.min.js"></script>
21+
22+
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
23+
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
24+
<!--[if lt IE 9]>
25+
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
26+
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
27+
<![endif]-->
28+
<script src="bower_components/jquery/dist/jquery.js"></script>
29+
<script src="bower_components/angular/angular.js"></script>
30+
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
31+
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
32+
33+
<script src="app.js"></script>
34+
<script src="controllers.js"></script>
35+
<script src="components/version/version.js"></script>
36+
<script src="components/version/version-directive.js"></script>
37+
<script src="components/version/interpolate-filter.js"></script>
2138
</head>
22-
<body>
39+
<body style="padding-top: 80px;">
40+
41+
<!-- Navigation -->
42+
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
43+
<div class="container">
44+
<!-- Brand and toggle get grouped for better mobile display -->
45+
<div class="navbar-header">
46+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
47+
<span class="sr-only">Toggle navigation</span>
48+
<span class="icon-bar"></span>
49+
<span class="icon-bar"></span>
50+
<span class="icon-bar"></span>
51+
</button>
52+
<a class="navbar-brand" href="#">Start</a>
53+
</div>
54+
<!-- Collect the nav links, forms, and other content for toggling -->
55+
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
56+
<ul class="nav navbar-nav">
57+
<li class="dropdown">
58+
<a class="dropdown-toggle" data-toggle="dropdown">Demos <b class="caret"></b></a>
59+
<ul class="dropdown-menu">
60+
<li><a ui-sref="view1">View 1</a></li>
61+
<li><a ui-sref="view2">View 2</a></li>
62+
<li><a ui-sref="accordion">Accordion</a></li>
63+
</ul>
64+
</li>
65+
<!--
66+
<li>
67+
<a href="#">Services</a>
68+
</li>
69+
<li>
70+
<a href="#">Contact</a>
71+
</li>
72+
-->
73+
</ul>
74+
</div>
75+
<!-- /.navbar-collapse -->
76+
</div>
77+
<!-- /.container -->
78+
</nav>
79+
<!--
2380
<ul class="menu">
24-
<!--
81+
2582
<li><a href="#/view1">view1</a></li>
2683
<li><a href="#/view2">view2</a></li>
27-
-->
84+
2885
<li><a ui-sref="view1">View 1</a></li>
2986
<li><a ui-sref="view2">View 2</a></li>
3087
<li><a ui-sref="accordion">Accordion</a></li>
3188
</ul>
32-
89+
-->
3390
<!--[if lt IE 7]>
3491
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
3592
<![endif]-->
3693

37-
<div class="container" ui-view="body"></div>
94+
<div class="container" ui-view></div>
95+
3896

39-
<div>Angular seed app: v<span app-version></span></div>
4097

4198
<!-- In production use:
4299
<script src="//ajax.googleapis.com/ajax/libs/angularjs/x.x.x/angular.min.js"></script>
43100
-->
44-
<script src="bower_components/jquery/dist/jquery.js"></script>
45-
<script src="bower_components/angular/angular.js"></script>
46-
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
47-
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
48101

49-
<script src="app.js"></script>
50-
<script src="controllers.js"></script>
51-
<script src="components/version/version.js"></script>
52-
<script src="components/version/version-directive.js"></script>
53-
<script src="components/version/interpolate-filter.js"></script>
54102
</body>
55103
</html>

‎app/views/accordion.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
<div class="row">
1+
22
<div class="col-xs-12">
33
<p>This is the partial for accordion.</p>
44
</div>
5-
</div>
5+
6+
<div>Angular seed app: v<span app-version></span></div>

‎app/views/view1.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
<div class="row">
1+
22
<div class="col-xs-12">
33
<p>This is the partial for view 1.</p>
44
</div>
5-
</div>
5+
6+
<div>Angular seed app: v<span app-version></span></div>

‎app/views/view2.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<div class="row">
1+
22
<div class="col-xs-12">
33
<p>This is the partial for view 2.</p>
44
<p>
55
Showing of 'interpolate' filter:
66
{{ 'Current version is v%VERSION%.' | interpolate }}
77
</p>
88
</div>
9-
</div>
9+
10+
<div>Angular seed app: v<span app-version></span></div>

0 commit comments

Comments
 (0)