Merge branch 'master' of https://github.com/fredtempez/ZwiiCMS
This commit is contained in:
commit
6cfcd35e78
2
.gitignore
vendored
2
.gitignore
vendored
@ -24,5 +24,3 @@ site/file/thumb/*
|
||||
# Trucs
|
||||
.gitignore
|
||||
core/vendor/tinymce/link_list.json
|
||||
core/vendor/tinymce/link_list.json
|
||||
|
||||
|
@ -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
|
||||
|
@ -125,6 +125,8 @@ $( document ).ready(function() {
|
||||
$("#pageEditDisplayMenuWrapper").slideDown();
|
||||
$("#pageEditGroupWrapper").removeClass("disabled");
|
||||
$("#pageEditGroupWrapper").slideUp();
|
||||
$("#PageEditMenuSpecial").removeClass("disabled");
|
||||
$("#PageEditMenuSpecial").slideUp();
|
||||
} else {
|
||||
$("#pageEditDisplayMenuWrapper").removeClass("disabled");
|
||||
$("#pageEditDisplayMenuWrapper").slideUp();
|
||||
|
@ -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>
|
||||
|
@ -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
2
core/vendor/tinymce/link_list.json
vendored
@ -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"}]
|
24
index.php
24
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
|
||||
|
Loading…
Reference in New Issue
Block a user