Commit e18daa4a6142f2e450ef77bffba3b037f1ef724f
1 parent
17d9e588be
Exists in
master
and in
1 other branch
Formatting home and importing unminified angjs
Showing 1 changed file with 6 additions and 10 deletions Side-by-side Diff
home.html
View file @
e18daa4
| 1 | 1 | <!DOCTYPE html> |
| 2 | 2 | <html ng-app="flashy"> |
| 3 | 3 | <base href="/app/"> |
| 4 | - <header> | |
| 5 | - | |
| 6 | - <link rel = "stylesheet" href ="styles/bootstrap-3.3.4-dist/css/bootstrap.css" /> | |
| 7 | - <link rel ="stylesheet" href="flashy.css" /> | |
| 8 | - | |
| 9 | - </header> | |
| 4 | + <head> | |
| 5 | + <link rel = "stylesheet" href ="styles/bootstrap-3.3.4-dist/css/bootstrap.css" /> | |
| 6 | + <link rel ="stylesheet" href="flashy.css" /> | |
| 7 | + </head> | |
| 10 | 8 | <body ng-controller="HomeController"> |
| 11 | 9 | |
| 12 | 10 | <!-- MENU BAR --> |
| ... | ... | @@ -50,7 +48,6 @@ |
| 50 | 48 | |
| 51 | 49 | <!-- LOGIN FORM --> |
| 52 | 50 | <div class="tab-pane" id="tab2"> |
| 53 | - | |
| 54 | 51 | <form> |
| 55 | 52 | <div class="form-group"> |
| 56 | 53 | <input type="email" class="form-control" ng-model="loginEmailOrUsername" placeholder="Email or username" /> |
| 57 | 54 | |
| ... | ... | @@ -61,12 +58,11 @@ |
| 61 | 58 | <input type="submit" class="btn btn-primary" ng-click="login(loginEmailOrUsername, loginPassword)" value="LOGIN" /> |
| 62 | 59 | </form> |
| 63 | 60 | </div> |
| 64 | - | |
| 65 | 61 | </div> |
| 66 | 62 | |
| 67 | 63 | |
| 68 | 64 | |
| 69 | - <script src = "scripts/angular.min.js"></script> | |
| 65 | + <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script> | |
| 70 | 66 | <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script> |
| 71 | 67 | <script src="controller.js"></script> |
| 72 | 68 |