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

Commit ad936c83 authored by Thomas Citharel's avatar Thomas Citharel 🌲

Merge branch 'limite-upload' into 'master'

Modification de la limite d'upload d'image de 5 à 2Mo

See merge request !40
parents 99c51ee8 2689d90d
......@@ -18,7 +18,7 @@ MediaManagment = {
//bouton d'aijout d'une nouvelle media
addButon: `<a href="#!" class=" light-shadow columnItem" id="addMediaToLibrary" style="background-color: rgb(255,255,255) !important;">
<div class=" light-shadow hoverBorderInBox tooltipped" data-position="top"
data-delay="350" data-tooltip="Ajouter une image à votre bibliothèque, taille limite : 5Mo" style="text-align: center; background-color: rgb(255,255,255) !important; margin: 0 10px 0px 10px !important; ">
data-delay="350" data-tooltip="Ajouter une image à votre bibliothèque, taille limite : 2Mo" style="text-align: center; background-color: rgb(255,255,255) !important; margin: 0 10px 0px 10px !important; ">
<i class="material-icons frama-orange-text lighten-2 large" style="margin: 50px">add</i>
</div>
</a>`
......@@ -46,9 +46,9 @@ MediaManagment = {
let htmlToInsert = ""
htmlToInsert += `
<section class="blockList relative parent-hover">
<a href="#!" id="admin/edit/delete-media?id=` + media.id + `&CSRFToken=` + CSRFToken + `" class="children-hover btn-floating
<a href="#!" id="admin/edit/delete-media?id=` + media.id + `&CSRFToken=` + CSRFToken + `" class="children-hover btn-floating
waves-effect waves-light lightButton absolute tooltipped removeMediaFromLibrary " data-position="top"
data-delay="350" data-tooltip="Supprimer l'image de votre bibliothèque"
data-delay="350" data-tooltip="Supprimer l'image de votre bibliothèque"
style="top: 10px ; right: 20px; z-index: 10000">
<i class="material-icons " >delete</i>
</a>
......@@ -59,7 +59,7 @@ MediaManagment = {
style="background-color: rgb(255,255,255) !important;">
<i class="absolute white-text " style="margin:20px 0 0 10px; font-size: small">` + media.size + `</i>
<img class="responsive-img" src="` + media.url + `" alt="` + media.label + `">
<div class="absolute children-hover `
htmlToInsert += this.onlyForPickUp ? 'displaynone' : '';
htmlToInsert += `" style="bottom: 0; width: 100%; background-color: rgba(0,0,0,0.52)">
......@@ -71,9 +71,9 @@ MediaManagment = {
htmlToInsert += media.label ? 'value="' + media.label + '"' : "";
htmlToInsert += ` placeholder="Donner un titre a votre image" class="tooltipped white-text" data-position="bottom"
data-delay="350" data-tooltip="Editer le nom de votre image, utile pour l'accessibilité de votre site et son référencent" style="width: 100%; margin-bottom: 10px!important; ">
<button class=" btn-floating waves-effect waves-light lightButton absolute tooltipped" data-position="top"
data-delay="350" data-tooltip="Editer"
data-delay="350" data-tooltip="Editer"
style="top: -10px ; right: 10px">
<i class="material-icons " >edit</i>
</button>
......@@ -304,7 +304,7 @@ MediaManagment = {
<input type="text" class="displaynone" name="CSRFToken" value="` + CSRFToken + `">
<input type="file" name="media" accept="image/*">
</form>
`
$('#croppingModalContainer').html(` <div class="absolute modal-close" style="right : 20px; top: 20px; z-index: 7000">
......@@ -371,4 +371,4 @@ MediaManagment = {
$(document).ready(function () {
MediaManagment.render();
})
\ 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