remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

Merge branch 'dev' into blog_v3

Browse Source
This commit is contained in:
Fred Tempez 2020-07-06 19:51:16 +02:00
commit 43f2ccca4f
3 changed files with 121 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/module/config/view/index/index.css
View File

@ -14,7 +14,7 @@
@import url("site/data/admin.css");
.blockContainer:not(#info) {
.blockContainer {
display : none;
}

4
core/module/config/view/index/index.js.php
View File

@ -39,7 +39,7 @@ $( document).ready(function() {
* Initialisation des blocs
*/
var i = ["info", "setup", "social", "ceo", "network", "smtp", "login", "logs", "script", "system" ];
var i = [ "social", "ceo", "network", "smtp", "login", "logs", "script", "system" ];
$.each(i,function(e) {
if (getCookie(i[e]) === "true") {
$("#" + i[e]).find(".zwiico-plus").hide();
@ -62,7 +62,7 @@ $( document).ready(function() {
* true = bloc déplié
*/
document.cookie = $(this).attr('id') + "=" + $(this).find(".zwiico-minus").is(":visible");
}).on("click", "span > input, input, textarea, label, option, button, a, .blockContainer", function(e) {
}).on("click", "span > input, input, textarea, label, option, button, a:not(.inputFile), .blockContainer", function(e) {
// Empêcher les déclenchements dans les blocs
e.stopPropagation();
});

18
core/module/config/view/index/index.php
View File

@ -28,12 +28,8 @@
</div>
<div class="row">
<div class="col12">
<div class="block" id="info">
<h4><?php
echo template::ico('plus','right');
echo template::ico('minus','right');
?>Informations générales</h4>
<div class="blockContainer" id="info">
<div class="block">
<h4>Informations générales</h4>
<div class="row">
<div class="col4">
<?php
@ -69,15 +65,10 @@
</div>
</div>
</div>
</div>
<div class="row">
<div class="col12">
<div class="block" id="setup">
<h4><?php
echo template::ico('plus','right');
echo template::ico('minus','right');
?>Paramètres</h4>
<div class="blockContainer">
<div class="block">
<h4>Paramètres</h4>
<?php $error = helper::urlGetContents('http://zwiicms.com/update/' . common::ZWII_UPDATE_CHANNEL . '/version');?>
<div class="row">
<div class="col4">
@ -174,7 +165,6 @@
</div>
</div>
</div>
</div>
<div class="row">
<div class="col12">
<div class="block" id="social">