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

Merge branch 'master' of https://github.com/fredtempez/ZwiiCMS

Browse Source
This commit is contained in:
fredtempez 2019-05-03 22:36:27 +02:00
commit 6cfcd35e78
7 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -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

1
core/core.php
View File

@ -1838,7 +1838,6 @@ class layout extends common {
/**
* Affiche le contenu de la barre droite
* @param page chargée
*/
public function showBarContentRight() {
// Détermine si le menu est présent

6
core/module/page/view/edit/edit.js.php
View File

@ -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();

4
core/module/theme/view/index/index.php
View File

@ -15,8 +15,8 @@
</div>
<div class="col2">
<?php echo template::button('themeManage', [
'ico' => 'upload',
'href' => helper::baseUrl() . $this->getUrl(0) . '/manage',
'ico' => 'download',
'value' => 'Thèmes'
]); ?>
</div>
@ -48,7 +48,7 @@
<div class="col2">
<?php echo template::button('themeManage', [
'href' => helper::baseUrl() . $this->getUrl(0) . '/manage',
'ico' => 'download',
'ico' => 'upload',
'value' => 'Thèmes'
]); ?>
</div>

10
core/module/theme/view/manage/manage.php
View File

@ -12,10 +12,10 @@
<div class="row">
<div class="col6">
<div class="block">
<h4>Importer</h4>
<h4>Importer un thème</h4>
<?php echo template::file('themeManageImport', [
'label' => 'Archive',
'type' => 2
'label' => 'Archive ZIP',
'type' => 2,
]); ?>
<div class="col5 offset3">
<?php echo template::submit('themeImportSubmit', [
@ -26,12 +26,12 @@
</div>
<div class="col6">
<div class="block">
<h4>Exporter</h4>
<h4>Exporter un thème</h4>
<div class="row">
<div class="col5 offset1">
<?php echo template::button('themeSave', [
'href' => helper::baseUrl() . 'theme/save',
'ico' => 'download',
'ico' => 'download-cloud',
'value' => 'Sauvegarder'
]); ?>
</div>

2
core/vendor/tinymce/link_list.json vendored
View File

@ -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"}]

26
index.php
View File

@ -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();
echo $core->router();