Change folder architecture !
This commit is contained in:
parent
fe06bd586a
commit
c6186b71c1
10 changed files with 20 additions and 14 deletions
|
@ -74,10 +74,11 @@
|
||||||
<script src="./js/requests/identity.js"></script>
|
<script src="./js/requests/identity.js"></script>
|
||||||
|
|
||||||
<!-- Include controller -->
|
<!-- Include controller -->
|
||||||
<script src="./js/controllers/home.js"></script>
|
|
||||||
<script src="./js/controllers/login.js"></script>
|
<script src="./js/controllers/login.js"></script>
|
||||||
<script src="./js/controllers/network.js"></script>
|
|
||||||
<script src="./js/controllers/status.js"></script>
|
<script src="./js/controllers/status.js"></script>
|
||||||
|
<script src="./js/controllers/home/main.js"></script>
|
||||||
|
<script src="./js/controllers/network/main.js"></script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,11 +6,11 @@ var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize']);
|
||||||
mainApp.config(['$routeProvider', function($routeProvider){
|
mainApp.config(['$routeProvider', function($routeProvider){
|
||||||
$routeProvider.
|
$routeProvider.
|
||||||
when('/home',{
|
when('/home',{
|
||||||
templateUrl: 'partials/home.html',
|
templateUrl: 'partials/home/main.html',
|
||||||
controller: 'homeCtrl'
|
controller: 'homeCtrl'
|
||||||
}).
|
}).
|
||||||
when('/network',{
|
when('/network',{
|
||||||
templateUrl: 'partials/network.html',
|
templateUrl: 'partials/network/main.html',
|
||||||
controller: 'networkCtrl'
|
controller: 'networkCtrl'
|
||||||
}).otherwise({
|
}).otherwise({
|
||||||
redirectTo: '/home'
|
redirectTo: '/home'
|
||||||
|
|
|
@ -4,11 +4,14 @@
|
||||||
* and open the template in the editor.
|
* and open the template in the editor.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Represents a book.
|
||||||
|
* @constructor
|
||||||
|
*/
|
||||||
mainApp.controller('loginCtrl', function ($scope,$interval,$sce)
|
mainApp.controller('loginCtrl', function ($scope,$interval,$sce)
|
||||||
{
|
{
|
||||||
// Define default states
|
// Define default states
|
||||||
$('#loginModal').modal({backdrop: 'static', keyboard: false});
|
//$('#loginModal').modal({backdrop: 'static', keyboard: false});
|
||||||
$('#loadingLoginButton').hide();
|
$('#loadingLoginButton').hide();
|
||||||
$('#failedToLoginAlert').hide();
|
$('#failedToLoginAlert').hide();
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
|
|
||||||
mainApp.controller('statusCtrl', function ($scope,$interval,$sce)
|
mainApp.controller('statusCtrl', function ($scope,$interval,$sce)
|
||||||
{
|
{
|
||||||
|
$scope.username="John Doe";
|
||||||
|
$scope.projectname="Web Server";
|
||||||
// Update status every 2 seconds
|
// Update status every 2 seconds
|
||||||
/*$interval(function(){
|
/*$interval(function(){
|
||||||
var status=identity.fetchStatus();
|
var status=identity.fetchStatus();
|
||||||
|
|
|
@ -14,12 +14,12 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label label-default="" for="inputUser">User</label>
|
<label label-default="" for="inputUser">User</label>
|
||||||
<input class="form-control" id="inputUser"
|
<input class="form-control" id="inputUser"
|
||||||
placeholder="Enter email" type="text" ng-model="identityFormData.user">
|
placeholder="Email" type="text" ng-model="identityFormData.user">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label label-default="" for="inputProject">Project</label>
|
<label label-default="" for="inputProject">Project</label>
|
||||||
<input class="form-control" id="inputProject"
|
<input class="form-control" id="inputProject"
|
||||||
placeholder="Password" type="password" ng-model="identityFormData.project">
|
placeholder="Project Name" type="password" ng-model="identityFormData.project">
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label label-default="" for="inputPassword">Password</label>
|
<label label-default="" for="inputPassword">Password</label>
|
||||||
|
|
|
@ -17,10 +17,11 @@
|
||||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||||
|
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
<li class="nav-divider"></li>
|
<li class="nav-divider"></li>
|
||||||
<li><a href="#">User : {{ username }}</a></li>
|
<li><a href="#">User : {{ username }}</a></li>
|
||||||
<li><a href="#">Last Connection : {{ lastconnection }}</a></li>
|
<li><a href="#">Project Name : {{ projectname }}</a></li>
|
||||||
<li><a href="#" >Connection : <span ng-bind-html="connection"></span></a></li>
|
|
||||||
|
<!--<li><a href="#" >Connection : <span ng-bind-html="connection"></span></a></li>-->
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
@ -31,7 +32,7 @@
|
||||||
<li><a href="#">Informations</a></li>
|
<li><a href="#">Informations</a></li>
|
||||||
<li><a href="#">Settings</a></li>
|
<li><a href="#">Settings</a></li>
|
||||||
<li role="separator" class="divider"></li>
|
<li role="separator" class="divider"></li>
|
||||||
<li><a href="#myModal" data-toggle="modal" data-target="#loginModal">Login</a>
|
<li><a href="#myModal" data-toggle="modal">Logout</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
Loading…
Add table
Reference in a new issue