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

Fix graphics #3

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Fix graphics #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6afbe2d
Fix graphics
cyrilphoenix71 Jan 16, 2019
ebce8bd
little fix
cyrilphoenix71 Jan 16, 2019
1709946
oubli
cyrilphoenix71 Jan 16, 2019
4bd9906
Change search list
cyrilphoenix71 Jan 16, 2019
780132b
little fix
cyrilphoenix71 Jan 16, 2019
b7336c8
try to clean styles
cyrilphoenix71 Jan 17, 2019
a5576af
fix size
cyrilphoenix71 Jan 17, 2019
c5d62c2
Merge branch 'develop' into feature/FixGraphics
DanoneKiD Feb 6, 2019
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
21 changes: 19 additions & 2 deletions desktop/css/meross.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,27 @@
height: auto;
}

.eqlogic-box-title {
.eqlogicBoxTitle {
margin-top: 5px;
margin-bottom: 5px;
font-size: 25px;
font-weight: 300;
color: white
color: white;
}

.eqlogicConfigBtn {
text-align: center;
background-color : #ffffff;
color:#767676;
height : 130px;
width : 150px;
font-size : 5em;
display: block;
}

.eqlogicConfigBtnTitle {
font-size : 0.2em;
word-break : break-all;
white-space : pre-wrap;
word-wrap : break-word;
}
6 changes: 5 additions & 1 deletion desktop/js/meross.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ $('.eqLogicAction[data-action=sync]').on('click', function () {
});
});

$("#bt_displayListEqlogiq").on('click', function () {
$('#ListEqlogiq').toggle();
});

