Si vous constatez la perte de tickets, de commentaires ou de projets, veuillez consulter la page https://status.framasoft.org/incident/626.

Commit 0c9561a3 authored by robin banquo's avatar robin banquo

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/views/modules/caroussel/info.json
parents 05265877 05b80aa1
......@@ -99,6 +99,89 @@ Vérifiez que vous avez bien :
/autres options/
isMediaPathModified =
## Installer PrettyNoemie sur un serveur Nginx
Je pars du principe que vous utilisez Debian et la verison 7 de PHP-fpm
**Pré-requis :**
- PHP-fpm (7 recommandé)
- Nginx
- Composer (sur votre système ou en installé dans votre dossier, [pour installer Composer, c'est ici](https://getcomposer.org/))
**Déployer PrettyNoemie**
cd /var/www/
mkdir VOTRESITE
(ou directement dans /var/www/html)
cd VOTRESITE
Téléchargez les fichier en zip ou clonez le repository avec :
git clone https://framagit.org/framasoft/PrettyNoemieCMS
Puis à l'interieur du dossier, lancez la commande d'installation avec Composer :
composer install
Si la commande n'est pas reconnue, essayez : `php composer.phar installer` ou `php composer.phar instal`
**Configurer PHP-fpm**
cd /etc/php/7.0/fpm/pool.d
nano www.conf
Trouver la ligne commençant pas "listen" puis remplacer là par
listen = 127.0.0.1:9000
ou un autre port, mais attention par la suite, il faudra le spécifier.
**Configurer Nginx pour PrettyNoemieCMS**
cd /etc/nginx/sites-available
rm default
nano VOTRESITE
Voici une configuration fonctionnelle, remplacer XXX par votre nom de domaine :
server {
listen 80 default_server;
listen [::]:80 default_server;
root /var/www/VOTRESITE;
# Add index.php to the list if you are using PHP
index index.php index.html index.htm;
server_name XXX;
location / {
# First attempt to serve request as file, then
# as directory, then fall back to displaying a 404.
try_files $uri $uri/ /index.php?$query_string;
}
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
location ~ \.php$ {
include snippets/fastcgi-php.conf;
fastcgi_pass unix:/run/php/php7.0-fpm.sock;
include fastcgi_params;
}
}
Si vous avez spécifier un port spécifique dans la configuration de PHP-fpm, alors remplacer `fastcgi_pass unix:/run/php/php7.0-fpm.sock;` par `fastcgi_pass 127.0.0.1:VOTREPORT`
Il faut activer votre site dans Nginx :
ln -s /etc/nginx/sites-available/VOTRESITE /etc/nginx/sites-enabled/VOTRESITE
**Redémarrer PHP et Nginx**
service php7.0-fpm restart
service nginx restart
## Contribuer
......@@ -123,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
GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007
\ No newline at end of file
{
"name": "carroussel",
"title": "caroussel",
"title": "Carrousel",
"tags" : "moduleTag-animated moduleTag-img",
"description": "Module permettant d'afficher un carousel d'images ",
"hidden" : false,
......
{
"name": "competences",
"title": "Compétences",
"description": "Module permettant de presenter vos compétences aux visiteurs",
"description": "Module permettant de présenter vos compétences aux visiteurs",
"tags" : "moduleTag-special moduleTag-cv",
"hidden" : false,
"fields": {
......@@ -102,4 +102,4 @@
"value": "0"
}
}
}
\ No newline at end of file
}
{
"name" : "contact",
"title" : "Formulaire de contact",
"description" : "Module permettant à vos visiteurs de vous contacter grâce aà un email envoyé automatiquement",
"description" : "Module permettant à vos visiteurs de vous contacter grâce à un email envoyé automatiquement",
"tags": "moduleTag-special",
"hidden" : false,
"fields" : {
......
{
"name": "gallery",
"title": "Galerie",
"description": "Module permettant de presenter jusqu'a 30 images sous forme d'un portfolio",
"description": "Module permettant de présenter jusqu'a 30 images sous forme d'un portfolio",
"tags": "moduleTag-img moduleTag-animated",
"hidden" : false,
"fields": {
......@@ -130,4 +130,4 @@
"value": ""
}
}
}
\ No newline at end of file
}
$('.editGalleryImage').click(function () {
let id = this.id.split("-")[1]
let img=this.id.split("-")[2]
$("#siteOptionsModal").modal('open')
$("a[href=#options-medias]").click()
MediaManagment.render(true, "uglyForm-"+id+"-imgUrl"+img)
initMainSaveBtn()
})
$('.removeGalleryImage').click(function () {
let id = this.id.split("-")[1]
let field= this.id.split("-")[2]
$('#uglyForm input[name=uglyForm-'+id+'-'+field+']').val("");
$('#moduleValue-'+field).attr('src', 'app/views/modules/gallery/default.png')
console.log(field)
setTimeout(function () {
$('.carousel.carousel-slider').carousel({fullWidth: true,indicators: true });
},200)
initMainSaveBtn()
})
\ No newline at end of file
{
"name": "gallery_little",
"title": "Galerie petites colonnes",
"description": "Module permettant de presenter jusqu'a 100 images sous forme d'un portfolio",
"tags": "moduleTag-img moduleTag-animated",
"hidden" : false,
"fields": {
"title": {
"type": "text",
"value": "<h5>Galerie</h5>"
},
"imgUrl0": {
"type": "text",
"value": "app/views/modules/gallery/aquarelle_2.jpg"
},
"imgUrl1": {
"type": "text",
"value": ""
},
"imgUrl2": {
"type": "text",
"value": ""
},
"imgUrl3": {
"type": "text",
"value": ""
},
"imgUrl4": {
"type": "text",
"value": ""
},
"imgUrl5": {
"type": "text",
"value": ""
},
"imgUrl6": {
"type": "text",
"value": ""
},
"imgUrl7": {
"type": "text",
"value": ""
},
"imgUrl8": {
"type": "text",
"value": ""
},
"imgUrl9": {
"type": "text",
"value": ""
},
"imgUrl10": {
"type": "text",
"value": ""
},
"imgUrl11": {
"type": "text",
"value": ""
},
"imgUrl12": {
"type": "text",
"value": ""
},
"imgUrl13": {
"type": "text",
"value": ""
},
"imgUrl14": {
"type": "text",
"value": ""
},
"imgUrl15": {
"type": "text",
"value": ""
},
"imgUrl16": {
"type": "text",
"value": ""
},
"imgUrl17": {
"type": "text",
"value": ""
},
"imgUrl18": {
"type": "text",
"value": ""
},
"imgUrl19": {
"type": "text",
"value": ""
},
"imgUrl20": {
"type": "text",
"value": ""
},
"imgUrl21": {
"type": "text",
"value": ""
},
"imgUrl22": {
"type": "text",
"value": ""
},
"imgUrl23": {
"type": "text",
"value": ""
},
"imgUrl24": {
"type": "text",
"value": ""
},
"imgUrl25": {
"type": "text",
"value": ""
},
"imgUrl26": {
"type": "text",
"value": ""
},
"imgUrl27": {
"type": "text",
"value": ""
},
"imgUrl28": {
"type": "text",
"value": ""
},
"imgUrl29": {
"type": "text",
"value": ""
},
"imgUrl30": {
"type": "text",
"value": ""
},
"imgUrl31": {
"type": "text",
"value": ""
},
"imgUrl32": {
"type": "text",
"value": ""
},
"imgUrl33": {
"type": "text",
"value": ""
},
"imgUrl34": {
"type": "text",
"value": ""
},
"imgUrl35": {
"type": "text",
"value": ""
},
"imgUrl36": {
"type": "text",
"value": ""
},
"imgUrl37": {
"type": "text",
"value": ""
},
"imgUrl38": {
"type": "text",
"value": ""
},
"imgUrl39": {
"type": "text",
"value": ""
},
"imgUrl40": {
"type": "text",
"value": ""
},
"imgUrl41": {
"type": "text",
"value": ""
},
"imgUrl42": {
"type": "text",
"value": ""
},
"imgUrl43": {
"type": "text",
"value": ""
},
"imgUrl44": {
"type": "text",
"value": ""
},
"imgUrl45": {
"type": "text",
"value": ""
},
"imgUrl46": {
"type": "text",
"value": ""
},
"imgUrl47": {
"type": "text",
"value": ""
},
"imgUrl48": {
"type": "text",
"value": ""
},
"imgUrl49": {
"type": "text",
"value": ""
},
"imgUrl50": {
"type": "text",
"value": ""
},
"imgUrl51": {
"type": "text",
"value": ""
},
"imgUrl52": {
"type": "text",
"value": ""
},
"imgUrl53": {
"type": "text",
"value": ""
},
"imgUrl54": {
"type": "text",
"value": ""
},
"imgUrl55": {
"type": "text",
"value": ""
},
"imgUrl56": {
"type": "text",
"value": ""
},
"imgUrl57": {
"type": "text",
"value": ""
},
"imgUrl58": {
"type": "text",
"value": ""
},
"imgUrl59": {
"type": "text",
"value": ""
},
"imgUrl60": {
"type": "text",
"value": ""
},
"imgUrl61": {
"type": "text",
"value": ""
},
"imgUrl62": {
"type": "text",
"value": ""
},
"imgUrl63": {
"type": "text",
"value": ""
},
"imgUrl64": {
"type": "text",
"value": ""
},
"imgUrl65": {
"type": "text",
"value": ""
},
"imgUrl66": {
"type": "text",
"value": ""
},
"imgUrl67": {
"type": "text",
"value": ""
},
"imgUrl68": {
"type": "text",
"value": ""
},
"imgUrl69": {
"type": "text",
"value": ""
},
"imgUrl70": {
"type": "text",
"value": ""
},
"imgUrl71": {
"type": "text",
"value": ""
},
"imgUrl72": {
"type": "text",
"value": ""
},
"imgUrl73": {
"type": "text",
"value": ""
},
"imgUrl74": {
"type": "text",
"value": ""
},
"imgUrl75": {
"type": "text",
"value": ""
},
"imgUrl76": {
"type": "text",
"value": ""
},
"imgUrl77": {
"type": "text",
"value": ""
},
"imgUrl78": {
"type": "text",
"value": ""
},
"imgUrl79": {
"type": "text",
"value": ""
},
"imgUrl80": {
"type": "text",
"value": ""
},
"imgUrl81": {
"type": "text",
"value": ""
},
"imgUrl82": {
"type": "text",
"value": ""
},
"imgUrl83": {
"type": "text",
"value": ""
},
"imgUrl84": {
"type": "text",
"value": ""
},
"imgUrl85": {
"type": "text",
"value": ""
},
"imgUrl86": {
"type": "text",
"value": ""
},
"imgUrl87": {
"type": "text",
"value": ""
},
"imgUrl88": {
"type": "text",
"value": ""
},
"imgUrl89": {
"type": "text",
"value": ""
},
"imgUrl90": {
"type": "text",
"value": ""
},
"imgUrl91": {
"type": "text",
"value": ""
},
"imgUrl92": {
"type": "text",
"value": ""
},
"imgUrl93": {
"type": "text",
"value": ""
},
"imgUrl94": {
"type": "text",
"value": ""
},
"imgUrl95": {
"type": "text",
"value": ""
},
"imgUrl96": {
"type": "text",
"value": ""
},
"imgUrl97": {
"type": "text",
"value": ""
},
"imgUrl98": {
"type": "text",
"value": ""
},
"imgUrl99": {
"type": "text",
"value": ""
}
}
}
<link href="public/js/lightbox/css/lightbox.css" rel="stylesheet">
<div class="main-background module">
<div class="container" style="padding: 30px 0">
<check if="{{ @isAdminPage }}">
<div class="row infoModule" style="margin: 0 5px 5px 05px !important;">
<p class=" white-text no-margin relative center-align"
style="font-size: small;">
<i>Seules les images complétées seront visibles par vos visiteurs</i>
</p>
</div>
</check>
<div class="columnContainer gallery-little" >
<repeat group="{{ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,51,52,53,54,55,56,57,58,59,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99] }}" value="{{ @index }}">
<check if="{{ @fields['imgUrl'.@index]['value'] || @isAdminPage }}">
<div class="relative carousselImage" style="padding: 5px">
<check if="{{ @isAdminPage }}">
<a class="btn-floating waves-effect waves-light lightButton absolute tooltipped moduleBtn editGalleryImage" data-position="top"
data-delay="250" data-tooltip="modifier l'image" id="editGalleryImage-{{@id}}-{{@index}}" style=" left: 10px; top: 10px; z-index: 500">
<i class="material-icons">image</i></a>
<check if="{{ @fields['imgUrl'.@index]['value']}}">
<a class="btn-floating waves-effect waves-light lightButton absolute tooltipped moduleBtn removeGalleryImage" data-position="top"
data-delay="250" data-tooltip="retirer l'image" id="removeGalleryImage-{{@id}}-imgUrl{{@index}}" style=" left: 60px; top: 10px; z-index: 500">
<i class="material-icons">clear</i></a>
</check>
</check>
<a class="responsive-img" style="cursor: zoom-in" data-lightbox="galery-{{@id}}" width="100%" data-caption="{{@fields['imgUrl'.@index]['value'] | imgAlt}}" href="{{@fields['imgUrl'.@index]['value']? @fields['imgUrl'.@index]['value'] : 'app/views/modules/gallery/default.jpg'}}" >
<img class="responsive-img " id="moduleValue-imgUrl{{@index}}" width="100%" data-caption="{{@fields['imgUrl'.@index]['value'] | imgAlt}}" src="{{@fields['imgUrl'.@index]['value']? @fields['imgUrl'.@index]['value'] : 'app/views/modules/gallery/default.jpg'}}" alt="{{@fields['imgUrl'.@index]['value'] | imgAlt}}">
</a>
</div>
</check>
</repeat>
</div>
</div>
</div>
This diff is collapsed.
{
"name": "photo_cv",
"title": "Section présentation",
"description": "Module permettant d'afficher une photo de profil accompagné d'un texte, idéal pour un CV",
"description": "Module permettant d'afficher une photo de profil accompagnée d'un texte, idéal pour un CV",
"tags":"moduleTag-text moduleTag-img moduleTag-cv",
"hidden" : false,
"fields": {
......@@ -18,4 +18,4 @@
"value": "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet architecto assumenda consequuntur esse eum facere, illum libero molestiae nam nihil nulla pariatur quo saepe sequi sint, vitae voluptates voluptatum. </p>\t\t\t\t"
}
}
}
\ No newline at end of file
}
{
"name": "products",
"title": "Nos Produits",
"description": "Module permettant de presenter trois de vos produits",
"description": "Module permettant de présenter trois de vos produits",
"tags":"moduleTag-text moduleTag-img",
"hidden" : false,
"fields": {
......
{
"name": "soundcloud",
"title": "Lecteur Audio",
"description": "Module permettant d'ajouter un lecteur audio hébergée sur SoundCloud",
"description": "Module permettant d'ajouter un lecteur audio hébergé sur SoundCloud",
"tags":"moduleTag-video moduleTag-text",
"hidden": false,
"fields": {
......@@ -22,4 +22,4 @@
"value": "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet architecto assumenda consequuntur esse eum facere.</p>"
}
}
}
\ No newline at end of file
}
{
"name": "team",
"title": "Notre équipe",
"description": "Module permettant de presenter trois membres de votre équipe",