From d5a2f35a0f6efa5618a99520e505cbb59d0c8f8c Mon Sep 17 00:00:00 2001 From: Prof Langues Date: Fri, 3 May 2019 08:43:29 +0200 Subject: [PATCH 1/6] gitignore --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d87af51a..0db760b2 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,4 @@ site/file/thumb/* # Trucs .gitignore -core/vendor/tinymce/link_list.json -core/vendor/tinymce/link_list.json - +core/vendor/tinymce/link_list.json \ No newline at end of file From 24f6b72583055a4acfd3d83c880eb8a804213f43 Mon Sep 17 00:00:00 2001 From: Prof Langues Date: Fri, 3 May 2019 09:44:57 +0200 Subject: [PATCH 2/6] =?UTF-8?q?[9.1.00]=20Options=20de=20pages=20masqu?= =?UTF-8?q?=C3=A9es=20pour=20les=20barres?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/page/view/edit/edit.js.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php index 4c2194da..51450ae4 100755 --- a/core/module/page/view/edit/edit.js.php +++ b/core/module/page/view/edit/edit.js.php @@ -124,7 +124,9 @@ $( document ).ready(function() { $("#pageEditDisplayMenuWrapper").addClass("disabled"); $("#pageEditDisplayMenuWrapper").slideDown(); $("#pageEditGroupWrapper").removeClass("disabled"); - $("#pageEditGroupWrapper").slideUp(); + $("#pageEditGroupWrapper").slideUp(); + $("#PageEditMenuSpecial").removeClass("disabled"); + $("#PageEditMenuSpecial").slideUp(); } else { $("#pageEditDisplayMenuWrapper").removeClass("disabled"); $("#pageEditDisplayMenuWrapper").slideUp(); @@ -352,7 +354,7 @@ pageEditBlockDOM.on("change", function() { $("#pageEditDisplayMenuWrapper").addClass("disabled"); $("#pageEditDisplayMenuWrapper").slideDown(); $("#pageEditGroupWrapper").removeClass("disabled"); - $("#pageEditGroupWrapper").slideUp(); + $("#pageEditGroupWrapper").slideUp(); } else { $("#PageEditMenu").addClass("disabled"); $("#PageEditMenu").slideDown(); From affc54b2a575d28b55984e969610b0adba8c0fac Mon Sep 17 00:00:00 2001 From: Prof Langues Date: Fri, 3 May 2019 09:48:06 +0200 Subject: [PATCH 3/6] local --- core/vendor/tinymce/link_list.json | 2 +- index.php | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/core/vendor/tinymce/link_list.json b/core/vendor/tinymce/link_list.json index 5f706e0b..41d6f312 100644 --- a/core/vendor/tinymce/link_list.json +++ b/core/vendor/tinymce/link_list.json @@ -1 +1 @@ -[{"title":"Accueil","value":"?accueil","menu":[{"title":"Enfant","value":"?enfant"},{"title":"Mise en page","value":"?mise-en-page"},{"title":"Menu lat\u00e9ral","value":"?menu-lateral"}]},{"title":"Priv\u00e9e","value":"?privee"},{"title":"Blog","value":"?blog"},{"title":"Galeries","value":"?galeries"},{"title":"Site de Zwii","value":"?site-de-zwii"},{"title":"Contact","value":"?contact"}] +[{"title":"Accueil","value":"?accueil","menu":[{"title":"Accueil","value":"?accueil"},{"title":" \u00bb Enfant","value":"?enfant"},{"title":" \u00bb Mise en page","value":"?mise-en-page"},{"title":" \u00bb Menu lat\u00e9ral","value":"?menu-lateral"}]},{"title":"Priv\u00e9e","value":"?privee"},{"title":"Blog","value":"?blog"},{"title":"Galeries","value":"?galeries"},{"title":"Site de Zwii","value":"?site-de-zwii"},{"title":"Contact","value":"?contact"}] \ No newline at end of file diff --git a/index.php b/index.php index 69858788..883ea33a 100755 --- a/index.php +++ b/index.php @@ -21,7 +21,29 @@ if(version_compare(PHP_VERSION, '5.6.0', '<')) { /* Set locale to French */ date_default_timezone_set('Europe/Paris'); -setlocale (LC_TIME, 'fr_FR', 'fra'); +setlocale (LC_TIME, 'fra_fra', 'french'); + + +/*Configuration Proxy */ +$proxy = 'cache-etu.univ-artois.fr:3128'; +if (!empty($proxy)) { + $proxy = str_replace('http://', 'tcp://', $proxy); + $context = array( + 'http' => array( + 'proxy' => $proxy, + 'request_fulluri' => true, + 'verify_peer' => false, + 'verify_peer_name' => false, + ), + "ssl"=>array( + "verify_peer"=>false, + "verify_peer_name"=>false + ) + ); + stream_context_set_default($context); +} else { + echo "Proxy not found" . PHP_EOL; +} /** * Initialisation de Zwii @@ -30,4 +52,4 @@ session_start(); require 'core/core.php'; $core = new core; spl_autoload_register('core::autoload'); -echo $core->router(); \ No newline at end of file +echo $core->router(); From a75d3af0ce5db2e821ec75bd53005d6c6635e58e Mon Sep 17 00:00:00 2001 From: Prof Langues Date: Fri, 3 May 2019 10:39:43 +0200 Subject: [PATCH 4/6] =?UTF-8?q?|9.1.0.0]=20Ic=C3=B4nes=20th=C3=A8me=20et?= =?UTF-8?q?=20diverses?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 4 ++-- core/module/theme/view/index/index.php | 4 ++-- core/module/theme/view/manage/manage.php | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/core.php b/core/core.php index 07767582..c6538433 100644 --- a/core/core.php +++ b/core/core.php @@ -2266,7 +2266,7 @@ class layout extends common { if($this->getUser('group') >= self::GROUP_ADMIN) { $rightItems .= '
  • ' . template::ico('users') . '
    • '; $rightItems .= '
  • ' . template::ico('brush') . '
    • '; - $rightItems .= '
  • ' . template::ico('gear') . '
    • '; + $rightItems .= '
  • ' . template::ico('cog-alt') . '
    • '; // Mise à jour automatique if(helper::checkNewVersion() ) { $rightItems .= '
  • ' . template::ico('update colorRed') . '
    • '; @@ -2648,7 +2648,7 @@ class template { %s data-lity > - ' . self::ico('download', 'right') . ' + ' . self::ico('upload', 'right') . ' ', $attributes['class'], diff --git a/core/module/theme/view/index/index.php b/core/module/theme/view/index/index.php index e5180e1c..b92fc11d 100755 --- a/core/module/theme/view/index/index.php +++ b/core/module/theme/view/index/index.php @@ -15,8 +15,8 @@
    'upload', 'href' => helper::baseUrl() . $this->getUrl(0) . '/manage', - 'ico' => 'download', 'value' => 'Thèmes' ]); ?>
    @@ -48,7 +48,7 @@
    helper::baseUrl() . $this->getUrl(0) . '/manage', - 'ico' => 'download', + 'ico' => 'upload', 'value' => 'Thèmes' ]); ?>
    diff --git a/core/module/theme/view/manage/manage.php b/core/module/theme/view/manage/manage.php index f3d85d00..90c978fa 100644 --- a/core/module/theme/view/manage/manage.php +++ b/core/module/theme/view/manage/manage.php @@ -12,10 +12,10 @@
    -

    Importer

    +

    Importer un thème

    'Archive', - 'type' => 2 + 'label' => 'Archive ZIP', + 'type' => 2, ]); ?>
    -

    Exporter

    +

    Exporter un thème

    helper::baseUrl() . 'theme/save', - 'ico' => 'download', + 'ico' => 'download-cloud', 'value' => 'Sauvegarder' ]); ?>
    From aa46570acb512bf0928df15c3ce4df71ae67872c Mon Sep 17 00:00:00 2001 From: fredtempez Date: Fri, 3 May 2019 15:28:04 +0200 Subject: [PATCH 5/6] barre_menu_position --- core/core.php | 18 +++++++++++++++++- core/layout/main.php | 22 ++++------------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/core/core.php b/core/core.php index c6538433..72cbcb12 100644 --- a/core/core.php +++ b/core/core.php @@ -1820,7 +1820,23 @@ class layout extends common { * @param page chargée */ public function showBarContentLeft() { - echo $this->core->output['contentLeft']; + // Position du marqueur + + if ($this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'displayMenu']) === 'none') { + // Pas de menu + echo $this->core->output['contentLeft']; + } else { + // On recherche la position du menu + $mark = strpos('[]',$this->core->output['contentLeft']); + // pas de marqueur menu après le texte + if ($mark === 0 ) { + echo $this->core->output['contentLeft']; + echo '
    - showBarContentLeft(); - // Type de menu affiché - // 0 : aucun - // 1 : menu complet - // 2 : sous-menu de la page parente - if ($this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'displayMenu']) !== 'none') { - ?> + showBarContentLeft(); ?>
    - + +
    showContent(); ?>
    @@ -193,10 +182,7 @@ showBarContentRight(); - // Type de menu affiché - // 0 : aucun - // 1 : menu complet - // 2 : sous-menu de la page parente + if ($this->getData(['page',$this->getData(['page',$this->getUrl(0),'barRight']),'displayMenu']) !== 'none') { ?>