Skip to content

2014 june 19 init #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maxitan001 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

2014 june 19 init #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
daaf300
Removed PLACE HOLDERS
josaine Jun 19, 2014
e213c4a
Added / in index.html
josaine Jun 19, 2014
88a6ae4
Working so far.
josaine Jun 19, 2014
8191a96
Added Redirect to Home
josaine Jun 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/app/about/about.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
angular.module( 'ngBoilerplate.about', [
'ui.router',
'placeholders',
'ui.bootstrap'
])

Expand Down
2 changes: 1 addition & 1 deletion src/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ angular.module( 'ngBoilerplate', [
])

.config( function myAppConfig ( $stateProvider, $urlRouterProvider, $locationProvider ) {
//$urlRouterProvider.otherwise( '/home' );
$urlRouterProvider.otherwise( '/' );
$locationProvider.html5Mode(true);
})

Expand Down
3 changes: 2 additions & 1 deletion src/app/dashboard/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ angular.module( 'ngBoilerplate.home', [
/**
* And of course we define a controller for our route.
*/
.controller( 'HomeCtrl', function HomeController( $scope, $state ) {
.controller( 'HomeCtrl', function HomeCtrl( $scope, $state ) {
console.log ($state);
$scope.$state = $state;
})

Expand Down
1 change: 0 additions & 1 deletion src/app/forms/forms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
angular.module( 'ngBoilerplate.forms', [
'ui.router',
'placeholders',
'ui.bootstrap'
])

Expand Down
1 change: 0 additions & 1 deletion src/app/panels-and-wells/panels-and-wells.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
angular.module( 'ngBoilerplate.panels_and_wells', [
'ui.router',
'placeholders',
'ui.bootstrap'
])

Expand Down
1 change: 0 additions & 1 deletion src/app/tables/tables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
angular.module( 'ngBoilerplate.tables', [
'ui.router',
'placeholders',
'ui.bootstrap'
])

Expand Down
38 changes: 19 additions & 19 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,40 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Start Bootstrap - SB Admin Version 2.0 Demo</title>

<!-- font awesome from BootstrapCDN -->
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">

<!-- compiled CSS --><% styles.forEach( function ( file ) { %>
<link rel="stylesheet" type="text/css" href="<%= file %>" /><% }); %>

<!-- compiled JavaScript --><% scripts.forEach( function ( file ) { %>
<script type="text/javascript" src="<%= file %>"></script><% }); %>

<!-- Core CSS - Include with every page -->
<title>Start Bootstrap - SB Admin Version 2.0 Demo</title>
<!-- font awesome from BootstrapCDN -->
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<!-- compiled CSS --><% styles.forEach( function ( file ) { %>
<link rel="stylesheet" type="text/css" href="/<%= file %>" /><% }); %>
<!-- compiled JavaScript --><% scripts.forEach( function ( file ) { %>
<script type="text/javascript" src="/<%= file %>"></script><% }); %>

<!-- Core CSS - Include with every page -->
<!--
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="font-awesome/css/font-awesome.css" rel="stylesheet">
<link href="font-awesome/css/font-awesome.css" rel="stylesheet">
-->

<!-- Page-Level Plugin CSS - Dashboard -->
<!-- Page-Level Plugin CSS - Dashboard -->
<!--
<link href="css/plugins/morris/morris-0.4.3.min.css" rel="stylesheet">
<link href="css/plugins/timeline/timeline.css" rel="stylesheet">
<link href="css/plugins/timeline/timeline.css" rel="stylesheet">
-->

<!-- SB Admin CSS - Include with every page -->
<!-- SB Admin CSS - Include with every page -->
<!--
<link href="css/sb-admin.css" rel="stylesheet">
<link href="css/sb-admin.css" rel="stylesheet">
-->

</head>

<body>
<body>
<div>

<div ui-view="main"></div>
<div ui-view="main"></div>
</div>

</body>
Expand Down