ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Zutil correction fix

Browse source 
Former-commit-id: 58c6312aba52fc291a6594d1f506366f15966966
This commit is contained in:
Ziver Koc 2016-01-15 10:52:21 +01:00
parent cc6da8fccf
commit bd14a79be7
4 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Hal.iml
View file

@ -15,6 +15,7 @@
<sourceFolder url="file://$MODULE_DIR$/lib/sphinx4-5prealpha-src/sphinx4-data/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/lib/sphinx4-5prealpha-src/sphinx4-samples/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/lib/java-speech-api-master/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/web-resource" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/lib/sphinx4-5prealpha-src/sphinx4-data" />
<excludeFolder url="file://$MODULE_DIR$/lib/sphinx4-5prealpha-src/sphinx4-samples" />
<excludeFolder url="file://$MODULE_DIR$/lib/sphinx4-5prealpha-src/tests" />

16
web-resource/event_config.tmpl
View file

@ -20,9 +20,9 @@
</thead>
{{#localEvents}}
<tr>
<td>{{.name}}</td>
<td>{{.type}}</td>
<td>{{.config}}</td>
<td>{{.getName()}}</td>
<td>{{.getType()}}</td>
<td>{{.getConfig()}}</td>
<td>
<form method="POST">
<input type="hidden" name="action" value="remove_local_event">
@ -32,9 +32,9 @@
<button type="button" class="btn btn-default btn-xs" data-toggle="modal"
data-target="#eventModal"
data-id="{{.getId()}}"
data-name="{{.name}}"
data-type="{{.type}}"
data-config="{{.config}}">
data-name="{{.getName()}}"
data-type="{{.getType()}}"
data-config="{{.getConfig()}}">
<span class="glyphicon glyphicon-pencil"></span>
</button>
@ -63,8 +63,8 @@
<div class="btn-toolbar pull-right">
<button type="button" class="btn btn-default btn-xs" data-toggle="modal"
data-target="#eventModal"
data-type="{{.type}}"
data-config="{{.config}}">
data-type="{{.getClass().getName()}}"
data-config="{{.}}">
<span class="glyphicon glyphicon-plus"></span>
</button>
</div>

38
web-resource/sensor_config.tmpl
View file

@ -21,10 +21,10 @@
</thead>
{{#localSensors}}
<tr>
<td>{{.name}}</td>
<td>{{.type}}</td>
<td>{{.sync}}</td>
<td>{{.config}}</td>
<td>{{.getName()}}</td>
<td>{{.getType()}}</td>
<td>{{.isSynced()}}</td>
<td>{{.getConfig()}}</td>
<td>
<form method="POST">
<input type="hidden" name="action" value="remove_local_sensor">
@ -34,10 +34,10 @@
<button type="button" class="btn btn-default btn-xs" data-toggle="modal"
data-target="#sensorModal"
data-id="{{.getId()}}"
data-name="{{.name}}"
data-type="{{.type}}"
data-sync="{{.sync}}"
data-config="{{.config}}">
data-name="{{.getName()}}"
data-type="{{.getType()}}"
data-sync="{{.isSynced()}}"
data-config="{{.getConfig()}}">
<span class="glyphicon glyphicon-pencil"></span>
</button>
@ -66,8 +66,8 @@
<div class="btn-toolbar pull-right">
<button type="button" class="btn btn-default btn-xs" data-toggle="modal"
data-target="#sensorModal"
data-type="{{.type}}"
data-config="{{.config}}">
data-type="{{.getClass().getName()}"
data-config="{{.}}">
<span class="glyphicon glyphicon-plus"></span>
</button>
</div>
@ -100,10 +100,10 @@
</thead>
{{#extUsers}}
<tr>
<td>{{.username}}</td>
<td>{{.address}}</td>
<td>{{.hostname}}</td>
<td>{{.port}}</td>
<td>{{.getUsername()}}</td>
<td>{{.getAddress()}}</td>
<td>{{.getHostname()}}</td>
<td>{{.getPort()}}</td>
<td>
<form method="POST">
<input type="hidden" name="action" value="remove_external_user">
@ -113,8 +113,8 @@
<button type="button" class="btn btn-default btn-xs" data-toggle="modal"
data-target="#userModal"
data-id="{{.getId()}}"
data-hostname="{{.hostname}}"
data-port="{{.port}}">
data-hostname="{{.getHostname()}}"
data-port="{{.getPort()}}">
<span class="glyphicon glyphicon-pencil"></span>
</button>
@ -146,9 +146,9 @@
</thead>
{{#extSensor}}
<tr>
<td>{{.name}}</td>
<td>{{.type}}</td>
<td>{{.config}}</td>
<td>{{.getName()}}</td>
<td>{{.getType()}}</td>
<td>{{.getConfig()}}</td>
<td>
<form method="POST">
<div class="btn-toolbar pull-right">

4
web-resource/user_config.tmpl
View file

@ -9,13 +9,13 @@
<div class="form-group">
<label for="username" class="col-sm-2 control-label">Username:</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="username" name="username" value="{{user.username}}">
<input type="text" class="form-control" id="username" name="username" value="{{user.getUsername()}}">
</div>
</div>
<div class="form-group">
<label for="address" class="col-sm-2 control-label">Address:</label>
<div class="col-sm-10">
<textarea class="form-control" id="address" name="address">{{user.address}}</textarea>
<textarea class="form-control" id="address" name="address">{{user.getAddress()}}</textarea>
</div>
</div>
<div class="form-group">