Commit a87fe19b authored by Robin Caramaschi's avatar Robin Caramaschi

Merge branch 'master' into 'master'

Masquage du titre

See merge request framasoft/PrettyNoemieCMS!28
parents 5d96c99a a2e6fd53
......@@ -132,7 +132,7 @@ Si la commande n'est pas reconnue, essayez : `php composer.phar installer` ou `p
cd /etc/php/7.0/fpm/pool.d
nano www.conf
Trouver la ligne commençant pas "listen" puis remplacer là par
Trouver la ligne commençant par "listen" puis remplacer là par
listen = 127.0.0.1:9000
......@@ -206,4 +206,4 @@ Pour savoir comment faire, voici un tuto sur l'utilisation de git et Gitlab pour
## Licence
GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007
\ No newline at end of file
GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007
......@@ -7,11 +7,11 @@ ParamsManagment = {
render() {
let htmlToInclude = `
<form class="col s12 relative" id="siteParamsForm" >
<div class="row no-margin">
<div class="col s12">
<div class="row card light-shadow center-align" style="background-color: white; padding: 30px !important;">
<div class="switch relative">
<label class="row no-margin relative" style="left: -27px !important;">
<span class="grey-text text-darken-2" style="font-size: 1.2em !important;">Mode maintenance</span>
......@@ -24,7 +24,7 @@ ParamsManagment = {
<span class="grey-text text-darken-2" style="font-size: 1.2em !important;">Site visible</span>
</label>
</div>
</div>
</div>
</div>
......@@ -34,8 +34,8 @@ ParamsManagment = {
<div class="row">
<h5 class="center-align grey-text text-darken-2">Personaliser l'affichage</h5>
</div>
<div class="input-field col s12 tooltipped" data-position="top"
data-delay="350" data-tooltip="Modifier le nom de votre site (son adresse restera identique, seul le nom visible par les utilisateurs sera remplacé)">
<input id="siteName" name="siteName" type="text" required class="validate" value="` + this.params.title + `">
......@@ -44,9 +44,10 @@ ParamsManagment = {
<div class="input-field col s12 tooltipped" data-position="top"
data-delay="350" data-tooltip="Augmenter ou réduire la taille de votre titre">
<select id="titleSize" >
<option class="grey-text text-darken-2" value="large" ` + this.autoSelect(this.params.titleSize, 'large') + `>Large</option>
<option class="grey-text text-darken-2" value="medium" ` + this.autoSelect(this.params.titleSize, 'medium') + `>Medium</option>
<option class="grey-text text-darken-2" value="small" ` + this.autoSelect(this.params.titleSize, 'small') + `>Small</option>
<option class="grey-text text-darken-2" value="large" ` + this.autoSelect(this.params.titleSize, 'large') + `>Grand</option>
<option class="grey-text text-darken-2" value="medium" ` + this.autoSelect(this.params.titleSize, 'medium') + `>Moyen</option>
<option class="grey-text text-darken-2" value="small" ` + this.autoSelect(this.params.titleSize, 'small') + `>Petit</option>
<option class="grey-text text-darken-2" value="none" ` + this.autoSelect(this.params.titleSize, 'none') + `>Ne pas afficher</option>
</select>
<label>Taille du titre</label>
</div>
......@@ -66,7 +67,7 @@ ParamsManagment = {
<i class="material-icons">clear</i>
</a>`
}
htmlToInclude += `
htmlToInclude += `
</p>
</div>
<div class="col s6 ">
......@@ -74,7 +75,7 @@ ParamsManagment = {
<p class="center-align relative" >
<input type="text" class="displaynone" name="siteLogo" value="${this.params.siteLogo}">
<img id="siteParams-siteLogo" class="center-align siteParamsChangeImage tooltipped"
data-position="top" data-delay="350" data-tooltip="Logo visible à coté du titre de votre site, taille recommandée : 100x100 px"
data-position="top" data-delay="350" data-tooltip="Logo visible à coté du titre de votre site, taille recommandée : 100x100 px"
style="width: 60px !important;height: 60px !important; cursor: pointer" src="` + this.imgOrDefault(this.params.siteLogo) + `" alt="">
`
if (this.params.siteLogo) {
......@@ -83,9 +84,9 @@ ParamsManagment = {
<i class="material-icons">clear</i>
</a>`
}
htmlToInclude += `
htmlToInclude += `
</p>
</div>
</div>
</div>
......@@ -116,7 +117,7 @@ ParamsManagment = {
</div>
</div>
</div>
<div class="row">
<div class="col s12 center-align" style="margin-top: 20px !important;">
<button id="submitParamsBtn" type="submit" class="light-shadow fixed btn-large frama-orange hover-frama-purple waves-effect waves-light btn" style="top: 126px ; right: 35px"><i class="material-icons white-text right">save</i>Enregistrer</button>
......@@ -245,7 +246,7 @@ ParamsManagment = {
data += 'CSRFToken=' + CSRFToken
//pui on recupere les valeurs des champs
let submittedValues = {
isPublished : $('#siteParamsForm #isPublished:checked').val()?$('#siteParamsForm #isPublished:checked').val():"",
isPublished: $('#siteParamsForm #isPublished:checked').val() ? $('#siteParamsForm #isPublished:checked').val() : "",
title: $('#siteParamsForm #siteName').val(),
titleSize: $('#siteParamsForm #titleSize').val(),
favIcon: $('#siteParamsForm input[name=favIcon]').val(),
......@@ -298,4 +299,4 @@ ParamsManagment = {
$(document).ready(function () {
//au chargement de la page on y insere le tout
ParamsManagment.render();
})
\ No newline at end of file
})
......@@ -29,8 +29,8 @@
"favIcon": "",
"siteLogo": "",
"lang": "fr_FR",
"description": "Site r\u00e9alis\u00e9 avec FramaSite",
"description": "Site",
"keywords": "site, internet, CMS, framasite",
"isPublished": "true"
}
}
\ No newline at end of file
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment