diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-02 21:03:25 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-02 21:03:25 +0100 |
| commit | dde482df6492e874ffb30c3c5127e620c418c57b (patch) | |
| tree | c140423cc3d396a8a3507496b392894cbe47fecf /client/partials/home/main.html | |
| parent | 6ce1bbc7be91aa6441c3ff168a734ed25479eb72 (diff) | |
| parent | 85222e1246b3805100428717874d15aafd682d26 (diff) | |
Correct conflicts
Diffstat (limited to 'client/partials/home/main.html')
| -rw-r--r-- | client/partials/home/main.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/partials/home/main.html b/client/partials/home/main.html index 37638d3..f9f8878 100644 --- a/client/partials/home/main.html +++ b/client/partials/home/main.html @@ -3,9 +3,10 @@ Home </div> <div class="panel-body"> - Main Content - <button ng-click="raiseShowMachineDetailsEvent()" > Show Machine details</button> - <div id="test"> - </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> + </div> </div> |