/*
* Fonction pour l'ajout de commande, appellé automatiquement par plugin.Meross
*/
Expand Down Expand Up @@ -121,7 +125,7 @@ function addCmdToTable(_cmd) {
tr += '<td>';
if (is_numeric(_cmd.id)) {
tr += '<a class="btn btn-default btn-xs cmdAction" 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" data-action="test"><i class="fa fa-rss">&nbsp;&nbsp;</i>{{Tester}}</a>';
}
tr += '</tr>';
$('#table_cmd tbody').append(tr);
Expand Down
106 changes: 57 additions & 49 deletions desktop/php/meross.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,46 +25,29 @@
?>

<div class="row row-overflow">
<div class="col-lg-2 col-md-3 col-sm-4">
<div class="bs-sidebar">
<ul id="ul_eqLogic" class="nav nav-list bs-sidenav">
<li class="filter" style="margin-bottom: 5px;">
<input class="filter form-control input-sm" placeholder="{{Rechercher}}" style="width: 100%" />
</li>
<?php
foreach ($eqLogics as $eqLogic) {
$opacity = ($eqLogic->getIsEnable()) ? '' : jeedom::getConfiguration('eqLogic:style:noactive');
echo '<li class="cursor li_eqLogic" data-eqLogic_id="' . $eqLogic->getId() . '" style="' . $opacity . '"><a>' . $eqLogic->getHumanName(true) . '</a></li>';
}
?>
</ul>
</div>
</div>

<div class="col-lg-10 col-md-9 col-sm-8 eqLogicThumbnailDisplay" style="border-left: solid 1px #EEE; padding-left: 25px;">
<legend><i class="fa fa-cog"></i> {{Gestion}}</legend>
<div class="eqLogicThumbnailContainer">
<div class="cursor eqLogicAction" data-action="sync" style="text-align: center; background-color : #ffffff; height : 120px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 160px;margin-left : 10px;">
<i class="fa fa-sync" style="font-size : 6em;color:#33b8cc;"></i>
<br>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;">{{ Synchroniser }}</span>
<div class="col-lg-12 col-md-9 col-sm-8 eqLogicThumbnailDisplay">
<legend><i class="fa fa-cog">&nbsp;&nbsp;</i>{{Gestion}}</legend>
<div class="eqLogicThumbnailContainer form-group">
<div class="cursor eqLogicAction eqlogicConfigBtn" data-action="sync">
<div class="fa fa-sync icon_theme_color"></div>
<div class="eqlogicConfigBtnTitle">{{ Synchroniser }}</div>
</div>
<div class="cursor eqLogicAction" data-action="gotoPluginConf" style="text-align: center; background-color : #ffffff; height : 120px;margin-bottom : 10px;padding : 5px;border-radius: 2px;width : 160px;margin-left : 10px;">
<i class="fa fa-wrench" style="font-size : 6em;color:#767676;"></i>
<br>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;">{{ Configuration }}</span>
<div class="cursor eqLogicAction eqlogicConfigBtn" data-action="gotoPluginConf" >
<div class="fa fa-wrench"></div>
<div class="eqlogicConfigBtnTitle">{{ Configuration }}</div>
</div>
<div class="cursor" id="bt_healthmeross" style="text-align: center; background-color : #ffffff; height : 120px;margin-bottom : 10px;padding : 5px; border-radius: 2px;width : 160px;margin-left : 10px;">
<i class="fa fa-medkit" style="font-size : 6em;color:#767676;"></i>
<br>
<span style="font-size : 1.1em;position:relative; top : 15px;word-break: break-all;white-space: pre-wrap;word-wrap: break-word;">{{ Santé }}</span>
<div class="cursor eqlogicConfigBtn" id="bt_healthmeross">
<div class="fa fa-medkit"></div>
<div class="eqlogicConfigBtnTitle">{{ Santé }}</div>
</div>
</div>

<br>

<legend><i class="fa fa-table"></i> {{Mes Meross}}</legend>
<legend><i class="fa fa-table">&nbsp;&nbsp;</i>{{Mes Meross}}</legend>
<div class="eqLogicThumbnailContainer">
<div class="input-group">
<div class="input-group-addon"><i class="fas fa-search"></i></div>
<input class="filter form-control" placeholder="{{Rechercher...}}" id="in_searchEq">
</div>
<?php
foreach ($eqLogics as $eqLogic) {
$opacity = ($eqLogic->getIsEnable()) ? '' : jeedom::getConfiguration('eqLogic:style:noactive');
Expand All @@ -82,11 +65,32 @@
</div>
</div>

<div class="col-lg-10 col-md-9 col-sm-8 eqLogic" style="display: none;">
<section class="content-header">
<div class="col-lg-2 col-md-3 col-sm-4" id="ListEqlogiq" style="display: none;">
<div class="bs-sidebar">
<ul id="ul_eqLogic" class="nav nav-list bs-sidenav">
<legend><i class="fa fa-table">&nbsp;&nbsp;</i>{{Mes Meross}}</legend>
<li class="filter">
<div class="input-group">
<div class="input-group-addon"><i class="fas fa-search"></i></div>
<input class="filter form-control" placeholder="{{Rechercher...}}">
</div>
</li>
<?php
foreach ($eqLogics as $eqLogic) {
$opacity = ($eqLogic->getIsEnable()) ? '' : jeedom::getConfiguration('eqLogic:style:noactive');
echo '<li class="cursor li_eqLogic" data-eqLogic_id="' . $eqLogic->getId() . '" style="' . $opacity . '"><a>' . $eqLogic->getHumanName(true) . '</a></li>';
}
?>
</ul>
</div>
</div>

<div class="eqLogic" style="display: none;padding-left:0px">
<section class="content-header" style="padding-top:0px">
<div class="action-bar">
<div class="action-group">
<a class="btn btn-danger btn-action-bar eqLogicAction" data-action="returnToThumbnailDisplay"><i class="fas fa-chevron-left">&nbsp;&nbsp;</i>Retour</a>
<a class="btn btn-action btn-action-bar eqLogicAction" id="bt_displayListEqlogiq"><i class="fas fa-list">&nbsp;&nbsp;</i>Liste</a>
</div>
<div class="action-group">
<a class="btn btn-success eqLogicAction pull-right" data-action="save"><i class="fa fa-check-circle">&nbsp;&nbsp;</i>{{Sauvegarder}}</a>
Expand All @@ -100,26 +104,27 @@
<ul class="nav nav-tabs pull-right" role="tablist">
<li role="presentation" class="active">
<a href="#eqlogictab" aria-controls="home" role="tab" data-toggle="tab">
<i class="fa fa-tachometer"></i> {{Equipement}}
<i class="fa fa-tachometer">&nbsp;&nbsp;</i>{{Equipement}}
</a>
</li>
<li role="presentation">
<a href="#commandtab" aria-controls="profile" role="tab" data-toggle="tab">
<i class="fa fa-list-alt"></i> {{Commandes}}
<i class="fa fa-list-alt">&nbsp;&nbsp;</i>{{Commandes}}
</a>
</li>
<h4 class="label label-primary pull-right label-sticker">{{ID : }}<span class="eqLogicAttr" data-l1key="id"></span></h4>
<li class="header pull-left"><i class="fas fa-pencil-alt">&nbsp;&nbsp;</i>{{Edition équipement}}</li>
</ul>
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="eqlogictab">
<br />
<div class="row">
<!-- Configuration -->
<div class="col-md-8">
<div class="box box-widget widget-user-2">
<div class="widget-user-header backgroundColor">
<h3 class="eqlogic-box-title">{{ Configuration équipement }}</h3>
<h3 class="eqlogicBoxTitle">{{Configuration équipement}}</h3>
</div>
<div class="box-body">
<div class="box-body" style="margin-top:10px">
<form class="form-horizontal">
<fieldset>
<div class="form-group">
Expand Down Expand Up @@ -147,21 +152,21 @@
<div class="col-sm-9">
<?php
foreach (jeedom::getConfiguration('eqLogic:category') as $key => $value) {
echo '<label class="checkbox-inline" for="category-' . $key . '">';
echo '<input type="checkbox" id="category-' . $key . '" class="eqLogicAttr" data-l1key="category" data-l2key="' . $key . '" />' . $value['name'];
echo '<label class="checkbox-inline" for="category-' . $key . '" style="padding-top: 0px">';
echo '<input type="checkbox" id="category-' . $key . '" class="eqLogicAttr" data-l1key="category" data-l2key="' . $key . '" />&nbsp;' . $value['name'];
echo '</label>';
}
?>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"></label>
<label class="col-sm-3 control-label">{{Options}}</label>
<div class="col-sm-9">
<label class="checkbox-inline" for="is-enable">
<label class="checkbox-inline" style="padding-top: 0px" for="is-enable">
<input type="checkbox" class="eqLogicAttr" data-l1key="isEnable" checked="checked" id="is-enable" />
{{Activer}}
</label>
<label class="checkbox-inline" for="is-visible">
<label class="checkbox-inline" style="padding-top: 0px" for="is-visible">
<input type="checkbox" class="eqLogicAttr" data-l1key="isVisible" checked="checked" id="is-visible" />
{{Visible}}
</label>
Expand All @@ -178,7 +183,7 @@
<div class="col-md-4">
<div class="box box-widget widget-user-2">
<div class="widget-user-header backgroundColor">
<h3 class="eqlogic-box-title">{{ Informations Meross Cloud }}</h3>
<h3 class="eqlogicBoxTitle">{{ Informations Meross Cloud }}</h3>
</div>
<div class="box-footer no-padding">
<ul class="nav nav-stacked">
Expand All @@ -200,7 +205,7 @@
</div>
</div>
<!-- End Informations -->
</div>
</div>

</div>
<div role="tabpanel" class="tab-pane" id="commandtab">
Expand All @@ -217,10 +222,13 @@
<tbody>
</tbody>
</table>
<div class="btn btn-success btn-sm cmdAction" data-action="add">
<i class="fa fa-plus-circle">&nbsp;&nbsp;</i>{{Commandes}}
</div>
</div>
</div>
</div>
</section>
</section>
</div>
</div>

Expand Down
26 changes: 14 additions & 12 deletions plugin_info/configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,14 @@
?>

<form class="form-horizontal">
<fieldset>
<div class="col-lg-4 col-lg-offset-4 col-md-6 col-md-offset-3 col-xs-12">
<div class="form-group">
<label for="merossEmail">{{Email}}</label>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-envelope"></i></span>
<input type="email" class="configKey form-control" placeholder="{{Email de votre compte Meross}}"
data-l1key="merossEmail" id="merossEmail">
</div>
</div>
<fieldset>
<legend>{{Connexion au Cloud Meross}}</legend>
<div class="col-lg-4 col-lg-offset-4 col-md-6 col-md-offset-3 col-xs-12">
<div class="form-group">
<label for="merossEmail">{{Email}}</label>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-envelope"></i></span>
<input type="email" class="configKey form-control" placeholder="{{Email de votre compte Meross}}" data-l1key="merossEmail" id="merossEmail">
</div>

<br>
Expand All @@ -53,5 +51,9 @@
</div>
</div>
</div>
</fieldset>
</form>

</div>
</div>
</fieldset>
</form>