Skip to content

Commit b67ee93

Browse files
Mips2648Mips2648
committed
update layout v4.2 + v4.3
1 parent 410301e commit b67ee93

2 files changed

Lines changed: 91 additions & 96 deletions

File tree

‎desktop/js/script.js‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,6 @@ $("#md_editScriptFile").dialog({
7878
closeText: ''
7979
});
8080

81-
$('#bt_cronGenerator').on('click', function () {
82-
jeedom.getCronSelectModal({}, function (result) {
83-
$('.eqLogicAttr[data-l1key=configuration][data-l2key=autorefresh]').value(result.value);
84-
});
85-
});
86-
8781
$("#table_cmd tbody").delegate(".editScriptFile", 'click', function (event) {
8882
var tr = $(this).closest('tr');
8983
var path = tr.find('.cmdAttr[data-l1key=configuration][data-l2key=request]').val();
@@ -204,17 +198,13 @@ function addCmdToTable(_cmd) {
204198

205199
tr += '<td>';
206200
tr += '<input class="cmdAttr form-control input-sm" data-l1key="id" style="display : none;">';
207-
tr += '<div class="row">';
208-
tr += '<div class="col-sm-6">';
209-
tr += '<a class="cmdAction btn btn-default btn-sm" data-l1key="chooseIcon"><i class="fas fa-flag"></i> Icone</a>';
210-
tr += '<span class="cmdAttr" data-l1key="display" data-l2key="icon" style="margin-left : 10px;"></span>';
201+
tr += '<div class="input-group">';
202+
tr += '<input class="cmdAttr form-control input-sm roundedLeft" data-l1key="name" placeholder="{{Nom de la commande}}">';
203+
tr += '<span class="input-group-btn"><a class="cmdAction btn btn-sm btn-default" data-l1key="chooseIcon" title="{{Choisir une icône}}"><i class="fas fa-icons"></i></a></span>';
204+
tr += '<span class="cmdAttr input-group-addon roundedRight" data-l1key="display" data-l2key="icon" style="font-size:19px;padding:0 5px 0 0!important;"></span>';
211205
tr += '</div>';
212-
tr += '<div class="col-sm-6">';
213-
tr += '<input class="cmdAttr form-control input-sm" data-l1key="name">';
214-
tr += '</div>';
215-
tr += '</div>';
216-
tr += '<select class="cmdAttr form-control input-sm" data-l1key="value" style="display : none;margin-top : 5px;" title="{{La valeur de la commande vaut par défaut la commande}}">';
217-
tr += '<option value="">Aucune</option>';
206+
tr += '<select class="cmdAttr form-control input-sm" data-l1key="value" style="display:none;margin-top:5px;" title="{{Commande info liée}}">';
207+
tr += '<option value="">{{Aucune}}</option>';
218208
tr += '</select>';
219209
tr += '</td>';
220210
tr += '<td class="requestType" type="' + init(_cmd.configuration.requestType) + '" >' + selRequestType;

‎desktop/php/script.php‎

Lines changed: 85 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -33,42 +33,37 @@
3333
</div>
3434
</div>
3535
<legend><i class="fas fa-file"></i> {{Mes Scripts}}</legend>
36-
37-
<div class="input-group" style="margin:5px;">
38-
<input class="form-control roundedLeft" placeholder="{{Rechercher}}" id="in_searchEqlogic" />
39-
<div class="input-group-btn">
40-
<a id="bt_resetSearch" class="btn" style="width:30px"><i class="fas fa-times"></i></a>
41-
<a class="btn roundedRight hidden" id="bt_pluginDisplayAsTable" data-coreSupport="1" data-state="0"><i class="fas fa-grip-lines"></i></a>
42-
</div>
43-
</div>
44-
45-
<div class="eqLogicThumbnailContainer">
46-
<?php
47-
$content = '';
36+
<?php
37+
if (count($eqLogics) == 0) {
38+
echo '<br><div class="text-center" style="font-size:1.2em;font-weight:bold;">{{Aucun équipement trouvé, cliquer sur "Ajouter" pour commencer}}</div>';
39+
} else {
40+
// Champ de recherche
41+
echo '<div class="input-group" style="margin:5px;">';
42+
echo '<input class="form-control roundedLeft" placeholder="{{Rechercher}}" id="in_searchEqlogic">';
43+
echo '<div class="input-group-btn">';
44+
echo '<a id="bt_resetSearch" class="btn" style="width:30px"><i class="fas fa-times"></i></a>';
45+
echo '<a class="btn roundedRight hidden" id="bt_pluginDisplayAsTable" data-coreSupport="1" data-state="0"><i class="fas fa-grip-lines"></i></a>';
46+
echo '</div>';
47+
echo '</div>';
48+
// Liste des équipements du plugin
49+
echo '<div class="eqLogicThumbnailContainer">';
4850
foreach ($eqLogics as $eqLogic) {
4951
$opacity = ($eqLogic->getIsEnable()) ? '' : 'disableCard';
50-
$eqString = '';
51-
$eqString .= '<div class="eqLogicDisplayCard cursor ' . $opacity . '" data-eqLogic_id="' . $eqLogic->getId() . '">';
52-
$eqString .= '<img src="' . $plugin->getPathImgIcon() . '" />';
53-
$eqString .= '<br>';
54-
$eqString .= '<span class="name">' . $eqLogic->getHumanName(true, true) . '</span>';
55-
56-
$eqString .= '<span class="hidden hiddenAsCard displayTableRight">';
57-
if ($eqLogic->getConfiguration('autorefresh') != '') $eqString .= '<span>' . $eqLogic->getConfiguration('autorefresh') . '</span>';
58-
$cats = $eqLogic->getCategory();
59-
unset($cats['default']);
60-
$eqString .= '<span>' . implode(', ', array_keys($cats, 1)) . '</span>';
61-
if ($eqLogic->getIsVisible() == 1) {
62-
$eqString .= ' <i class="fas fa-eye"></i>';
63-
} else {
64-
$eqString .= ' <i class="fas fa-eye-slash"></i>';
52+
echo '<div class="eqLogicDisplayCard cursor ' . $opacity . '" data-eqLogic_id="' . $eqLogic->getId() . '">';
53+
echo '<img src="' . $plugin->getPathImgIcon() . '">';
54+
echo '<br>';
55+
echo '<span class="name">' . $eqLogic->getHumanName(true, true) . '</span>';
56+
echo '<span class="hiddenAsCard displayTableRight hidden">';
57+
if ($eqLogic->getConfiguration('autorefresh', '') != '') {
58+
echo '<span class="label label-info">' . $eqLogic->getConfiguration('autorefresh') . '</span>';
6559
}
66-
$eqString .= '</span>';
67-
$content .= $eqString . '</div>';
60+
echo ($eqLogic->getIsVisible() == 1) ? '<i class="fas fa-eye" title="{{Equipement visible}}"></i>' : '<i class="fas fa-eye-slash" title="{{Equipement non visible}}"></i>';
61+
echo '</span>';
62+
echo '</div>';
6863
}
69-
echo $content;
70-
?>
71-
</div>
64+
echo '</div>';
65+
}
66+
?>
7267
</div>
7368

7469
<div class="col-xs-12 eqLogic" style="display: none;">
@@ -84,63 +79,73 @@
8479
</ul>
8580
<div class="tab-content" style="height:calc(100% - 50px);overflow:auto;overflow-x: hidden;">
8681
<div role="tabpanel" class="tab-pane active" id="eqlogictab">
87-
<br />
8882
<form class="form-horizontal">
8983
<fieldset>
90-
<div class="form-group">
91-
<label class="col-sm-2 control-label">{{Nom de l'équipement script}}</label>
92-
<div class="col-sm-3">
93-
<input type="text" class="eqLogicAttr form-control" data-l1key="id" style="display : none;" />
94-
<input type="text" class="eqLogicAttr form-control" data-l1key="name" placeholder="{{Nom de l'équipement script}}" />
84+
<div class="col-lg-7">
85+
<legend><i class="fas fa-wrench"></i> {{Paramètres généraux}}</legend>
86+
<div class="form-group">
87+
<label class="col-sm-4 control-label">{{Nom de l'équipement}}</label>
88+
<div class="col-sm-6">
89+
<input type="text" class="eqLogicAttr form-control" data-l1key="id" style="display:none;">
90+
<input type="text" class="eqLogicAttr form-control" data-l1key="name" placeholder="{{Nom de l'équipement}}">
91+
</div>
9592
</div>
96-
</div>
97-
<div class="form-group">
98-
<label class="col-sm-2 control-label">{{Objet parent}}</label>
99-
<div class="col-sm-3">
100-
<select class="form-control eqLogicAttr" data-l1key="object_id">
101-
<option value="">{{Aucun}}</option>
93+
<div class="form-group">
94+
<label class="col-sm-4 control-label">{{Objet parent}}</label>
95+
<div class="col-sm-6">
96+
<select id="sel_object" class="eqLogicAttr form-control" data-l1key="object_id">
97+
<option value="">{{Aucun}}</option>
98+
<?php
99+
$options = '';
100+
foreach ((jeeObject::buildTree(null, false)) as $object) {
101+
$options .= '<option value="' . $object->getId() . '">' . str_repeat('&nbsp;&nbsp;', $object->getConfiguration('parentNumber')) . $object->getName() . '</option>';
102+
}
103+
echo $options;
104+
?>
105+
</select>
106+
</div>
107+
</div>
108+
<div class="form-group">
109+
<label class="col-sm-4 control-label">{{Catégorie}}</label>
110+
<div class="col-sm-6">
102111
<?php
103-
$options = '';
104-
foreach ((jeeObject::buildTree(null, false)) as $object) {
105-
$options .= '<option value="' . $object->getId() . '">' . str_repeat('&nbsp;&nbsp;', $object->getConfiguration('parentNumber')) . $object->getName() . '</option>';
112+
foreach (jeedom::getConfiguration('eqLogic:category') as $key => $value) {
113+
echo '<label class="checkbox-inline">';
114+
echo '<input type="checkbox" class="eqLogicAttr" data-l1key="category" data-l2key="' . $key . '" >' . $value['name'];
115+
echo '</label>';
106116
}
107-
echo $options;
108117
?>
109-
</select>
110-
</div>
111-
</div>
112-
<div class="form-group">
113-
<label class="col-sm-2 control-label">{{Catégorie}}</label>
114-
<div class="col-sm-8">
115-
<?php
116-
foreach (jeedom::getConfiguration('eqLogic:category') as $key => $value) {
117-
echo '<label class="checkbox-inline">';
118-
echo '<input type="checkbox" class="eqLogicAttr" data-l1key="category" data-l2key="' . $key . '" />' . $value['name'];
119-
echo '</label>';
120-
}
121-
?>
122-
</div>
123-
</div>
124-
<div class="form-group">
125-
<label class="col-sm-2 control-label"></label>
126-
<div class="col-sm-9">
127-
<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr" data-l1key="isEnable" checked />{{Activer}}</label>
128-
<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr" data-l1key="isVisible" checked />{{Visible}}</label>
118+
</div>
129119
</div>
130-
</div>
131-
<div class="form-group">
132-
<label class="col-sm-2 control-label">{{Auto-actualisation (cron)}}</label>
133-
<div class="col-sm-2">
134-
<input type="text" class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="autorefresh" placeholder="{{Auto-actualisation (cron)}}" />
120+
<div class="form-group">
121+
<label class="col-sm-4 control-label">{{Options}}</label>
122+
<div class="col-sm-6">
123+
<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr" data-l1key="isEnable" checked>{{Activer}}</label>
124+
<label class="checkbox-inline"><input type="checkbox" class="eqLogicAttr" data-l1key="isVisible" checked>{{Visible}}</label>
125+
</div>
135126
</div>
136-
<div class="col-sm-1">
137-
<i class="fas fa-question-circle cursor floatright" id="bt_cronGenerator"></i>
127+
128+
<legend><i class="fas fa-cogs"></i> {{Paramètres spécifiques}}</legend>
129+
<div class="form-group">
130+
<label class="col-sm-4 control-label">{{Auto-actualisation}}
131+
<sup><i class="fas fa-question-circle tooltips" title="{{Fréquence de rafraîchissement des commandes infos de l'équipement}}"></i></sup>
132+
</label>
133+
<div class="col-sm-6">
134+
<div class="input-group">
135+
<input type="text" class="eqLogicAttr form-control roundedLeft" data-l1key="configuration" data-l2key="autorefresh" placeholder="{{Cliquer sur ? pour afficher l'assistant cron}}">
136+
<span class="input-group-btn">
137+
<a class="btn btn-default cursor jeeHelper roundedRight" data-helper="cron" title="Assistant cron">
138+
<i class="fas fa-question-circle"></i>
139+
</a>
140+
</span>
141+
</div>
142+
</div>
138143
</div>
139-
</div>
140-
<div class="form-group">
141-
<label class="col-sm-2 control-label">{{Délai avant d'actualiser les infos suite à une action (en secondes)}}</label>
142-
<div class="col-sm-2">
143-
<input type="text" class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="delayBeforeRefrehInfo" />
144+
<div class="form-group">
145+
<label class="col-sm-4 control-label">{{Délai avant d'actualiser les infos suite à une action (en secondes)}}</label>
146+
<div class="col-sm-6">
147+
<input type="text" class="eqLogicAttr form-control" data-l1key="configuration" data-l2key="delayBeforeRefrehInfo" />
148+
</div>
144149
</div>
145150
</div>
146151
</fieldset>

0 commit comments

Comments
 (0)