Skip to content
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

Jump to bottom

PR Update pour PH 7.3 + icône #3

Closed
wants to merge 1 commit into from
Closed

PR Update pour PH 7.3 + icône #3

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions desktop/js/ipx800.js
View file
Open in desktop
Expand Up @@ -114,7 +114,7 @@ function addCmdToTable(_cmd) {
}
if (init(_cmd.logicalId) == 'reel') {
tr += '<textarea class="cmdAttr form-control input-sm Formule" data-l1key="configuration" data-l2key="calcul" style="height : 33px;" placeholder="{{Calcul}}"></textarea>';
tr += '<a class="btn btn-default cursor listEquipementInfo" data-input="calcul" style="margin-top : 5px;"><i class="fa fa-list-alt "></i> {{Rechercher équipement}}</a>';
tr += '<a class="btn btn-default cursor listEquipementInfo" data-input="calcul" style="margin-top : 5px;"><i class="fas fa-list-alt "></i> {{Rechercher équipement}}</a>';
tr += '<select class="cmdAttr form-control tooltips input-sm choixFormule" style="margin-top : 5px;" title="{{Formule standard}}" data-l1key="configuration" data-l2key="type">';
tr += '<option value=""></option>';
tr += '<option value="LM35Z">Sonde LM35Z</option>';
Expand Down Expand Up @@ -159,7 +159,7 @@ function addCmdToTable(_cmd) {
} tr += '</td>';
tr += '<td>';
if (is_numeric(_cmd.id)) {
tr += '<a class="btn btn-default btn-xs cmdAction expertModeVisible" data-action="configure"><i class="fa fa-cogs"></i></a> ';
tr += '<a class="btn btn-default btn-xs cmdAction expertModeVisible" data-action="configure"><i class="fas fa-cogs"></i></a> ';
}
tr += '</td>';
table_cmd = '#table_cmd';
Expand Down Expand Up @@ -192,8 +192,8 @@ function addCmdToTable(_cmd) {
tr += '</td>';
tr += '<td>';
if (is_numeric(_cmd.id)) {
tr += '<a class="btn btn-default btn-xs cmdAction expertModeVisible" data-action="configure"><i class="fa fa-cogs"></i></a> ';
tr += '<a class="btn btn-default btn-xs cmdAction" data-action="test"><i class="fa fa-rss"></i> {{Tester}}</a>';
tr += '<a class="btn btn-default btn-xs cmdAction expertModeVisible" data-action="configure"><i class="fas fa-cogs"></i></a> ';
tr += '<a class="btn btn-default btn-xs cmdAction" data-action="test"><i class="fas fa-rss"></i> {{Tester}}</a>';
}
tr += '</td>';
tr += '</tr>';
Expand Down
6 changes: 3 additions & 3 deletions desktop/modal/ipx800.configpush.php
View file
Open in desktop
Expand Up @@ -90,7 +90,7 @@
Attention, chaque case validée renseignera le Push settings concerné de l'ipx800 et effacera la configuration existante. Pour les entrées analogique, les associations à des relais pourront être perdu.
</div>
<div id='div_configurePush' style="display: none;"></div>
<a class="btn btn-warning pull-right" id="bt_ApplyconfigPush" style="color : white;"><i class="fa fa-wrench"></i> {{Appliquer}}</a>
<a class="btn btn-success pull-right" id="bt_UnCheckAll" style="color : white;"><i class="fa fa-square-o"></i> {{Tout décocher}}</a>
<a class="btn btn-success pull-right" id="bt_CheckAll" style="color : white;"><i class="fa fa-check-square-o"></i> {{Tout cocher}}</a>
<a class="btn btn-warning pull-right" id="bt_ApplyconfigPush" style="color : white;"><i class="fas fa-wrench"></i> {{Appliquer}}</a>
<a class="btn btn-success pull-right" id="bt_UnCheckAll" style="color : white;"><i class="fas fa-square-o"></i> {{Tout décocher}}</a>
<a class="btn btn-success pull-right" id="bt_CheckAll" style="color : white;"><i class="fas fa-check-square-o"></i> {{Tout cocher}}</a>
<?php include_file('desktop', 'ipx800', 'js', 'ipx800'); ?>
7 changes: 4 additions & 3 deletions desktop/php/ipx800.php
View file
Open in desktop
Expand Up @@ -2,8 +2,9 @@
if (!isConnect('admin')) {
throw new Exception('{{401 - Accès non autorisé}}');
}
sendVarToJS('eqType', 'ipx800');
$eqLogics = eqLogic::byType('ipx800');
$plugin = plugin::byId('ipx800');
sendVarToJS('eqType', $plugin->getId());
$eqLogics = eqLogic::byType($plugin->getId());
?>

<div class="row row-overflow">
Expand Down Expand Up @@ -301,7 +302,7 @@
<select class="form-control eqLogicAttr" data-l1key="object_id">
<option value="">{{Aucun}}</option>
<?php
foreach (object::all() as $object) {
foreach (jeeobject::all() as $object) {
echo '<option value="' . $object->getId() . '">' . $object->getName() . '</option>'."\n";
}
?>
Expand Down
8 changes: 4 additions & 4 deletions desktop/php/ipx800_analogique.php
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@
<form class="form-horizontal">
<fieldset>
<legend>
<i class="fa fa-arrow-circle-left eqLogicAction cursor" data-action="returnToThumbnailDisplay"></i> {{Général}}
<i class='fa fa-cogs eqLogicAction pull-right cursor expertModeVisible' data-action='configure'></i>
<i class="fas fa-arrow-circle-left eqLogicAction cursor" data-action="returnToThumbnailDisplay"></i> {{Général}}
<i class='fas fa-cogs eqLogicAction pull-right cursor expertModeVisible' data-action='configure'></i>
</legend>
<div class="form-group">
<label class="col-lg-2 control-label">{{Nom de l'entrée analogique}}</label>
Expand All @@ -18,7 +18,7 @@
<select class="form-control eqLogicAttr" data-l1key="object_id">
<option value="">{{Aucun}}</option>
<?php
foreach (object::all() as $object) {
foreach (jeeobject::all() as $object) {
echo '<option value="' . $object->getId() . '">' . $object->getName() . '</option>';
}
?>
Expand Down Expand Up @@ -69,7 +69,7 @@
<form class="form-horizontal">
<fieldset>
<div class="form-actions">
<a class="btn btn-success eqLogicAction" data-action="save"><i class="fa fa-check-circle"></i> {{Sauvegarder}}</a>
<a class="btn btn-success eqLogicAction" data-action="save"><i class="far fa-check-circle"></i> {{Sauvegarder}}</a>
</div>
</fieldset>
</form>
Expand Down
6 changes: 3 additions & 3 deletions desktop/php/ipx800_bouton.php
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@
<form class="form-horizontal">
<fieldset>
<legend>
<i class="fa fa-arrow-circle-left eqLogicAction cursor" data-action="returnToThumbnailDisplay"></i> {{Général}}
<i class='fa fa-cogs eqLogicAction pull-right cursor expertModeVisible' data-action='configure'></i>
<i class="fas fa-arrow-circle-left eqLogicAction cursor" data-action="returnToThumbnailDisplay"></i> {{Général}}
<i class='fas fa-cogs eqLogicAction pull-right cursor expertModeVisible' data-action='configure'></i>
</legend>
<div class="form-group">
<label class="col-lg-2 control-label">{{Nom de l'entrée numérique}}</label>
Expand All @@ -18,7 +18,7 @@
<select class="form-control eqLogicAttr" data-l1key="object_id">
<option value="">{{Aucun}}</option>
<?php
foreach (object::all() as $object) {
foreach (jeeobject::all() as $object) {
echo '<option value="' . $object->getId() . '">' . $object->getName() . '</option>';
}
?>
Expand Down
2 changes: 1 addition & 1 deletion desktop/php/ipx800_compteur.php
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
<select class="form-control eqLogicAttr" data-l1key="object_id">
<option value="">{{Aucun}}</option>
<?php
foreach (object::all() as $object) {
foreach (jeeobject::all() as $object) {
echo '<option value="' . $object->getId() . '">' . $object->getName() . '</option>';
}
?>
Expand Down
2 changes: 1 addition & 1 deletion desktop/php/ipx800_relai.php
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
<select class="form-control eqLogicAttr" data-l1key="object_id">
<option value="">{{Aucun}}</option>
<?php
foreach (object::all() as $object) {
foreach (jeeobject::all() as $object) {
echo '<option value="' . $object->getId() . '">' . $object->getName() . '</option>';
}
?>
Expand Down