Zbiór zmian 853 dla branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem
- Data:
- 2009-10-15 15:34:49 (17 years ago)
- Lokalizacja:
- branches/Emisje
- Pliki:
-
- 5 zmodyfikowane
-
. (zmodyfikowane) (1 prop)
-
Wierszowki/Wierszowki.Web/Views/MagazineItem/Confirm.aspx (zmodyfikowane) (2 diffs)
-
Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx (zmodyfikowane) (3 diffs)
-
Wierszowki/Wierszowki.Web/Views/MagazineItem/Delete.aspx (zmodyfikowane) (3 diffs)
-
Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx (zmodyfikowane) (4 diffs)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
branches/Emisje
- Property svn:mergeinfo
-
old new 2 2 /branches/ReklamaReorganizacja:568-731 3 3 /tags/BazaReklam_1.1.28:831 4 /trunk:774-8 374 /trunk:774-852
-
- Property svn:mergeinfo
-
branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Confirm.aspx
r838 r853 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 wierszówki … … 6 6 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 7 7 <% 8 if (ViewData ["message"] == "delete")8 if (ViewData.Model.akcja == OperationType.Delete) 9 9 { 10 10 %> 11 <h4>Pomylnie usuniêto wierszówkê!</h4> 12 <% 13 } 14 else if(ViewData["message"] == "null"){ 15 %> 16 <h6>Nie mo¿na wykonaæ operacji. B³êdny numer id!!! </h6> 11 <h2>Pomylnie usuniêto wierszówkê!</h2> 17 12 <% } 18 else 13 else if (ViewData.Model.akcja == OperationType.WrongId) 19 14 { 20 15 %> 21 <h2>Pomylnie dodano/zaktualizowano wierszówkê dla: <%= Html.Encode(ViewData.Model.FirstName + " " + ViewData.Model.LastName)%></h2> 16 <h2>Nie mo¿na wykonaæ operacji. B³êdny numer id!!! </h2> 17 <% } 18 else if (ViewData.Model.akcja == OperationType.NullId) 19 { 20 %> 21 <h2>Nie mo¿na wykonaæ operacji, gdy¿ nie podano numeru id wierszówki!!! </h2> 22 <% } 23 else if (ViewData.Model.akcja == OperationType.Update) 24 { 25 %> 26 <h2>Pomylnie zaktualizowano wierszówkê dla: <%= Html.Encode(ViewData.Model.Author.FirstName + " " + ViewData.Model.Author.LastName)%></h2> 22 27 <% 23 28 } 29 else if (ViewData.Model.akcja == OperationType.Create) 30 { 24 31 %> 25 <div> 26 <%=Html.ActionLink("Powrót", "Index", "Report") %> 32 <h2>Pomylnie dodano wierszówkê dla: <%= Html.Encode(ViewData.Model.Author.FirstName + " " + ViewData.Model.Author.LastName)%></h2> 33 <% 34 } 35 36 %> 37 <div> 38 <% 39 if (ViewData.Model.info != null) 40 { 41 if (ViewData.Model.info.powrot == "2" && (ViewData.Model.akcja == OperationType.Delete || ViewData.Model.akcja == OperationType.Update)) 42 { 43 var sciezka = "All/" + ViewData.Model.info.year + "/" + ViewData.Model.info.month + "/" + ViewData.Model.info.user_id; 44 %> 45 <%=Html.ActionLink("Powrót", sciezka, "Report")%> | 46 <%=Html.ActionLink("Raporty", "Index", "Report")%> 47 <% 48 } 49 else if (ViewData.Model.info.powrot == "1" && (ViewData.Model.akcja == OperationType.Delete || ViewData.Model.akcja == OperationType.Update)) 50 { 51 %> 52 <%=Html.ActionLink("Powrót", "ToPrice", "Report")%> | 53 <%=Html.ActionLink("Strona G³ówna", "Index", "Home")%> 54 <% 55 } 56 } 57 if (ViewData.Model.akcja == OperationType.Create) 58 { 59 %> 60 <%=Html.ActionLink("Powrót", "Index", "Home")%> | 61 <%=Html.ActionLink("Dodaj now¹ wierszówkê", "Create", "MagazineItem")%> 62 <% 63 } 64 else if (ViewData.Model.akcja == OperationType.WrongId || ViewData.Model.akcja == OperationType.NullId) 65 { 66 %> 67 <%=Html.ActionLink("Strona G³ówna", "Index", "Home")%> 68 <% 69 } 70 %> 27 71 </div> 28 72 </asp:Content> -
branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx
r796 r853 1 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.MagazineItemViewData>" %> 2 2 <%@ Import namespace="Wierszowki.Core.Validation"%> 3 3 <asp:Content ID="js" ContentPlaceHolderID="jsContent" runat="server"> 4 4 <script src="../../Scripts/jquery-1.3.1.js" type="text/javascript"></script> … … 10 10 <script src="../../Scripts/spiffy.js" type="text/javascript"></script> 11 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 <script src="../../Scripts/jqueryvalid.js" type="text/javascript"></script> 15 <script src="../../Scripts/xValCreateMagazineItem.js" type="text/javascript"></script> 12 16 </asp:Content> 13 17 … … 17 21 18 22 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 19 <script type="text/javascript"> 20 $(function() { 21 $("#Magazine").change(function() { 22 var magazineId = $("#Magazine > option:selected").attr("value"); 23 var urlAction = "<%= Url.Action("FindIssuesById", "Magazine") %>"; 24 urlAction = urlAction + "/" + magazineId; 25 $.getJSON(urlAction, function(data) { 26 $("#MagazineItem_IssueId").addItems(data); 27 }); 23 <script type="text/javascript"> 24 $(document).ready(function() { 25 $("#Magazine_Id").change(function() { 26 var magazineId = $("#Magazine_Id > option:selected").attr("value"); 27 var urlAction = "<%= Url.Action("FindIssuesById", "Magazine") %>"; 28 urlAction = urlAction + "/" + magazineId; 29 $.getJSON(urlAction, function(data) { 30 $("#IssueId").addItems(data); 31 }); 32 }); 28 33 }); 29 }); 30 </script> 31 34 </script> 32 35 <h2>Dodaj wierszówkê</h2> 33 <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %> 34 35 <div> 36 <div id="messages"></div> 37 <% using (Html.BeginForm("Create", "MagazineItem", Model.MagazineItem)) 38 { %> 36 <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.")%> 37 <div> 38 <% Html.BeginForm("Create", "MagazineItem", Model.MagazineItem, FormMethod.Post, new { id = "myform" }) ; 39 %> 39 40 <fieldset> 40 41 <legend>Nowa wierszówka</legend> 41 42 <div class="formitem"> 42 43 <label for="MagazineItem.AuthorId">Autor:</label> 43 <%= Html.DropDownList("MagazineItem.AuthorId", ViewData.Model.AuthorList, "-- proszê wybraæ --")%> 44 <%= Html.ValidationMessage("MagazineItem.AuthorId", "*")%> 44 <%= Html.DropDownList("AuthorId", ViewData.Model.AuthorList, "-- proszê wybraæ --")%> 45 <%= Html.ValidationMessage("AuthorId", "*")%> 46 <br /> 45 47 </div> 46 48 <div class="formitem"> 47 49 <label for="Magazine">Gazeta:</label> 48 <%= Html.DropDownList("Magazine", ViewData.Model.MagazineList, "-- proszê wybraæ --")%> 49 <%= Html.ValidationMessage("Magazine", "*")%> 50 <%= Html.DropDownList("Magazine.Id", ViewData.Model.MagazineList, "-- proszê wybraæ --")%> 51 <%= Html.ValidationMessage("Magazine.Id", "*")%> 52 <br /> 50 53 </div> 51 54 <div class="formitem"> 52 55 <label for="MagazineItem.IssueId">Wydanie:</label> 53 <%= Html.DropDownList("MagazineItem.IssueId", ViewData.Model.IssueList, "-- proszê wybraæ --")%> 54 <%= Html.ValidationMessage("MagazineItem.IssueId", "*")%> 56 <%= Html.DropDownList("IssueId", ViewData.Model.IssueList, "-- proszê wybraæ --")%> 57 <%= Html.ValidationMessage("IssueId", "*")%> 58 <br /> 55 59 </div> 56 60 <div class="formitem"> 57 61 <label for="MagazineItem.ItemTypeId">Typ:</label> 58 <%= Html.DropDownList("MagazineItem.ItemTypeId", ViewData.Model.ItemTypeList, "-- proszê wybraæ --")%> 59 <%= Html.ValidationMessage("MagazineItem.ItemTypeId", "*")%> 62 <%= Html.DropDownList("ItemTypeId", ViewData.Model.ItemTypeList, "-- proszê wybraæ --")%> 63 <%= Html.ValidationMessage("ItemTypeId", "*")%> 64 <br /> 60 65 </div> 61 66 <div class="formitem"> 62 67 <label for="MagazineItem.Date">Miesi¹c:</label> 63 <%= Html.TextBox(" MagazineItem.Date",Model.MagazineItem.Date, new { Class = "date-pick" })%>64 <%= Html.ValidationMessage(" MagazineItem.Date", "*")%>65 </div>66 68 <%= Html.TextBox("Date", ViewData.Model.MagazineItem.Date, new { Class = "date-pick" })%> 69 <%= Html.ValidationMessage("Date", "*")%> 70 <br /> 71 </div> 67 72 <div class="formitem"> 68 73 <label for="MagazineItem.Caption">Tytu³:</label> 69 <%= Html.TextBox("MagazineItem.Caption", Model.MagazineItem.Caption, new { title = "Proszê wprowadziæ tytu³ artyku³u." })%> 70 <%= Html.ValidationMessage("MagazineItem.Caption", "*")%> 74 <%= Html.TextBox("Caption", ViewData.Model.MagazineItem.Caption)%> 75 <%= Html.ValidationMessage("Caption", "*")%> 76 <br /> 71 77 </div> 72 78 <div class="formitem"> 73 79 <label for="MagazineItem.Description">Opis:</label> 74 <%= Html.TextArea("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%> 80 <%= Html.TextArea("Description", ViewData.Model.MagazineItem.Description)%> 81 <br /> 75 82 </div> 76 83 <div class="formitem"> 77 84 <label for="MagazineItem.Price">Wycena:</label> 78 <%= Html.TextBox("MagazineItem.Price", Model.MagazineItem.Price.ToString("#0.00"), new { title = "Proszê wprowadziæ wycenê artyku³u." })%> 79 <%= Html.ValidationMessage("MagazineItem.Price", "*")%> 85 <%= Html.TextBox("Price", ViewData.Model.MagazineItem.Price)%> 86 <%= Html.ValidationMessage("Price", "*")%> 87 <br /> 80 88 </div> 81 89 <div class="formitem"> 82 90 <label for="MagazineItem.Bonus">Bonus:</label> 83 <%= Html.TextBox("MagazineItem.Bonus", Model.MagazineItem.Bonus.ToString("#0.00"), new { title = "Proszê wprowadziæ bonus do wyceny artyku³u." })%> 84 <%= Html.ValidationMessage("MagazineItem.Bonus", "*")%> 91 <%= Html.TextBox("Bonus", ViewData.Model.MagazineItem.Bonus)%> 92 <%= Html.ValidationMessage("Bonus", "*")%> 93 <br /> 85 94 </div> 86 <div class="submit">87 <input type="submit" value="Dodaj" />95 <div> 96 <input type="submit" value="Dodaj" name="dodaj" id="dodaj"/> 88 97 </div> 89 98 </fieldset> 90 <% }%>99 <% Html.EndForm();%> 91 100 </div> 92 101 <div> 93 102 <%=Html.ActionLink("Powrót", "Index", "Home") %> 103 <%=Html.ClientSideValidation<MagazineItemValidation>("MagazineItem")%> 94 104 </div> 95 105 </asp:Content> -
branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Delete.aspx
r838 r853 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models. MagazineItemViewData>" %>1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.DeleteViewData>" %> 2 2 3 3 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> … … 6 6 7 7 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 8 9 <% using (Html.BeginForm("Delete","MagazineItem")) 8 <% 9 RouteValueDictionary routeValues = ViewContext.RouteData.Values; 10 routeValues.Add("powrot", Model.Info.powrot); 11 routeValues.Add("month", Model.Info.month); 12 routeValues.Add("year", Model.Info.year); 13 routeValues.Add("user_id", Model.Info.user_id); 14 15 16 17 using (Html.BeginForm("Delete","MagazineItem", routeValues,FormMethod.Post)) 10 18 { %> 11 19 <h2>Czy napewno chcesz usun¹æ wierszówkê??? </h2> … … 13 21 <input type="submit" value="Usuñ" /> 14 22 </div> 15 <br /> 16 <% } %>17 <div>18 < %=Html.ActionLink("Powrót", "Index", "Home") %>19 </div>23 <br /> 24 <div> 25 <%=Html.ActionLink("Powrót", "Index", "Report") %> 26 </div> 27 <% } %> 20 28 </asp:Content> 21 29 -
branches/Emisje/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx
r796 r853 1 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.MagazineItemViewData>" %> 2 2 <%@ Import namespace="Wierszowki.Core.Validation"%> 3 3 <asp:Content ID="js" ContentPlaceHolderID="jsContent" runat="server"> 4 4 <script src="../../Scripts/jquery-1.3.1.js" type="text/javascript"></script> … … 10 10 <script src="../../Scripts/spiffy.js" type="text/javascript"></script> 11 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 <script src="../../Scripts/jqueryvalid.js" type="text/javascript"></script> 15 <script src="../../Scripts/xValEditMagazineItem.js" type="text/javascript"></script> 12 16 </asp:Content> 13 17 14 18 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> 15 Dodaj wierszówkê19 Edytuj wierszówkê 16 20 </asp:Content> 17 21 18 22 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 19 <script type="text/javascript"> 20 $(function() { 21 $("#Magazine_Id").change(function() { 22 var magazineId = $("#Magazine_Id > option:selected").attr("value"); 23 var urlAction = "<%= Url.Action("FindIssuesById", "Magazine") %>"; 24 urlAction = urlAction + "/" + magazineId; 25 $.getJSON(urlAction, function(data) { 26 $("#MagazineItem_IssueId").addItems(data); 27 }); 23 <script type="text/javascript"> 24 $(document).ready(function() { 25 $("#Magazine_Id").change(function() { 26 27 var magazineId = $("#Magazine_Id > option:selected").attr("value"); 28 var urlAction = "<%= Url.Action("FindIssuesById", "Magazine") %>"; 29 urlAction = urlAction + "/" + magazineId; 30 $.getJSON(urlAction, function(data) { 31 $("#MagazineItem_IssueId").addItems(data); 32 }); 33 }); 28 34 }); 29 }); 30 </script> 31 35 </script> 32 36 <h2>Edytuj wierszówkê</h2> 33 37 <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %> … … 35 39 <div> 36 40 <div id="messages"></div> 37 <% using (Html.BeginForm("Update", "MagazineItem", Model.MagazineItem)) 38 { %> 41 <% 42 using (Html.BeginForm("Update", "MagazineItem", FormMethod.Post, new { id = "myform" })) 43 { %> 39 44 <fieldset> 45 <%= Html.Hidden("Info.user_id", Model.Info.user_id)%> 46 <%= Html.Hidden("Info.powrot", Model.Info.powrot)%> 47 <%= Html.Hidden("Info.month", Model.Info.month)%> 48 <%= Html.Hidden("Info.year", Model.Info.year)%> 40 49 <legend>Dane wierszówki</legend> 41 50 <%= Html.Hidden("MagazineItem.Id", Model.MagazineItem.Id)%> 42 51 <div class="formitem"> 43 52 <label for="MagazineItem.AuthorId">Autor:</label> 44 <%= Html.DropDownList("MagazineItem.AuthorId", ViewData.Model.AuthorList, "-- proszê wybraæ --")%>53 <%= Html.DropDownList("MagazineItem.AuthorId", Model.AuthorList, "-- proszê wybraæ --")%> 45 54 <%= Html.ValidationMessage("MagazineItem.AuthorId", "*")%> 55 <br /> 46 56 </div> 47 57 <div class="formitem"> 48 58 <label for="Magazine">Gazeta:</label> 49 <%= Html.DropDownList("Magazine.Id", ViewData.Model.MagazineList, "-- proszê wybraæ --")%>59 <%= Html.DropDownList("Magazine.Id",Model.MagazineList, "-- proszê wybraæ --")%> 50 60 <%= Html.ValidationMessage("Magazine.Id", "*")%> 51 </div> 61 <br /> 62 </div> 52 63 <div class="formitem"> 53 <label for="MagazineItem.IssueId">Wydanie :</label>54 <%= Html.DropDownList("MagazineItem.IssueId", ViewData.Model.IssueList, "-- proszê wybraæ --")%>64 <label for="MagazineItem.IssueId">Wydanie</label> 65 <%= Html.DropDownList("MagazineItem.IssueId", Model.IssueList, "-- proszê wybraæ --")%> 55 66 <%= Html.ValidationMessage("MagazineItem.IssueId", "*")%> 67 <br /> 56 68 </div> 57 69 <div class="formitem"> 58 70 <label for="MagazineItem.ItemTypeId">Typ:</label> 59 <%= Html.DropDownList("MagazineItem.ItemTypeId", ViewData.Model.ItemTypeList, "-- proszê wybraæ --")%>71 <%= Html.DropDownList("MagazineItem.ItemTypeId", Model.ItemTypeList, "-- proszê wybraæ --")%> 60 72 <%= Html.ValidationMessage("MagazineItem.ItemTypeId", "*")%> 73 <br /> 61 74 </div> 62 75 <div class="formitem"> … … 64 77 <%= Html.TextBox("MagazineItem.Date", Model.MagazineItem.Date, new { Class = "date-pick" })%> 65 78 <%= Html.ValidationMessage("MagazineItem.Date", "*")%> 66 </div>67 79 <br /> 80 </div> 68 81 <div class="formitem"> 69 82 <label for="MagazineItem.Caption">Tytu³:</label> 70 <%= Html.TextBox("MagazineItem.Caption", Model.MagazineItem.Caption , new { title = "Proszê wprowadziæ tytu³ artyku³u." })%>83 <%= Html.TextBox("MagazineItem.Caption", Model.MagazineItem.Caption )%> 71 84 <%= Html.ValidationMessage("MagazineItem.Caption", "*")%> 85 <br /> 72 86 </div> 73 87 <div class="formitem"> 74 88 <label for="MagazineItem.Description">Opis:</label> 75 <%= Html.TextArea("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%> 89 <%= Html.TextArea("MagazineItem.Description", Model.MagazineItem.Description )%> 90 <%= Html.ValidationMessage("MagazineItem.Description", "*")%> 91 <br /> 76 92 </div> 77 93 <div class="formitem"> 78 94 <label for="MagazineItem.Price">Wycena:</label> 79 <%= Html.TextBox("MagazineItem.Price", Model.MagazineItem.Price.ToString("#0.00") , new { title = "Proszê wprowadziæ wycenê artyku³u." })%>95 <%= Html.TextBox("MagazineItem.Price", Model.MagazineItem.Price.ToString("#0.00"))%> 80 96 <%= Html.ValidationMessage("MagazineItem.Price", "*")%> 97 <br /> 81 98 </div> 82 99 <div class="formitem"> 83 100 <label for="MagazineItem.Bonus">Bonus:</label> 84 <%= Html.TextBox("MagazineItem.Bonus", Model.MagazineItem.Bonus.ToString("#0.00") , new { title = "Proszê wprowadziæ bonus do wyceny artyku³u." })%>101 <%= Html.TextBox("MagazineItem.Bonus", Model.MagazineItem.Bonus.ToString("#0.00"))%> 85 102 <%= Html.ValidationMessage("MagazineItem.Bonus", "*")%> 103 <br /> 86 104 </div> 87 <div class="submit">88 <input type="submit" value="Aktualizuj" />105 <div> 106 <input type="submit" name="edit" value="Aktualizuj" /> 89 107 </div> 90 108 </fieldset> 91 <% } %>109 <% } %> 92 110 </div> 93 111 <div> 94 112 <%=Html.ActionLink("Powrót", "Index", "Home") %> 113 <%=Html.ClientSideValidation<MagazineItemValidation>("MagazineItem")%> 95 114 </div> 96 115 </asp:Content>
