Merge remote-tracking branch 'origin/master'
Conflicts: SRC/public/css/referent.css SRC/resources/views/referent.blade.php
This commit is contained in:
BIN
SRC/public/css/chosen-sprite.png
Normal file
BIN
SRC/public/css/chosen-sprite.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 538 B |
BIN
SRC/public/css/chosen-sprite@2x.png
Normal file
BIN
SRC/public/css/chosen-sprite@2x.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 738 B |
3
SRC/public/css/chosen.min.css
vendored
Normal file
3
SRC/public/css/chosen.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -57,8 +57,12 @@ background: linear-gradient(to bottom, #a7cfdf 0%,#23538a 100%); /* W3C */
|
||||
background: white;
|
||||
border-radius: 7px;
|
||||
border: 1px solid grey;
|
||||
<<<<<<< HEAD
|
||||
box-shadow: 0px 0px 2px dimgrey;
|
||||
width : 40%;
|
||||
=======
|
||||
box-shadow: 1px 1px 2px dimgrey;
|
||||
>>>>>>> origin/master
|
||||
}
|
||||
|
||||
.jeux
|
||||
|
58
SRC/public/js/ListeOeuvre.js
Normal file
58
SRC/public/js/ListeOeuvre.js
Normal file
@ -0,0 +1,58 @@
|
||||
|
||||
//Selection d'une recherche d'oeuvre
|
||||
$('.listeoeuvre').click(function() {
|
||||
$('#oeuvrePic').empty();
|
||||
url = "/showListOeuvres/" + $(this).children('.idListeOeuvre').val();
|
||||
$.get(url, function( data ) {
|
||||
if (data.length == 0 )
|
||||
$("#oeuvrePic").append("Aucune Oeuvre");
|
||||
data.forEach( function(el) {
|
||||
$("#oeuvrePic").append('<div class="col-xs-4 col-md-3">'
|
||||
+'<a href="#" class="thumbnail">'
|
||||
+'<img src="http://www.augustins.org/documents/10180/156407/' + el.urlPhoto + '"/>'
|
||||
+'</a></div>');
|
||||
})
|
||||
}, "json" )
|
||||
|
||||
.fail(function() {
|
||||
$("#oeuvrePic").append('<div class="alert alert-danger">'
|
||||
+'<strong>Oouups!</strong> Il y a un problème.<br><br>'
|
||||
+'<ul>'
|
||||
+'<li>Erreur lors de la récupération</li>'
|
||||
+'</ul>'
|
||||
+'</div>'
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
//Enregistrement d'une liste d'ouevre
|
||||
$('#enregistrer').click(function() {
|
||||
url = "setListOeuvres";
|
||||
dataSend = {
|
||||
_token : $('#_token').val(),
|
||||
idListeOeuvre : "1",
|
||||
oeuvres : "1-2-3-4"};
|
||||
$.post(url,
|
||||
dataSend,
|
||||
function( data ) {
|
||||
;
|
||||
}, "json")
|
||||
.done(function() {
|
||||
$("#oeuvrePic").append('<div class="alert alert-success">'
|
||||
+'<ul>'
|
||||
+'<li>Sauvegarde validée</li>'
|
||||
+'</ul>'
|
||||
+'</div>');
|
||||
})
|
||||
.fail(function() {
|
||||
$("#oeuvrePic").append('<div class="alert alert-danger">'
|
||||
+'<strong>Oouups!</strong> Il y a un problème.<br><br>'
|
||||
+'<ul>'
|
||||
+'<li>Erreur lors de l\'envoie</li>'
|
||||
+'</ul>'
|
||||
+'</div>');
|
||||
});
|
||||
});
|
||||
|
||||
|
1239
SRC/public/js/chosen.jquery.js
Normal file
1239
SRC/public/js/chosen.jquery.js
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,21 +0,0 @@
|
||||
$(document).ready( function() {
|
||||
console.log( "document loaded" );
|
||||
$('.listeoeuvre').click(function() {
|
||||
url = "/showListOeuvres/" + $(this).children('.idListeOeuvre').val();
|
||||
$.get(url, function( data ) {
|
||||
if (data.length == 0 )
|
||||
$("#oeuvrePic").append("Aucune Oeuvre");
|
||||
data.forEach( function(el) {
|
||||
$("#oeuvrePic").append('<div class="col-xs-4 col-md-3">'
|
||||
+'<a href="#" class="thumbnail">'
|
||||
+'<img src="http://www.augustins.org/documents/10180/156407/' + el.urlPhoto + '"/>'
|
||||
+'</a></div>');
|
||||
})
|
||||
}, "json" )
|
||||
|
||||
.fail(function() {
|
||||
console.log( "error" );
|
||||
});
|
||||
});
|
||||
});
|
||||
|
@ -1,20 +0,0 @@
|
||||
$(document).ready( function() {
|
||||
$('#enregistrer').click(function() {
|
||||
event.preventDefault();
|
||||
send = {idListeOeuvre : " " ,
|
||||
idOeuvres : [1,2,3,4,4] }
|
||||
url = "/setListOeuvres";
|
||||
$.post(url,
|
||||
send,
|
||||
function( data ) {
|
||||
})
|
||||
.done(function() {
|
||||
console.log( "success" );
|
||||
})
|
||||
.fail(function() {
|
||||
console.log( "error" );
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
|
Reference in New Issue
Block a user