Skip to content

Commit

Permalink
Css les images s'affichent de nouveau 2 par ligne
Browse files Browse the repository at this point in the history
  • Loading branch information
@xxdomxx
xxdomxx committed Nov 21, 2014
1 parent 5f18f2d commit 669df6f
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 53 deletions.
Binary file modified PhotoFun.suo
View file
Binary file not shown.
5 changes: 2 additions & 3 deletions PhotoFun/Content/MonCSS.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@
position:fixed;
padding-left: 0;
margin-bottom: 0;
list-style: none;
background-color:Lime;
list-style: none;
}

.menucotegauche > li {
Expand All @@ -79,7 +78,7 @@ bottom: 0;
left: 0;
z-index: 1000;
display: block;
padding: 20px;
padding: 2%;
overflow-x: hidden;
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
background-color: #101010;
Expand Down
92 changes: 45 additions & 47 deletions PhotoFun/Views/Account/PhotoUtil.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,68 +5,66 @@
<div class="page-header">
<h2>@ViewBag.Title</h2>
</div>
@using (Html.BeginForm())

@if (lstimage != null && lstimage.Count > 0)
{
if (lstimage != null && lstimage.Count > 0)
var nomutil = nom;
var photoFunBd = new PhotoFun.Models.PhotoFunBD();
int nbJaime;
foreach (var PhotoUtil in lstimage)
{
var nomutil = nom;
var photoFunBd = new PhotoFun.Models.PhotoFunBD();
int nbJaime;
foreach (var PhotoUtil in lstimage)
nbJaime = photoFunBd.RetourneLeNombreDeJAimeSelonPhoto(PhotoUtil);
<div class="divdesimages">
@using (Html.BeginForm("PhotoUtil", "Account", FormMethod.Post))
{
nbJaime = photoFunBd.RetourneLeNombreDeJAimeSelonPhoto(PhotoUtil);
<div class="divdesimages">
@using (Html.BeginForm("PhotoUtil", "Account", FormMethod.Post))
if (User.Identity.IsAuthenticated)
{
if (User.Identity.IsAuthenticated)
if (nomutil == User.Identity.Name)
{
if (nomutil == User.Identity.Name)
if (photoFunBd.VerifLiaisonPhotoUtil(User.Identity.Name, PhotoUtil))
{
if (photoFunBd.VerifLiaisonPhotoUtil(User.Identity.Name, PhotoUtil))
{
<button type="submit" class="close boutonliker" title="J'aime" name="actionAFaire" value="LIKE"><span class="glyphicon glyphicon-heart"></span><span class="badge">@nbJaime</span></button>
<button type="submit" class="close boutonediter" name="actionAFaire" value="EDIT">
<span class="glyphicon glyphicon-pencil"></span></button><button type="submit" class="close boutonsupprimer" name="actionAFaire" value="DELETE"><span class="glyphicon glyphicon-remove"></span></button>
<img src="@PhotoUtil" class="img-thumbnail" alt="Image inaccessible" width="100%"/>
@Html.Hidden("Image", PhotoUtil)
@Html.Hidden("nom", nomutil)
}
else
{
<button type="submit" class="close boutonliker" title="Je n'aime plus" name="actionAFaire" value="LIKE"><span class="glyphicon glyphicon-heart-empty"></span><span class="badge">@nbJaime</span></button>
<button type="submit" class="close boutonediter" name="actionAFaire" value="EDIT"><span class="glyphicon glyphicon-pencil"></span></button>
<button type="submit" class="close boutonsupprimer" name="actionAFaire" value="DELETE"><span class="glyphicon glyphicon-remove"></span></button>
<img src="@PhotoUtil" class="img-thumbnail" alt="Image inaccessible" width="100%"/>
@Html.Hidden("Image", PhotoUtil)
@Html.Hidden("nom", nomutil)
}
<button type="submit" class="close boutonliker" title="J'aime" name="actionAFaire" value="LIKE"><span class="glyphicon glyphicon-heart"></span><span class="badge">@nbJaime</span></button>
<button type="submit" class="close boutonediter" name="actionAFaire" value="EDIT"><span class="glyphicon glyphicon-pencil"></span></button>
<button type="submit" class="close boutonsupprimer" name="actionAFaire" value="DELETE"><span class="glyphicon glyphicon-remove"></span></button>
<img src="@PhotoUtil" class="img-thumbnail" alt="Image inaccessible" width="100%"/>
@Html.Hidden("Image", PhotoUtil)
@Html.Hidden("nom", nomutil)
}
else
{
if (photoFunBd.VerifLiaisonPhotoUtil(User.Identity.Name, PhotoUtil))
{
<button type="submit" class="close boutonliker" title="J'aime" name="actionAFaire" value="LIKE"><span class="glyphicon glyphicon-heart"></span><span class="badge">@nbJaime</span></button>
<img src="@PhotoUtil" class="img-thumbnail" alt="Image inaccessible" width="100%"/>
@Html.Hidden("Image", PhotoUtil)
@Html.Hidden("nom", nomutil)
}
else
{
<button type="submit" class="close boutonliker" title="Je n'aime plus" name="actionAFaire" value="LIKE"><span class="glyphicon glyphicon-heart-empty"></span><span class="badge">@nbJaime</span></button>
<img src="@PhotoUtil" class="img-thumbnail" alt="Image inaccessible" width="100%"/>
@Html.Hidden("Image", PhotoUtil)
@Html.Hidden("nom", nomutil)
}
<button type="submit" class="close boutonliker" title="Je n'aime plus" name="actionAFaire" value="LIKE"><span class="glyphicon glyphicon-heart-empty"></span><span class="badge">@nbJaime</span></button>
<button type="submit" class="close boutonediter" name="actionAFaire" value="EDIT"><span class="glyphicon glyphicon-pencil"></span></button>
<button type="submit" class="close boutonsupprimer" name="actionAFaire" value="DELETE"><span class="glyphicon glyphicon-remove"></span></button>
<img src="@PhotoUtil" class="img-thumbnail" alt="Image inaccessible" width="100%"/>
@Html.Hidden("Image", PhotoUtil)
@Html.Hidden("nom", nomutil)
}
}
else
{
<button type="submit" class="close boutonliker" title="J'aime" name="actionAFaire" value="LIKE"><span class="glyphicon glyphicon-heart"></span><span class="badge">@nbJaime</span></button>
<img src="@PhotoUtil" class="img-thumbnail" alt="Image inaccessible" width="100%"/>
@Html.Hidden("Image", PhotoUtil)
if (photoFunBd.VerifLiaisonPhotoUtil(User.Identity.Name, PhotoUtil))
{
<button type="submit" class="close boutonliker" title="J'aime" name="actionAFaire" value="LIKE"><span class="glyphicon glyphicon-heart"></span><span class="badge">@nbJaime</span></button>
<img src="@PhotoUtil" class="img-thumbnail" alt="Image inaccessible" width="100%"/>
@Html.Hidden("Image", PhotoUtil)
@Html.Hidden("nom", nomutil)
}
else
{
<button type="submit" class="close boutonliker" title="Je n'aime plus" name="actionAFaire" value="LIKE"><span class="glyphicon glyphicon-heart-empty"></span><span class="badge">@nbJaime</span></button>
<img src="@PhotoUtil" class="img-thumbnail" alt="Image inaccessible" width="100%"/>
@Html.Hidden("Image", PhotoUtil)
@Html.Hidden("nom", nomutil)
}
}
}
</div>
else
{
<button type="submit" class="close boutonliker" title="J'aime" name="actionAFaire" value="LIKE"><span class="glyphicon glyphicon-heart"></span><span class="badge">@nbJaime</span></button>
<img src="@PhotoUtil" class="img-thumbnail" alt="Image inaccessible" width="100%"/>
@Html.Hidden("Image", PhotoUtil)
}
}
</div>
}
}
6 changes: 3 additions & 3 deletions PhotoFun/Views/Shared/_Layout.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
</div>
</form>
</div>
<ul class="nav navbar-nav navbar-right" style="margin-left:2%">
<ul class="nav navbar-nav navbar-right">
@Html.Partial("_LoginPartial")
<li>@Html.ActionLink("Accueil", "Index", "Home")</li>
<li>@Html.ActionLink("Importer", "Importer", "Home")</li>
<li>@Html.ActionLink("Contact", "Contact", "Home")</li>
</ul>
@using (Html.BeginForm("LogOff", "Account", FormMethod.Post, new { id = "logoutForm" })){
@Html.AntiForgeryToken()}
</div>
</div>
</div>
</div>
<div class="container-fluid">
Expand All @@ -57,7 +57,7 @@
<li>@Html.ActionLink("Autres", "RetourneLaVueSelonCategorie", "Home", new { categorie = "Autres" }, null)</li>
</ul>
</div>
<div class="col-xs-8 col-sm-8 col-md-9 col-lg-9 main">
<div class="col-xs-8 col-sm-8 col-md-9 col-lg-10 main" style="margin-left:2%">
@RenderSection("featured", required: false)
@RenderBody()
</div>
Expand Down
Binary file modified PhotoFun/obj/Debug/PhotoFun.dll
View file
Binary file not shown.
Binary file modified PhotoFun/obj/Debug/PhotoFun.pdb
View file
Binary file not shown.
Binary file modified TestPhotoFun/obj/Debug/TestPhotoFun.csprojResolveAssemblyReference.cache
View file
Binary file not shown.

0 comments on commit 669df6f

Please sign in to comment.