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.

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

Stable 4.4.4 #2517

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion core/config/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.4.3
4.4.4
4 changes: 2 additions & 2 deletions core/js/eqLogic.class.js
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,8 @@ jeedom.eqLogic.refreshValue = function(_params) {
if (jeedomUtils.userDevice.type == undefined) {
eqLogic.triggerEvent('create')
jeedomUtils.setTileSize('.eqLogic')
} else if (jeeFrontEnd.dashboard && jeeFrontEnd.dashboard.editWidgetMode && typeof jeeFrontEnd.dashboard.editWidgetMode == 'function' && document.getElementById('bt_editDashboardWidgetOrder') != null) {
jeeFrontEnd.dashboard.editWidgetMode()
} else if (jeedomUI && typeof jeeFrontEnd?.dashboard?.editWidgetMode == 'function' && document.getElementById('bt_editDashboardWidgetOrder') != null) {
jeeFrontEnd.dashboard.editWidgetMode(jeedomUI?.isEditing)
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions core/js/jeedom.class.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ jeedom.changes = function() {
continue
}
if (data.result[i].name == 'eqLogic::update') {
if(jeedomUI?.isEditing){
continue
}
eqLogic_update.push(data.result[i].option)
continue
}
Expand Down
2 changes: 1 addition & 1 deletion desktop/css/coreWidgets.css
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ div.cmd-widget.widget-compass .widget-compass-needle-placer {
}

div.cmd-widget.widget-compass .widget-compass-needle {
position: relative;
position: fixed;
width: 0px;
height: 0px;
border: 8px solid transparent;
Expand Down
2 changes: 1 addition & 1 deletion desktop/js/display.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if (!jeeFrontEnd.display) {

this.setSortables()
var checkContextMenuCallback = function(_el) {
_el.trigger('change')
_el.triggerEvent('change')
}
jeedomUtils.setCheckContextMenu(checkContextMenuCallback)
},
Expand Down
9 changes: 6 additions & 3 deletions desktop/js/history.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ if (!jeeFrontEnd.history) {
var text = '{{Comparer}} ' + diffPeriod + ' {{jours avec}} ' + cdiffPeriod + ' {{jours il y a}} ' + document.getElementById('sel_comparePeriod').selectedOptions[0].text
_md.querySelector('.spanCompareDiffResult').textContent = text
if (diffPeriod != cdiffPeriod) {
jeeDialog.get('#md_historyCompare').show()
_md.querySelector('.spanCompareDiff').seen()
} else {
jeeDialog.get('#md_historyCompare').hide()
_md.querySelector('.spanCompareDiff').unseen()
}
return
}
Expand All @@ -237,7 +237,7 @@ if (!jeeFrontEnd.history) {

var m_startDate = moment(startDate, 'YYYY-MM-DD HH:mm:ss')
var endDate = m_startDate.subtract(num, type).format("YYYY-MM-DD")
document.getElementById('in_compareStart1').value = endDate
_md.querySelector('#in_compareStart1').value = endDate

//range to compare with:
num = _md.querySelector('#sel_comparePeriod').value.split('.')[0]
Expand All @@ -247,6 +247,7 @@ if (!jeeFrontEnd.history) {
m_startDate = moment(startDate, 'YYYY-MM-DD HH:mm:ss')
endDate = m_startDate.subtract(num, type).format("YYYY-MM-DD")
_md.querySelector('#in_compareStart2').value = endDate
_md.querySelector('input.in_datepicker').triggerEvent('change')
return
}

Expand All @@ -263,6 +264,7 @@ if (!jeeFrontEnd.history) {
m_startDate = moment(startDate, 'YYYY-MM-DD HH:mm:ss')
endDate = m_startDate.subtract(num, type).format("YYYY-MM-DD")
_md.querySelector('#in_compareStart2').value = endDate
_md.querySelector('input.in_datepicker').triggerEvent('change')
return
}
})
Expand All @@ -274,6 +276,7 @@ if (!jeeFrontEnd.history) {
},
onShown: function() {
jeeDialog.get('#md_historyCompare', 'content').querySelector('#md_getCompareRange').removeClass('hidden')
jeedomUtils.datePickerInit()
},
buttons: {
confirm: {
Expand Down
2 changes: 1 addition & 1 deletion desktop/modal/eqLogic.dashboard.edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
$display .= '<table class="table table-condensed">';

//Editable name:
$display .= '<tr><td>{{Name}}</td><td colspan="2"><input class="input-sm ' . $thisclassAttrib . '" data-l1key="name" style="width: 100%;"></td>';
$display .= '<tr><td>{{Nom}}</td><td colspan="2"><input class="input-sm ' . $thisclassAttrib . '" data-l1key="name" style="width: 100%;"></td>';

//visible and td widths:
$display .= '<tr><td>{{Visible}}<input type="checkbox" class="' . $thisclassAttrib . '" data-l1key="isVisible" style="float: right"></td>';
Expand Down
6 changes: 3 additions & 3 deletions desktop/php/administration.php
Original file line number Diff line number Diff line change
Expand Up @@ -526,14 +526,14 @@
<legend>{{Tuiles}}</legend>
<div class="form-group">
<label class="col-xs-4 control-label">{{Pas}}
<sup><i class="fas fa-question-circle" tooltip="{{Contraint la hauteur et la largeur des tuiles tous les x pixels (minimum 60*80px)}}"></i></sup>
<sup><i class="fas fa-question-circle" tooltip="{{Contraint la hauteur et la largeur des tuiles tous les x pixels}}"></i></sup>
</label>
<div class="col-md-6 col-xs-8">
<div class="input-group">
<span class="input-group-addon roundedLeft">{{Hauteur}}</span>
<input type="number" min="1" step="10" max="300" class="configKey form-control ispin" data-l1key="widget::step::height" data-reload="1" placeholder="60">
<input type="number" min="1" step="1" max="300" class="configKey form-control ispin" data-l1key="widget::step::height" data-reload="1" placeholder="60">
<span class="input-group-addon ">{{Largeur}}</span>
<input type="number" min="1" step="10" max="300" class="configKey form-control ispin roundedRight" data-l1key="widget::step::width" data-reload="1" placeholder="80">
<input type="number" min="1" step="1" max="300" class="configKey form-control ispin roundedRight" data-l1key="widget::step::width" data-reload="1" placeholder="80">
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion desktop/php/object.php
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
<div class="form-group">
<div class="col-sm-7 col-sm-offset-3 objectImg">
<a class="btn btn-sm btn-danger" id="bt_removeBackgroundImage" style="position:absolute;bottom:0;"><i class="fas fa-trash"></i> {{Enlever l'image}}</a>
<img class="img-responsive" src="" width="240px" />
<img class="img-responsive" src="" width="240px" style="min-height : 50px" />
</div>
</div>
<div class="form-group">
Expand Down
3 changes: 1 addition & 2 deletions desktop/php/update.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
echo '<div class="alert alert-danger">{{Erreur sur la vérification des mises à jour :}}' . ' ' . $e->getMessage() . '</div>';
}
}

$hardware = jeedom::getHardwareName();
$distrib = system::getDistrib();
$coreRemoteVersion = update::byLogicalId('jeedom')->getRemoteVersion();
Expand Down Expand Up @@ -37,7 +36,7 @@
}
}
$logUpdate = log::getLastLine('update');
if (strpos($logUpdate, 'END UPDATE')) {
if (strpos($logUpdate, 'END UPDATE') || count(system::ps('install/update.php', 'sudo')) == 0) {
sendVarToJS('jeephp2js.isUpdating', '0');
} else {
sendVarToJS('jeephp2js.isUpdating', '1');
Expand Down
8 changes: 8 additions & 0 deletions docs/fr_FR/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
>
>Même si elles ne sont pas forcément visibles au premier abord, la version 4.4 de Jeedom apporte des modifications majeures avec une interface qui a été complètement réécrite pour une maitrise complète et surtout un gain de fluidité de navigation inégalé. La gestion des dépendances PHP à également été revue afin de pouvoir les maintenir à jour automatiquement. Même si l'équipe Jeedom et les beta testeurs ont fait énormément de tests, il y a autant de version de jeedom qu'il y a de jeedom... Il n'est donc pas possible de garantir un bon fonctionnement dans 100% des cas cependant en cas de souci vous pouvez [ouvrir un sujet sur le forum avec l'étiquette `v4_4`](https://community.jeedom.com/) ou contacter le support depuis votre profil market *(sous condition d'être détenteur d'un service pack ou supérieur)*.

## 4.4.4

- Ajout d'exemple de code sur la documentation de personnalisation de jeedom (a consulter pour ceux voulant pousser la personnalisation)
- Correction d'un bug sur la fenetre de choix des dates pour la comparaison d'historique
- Correction d'un bug sur le dashboard sur le déplacement des commandes qui n'était pas immediatement refleté sur le widget
- Correction de bugs diverse (affichage et texte)
- Correction d'un bug sur la page de mise à jour qui indiqué qu'une mise à jour était en cours alors que non

## 4.4.3

- Correction de l'erreur 401 lors de l'ouverture d'un design avec un utilisateur non administrateur
Expand Down
26 changes: 26 additions & 0 deletions docs/fr_FR/custom.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,29 @@ Dans ce cas, deux solutions:
- Ouvrez un navigateur en mode rescue : `IP/index.php?rescue=1`
- Se connecter en SSH et supprimer les fichiers de customisation : `desktop/custom` et `mobile/custom`

## Exemple de personalisation avancée dans le CSS

Tous ces exemple sont a mettre dans le fichier CSS (n'oubliez pas d'activer la personnalisation avancée en haut)

### Suppression des barres de defilement sur les widgets

```
.eqLogic-widget .cmds{
overflow-x: hidden !important;
overflow-y: hidden !important;
}
```

### Supprimer la largeur/hauteur minimal des widgets

Ca permets d'avoir des widgets plus petit (largeur [min-width], hauteur [min-height]) mais attention cela peut rendre l'affichage moins jolie

```
div.cmd-widget .content,
div.cmd-widget .content-sm,
div.cmd-widget .content-lg,
div.cmd-widget .content-xs {
min-width: unset !important;
min-height: unset !important;
}
```
8 changes: 0 additions & 8 deletions install/update/4.4.2.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@
}
}

//New grid steps:
if (config::byKey('widget::step::width', 'core', 0) < 40) {
config::save('widget::step::width', 40, 'core');
}
if (config::byKey('widget::step::height', 'core', 0) < 30) {
config::save('widget::step::height', 30, 'core');
}

//Theme config renamed & legacy removed:
foreach (['default_bootstrap_theme' => 'jeedom_theme_main', 'default_bootstrap_theme_night' => 'jeedom_theme_alternate'] as $oldTheme => $newTheme) {
if (($value = config::byKey($oldTheme, 'core')) !== '') {
Expand Down
2 changes: 1 addition & 1 deletion mobile/js/equipment.js
Original file line number Diff line number Diff line change
Expand Up @@ -285,4 +285,4 @@ function displayEqsBySummary(_objectsAll, _objectId, _summary) {
window.triggerEvent('resize')
}
})
}
}
Loading