mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-18 16:17:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/pr/785' into FeaturesfFor5.0

Browse Source 
# Conflicts:
#	src/main/resources/public/scripts/app.js
This commit is contained in:
Admin
2017-11-14 13:13:22 -06:00
parent 548da932ad 31fe05fe2b
commit feee22dbac
35 changed files with 1518 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/resources/public/views/system.html
View File

@@ -7,6 +7,10 @@
href="#!/veradevices">Vera Devices</a></li>
<li ng-if="bridge.showVera" role="presentation"><a
href="#!/verascenes">Vera Scenes</a></li>
<li ng-if="bridge.showFibaro" role="presentation"><a
href="#!/fibarodevices">Fibaro Devices</a></li>
<li ng-if="bridge.showFibaro" role="presentation"><a
href="#!/fibaroscenes">Fibaro Scenes</a></li>
<li ng-if="bridge.showHarmony" role="presentation"><a
href="#!/harmonyactivities">Harmony Activities</a></li>
<li ng-if="bridge.showHarmony" role="presentation"><a
@@ -147,6 +151,51 @@
</tr>
</table></td>
</tr>
<tr>
<td>Fibaro Names and IP Addresses</td>
<td><table
class="table table-bordered table-striped table-hover">
<thead>
<tr>
<th>Name</th>
<th>IP</th>
<th>Port</th>
<th>Username</th>
<th>Password </th>
<th>Manage</th>
</tr>
</thead>
<tr ng-repeat="fibaro in bridge.settings.fibaroaddress.devices">
<td>{{fibaro.name}}</td>
<td>{{fibaro.ip}}</td>
<td>{{fibaro.port}}</td>
<td>{{fibaro.username}}</td>
<td ng-if="fibaro.password">*******</td>
<td ng-if="!fibaro.password"> </td>
<td><button class="btn btn-danger" type="submit"
ng-click="removeFibarotoSettings(fibaro.name, fibaro.ip, fibaro.port)">Del</button></td>
</tr>
<tr>
<td><input id="bridge-settings-next-fibaro-name"
class="form-control" type="text" ng-model="newfibaroname"
placeholder="A Fibaro"></td>
<td><input id="bridge-settings-next-fibaro-ip"
class="form-control" type="text" ng-model="newfibaroip"
placeholder="192.168.1.2"></td>
<td><input id="bridge-settings-next-fibaro-port"
class="form-control" type="text" ng-model="newfibaroport"
placeholder="80"></td>
<td><input id="bridge-settings-next-fibaro-username"
class="form-control" type="text" ng-model="newfibarousername"
placeholder="Fibaro username"></td>
<td><input id="bridge-settings-next-fibaro-password"
class="form-control" type="password" ng-model="newfibaropassword"
placeholder="Fibaro password"></td>
<td><button class="btn btn-success" type="submit"
ng-click="addFibarotoSettings(newfibaroname, newfibaroip, newfibaroport, newfibarousername, newfibaropassword)">Add</button></td>
</tr>
</table></td>
</tr>
<tr>
<td>Harmony Names and IP Addresses</td>
<td><table