diff options
| author | Eole <EoleDev@outlook.fr> | 2016-04-27 16:42:28 +0200 |
|---|---|---|
| committer | Eole <EoleDev@outlook.fr> | 2016-04-27 16:42:28 +0200 |
| commit | 49f416dc5061032e0514ea0cfeceaca37d13e432 (patch) | |
| tree | 1202ac2a6fa860b8929afdc886c94fc50bd0a1de /client/partials/home | |
| parent | c7edd70b5e5b0f5159c78ce3d924d4e7f60db816 (diff) | |
| parent | c9202d9113210981ae47df40511645da2ee140df (diff) | |
Merge branch 'develop' into Eole_Graph
Conflicts:
client/index.html
client/js/controllers/home/home.js
client/partials/home/home.html
Diffstat (limited to 'client/partials/home')
| -rwxr-xr-x[-rw-r--r--] | client/partials/home/home.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/partials/home/home.html b/client/partials/home/home.html index aaf141d..1a6717d 100644..100755 --- a/client/partials/home/home.html +++ b/client/partials/home/home.html @@ -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> |