Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb
This commit is contained in:
commit
f8c04b617d
@ -278,8 +278,13 @@ $('#imagesSearched').load('{{ URL::to('api/searchOeuvres') }}', function(){$("se
|
|||||||
gutterWidth: 10
|
gutterWidth: 10
|
||||||
}).masonry('reload');
|
}).masonry('reload');
|
||||||
};*/
|
};*/
|
||||||
|
var toAdd = [];
|
||||||
|
|
||||||
$('#imagesSearched').on('click', '.pagination a', function (event) {
|
$('#imagesSearched').on('click', '.pagination a', function (event) {
|
||||||
|
for (i=0; i < document.getElementById('toadd').length; i++) {
|
||||||
|
if(document.getElementById('toadd')[i].selected)
|
||||||
|
toAdd.push(document.getElementById('toadd')[i].value);
|
||||||
|
}
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
if ( $(this).attr('href') != '#' ) {
|
if ( $(this).attr('href') != '#' ) {
|
||||||
$("#imagesSearched").animate({ scrollTop: 0 }, "fast");
|
$("#imagesSearched").animate({ scrollTop: 0 }, "fast");
|
||||||
@ -301,6 +306,8 @@ $('#recherche select').multiselect({
|
|||||||
enableCaseInsensitiveFiltering: true
|
enableCaseInsensitiveFiltering: true
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$("#recherche").on('submit', function(event){
|
$("#recherche").on('submit', function(event){
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
$('#imagesSearched').empty();
|
$('#imagesSearched').empty();
|
||||||
@ -315,7 +322,7 @@ $("#recherche").on('submit', function(event){
|
|||||||
});
|
});
|
||||||
|
|
||||||
$(".radioAsso").change(function() {
|
$(".radioAsso").change(function() {
|
||||||
$.get('{{ URL::to('referent/changerparamliste') }}' + $('#assoListeJeu').serialize());
|
$.post('{{ URL::to('referent/changerparamliste') }}', $('#assoListeJeu').serialize());
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
<li class="active"><a href="#">Mes Listes</a></li>
|
<li class="active"><a href="#">Mes Listes</a></li>
|
||||||
<li><a data-toggle="modal" data-target="#myModal1" href="#">Mon Compte</a></li>
|
<li><a data-toggle="modal" data-target="#myModal1" href="#">Mon Compte</a></li>
|
||||||
<li><a href="{{ URL::to('changerref', $me->id) }}" >Voir mes jeux</a></li>
|
<li><a href="{{ URL::to('changerref', $me->id) }}" >Essayer mes jeux</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<ul class="nav navbar-nav navbar-right">
|
<ul class="nav navbar-nav navbar-right">
|
||||||
<li><a href="{{ URL::to('logout') }}">Déconnexion</a></li>
|
<li><a href="{{ URL::to('logout') }}">Déconnexion</a></li>
|
||||||
@ -59,13 +59,13 @@
|
|||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="password_confirm" class="col-sm-4 control-label">Nouveau mot de passe (min. 6 caractères):</label>
|
<label for="password_confirm" class="col-sm-4 control-label">Nouveau mot de passe (min. 6 caractères):</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input type="password" class="form-control" id="password" name="password" required placeholder="Mot de passe">
|
<input type="password" class="form-control" id="password" name="password" placeholder="Mot de passe">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="password_confirm" class="col-sm-4 control-label">Confirmer le mot de passe :</label>
|
<label for="password_confirm" class="col-sm-4 control-label">Confirmer le mot de passe :</label>
|
||||||
<div class="col-sm-8">
|
<div class="col-sm-8">
|
||||||
<input type="password" class="form-control" id="password_confirm" name="password_confirm" required placeholder="Mot de passe">
|
<input type="password" class="form-control" id="password_confirm" name="password_confirm" placeholder="Mot de passe">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
Reference in New Issue
Block a user