Skip to content

Commit

Permalink
Disable html5mode in route.
Browse files Browse the repository at this point in the history
  • Loading branch information
mrwogu committed Feb 17, 2014
1 parent 8829bce commit a79333f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
10 changes: 5 additions & 5 deletions public_html/angular/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="home">DU AAC</a>
<a class="navbar-brand" href="#/home">DU AAC</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav">
<li><a href="about">About</a></li>
<li><a href="home">Services</a></li>
<li><a href="home">Contact</a></li>
<li><a href="#/about">About</a></li>
<li><a href="#/home">Services</a></li>
<li><a href="#/home">Contact</a></li>
</ul>
<form ng-submit="Login()" ng-controller="WidgetController" class="navbar-form navbar-right">
<div class="form-group">
Expand All @@ -57,7 +57,7 @@
<input ng-model="login.password" required class="form-control" placeholder="Password" type="password" >
</div>
<button type="submit" class="btn btn-success">Sign in</button>
<a class="btn btn-info" href="account/register">Sign up</a>
<a class="btn btn-info" href="#/account/register">Sign up</a>
</form>
</div>
<!-- /.navbar-collapse -->
Expand Down
14 changes: 6 additions & 8 deletions public_html/angular/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,30 @@ function ApiUrl(link) {
var app = angular.module('app', ['ngRoute']);
app.config(['$routeProvider', '$locationProvider', function($routeProvider, $locationProvider) {

$routeProvider.when('/angular/', {
$routeProvider.when('/', {
templateUrl: PageUrl('news'),
controller: 'NewsController'
});

$routeProvider.when('/angular/home', {
$routeProvider.when('/home', {
templateUrl: PageUrl('news'),
controller: 'NewsController'
});

$routeProvider.when('/angular/players/:id', {
$routeProvider.when('/players/:id', {
templateUrl: PageUrl('profile'),
controller: 'ProfileController'
});

$routeProvider.when('/angular/404', {
$routeProvider.when('/404', {
templateUrl: PageUrl('404')
});

$routeProvider.when('/angular/about', {
$routeProvider.when('/about', {
templateUrl: PageUrl('about')
});

$routeProvider.otherwise({
redirectTo : '/angular/404'
redirectTo : '/404'
});

$locationProvider.html5Mode(true);
}]);

0 comments on commit a79333f

Please sign in to comment.