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

Fix pour affichage v4.1 #105

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix pour affichage v4.1 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8251599
Fix for v4.1
Pulpyyyy Jun 29, 2020
fd3b767
fix for v4.1
Pulpyyyy Jun 29, 2020
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
8 changes: 4 additions & 4 deletions desktop/js/jMQTT.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,14 +553,14 @@ function addCmdToTable(_cmd) {
tr += '</td>';
}

tr += '<td><textarea class="cmdAttr form-control input-sm" data-l1key="name" style="height:65px;" placeholder="{{Nom de l\'info}}" /></td>';
tr += '<td><textarea class="cmdAttr form-control input-sm" data-l1key="name" style="height:65px;" placeholder="{{Nom de l\'info}}" /></textarea></td>';
tr += '<td>';
tr += '<input class="cmdAttr form-control type input-sm" data-l1key="type" value="info" disabled style="margin-bottom:5px;width:120px;" />';
tr += '<span class="cmdAttr subType" subType="' + init(_cmd.subType) + '"></span>';
tr += '</td><td>';
tr += '<textarea class="cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="topic" style="height:65px;" ' + disabled + ' placeholder="{{Topic}}"/>';
tr += '<textarea class="cmdAttr form-control input-sm" data-l1key="configuration" data-l2key="topic" style="height:65px;" ' + disabled + ' placeholder="{{Topic}}"/></textarea>';
tr += '</td><td>';
tr += '<textarea class="form-control input-sm" data-key="value" style="height:65px;" ' + disabled + ' placeholder="{{Valeur}}" readonly=true />';
tr += '<textarea class="form-control input-sm" data-key="value" style="height:65px;" ' + disabled + ' placeholder="{{Valeur}}" readonly=true /></textarea>';
tr += '</td><td class="fitwidth">';
tr += '<input class="cmdAttr form-control input-sm" data-l1key="unite" placeholder="{{Unité}}"></td><td>';
if (is_numeric(_cmd.id)) {
Expand Down Expand Up @@ -830,4 +830,4 @@ $('body').off('jMQTT::eqptAdded').on('jMQTT::eqptAdded', function (_event,_optio
}, 3000);
}
}
});
});
4 changes: 2 additions & 2 deletions desktop/php/jMQTT.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ class="btn btn-sm btn-default"><input type="radio" autocomplete="off"><i class="
</div>
</div>

<?php include_file('desktop', 'jMQTT-min', 'js', 'jMQTT'); ?>
<?php include_file('desktop', 'jMQTT', 'js', 'jMQTT'); ?>
<?php include_file('core', 'plugin.template', 'js'); ?>
<?php include_file('3rdparty', 'jquery.treegrid', 'css', 'jMQTT'); ?>
<?php include_file('3rdparty', 'jquery.treegrid.min', 'js', 'jMQTT'); ?>
Expand All @@ -282,4 +282,4 @@ class="btn btn-sm btn-default"><input type="radio" autocomplete="off"><i class="
}
?>

</script>
</script>