Skip to content

Commit 4d5325b

Browse files
xxdomxxxxdomxx
committed
Merge pull request #6 from dinfcll/dv_np_BaseDonnees
Merge à master de ma branche
2 parents c2a46dc + ca40d45 commit 4d5325b

File tree

119 files changed

+101521
-32
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+101521
-32
lines changed

‎Local.testsettings

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<TestSettings name="Local" id="2bdc9e53-d10a-47ce-b5c1-e3b18e2ff5c4" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
3+
<Description>Il s'agit des paramètres de test par défaut pour une série de tests locale.</Description>
4+
<Deployment enabled="false" />
5+
<Execution>
6+
<TestTypeSpecific />
7+
<AgentRule name="Execution Agents">
8+
</AgentRule>
9+
</Execution>
10+
</TestSettings>

‎PhotoFun.sln

+16
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
44
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoFun", "PhotoFun\PhotoFun.csproj", "{4E0BB2E7-1B95-4A0F-A0DF-7C282174C715}"
55
EndProject
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestPhotoFun", "TestPhotoFun\TestPhotoFun.csproj", "{32B7CE3C-1345-4F61-8EE6-F7234216FF80}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CE2F057-BE6E-4363-A31E-74758ED0B5B8}"
9+
ProjectSection(SolutionItems) = preProject
10+
Local.testsettings = Local.testsettings
11+
PhotoFun.vsmdi = PhotoFun.vsmdi
12+
TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
13+
EndProjectSection
14+
EndProject
615
Global
16+
GlobalSection(TestCaseManagementSettings) = postSolution
17+
CategoryFile = PhotoFun.vsmdi
18+
EndGlobalSection
719
GlobalSection(SolutionConfigurationPlatforms) = preSolution
820
Debug|Any CPU = Debug|Any CPU
921
Release|Any CPU = Release|Any CPU
@@ -13,6 +25,10 @@ Global
1325
{4E0BB2E7-1B95-4A0F-A0DF-7C282174C715}.Debug|Any CPU.Build.0 = Debug|Any CPU
1426
{4E0BB2E7-1B95-4A0F-A0DF-7C282174C715}.Release|Any CPU.ActiveCfg = Release|Any CPU
1527
{4E0BB2E7-1B95-4A0F-A0DF-7C282174C715}.Release|Any CPU.Build.0 = Release|Any CPU
28+
{32B7CE3C-1345-4F61-8EE6-F7234216FF80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29+
{32B7CE3C-1345-4F61-8EE6-F7234216FF80}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{32B7CE3C-1345-4F61-8EE6-F7234216FF80}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{32B7CE3C-1345-4F61-8EE6-F7234216FF80}.Release|Any CPU.Build.0 = Release|Any CPU
1632
EndGlobalSection
1733
GlobalSection(SolutionProperties) = preSolution
1834
HideSolutionNode = FALSE

‎PhotoFun.suo

11.5 KB
Binary file not shown.

‎PhotoFun.vsmdi

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
3+
<TestList name="Listes de tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
4+
<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" />
5+
</TestList>
6+
</TestLists>

‎PhotoFun/App_Data/S_CHIEN2.BMP

-10.4 KB
Binary file not shown.

‎PhotoFun/App_Data/souris.jpg

-2.92 KB
Binary file not shown.

‎PhotoFun/Content/PhotoFun/PhotoFunLogo.jpg

11.6 KB
Loading

‎PhotoFun/Content/Site.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ tr.pager td {
740740
/* footer
741741
----------------------------------------------------------*/
742742
footer .float-left,
743-
footer .float-right {
743+
footer .float-right{
744744
float: none;
745745
}
746746

@@ -753,4 +753,4 @@ tr.pager td {
753753
footer p {
754754
margin: 0;
755755
}
756-
}
756+
}

‎PhotoFun/Controllers/HomeController.cs

+8-7
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,23 @@ public class HomeController : Controller
1010
{
1111
public ActionResult Index()
1212
{
13-
ViewBag.Message = "Modifiez ce modèle pour dynamiser votre application ASP.NET MVC.";
14-
1513
return View();
1614
}
1715

1816
public ActionResult Importer()
1917
{
20-
ViewBag.Message = "Votre page de description d’application.";
21-
22-
return View();
18+
if (User.Identity.IsAuthenticated)
19+
{
20+
return View();
21+
}
22+
else
23+
{
24+
return RedirectToAction("Login", "Account");
25+
}
2326
}
2427

2528
public ActionResult Contact()
2629
{
27-
ViewBag.Message = "Votre page de contact.";
28-
2930
return View();
3031
}
3132
}

‎PhotoFun/Models/AccountModels.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ public class RegisterModel
8383
public string ConfirmPassword { get; set; }
8484

8585
[Required]
86-
[Display(Name = "Courriela")]
87-
public string Courriela { get; set; }
86+
[Display(Name = "Courriel")]
87+
public string Courriel { get; set; }
8888

8989
[Required]
9090
[Display(Name = "Nom")]

‎PhotoFun/PhotoFun.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,9 @@
243243
<Content Include="Scripts\knockout-2.1.0.debug.js" />
244244
<Content Include="Scripts\knockout-2.1.0.js" />
245245
<Content Include="Scripts\modernizr-2.5.3.js" />
246-
<Content Include="Web.config" />
246+
<Content Include="Web.config">
247+
<SubType>Designer</SubType>
248+
</Content>
247249
<Content Include="Web.Debug.config">
248250
<DependentUpon>Web.config</DependentUpon>
249251
</Content>
@@ -271,8 +273,6 @@
271273
<Content Include="Views\Account\Login.cshtml" />
272274
<Content Include="Views\Account\Manage.cshtml" />
273275
<Content Include="Views\Account\Register.cshtml" />
274-
<Content Include="Views\Account\ExternalLoginFailure.cshtml" />
275-
<Content Include="Views\Account\ExternalLoginConfirmation.cshtml" />
276276
<Content Include="Views\Home\Importer.cshtml" />
277277
<Content Include="Views\Home\Contact.cshtml" />
278278
<Content Include="Views\Home\Index.cshtml" />
@@ -307,7 +307,7 @@
307307
<WebProjectProperties>
308308
<UseIIS>False</UseIIS>
309309
<AutoAssignPort>True</AutoAssignPort>
310-
<DevelopmentServerPort>3507</DevelopmentServerPort>
310+
<DevelopmentServerPort>5328</DevelopmentServerPort>
311311
<DevelopmentServerVPath>/</DevelopmentServerVPath>
312312
<IISUrl>
313313
</IISUrl>

‎PhotoFun/Views/Account/Register.cshtml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
@Html.PasswordFor(m => m.ConfirmPassword)
2929
</li>
3030
<li>
31-
@Html.LabelFor(m => m.Courriela)
32-
@Html.TextBoxFor(m => m.Courriela)
31+
@Html.LabelFor(m => m.Courriel)
32+
@Html.TextBoxFor(m => m.Courriel)
3333
</li>
3434
<li>
3535
@Html.LabelFor(m => m.PrenomUtil)

‎PhotoFun/Views/Home/Importer.cshtml

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<input type="radio" name="categorie" />Autres
2020
</ul>
2121
</div>
22-
<div id="Photo Importer" style="background-image:url(/content/Photo/souris.jpg); background-repeat:no-repeat; height:500px; width:500px"></div>
22+
<div id="Photo Importer" style="background-image:url(/content/Photo/souris.jpg); background-repeat:no-repeat; height:500px; width:500px"></div>
23+
2324

2425
</article>
2526

‎PhotoFun/Views/Home/Index.cshtml

+9-11
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
@section featured {
55
<section class="featured">
66
<div class="content-wrapper">
7-
<hgroup class="title">
8-
<h1>@ViewBag.Title.</h1>
9-
<h2>@ViewBag.Message</h2>
10-
</hgroup>
11-
<p>
12-
Pour en savoir plus sur ASP.NET MVC, consultez la page
13-
<a href="http://asp.net/mvc" title="ASP.NET MVC Website">http://asp.net/mvc</a>.
14-
La page inclut <mark>des vidéos, des didacticiels et des exemples</mark> pour vous aider à tirer parti d’ASP.NET MVC.
15-
Si vous avez des questions sur ASP.NET MVC, consultez
16-
<a href="http://forums.asp.net/1146.aspx/1?MVC" title="ASP.NET MVC Forum">nos forums</a>.
17-
</p>
7+
<h2>
8+
<a href="~/Home/Index">Sport</a>
9+
<a href="~/Home/Index">Nature</a>
10+
<a href="~/Home/Index">Famille</a>
11+
<a href="~/Home/Index">Paysage</a>
12+
<a href="~/Home/Index">Cuisine</a>
13+
<a href="~/Home/Index">Animaux</a>
14+
<a href="~/Home/Index">Autre</a>
15+
</h2>
1816
</div>
1917
</section>
2018
}

‎PhotoFun/Views/Shared/_Layout.cshtml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<header>
1414
<div class="content-wrapper">
1515
<div class="float-left">
16-
<p class="site-title">@Html.ActionLink("votre logo ici", "Index", "Home")</p>
16+
<a class="site-title" href="~/Home/Index"><img src="~/Content/PhotoFun/PhotoFunLogo.jpg" alt="PhotoFun"/></a>
1717
</div>
1818
<div class="float-right">
1919
<section id="login">
@@ -38,7 +38,7 @@
3838
<footer>
3939
<div class="content-wrapper">
4040
<div class="float-left">
41-
<p>&copy; @DateTime.Now.Year - Mon application ASP.NET MVC</p>
41+
<p>&copy; @DateTime.Now.Year - PhotoFun</p>
4242
</div>
4343
</div>
4444
</footer>

‎PhotoFun/bin/PhotoFun.dll

-1.5 KB
Binary file not shown.

‎PhotoFun/bin/PhotoFun.pdb

-8 KB
Binary file not shown.

‎PhotoFun/obj/Debug/PhotoFun.csproj.FileListAbsolute.txt

-1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,5 @@ E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\bin\fr\System.
6464
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\bin\fr\WebMatrix.Data.resources.dll
6565
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\bin\fr\Microsoft.Web.WebPages.OAuth.resources.dll
6666
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\bin\fr\WebMatrix.WebData.resources.dll
67-
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\obj\Debug\PhotoFun.csprojResolveAssemblyReference.cache
6867
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\obj\Debug\PhotoFun.dll
6968
E:\Implantation d'un système informatique\a14-photo-fun\PhotoFun\obj\Debug\PhotoFun.pdb

‎PhotoFun/obj/Debug/PhotoFun.csprojResolveAssemblyReference.cache

-194 KB
Binary file not shown.

‎PhotoFun/obj/Debug/PhotoFun.dll

-1.5 KB
Binary file not shown.

‎PhotoFun/obj/Debug/PhotoFun.pdb

-8 KB
Binary file not shown.

‎PhotoFunBD.accdb

960 KB
Binary file not shown.

‎TestPhotoFun/Content/PagedList.css

+166
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
.pagination {
2+
display: inline-block;
3+
padding-left: 0;
4+
margin: 20px 0;
5+
border-radius: 4px;
6+
}
7+
8+
.pagination > li {
9+
display: inline;
10+
}
11+
12+
.pagination > li > a,
13+
.pagination > li > span {
14+
position: relative;
15+
float: left;
16+
padding: 6px 12px;
17+
margin-left: -1px;
18+
line-height: 1.428571429;
19+
text-decoration: none;
20+
background-color: #ffffff;
21+
border: 1px solid #dddddd;
22+
}
23+
24+
.pagination > li:first-child > a,
25+
.pagination > li:first-child > span {
26+
margin-left: 0;
27+
border-bottom-left-radius: 4px;
28+
border-top-left-radius: 4px;
29+
}
30+
31+
.pagination > li:last-child > a,
32+
.pagination > li:last-child > span {
33+
border-top-right-radius: 4px;
34+
border-bottom-right-radius: 4px;
35+
}
36+
37+
.pagination > li > a:hover,
38+
.pagination > li > span:hover,
39+
.pagination > li > a:focus,
40+
.pagination > li > span:focus {
41+
background-color: #eeeeee;
42+
}
43+
44+
.pagination > .active > a,
45+
.pagination > .active > span,
46+
.pagination > .active > a:hover,
47+
.pagination > .active > span:hover,
48+
.pagination > .active > a:focus,
49+
.pagination > .active > span:focus {
50+
z-index: 2;
51+
color: #ffffff;
52+
cursor: default;
53+
background-color: #428bca;
54+
border-color: #428bca;
55+
}
56+
57+
.pagination > .disabled > span,
58+
.pagination > .disabled > a,
59+
.pagination > .disabled > a:hover,
60+
.pagination > .disabled > a:focus {
61+
color: #999999;
62+
cursor: not-allowed;
63+
background-color: #ffffff;
64+
border-color: #dddddd;
65+
}
66+
67+
.pagination-lg > li > a,
68+
.pagination-lg > li > span {
69+
padding: 10px 16px;
70+
font-size: 18px;
71+
}
72+
73+
.pagination-lg > li:first-child > a,
74+
.pagination-lg > li:first-child > span {
75+
border-bottom-left-radius: 6px;
76+
border-top-left-radius: 6px;
77+
}
78+
79+
.pagination-lg > li:last-child > a,
80+
.pagination-lg > li:last-child > span {
81+
border-top-right-radius: 6px;
82+
border-bottom-right-radius: 6px;
83+
}
84+
85+
.pagination-sm > li > a,
86+
.pagination-sm > li > span {
87+
padding: 5px 10px;
88+
font-size: 12px;
89+
}
90+
91+
.pagination-sm > li:first-child > a,
92+
.pagination-sm > li:first-child > span {
93+
border-bottom-left-radius: 3px;
94+
border-top-left-radius: 3px;
95+
}
96+
97+
.pagination-sm > li:last-child > a,
98+
.pagination-sm > li:last-child > span {
99+
border-top-right-radius: 3px;
100+
border-bottom-right-radius: 3px;
101+
}
102+
103+
.pager {
104+
padding-left: 0;
105+
margin: 20px 0;
106+
text-align: center;
107+
list-style: none;
108+
}
109+
110+
.pager:before,
111+
.pager:after {
112+
display: table;
113+
content: " ";
114+
}
115+
116+
.pager:after {
117+
clear: both;
118+
}
119+
120+
.pager:before,
121+
.pager:after {
122+
display: table;
123+
content: " ";
124+
}
125+
126+
.pager:after {
127+
clear: both;
128+
}
129+
130+
.pager li {
131+
display: inline;
132+
}
133+
134+
.pager li > a,
135+
.pager li > span {
136+
display: inline-block;
137+
padding: 5px 14px;
138+
background-color: #ffffff;
139+
border: 1px solid #dddddd;
140+
border-radius: 15px;
141+
}
142+
143+
.pager li > a:hover,
144+
.pager li > a:focus {
145+
text-decoration: none;
146+
background-color: #eeeeee;
147+
}
148+
149+
.pager .next > a,
150+
.pager .next > span {
151+
float: right;
152+
}
153+
154+
.pager .previous > a,
155+
.pager .previous > span {
156+
float: left;
157+
}
158+
159+
.pager .disabled > a,
160+
.pager .disabled > a:hover,
161+
.pager .disabled > a:focus,
162+
.pager .disabled > span {
163+
color: #999999;
164+
cursor: not-allowed;
165+
background-color: #ffffff;
166+
}

0 commit comments

Comments
 (0)