Skip to content

sort devices by brand name #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sort devices by brand name #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions app/views/configuration/interview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h4><a href="" ng-click="goRename = !goRename">{{_t('device_rename_tooltip')}} <
<input name="device_name" id="device_name" type="text" class="form-control" value="{{deviceName}}" />
<button
type="submit"
class="btn btn-primary"
class="btn btn-primary"
id="btn_update"
>{{_t('btn_save_name')}}</button>
</form>
Expand Down Expand Up @@ -52,37 +52,37 @@ <h4><a href="" ng-click="goRename = !goRename">{{_t('device_rename_tooltip')}} <

<div class="cfg-block">
<button
data-ng-click="store('#btn_request_nif')"
data-store-url="devices[{{deviceId}}].RequestNodeInformation()"
class="btn btn-primary btn-spinner"
data-ng-click="store('#btn_request_nif')"
data-store-url="devices[{{deviceId}}].RequestNodeInformation()"
class="btn btn-primary btn-spinner"
id="btn_request_nif"
>{{_t('config_ui_request_node_info')}}</button>
<button
data-ng-click="store('#btn_interview_force')"
data-ng-click="store('#btn_interview_force')"
data-store-url="devices[{{deviceId}}].InterviewForce()"
data-redirect="{{deviceId}}"
class="btn btn-primary btn-spinner"
data-redirect="{{deviceId}}"
class="btn btn-primary btn-spinner"
id="btn_interview_force"
>{{_t('config_ui_force_interview')}}</button>
<button
data-ng-click="showModalInterview('#modal_interview', null)"
class="btn btn-primary btn-spinner"
class="btn btn-primary btn-spinner"
id="btn_request_nif"
>{{_t('config_ui_show_interview_results')}}</button>
<button
data-ng-click="showModalDeviceSelect('#modal_device_select', deviceId, '#modal_device_select .allert-hidden')"
class="btn btn-primary"
class="btn btn-primary"
id="btn_show_description"
>{{_t('config_ui_select_xml')}}</button>
<a
href="{{cfg.server_url + cfg.zddx_create_url + deviceId}}"
class="btn btn-primary"
class="btn btn-primary"
id="btn_create_zddx"
target="_blank"
>{{_t('btn_zddx_create')}}</a>
</div>

</div>
</div>
<!-- Modal interview -->
<div class="modal fade" id="modal_interview" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
Expand All @@ -92,7 +92,7 @@ <h4><a href="" ng-click="goRename = !goRename">{{_t('device_rename_tooltip')}} <
<h4 class="modal-title">{{_t('interview_results_dialog_title')}}</h4>
</div>
<div class="modal-body">
<p>{{_t('interview_results_title')}}
<p>{{_t('interview_results_title')}}
<a href="" ng-click="showModalCommandClass('#modal_command_class')">{{deviceName}}</a>
</p>
<div id="table_mobile_modal_1">
Expand All @@ -107,7 +107,7 @@ <h4 class="modal-title">{{_t('interview_results_dialog_title')}}</h4>
<tr ng-repeat="v in interviewCommands" id="{{v.ccId}}">
<td data-title="{{_t('th_instance')}}" ng-class="($index == 0 ? 'no-class' : 'mobile-hide')">
<a href="" ng-click="showModalCommandClass('#modal_command_class',v.iId,v.ccId, 'cmdDataIn')">{{v.iId}}</a> &nbsp;
</td>
</td>
<td data-title="{{_t('th_command_class')}}">
<a href="" ng-click="showModalCommandClass('#modal_command_class',v.iId,v.ccId, 'cmdData')">{{v.ccName}}</a>
</td>
Expand All @@ -116,8 +116,8 @@ <h4 class="modal-title">{{_t('interview_results_dialog_title')}}</h4>
<button
ng-if="!v.interviewDone"
data-store-url="devices[{{deviceId}}].instances[{{v.iId}}].commandClasses[{{v.ccId}}].Interview()"
data-ng-click="store('#btn_force_interview_' + v.ccId)"
class="btn btn-primary btn-sm"
data-ng-click="store('#btn_force_interview_' + v.ccId)"
class="btn btn-primary btn-sm"
id="btn_force_interview_{{v.ccId}}"
>{{_t('config_ui_force_interview')}}</button> &nbsp;
</td>
Expand Down Expand Up @@ -163,20 +163,20 @@ <h4 class="modal-title">{{_t('config_ui_select_xml')}}</h4>
<!--<div class="alert alert-warning allert-hidden">Can't select device description</div>-->
<div ng-if="deviceZddx.length > 0">
<p ng-bind-html="_t('select_zddx_help') | toTrusted"></p>
<select
name="select_zddx_help"
id="select_zddx_help"
class="form-control"
ng-change="changeDeviceSelect('#select_zddx_help', '#device_select_image',modelSelectZddx)"
<select
name="select_zddx_help"
id="select_zddx_help"
class="form-control"
ng-change="changeDeviceSelect('#select_zddx_help', '#device_select_image',modelSelectZddx)"
ng-model="modelSelectZddx">
<option value="">---</option>
<option
<option
ng-init="selectCfg = {
'name':((v.brandName == '' || v.productName == '')?('Unnamed ZDDX: ' + v.fileName):(v.brandName + ' ' + v.productName)),
'selected':(deviceZddxFile == v.fileName ? ' selected' : '')
}"
ng-repeat="v in deviceZddx"
value="{{v.fileName}}"
ng-repeat="v in deviceZddx | orderBy:'brandName'"
value="{{v.fileName}}"
data-image="{{v.deviceImage}}">{{selectCfg.name}}</option>
</select>
<div id="device_select_image_container">
Expand All @@ -192,7 +192,7 @@ <h4 class="modal-title">{{_t('config_ui_select_xml')}}</h4>
</div>
</div>
</div><!-- /.Modal -->

<!-- Modal CommandClass -->
<div class="modal fade" id="modal_command_class" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
Expand Down