Zbiór zmian 844 dla trunk/Wierszowki
- Data:
- 2009-10-05 15:24:54 (17 years ago)
- Lokalizacja:
- trunk/Wierszowki/Wierszowki.Web
- Pliki:
-
- 1 dodane
- 9 zmodyfikowane
-
Content/Site.css (zmodyfikowane) (3 diffs)
-
Controllers/AuthorController.cs (zmodyfikowane) (6 diffs)
-
Views/Author/Confirm.aspx (zmodyfikowane) (2 diffs)
-
Views/Author/Create.aspx (zmodyfikowane) (3 diffs)
-
Views/Author/Edit.aspx (zmodyfikowane) (3 diffs)
-
Views/MagazineItem/Create.aspx (zmodyfikowane) (4 diffs)
-
Views/MagazineItem/Edit.aspx (zmodyfikowane) (4 diffs)
-
Views/User/Edit.aspx (zmodyfikowane) (4 diffs)
-
Wierszowki.Web.csproj (zmodyfikowane) (3 diffs)
-
Wierszowki.Web.csproj.user (dodane)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
trunk/Wierszowki/Wierszowki.Web/Content/Site.css
r842 r844 322 322 .field-validation-error 323 323 { 324 padding-left: 2px; 324 325 color: #ff0000; 325 326 } … … 353 354 fieldset 354 355 { 355 width: 6 00px;356 padding: 5px 5px 5px 5px;356 width: 680px; 357 padding: 5px 2px 5px 5px; 357 358 } 358 359 … … 528 529 font-weight: normal; 529 530 } 531 532 .fieldset select,input { border: 1px solid black;} 533 select.error, input.error { border: 1px solid red; } 534 br { clear: both; } 535 536 label.error 537 { 538 background: url('http://dev.jquery.com/view/trunk/plugins/validate/demo/images/unchecked.gif') no-repeat; 539 padding-left: 18px; 540 margin-left: 307px; 541 margin-top: 3px; 542 } 543 .dp-choose-date{ 544 padding-left: 4px; 545 } -
trunk/Wierszowki/Wierszowki.Web/Controllers/AuthorController.cs
r752 r844 5 5 using Wierszowki.Services; 6 6 using xVal.ServerSide; 7 using System.Collections.Generic; 8 using Wierszowki.Core.Interfaces; 7 9 8 10 namespace Wierszowki.Controllers … … 28 30 { 29 31 var authorViewData = new AuthorViewData 30 31 32 33 32 { 33 Author = new Author(), 34 EmploymentTypeList = new SelectList(_context.GetEmploymentTypes().ToList(), "Id", "Name") 35 }; 34 36 35 37 return View(authorViewData); … … 51 53 52 54 if (ModelState.IsValid) 53 return RedirectToAction("Confirm", author); 55 { 56 var confirmViewData = new ConfirmViewData(); 57 confirmViewData = InitConfirmViewData(author, OperationType.Create, null); 58 return View("Confirm", confirmViewData); 59 //return RedirectToAction("Confirm", author); 60 } 54 61 55 62 … … 74 81 { 75 82 var authorViewData = new AuthorViewData 76 77 78 79 83 { 84 Author = _context.GetAuthorById(id), 85 EmploymentTypeList = new SelectList(_context.GetEmploymentTypes().ToList(), "Id", "Name") 86 }; 80 87 81 88 return View(authorViewData); … … 97 104 98 105 if (ModelState.IsValid) 99 return View("Confirm", author); 100 106 { 107 var confirmViewData = new ConfirmViewData(); 108 confirmViewData = InitConfirmViewData(author, OperationType.Update, null); 109 return View("Confirm", confirmViewData); 110 } 101 111 var authorViewData = new AuthorViewData 102 112 { … … 107 117 return View(authorViewData); 108 118 } 119 private ConfirmViewData InitConfirmViewData(Author author, OperationType c_type, Info inf) 120 { 121 var viewData = new ConfirmViewData 122 { 123 Author = author, 124 akcja = c_type, 125 info = inf 126 }; 127 return viewData; 128 } 109 129 } 110 130 } -
trunk/Wierszowki/Wierszowki.Web/Views/Author/Confirm.aspx
r752 r844 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki. Core.Linq.Author>" %>2 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.ConfirmViewData>" %> 2 <%@ Import Namespace ="Wierszowki.Models" %> 3 3 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> 4 4 Potwierdzenie dodania/edycji autora … … 7 7 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 8 8 9 <h2>Pomylnie dodano/zaktualizowano dane autora: <%= Html.Encode(ViewData.Model.FirstName + " " + ViewData.Model.LastName) %></h2> 9 <%if (Model.akcja == OperationType.Update) 10 { 11 %> 12 <h2>Pomylnie zaktualizowano dane autora: <%= Html.Encode(Model.Author.FirstName + " " + Model.Author.LastName)%></h2> 13 <% 14 } 15 else if(Model.akcja == OperationType.Create) 16 { 17 %> 18 <h2>Pomylnie dodano autora: <%= Html.Encode(Model.Author.FirstName + " " + Model.Author.LastName)%></h2> 19 <% 20 } 21 %> 10 22 <div> 11 <%= Html.ActionLink("Powrót do listy autorów", "Index") %>23 <%= Html.ActionLink("Powrót do listy autorów", "Index") %> 12 24 </div> 13 25 </asp:Content> -
trunk/Wierszowki/Wierszowki.Web/Views/Author/Create.aspx
r752 r844 1 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.AuthorViewData>" %> 2 2 <%@ Import namespace="Wierszowki.Core.Validation"%> 3 <asp:Content ID="js" ContentPlaceHolderID="jsContent" runat="server"> 4 <script src="../../Scripts/jquery-1.3.1.js" type="text/javascript"></script> 5 <script src="../../Scripts/jquery-1.3.1.min.js" type="text/javascript"></script> 6 <script src="../../Scripts/jquery.form.js" type="text/javascript"></script> 7 <script src="../../Scripts/jquery.blockUI.js" type="text/javascript"></script> 8 <script src="../../Scripts/date.js" type="text/javascript"></script> 9 <script src="../../Scripts/jquery.datePicker.js" type="text/javascript"></script> 10 <script src="../../Scripts/spiffy.js" type="text/javascript"></script> 11 <script src="../../Scripts/jHelper.js" type="text/javascript"></script> 12 <script src="../../Scripts/jquery.validate.js" type="text/javascript" ></script> 13 <script src="../../Scripts/xVal.jquery.validate.js" type="text/javascript"></script> 14 </asp:Content> 3 15 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> 4 16 Dodaj autora … … 6 18 7 19 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 8 20 <script type="text/javascript"> 21 $(function() { 22 jQuery.validator.setDefaults({ 23 success: "valid" 24 }); 25 $("#myform").validate({ 26 rules: { 27 "Author.FirstName": { required: true }, 28 "Author.LastName": { required: true }, 29 "Author.EmploymentTypeId": { required: true, range: [1, 10] } 30 }, 31 messages: { 32 "Author.FirstName": { required: "Proszê podaæ imiê autora." }, 33 "Author.LastName": { required: "Proszê podaæ nazwisko autora." }, 34 "Author.EmploymentTypeId": { required: "Proszê wybraæ typ zatrudnienia.", range: "dshvsh" } 35 } 36 }); 37 $("#myform").change(function() { 38 $("#myform").valid(); 39 }); 40 }); 41 </script> 9 42 <h2>Dodaj autora</h2> 10 43 11 44 <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.")%> 12 45 13 <% using (Html.BeginForm("Create", "Author", Model.Author)) {%> 46 <% using (Html.BeginForm("Create", "Author", Model.Author, FormMethod.Post, new { id = "myform" })) 47 {%> 14 48 15 49 <fieldset> … … 39 73 <div> 40 74 <%=Html.ActionLink("Powrót do listy autorów", "Index")%> 75 <%=Html.ClientSideValidation<AuthorValidation>("Author")%> 41 76 </div> 42 43 77 </asp:Content> -
trunk/Wierszowki/Wierszowki.Web/Views/Author/Edit.aspx
r752 r844 1 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.AuthorViewData>" %> 2 <%@ Import namespace="Wierszowki.Core.Validation"%> 3 <asp:Content ID="js" ContentPlaceHolderID="jsContent" runat="server"> 4 <script src="../../Scripts/jquery-1.3.1.js" type="text/javascript"></script> 5 <script src="../../Scripts/jquery-1.3.1.min.js" type="text/javascript"></script> 6 <script src="../../Scripts/jquery.form.js" type="text/javascript"></script> 7 <script src="../../Scripts/jquery.blockUI.js" type="text/javascript"></script> 8 <script src="../../Scripts/date.js" type="text/javascript"></script> 9 <script src="../../Scripts/jquery.datePicker.js" type="text/javascript"></script> 10 <script src="../../Scripts/spiffy.js" type="text/javascript"></script> 11 <script src="../../Scripts/jHelper.js" type="text/javascript"></script> 12 <script src="../../Scripts/jquery.validate.js" type="text/javascript" ></script> 13 <script src="../../Scripts/xVal.jquery.validate.js" type="text/javascript"></script> 14 </asp:Content> 2 15 3 16 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> … … 6 19 7 20 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 8 21 <script type="text/javascript"> 22 $(function() { 23 jQuery.validator.setDefaults({ 24 success: "valid" 25 }); 26 $("#myform").validate({ 27 rules: { 28 "Author.FirstName": { required: true }, 29 "Author.LastName": { required: true }, 30 "Author.EmploymentTypeId": { required: true, range:[1,10]} 31 }, 32 messages: { 33 "Author.FirstName": { required: "Proszê podaæ imiê autora." }, 34 "Author.LastName": { required: "Proszê podaæ nazwisko autora." }, 35 "Author.EmploymentTypeId": { required: "Proszê wybraæ typ zatrudnienia.",range:"dshvsh" } 36 } 37 }); 38 $("#myform").change(function() { 39 $("#myform").valid(); 40 }); 41 }); 42 </script> 9 43 <h2>Edytuj autora</h2> 10 44 11 45 <%= Html.ValidationSummary("Edycja siê nie powiod³a. Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %> 12 46 13 <% using (Html.BeginForm("Edit", "Author", Model.Author)) {%> 47 <% using (Html.BeginForm("Edit", "Author", Model.Author, FormMethod.Post, new { id = "myform" })) 48 {%> 14 49 15 50 <fieldset> 16 51 <legend>Dane autora</legend> 17 52 <%= Html.Hidden("Author.Id", Model.Author.Id)%> 18 < p>53 <div class="formitem"> 19 54 <label for="FirstName">Imiê:</label> 20 55 <%= Html.TextBox("Author.FirstName", Model.Author.FirstName)%> 21 56 <%= Html.ValidationMessage("Author.FirstName", "*")%> 22 </p> 23 <p> 57 <br /> 58 </div> 59 <div class="formitem"> 24 60 <label for="LastName">Nazwisko:</label> 25 61 <%= Html.TextBox("Author.LastName", Model.Author.LastName)%> 26 62 <%= Html.ValidationMessage("Author.LastName", "*")%> 27 </p> 28 <p> 63 <br /> 64 </div> 65 <div class="formitem"> 29 66 <label for="LastName">Zatrudnienie:</label> 30 67 <%= Html.DropDownList("Author.EmploymentTypeId", ViewData.Model.EmploymentTypeList, "-- proszê wybraæ --") %> 31 68 <%= Html.ValidationMessage("Author.EmploymentTypeId", "*")%> 32 </p> 33 <p> 69 <br /> 70 </div> 71 <div> 34 72 <input type="submit" value="Aktualizuj" /> 35 </ p>73 </div> 36 74 </fieldset> 37 75 … … 40 78 <div> 41 79 <%=Html.ActionLink("Powrót do listy autorów", "Index") %> 80 <%=Html.ClientSideValidation<AuthorValidation>("Author")%> 42 81 </div> 43 82 </asp:Content> -
trunk/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx
r842 r844 38 38 39 39 jQuery.validator.addMethod("RangePrice", function(cena, element) { 40 return cena.match(/^((0 )|(0[,]\d\d)|([1-9]\d[,]\d\d)|([1-9]\d\d[,]\d\d)|([1]{1}[0]{3}[,][0]{2}))$/);40 return cena.match(/^((0([,]\d\d)?)|([1-9](\d){0,2}([,]\d\d)?)|([1]{1}[0]{3}([,][0]{2})?))$/); 41 41 },"Wymagany format to 0,00 , a wartoæ nie mo¿e byæ wiêksza ni¿ 1000."); 42 42 … … 54 54 messages: { 55 55 AuthorId: { required: "Proszê wybraæ autora." }, 56 IssueId: { required: "Proszê wybraæ numer wydania. ", min: "Prosze wybraæ numer wydania. Musisz najpierw wybraæ Gazetê." },56 IssueId: { required: "Proszê wybraæ numer wydania. Musisz najpierw wybraæ Gazetê.", min: "Prosze wybraæ numer wydania. Musisz najpierw wybraæ Gazetê." }, 57 57 ItemTypeId: { required: "Proszê wybraæ typ wierszówki." }, 58 58 Date: { required: "Proszê podaæ miesi¹c"}, 59 59 Caption: { required: "Proszê podaæ tytu³ wierszówki.", maxlength: "Tytu³ jest za d³ugi." }, 60 60 Description: { maxlength:"Opis jest za d³ugi."}, 61 Bonus: { required: "Proszê wprowadziæ bonus d lawierszówki."},61 Bonus: { required: "Proszê wprowadziæ bonus do wierszówki."}, 62 62 Price: { required: "Proszê wprowadziæ wycenê wierszówki."} 63 63 } … … 68 68 }); 69 69 </script> 70 <style type="text/css">71 select,input { border: 1px solid black;}72 select.error, input.error { border: 1px solid red; }73 br { clear: both; }74 75 label.error {76 background: url('http://dev.jquery.com/view/trunk/plugins/validate/demo/images/unchecked.gif') no-repeat;77 padding-left: 18px;78 margin-left: 270px;79 margin-top: 3px;80 }81 </style>82 70 <h2>Dodaj wierszówkê</h2> 83 71 <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.")%> … … 116 104 <%= Html.ValidationMessage("Date", "*")%> 117 105 <br /> 118 </div> 119 106 </div> 120 107 <div class="formitem"> 121 108 <label for="MagazineItem.Caption">Tytu³:</label> -
trunk/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx
r842 r844 37 37 38 38 jQuery.validator.addMethod("RangePrice", function(cena, element) { 39 return cena.match(/^((0 )|(0[,]\d\d)|([1-9]\d[,]\d\d)|([1-9]\d\d[,]\d\d)|([1]{1}[0]{3}[,][0]{2}))$/);39 return cena.match(/^((0([,]\d\d)?)|([1-9](\d){0,2}([,]\d\d)?)|([1]{1}[0]{3}([,][0]{2})?))$/); 40 40 },"Wymagany format to 0,00 , a wartoæ nie mo¿e byæ wiêksza ni¿ 1000."); 41 41 42 42 $("#myform").validate({ 43 43 rules: { … … 53 53 messages: { 54 54 "MagazineItem.AuthorId": { required: "Proszê wybraæ autora." }, 55 "MagazineItem.IssueId": { required: "Proszê wybraæ numer wydania. ", min: "Prosze wybraæ numer wydania. Musisz najpierw wybraæ Gazetê." },55 "MagazineItem.IssueId": { required: "Proszê wybraæ numer wydania. Musisz najpierw wybraæ Gazetê.", min: "Prosze wybraæ numer wydania. Musisz najpierw wybraæ Gazetê." }, 56 56 "MagazineItem.ItemTypeId": { required: "Proszê wybraæ typ wierszówki." }, 57 57 "MagazineItem.Date": { required: "Proszê wprowadziæ miesi¹c."}, 58 58 "MagazineItem.Caption": { required: "Proszê wprowadziæ tytu³ wierszówki.", maxlength: "Tytu³ jest za d³ugi." }, 59 59 "MagazineItem.Description": { maxlength:"Opis jest za d³ugi."}, 60 "MagazineItem.Bonus": { required: "Proszê wprowadziæ bonus d lawierszówki."},60 "MagazineItem.Bonus": { required: "Proszê wprowadziæ bonus do wierszówki."}, 61 61 "MagazineItem.Price": { required: "Proszê wprowadziæ wycenê wierszówki."} 62 62 } … … 67 67 }); 68 68 </script> 69 <style type="text/css">70 select,input { border: 1px solid black;}71 select.error, input.error { border: 1px solid red; }72 br { clear: both; }73 74 label.error {75 background: url('http://dev.jquery.com/view/trunk/plugins/validate/demo/images/unchecked.gif') no-repeat;76 padding-left: 18px;77 margin-left: 270px;78 margin-top: 3px;79 }80 </style>81 69 <h2>Edytuj wierszówkê</h2> 82 70 <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %> … … 148 136 <br /> 149 137 </div> 150 <div class="submit">138 <div> 151 139 <input type="submit" name="edit" value="Aktualizuj" /> 152 140 </div> -
trunk/Wierszowki/Wierszowki.Web/Views/User/Edit.aspx
r752 r844 1 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Core.Linq.User>" %> 2 <%@ Import namespace="Wierszowki.Core.Validation"%> 3 <asp:Content ID="js" ContentPlaceHolderID="jsContent" runat="server"> 4 <script src="../../Scripts/jquery-1.3.1.js" type="text/javascript"></script> 5 <script src="../../Scripts/jquery-1.3.1.min.js" type="text/javascript"></script> 6 <script src="../../Scripts/jquery.form.js" type="text/javascript"></script> 7 <script src="../../Scripts/jquery.blockUI.js" type="text/javascript"></script> 8 <script src="../../Scripts/date.js" type="text/javascript"></script> 9 <script src="../../Scripts/jquery.datePicker.js" type="text/javascript"></script> 10 <script src="../../Scripts/spiffy.js" type="text/javascript"></script> 11 <script src="../../Scripts/jHelper.js" type="text/javascript"></script> 12 <script src="../../Scripts/jquery.validate.js" type="text/javascript" ></script> 13 <script src="../../Scripts/xVal.jquery.validate.js" type="text/javascript"></script> 14 </asp:Content> 2 15 3 16 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> … … 6 19 7 20 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 8 21 <script type="text/javascript"> 22 $(function() { 23 jQuery.validator.setDefaults({ 24 success: "valid" 25 }); 26 $("#myform").validate({ 27 rules: { 28 FirstName: { required: true }, 29 LastName: { required: true }, 30 Password: { required: true }, 31 Login: {required: true } 32 }, 33 messages: { 34 FirstName: { required: "Proszê podaæ imiê." }, 35 LastName: { required: "Proszê podaæ nazwisko." }, 36 Password: { required: "Proszê podaæ has³o." }, 37 Login: { required: "Proszê podaæ login."} 38 } 39 }); 40 $("#myform").change(function() { 41 $("#myform").valid(); 42 }); 43 }); 44 </script> 9 45 <h2>Edytuj u¿ytkownika</h2> 10 46 11 <%= Html.ValidationSummary(" Edit was unsuccessful. Please correct the errors and try again.") %>47 <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %> 12 48 13 <% using (Html.BeginForm("Edit", "User", Model ))49 <% using (Html.BeginForm("Edit", "User", Model, FormMethod.Post, new { id = "myform" })) 14 50 {%> 15 51 16 52 <fieldset> 17 53 <legend>Dane u¿ytkownika</legend> 18 <p> 54 <p> 19 55 <label for="Login">Login:</label> 20 56 <%= Html.TextBox("Login", Model.Login) %> … … 26 62 <%= Html.ValidationMessage("Password", "*") %> 27 63 </p> 28 <p> 64 <p> 29 65 <label for="FirstName">Imiê:</label> 30 66 <%= Html.TextBox("FirstName", Model.FirstName) %> 31 67 <%= Html.ValidationMessage("FirstName", "*") %> 32 68 </p> 33 <p> 69 <p> 34 70 <label for="LastName">Nazwisko:</label> 35 71 <%= Html.TextBox("LastName", Model.LastName) %> 36 72 <%= Html.ValidationMessage("LastName", "*") %> 37 73 </p> 38 <p> 74 <p> 39 75 <input type="submit" value="Aktualizuj" /> 40 76 </p> … … 44 80 45 81 <div> 46 <%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %> 82 <%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %> 83 <%=Html.ClientSideValidation<UserValidation>()%> 47 84 </div> 48 85 </asp:Content> -
trunk/Wierszowki/Wierszowki.Web/Wierszowki.Web.csproj
r842 r844 105 105 <Content Include="Default.aspx" /> 106 106 <Content Include="Global.asax" /> 107 <Content Include="Views\Scripts2\additional-methods.js" />108 <Content Include="Views\Scripts2\jquery-1.2.6.js" />109 <Content Include="Views\Scripts2\jquery-1.2.6.min.js" />110 <Content Include="Views\Scripts2\jquery.validate.js" />111 <Content Include="Views\Scripts2\MicrosoftAjax.debug.js" />112 <Content Include="Views\Scripts2\MicrosoftAjax.js" />113 <Content Include="Views\Scripts2\MicrosoftMvcAjax.debug.js" />114 <Content Include="Views\Scripts2\MicrosoftMvcAjax.js" />115 <Content Include="Views\Scripts2\xVal.AspNetNative.js" />116 <Content Include="Views\Scripts2\xVal.jquery.validate.js" />117 107 <Content Include="Scripts\date.js" /> 118 108 <Content Include="Scripts\jHelper.js" /> … … 135 125 <Content Include="Views\Author\Edit.aspx" /> 136 126 <Content Include="Views\Author\Index.aspx" /> 127 <Content Include="Views\Home\About.aspx" /> 128 <Content Include="Views\Home\Index.aspx" /> 137 129 <Content Include="Views\MagazineItem\Confirm.aspx" /> 138 130 <Content Include="Views\MagazineItem\Delete.aspx" /> … … 156 148 <Content Include="Scripts\MicrosoftMvcAjax.js" /> 157 149 <Content Include="Scripts\MicrosoftMvcAjax.debug.js" /> 158 <Content Include="Views\Home\About.aspx" />159 <Content Include="Views\Home\Index.aspx" />160 150 <Content Include="Views\Shared\LogOnUserControl.ascx" /> 161 151 <Content Include="Views\Shared\Site.Master" />
