Merge branch 'develop' into Eole_Graph
Conflicts: client/index.html client/js/controllers/home/home.js client/partials/home/home.html
This commit is contained in:
commit
49f416dc50
317 changed files with 5578 additions and 33526 deletions
8
client/partials/home/home.html
Normal file → Executable file
8
client/partials/home/home.html
Normal file → Executable file
|
@ -1,11 +1,11 @@
|
|||
<div class="panel panel-default">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
Home
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
|
||||
<div id="graphHolder"></div>
|
||||
Pour charger les machines, recharger la page (temporaire)<br />
|
||||
Selectionner une machine:
|
||||
<div ng-repeat="machine in machines"> <a ng-click="raiseShowMachineDetailsEvent(machine.id)"> {{ machine.name }}</a></div>
|
||||
Selectionner une machine:
|
||||
<div ng-repeat="machine in machines"> <a ng-click="raiseShowMachineDetailsEvent(machine.id)"> {{ machine.name }}</a></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue