Skip to content

Commit

Permalink
Merge pull request #6 from dinfcll/dv_np_BaseDonnees
Browse files Browse the repository at this point in the history
Merge à master de ma branche
  • Loading branch information
xxdomxx committed Sep 19, 2014

Partially verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
2 parents c2a46dc + ca40d45 commit 4d5325b
Showing 119 changed files with 101,521 additions and 32 deletions.
10 changes: 10 additions & 0 deletions Local.testsettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<TestSettings name="Local" id="2bdc9e53-d10a-47ce-b5c1-e3b18e2ff5c4" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
<Description>Il s'agit des paramètres de test par défaut pour une série de tests locale.</Description>
<Deployment enabled="false" />
<Execution>
<TestTypeSpecific />
<AgentRule name="Execution Agents">
</AgentRule>
</Execution>
</TestSettings>
16 changes: 16 additions & 0 deletions PhotoFun.sln
Original file line number Diff line number Diff line change
@@ -3,7 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoFun", "PhotoFun\PhotoFun.csproj", "{4E0BB2E7-1B95-4A0F-A0DF-7C282174C715}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestPhotoFun", "TestPhotoFun\TestPhotoFun.csproj", "{32B7CE3C-1345-4F61-8EE6-F7234216FF80}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CE2F057-BE6E-4363-A31E-74758ED0B5B8}"
ProjectSection(SolutionItems) = preProject
Local.testsettings = Local.testsettings
PhotoFun.vsmdi = PhotoFun.vsmdi
TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
EndProjectSection
EndProject
Global
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = PhotoFun.vsmdi
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
@@ -13,6 +25,10 @@ Global
{4E0BB2E7-1B95-4A0F-A0DF-7C282174C715}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E0BB2E7-1B95-4A0F-A0DF-7C282174C715}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E0BB2E7-1B95-4A0F-A0DF-7C282174C715}.Release|Any CPU.Build.0 = Release|Any CPU
{32B7CE3C-1345-4F61-8EE6-F7234216FF80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{32B7CE3C-1345-4F61-8EE6-F7234216FF80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{32B7CE3C-1345-4F61-8EE6-F7234216FF80}.Release|Any CPU.ActiveCfg = Release|Any CPU
{32B7CE3C-1345-4F61-8EE6-F7234216FF80}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Binary file modified PhotoFun.suo
Binary file not shown.
6 changes: 6 additions & 0 deletions PhotoFun.vsmdi
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
<TestList name="Listes de tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
<RunConfiguration id="2bdc9e53-d10a-47ce-b5c1-e3b18e2ff5c4" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</TestList>
</TestLists>
Binary file removed PhotoFun/App_Data/S_CHIEN2.BMP
Binary file not shown.
Binary file removed PhotoFun/App_Data/souris.jpg
Binary file not shown.
Binary file added PhotoFun/Content/PhotoFun/PhotoFunLogo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions PhotoFun/Content/Site.css
Original file line number Diff line number Diff line change
@@ -740,7 +740,7 @@ tr.pager td {
/* footer
----------------------------------------------------------*/
footer .float-left,
footer .float-right {
footer .float-right{
float: none;
}

@@ -753,4 +753,4 @@ tr.pager td {
footer p {
margin: 0;
}
}
}
15 changes: 8 additions & 7 deletions PhotoFun/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
@@ -10,22 +10,23 @@ public class HomeController : Controller
{
public ActionResult Index()
{
ViewBag.Message = "Modifiez ce modèle pour dynamiser votre application ASP.NET MVC.";

return View();
}

public ActionResult Importer()
{
ViewBag.Message = "Votre page de description d’application.";

return View();
if (User.Identity.IsAuthenticated)
{
return View();
}
else
{
return RedirectToAction("Login", "Account");
}
}

public ActionResult Contact()
{
ViewBag.Message = "Votre page de contact.";

return View();
}
}
4 changes: 2 additions & 2 deletions PhotoFun/Models/AccountModels.cs
Original file line number Diff line number Diff line change
@@ -83,8 +83,8 @@ public class RegisterModel
public string ConfirmPassword { get; set; }

[Required]
[Display(Name = "Courriela")]
public string Courriela { get; set; }
[Display(Name = "Courriel")]
public string Courriel { get; set; }

[Required]
[Display(Name = "Nom")]
8 changes: 4 additions & 4 deletions PhotoFun/PhotoFun.csproj
Original file line number Diff line number Diff line change
@@ -243,7 +243,9 @@
<Content Include="Scripts\knockout-2.1.0.debug.js" />
<Content Include="Scripts\knockout-2.1.0.js" />
<Content Include="Scripts\modernizr-2.5.3.js" />
<Content Include="Web.config" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
<Content Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</Content>
@@ -271,8 +273,6 @@
<Content Include="Views\Account\Login.cshtml" />
<Content Include="Views\Account\Manage.cshtml" />
<Content Include="Views\Account\Register.cshtml" />
<Content Include="Views\Account\ExternalLoginFailure.cshtml" />
<Content Include="Views\Account\ExternalLoginConfirmation.cshtml" />
<Content Include="Views\Home\Importer.cshtml" />
<Content Include="Views\Home\Contact.cshtml" />
<Content Include="Views\Home\Index.cshtml" />
@@ -307,7 +307,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>3507</DevelopmentServerPort>
<DevelopmentServerPort>5328</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>
4 changes: 2 additions & 2 deletions PhotoFun/Views/Account/Register.cshtml
Original file line number Diff line number Diff line change
@@ -28,8 +28,8 @@
@Html.PasswordFor(m => m.ConfirmPassword)
</li>
<li>
@Html.LabelFor(m => m.Courriela)
@Html.TextBoxFor(m => m.Courriela)
@Html.LabelFor(m => m.Courriel)
@Html.TextBoxFor(m => m.Courriel)
</li>
<li>
@Html.LabelFor(m => m.PrenomUtil)
3 changes: 2 additions & 1 deletion PhotoFun/Views/Home/Importer.cshtml
Original file line number Diff line number Diff line change
@@ -19,7 +19,8 @@
<input type="radio" name="categorie" />Autres
</ul>
</div>
<div id="Photo Importer" style="background-image:url(/content/Photo/souris.jpg); background-repeat:no-repeat; height:500px; width:500px"></div>
<div id="Photo Importer" style="background-image:url(/content/Photo/souris.jpg); background-repeat:no-repeat; height:500px; width:500px"></div>


</article>

20 changes: 9 additions & 11 deletions PhotoFun/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
@@ -4,17 +4,15 @@
@section featured {
<section class="featured">
<div class="content-wrapper">
<hgroup class="title">
<h1>@ViewBag.Title.</h1>
<h2>@ViewBag.Message</h2>
</hgroup>
<p>
Pour en savoir plus sur ASP.NET MVC, consultez la page
<a href="http://asp.net/mvc" title="ASP.NET MVC Website">http://asp.net/mvc</a>.
La page inclut <mark>des vidéos, des didacticiels et des exemples</mark> pour vous aider à tirer parti dASP.NET MVC.
Si vous avez des questions sur ASP.NET MVC, consultez
<a href="http://forums.asp.net/1146.aspx/1?MVC" title="ASP.NET MVC Forum">nos forums</a>.
</p>
<h2>
<a href="~/Home/Index">Sport</a>
<a href="~/Home/Index">Nature</a>
<a href="~/Home/Index">Famille</a>
<a href="~/Home/Index">Paysage</a>
<a href="~/Home/Index">Cuisine</a>
<a href="~/Home/Index">Animaux</a>
<a href="~/Home/Index">Autre</a>
</h2>
</div>
</section>
}
4 changes: 2 additions & 2 deletions PhotoFun/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
<header>
<div class="content-wrapper">
<div class="float-left">
<p class="site-title">@Html.ActionLink("votre logo ici", "Index", "Home")</p>
<a class="site-title" href="~/Home/Index"><img src="~/Content/PhotoFun/PhotoFunLogo.jpg" alt="PhotoFun"/></a>
</div>
<div class="float-right">
<section id="login">
@@ -38,7 +38,7 @@
<footer>
<div class="content-wrapper">
<div class="float-left">
<p>&copy; @DateTime.Now.Year - Mon application ASP.NET MVC</p>
<p>&copy; @DateTime.Now.Year - PhotoFun</p>
</div>
</div>
</footer>
Binary file modified PhotoFun/bin/PhotoFun.dll
Binary file not shown.
Binary file modified PhotoFun/bin/PhotoFun.pdb
Binary file not shown.
1 change: 0 additions & 1 deletion PhotoFun/obj/Debug/PhotoFun.csproj.FileListAbsolute.txt
Original file line number Diff line number Diff line change
@@ -64,6 +64,5 @@ E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\bin\fr\System.
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\bin\fr\WebMatrix.Data.resources.dll
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\bin\fr\Microsoft.Web.WebPages.OAuth.resources.dll
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\bin\fr\WebMatrix.WebData.resources.dll
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\obj\Debug\PhotoFun.csprojResolveAssemblyReference.cache
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\obj\Debug\PhotoFun.dll
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\obj\Debug\PhotoFun.pdb
Binary file not shown.
Binary file modified PhotoFun/obj/Debug/PhotoFun.dll
Binary file not shown.
Binary file modified PhotoFun/obj/Debug/PhotoFun.pdb
Binary file not shown.
Binary file added PhotoFunBD.accdb
Binary file not shown.
166 changes: 166 additions & 0 deletions TestPhotoFun/Content/PagedList.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
.pagination {
display: inline-block;
padding-left: 0;
margin: 20px 0;
border-radius: 4px;
}

.pagination > li {
display: inline;
}

.pagination > li > a,
.pagination > li > span {
position: relative;
float: left;
padding: 6px 12px;
margin-left: -1px;
line-height: 1.428571429;
text-decoration: none;
background-color: #ffffff;
border: 1px solid #dddddd;
}

.pagination > li:first-child > a,
.pagination > li:first-child > span {
margin-left: 0;
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
}

.pagination > li:last-child > a,
.pagination > li:last-child > span {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}

.pagination > li > a:hover,
.pagination > li > span:hover,
.pagination > li > a:focus,
.pagination > li > span:focus {
background-color: #eeeeee;
}

.pagination > .active > a,
.pagination > .active > span,
.pagination > .active > a:hover,
.pagination > .active > span:hover,
.pagination > .active > a:focus,
.pagination > .active > span:focus {
z-index: 2;
color: #ffffff;
cursor: default;
background-color: #428bca;
border-color: #428bca;
}

.pagination > .disabled > span,
.pagination > .disabled > a,
.pagination > .disabled > a:hover,
.pagination > .disabled > a:focus {
color: #999999;
cursor: not-allowed;
background-color: #ffffff;
border-color: #dddddd;
}

.pagination-lg > li > a,
.pagination-lg > li > span {
padding: 10px 16px;
font-size: 18px;
}

.pagination-lg > li:first-child > a,
.pagination-lg > li:first-child > span {
border-bottom-left-radius: 6px;
border-top-left-radius: 6px;
}

.pagination-lg > li:last-child > a,
.pagination-lg > li:last-child > span {
border-top-right-radius: 6px;
border-bottom-right-radius: 6px;
}

.pagination-sm > li > a,
.pagination-sm > li > span {
padding: 5px 10px;
font-size: 12px;
}

.pagination-sm > li:first-child > a,
.pagination-sm > li:first-child > span {
border-bottom-left-radius: 3px;
border-top-left-radius: 3px;
}

.pagination-sm > li:last-child > a,
.pagination-sm > li:last-child > span {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}

.pager {
padding-left: 0;
margin: 20px 0;
text-align: center;
list-style: none;
}

.pager:before,
.pager:after {
display: table;
content: " ";
}

.pager:after {
clear: both;
}

.pager:before,
.pager:after {
display: table;
content: " ";
}

.pager:after {
clear: both;
}

.pager li {
display: inline;
}

.pager li > a,
.pager li > span {
display: inline-block;
padding: 5px 14px;
background-color: #ffffff;
border: 1px solid #dddddd;
border-radius: 15px;
}

.pager li > a:hover,
.pager li > a:focus {
text-decoration: none;
background-color: #eeeeee;
}

.pager .next > a,
.pager .next > span {
float: right;
}

.pager .previous > a,
.pager .previous > span {
float: left;
}

.pager .disabled > a,
.pager .disabled > a:hover,
.pager .disabled > a:focus,
.pager .disabled > span {
color: #999999;
cursor: not-allowed;
background-color: #ffffff;
}
Loading

0 comments on commit 4d5325b

Please sign in to comment.