Edit controller

This commit is contained in:
manzerbredes 2016-01-24 15:10:13 +01:00
parent b2795163b3
commit a059014b1b
5 changed files with 32 additions and 18 deletions

View file

@ -17,11 +17,11 @@
</head> </head>
<body ng-controller="mainAppCtrl"> <body>
<!-- MAIN GRID --> <!-- MAIN GRID -->
<div class="container-lg"> <div class="container-lg">
<!-- Status bar --> <!-- Status bar -->
<div class="row"> <div class="row" ng-controller="statusCtrl">
<div class="col-lg-12"> <div class="col-lg-12">
<!-- Nav --> <!-- Nav -->
<div ng-include="'./partials/nav.html'"></div> <div ng-include="'./partials/nav.html'"></div>
@ -39,13 +39,13 @@
<!-- Left Menu --> <!-- Left Menu -->
<div ng-include="'./partials/menu.html'"></div> <div ng-include="'./partials/menu.html'"></div>
</div> </div>
<div class="col-lg-10"> <div class="col-lg-10" ng-controller="mainCtrl">
<div class="container-lg" > <div class="container-lg" >
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
Content test {{ test }}
</div> </div>
<div class="panel-body"> <div class="panel-body">
Main Content Main Content
@ -70,7 +70,9 @@
<!-- Include AngularJS and dependencies--> <!-- Include AngularJS and dependencies-->
<script src="./vendors/angularjs/angular.min.js"></script> <script src="./vendors/angularjs/angular.min.js"></script>
<script src="./js/app.js"></script> <script src="./js/app.js"></script>
<script src="./js/controllers/mainApp.js"></script> <script src="./js/controllers/main.js"></script>
<script src="./js/controllers/status.js"></script>
</html> </html>

View file

@ -0,0 +1,10 @@
/*
* mainApp Controller
*/
mainApp.controller('mainCtrl', function ($scope)
{
$scope.test="Test title";
});

View file

@ -1,10 +0,0 @@
/*
* mainApp Controller
*/
mainApp.controller('mainAppCtrl', function ($scope)
{
// TODO
});

View file

@ -0,0 +1,12 @@
/*
* mainApp Controller
*/
mainApp.controller('statusCtrl', function ($scope)
{
$scope.username="User 1";
$scope.connection="Online";
$scope.lastconnection="1 Septembre";
});

View file

@ -18,9 +18,9 @@
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="nav-divider"></li> <li class="nav-divider"></li>
<li><a href="#">User : CurrentUser</a></li> <li><a href="#">User : {{ username }}</a></li>
<li><a href="#">Last Connection : LastCon</a></li> <li><a href="#">Last Connection : {{ lastconnection }}</a></li>
<li><a href="#">Connection : Online</a></li> <li><a href="#">Connection : {{ connection }}</a></li>
</ul> </ul>