Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx (revision 795)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Edit.aspx (revision 854)
@@ -1,4 +1,4 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.MagazineItemViewData>" %>
-
+<%@ Import namespace="Wierszowki.Core.Validation"%> 
 <asp:Content ID="js" ContentPlaceHolderID="jsContent" runat="server">
     <script src="../../Scripts/jquery-1.3.1.js" type="text/javascript"></script>
@@ -10,24 +10,28 @@
     <script src="../../Scripts/spiffy.js" type="text/javascript"></script>
     <script src="../../Scripts/jHelper.js" type="text/javascript"></script>
+    <script src="../../Scripts/jquery.validate.js" type="text/javascript" ></script>
+    <script src="../../Scripts/xVal.jquery.validate.js" type="text/javascript"></script>
+    <script src="../../Scripts/jqueryvalid.js" type="text/javascript"></script>
+    <script src="../../Scripts/xValEditMagazineItem.js" type="text/javascript"></script>
 </asp:Content>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-	Dodaj wierszówkê
+	Edytuj wierszówkê
 </asp:Content>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-<script type="text/javascript">
-    $(function() {
-        $("#Magazine_Id").change(function() {
-        var magazineId = $("#Magazine_Id > option:selected").attr("value");
-        var urlAction = "<%= Url.Action("FindIssuesById", "Magazine") %>";
-        urlAction = urlAction + "/" + magazineId;
-        $.getJSON(urlAction, function(data) {
-                $("#MagazineItem_IssueId").addItems(data);
-            });
+    <script type="text/javascript">
+        $(document).ready(function() {            
+           $("#Magazine_Id").change(function() {
+       
+                var magazineId = $("#Magazine_Id > option:selected").attr("value");
+                var urlAction = "<%= Url.Action("FindIssuesById", "Magazine") %>";
+                urlAction = urlAction + "/" + magazineId;
+                $.getJSON(urlAction, function(data) {
+                    $("#MagazineItem_IssueId").addItems(data);
+                });
+           });
         });
-    });
-</script>
-    
+    </script>
     <h2>Edytuj wierszówkê</h2>
     <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %>
@@ -35,28 +39,37 @@
     <div>                        
         <div id="messages"></div>
-        <% using (Html.BeginForm("Update", "MagazineItem", Model.MagazineItem))
-           { %>
+        <%  
+            using (Html.BeginForm("Update", "MagazineItem", FormMethod.Post, new { id = "myform" }))
+            { %>
             <fieldset>
+                <%= Html.Hidden("Info.user_id", Model.Info.user_id)%>
+                <%= Html.Hidden("Info.powrot", Model.Info.powrot)%>
+                <%= Html.Hidden("Info.month", Model.Info.month)%>
+                <%= Html.Hidden("Info.year", Model.Info.year)%>
                 <legend>Dane wierszówki</legend>
                 <%= Html.Hidden("MagazineItem.Id", Model.MagazineItem.Id)%>
                 <div class="formitem">
                     <label for="MagazineItem.AuthorId">Autor:</label>
-                    <%= Html.DropDownList("MagazineItem.AuthorId", ViewData.Model.AuthorList, "-- proszê wybraæ --")%>
+                    <%= Html.DropDownList("MagazineItem.AuthorId", Model.AuthorList, "-- proszê wybraæ --")%>
                     <%= Html.ValidationMessage("MagazineItem.AuthorId", "*")%>
+                    <br />
                 </div>
                 <div class="formitem">
                     <label for="Magazine">Gazeta:</label>
-                    <%= Html.DropDownList("Magazine.Id", ViewData.Model.MagazineList, "-- proszê wybraæ --")%>
+                    <%= Html.DropDownList("Magazine.Id",Model.MagazineList, "-- proszê wybraæ --")%>
                     <%= Html.ValidationMessage("Magazine.Id", "*")%>
-                </div>
+                    <br />
+                </div>                
                 <div class="formitem">
-                    <label for="MagazineItem.IssueId">Wydanie:</label>
-                    <%= Html.DropDownList("MagazineItem.IssueId", ViewData.Model.IssueList, "-- proszê wybraæ --")%>
+                    <label for="MagazineItem.IssueId">Wydanie</label>
+                    <%= Html.DropDownList("MagazineItem.IssueId", Model.IssueList, "-- proszê wybraæ --")%>
                     <%= Html.ValidationMessage("MagazineItem.IssueId", "*")%>
+                    <br />
                 </div>
                 <div class="formitem">
                     <label for="MagazineItem.ItemTypeId">Typ:</label>
-                    <%= Html.DropDownList("MagazineItem.ItemTypeId", ViewData.Model.ItemTypeList, "-- proszê wybraæ --")%>
+                    <%= Html.DropDownList("MagazineItem.ItemTypeId", Model.ItemTypeList, "-- proszê wybraæ --")%>
                     <%= Html.ValidationMessage("MagazineItem.ItemTypeId", "*")%>
+                    <br />
                 </div>
                 <div class="formitem">
@@ -64,33 +77,39 @@
                     <%= Html.TextBox("MagazineItem.Date", Model.MagazineItem.Date, new { Class = "date-pick" })%>
                     <%= Html.ValidationMessage("MagazineItem.Date", "*")%>
-                </div>
-                
+                    <br />
+                </div>              
                 <div class="formitem">
                     <label for="MagazineItem.Caption">Tytu³:</label>
-                    <%= Html.TextBox("MagazineItem.Caption", Model.MagazineItem.Caption, new { title = "Proszê wprowadziæ tytu³ artyku³u." })%>
+                    <%= Html.TextBox("MagazineItem.Caption", Model.MagazineItem.Caption )%>
                     <%= Html.ValidationMessage("MagazineItem.Caption", "*")%>
+                    <br />
                 </div>
                 <div class="formitem">
                     <label for="MagazineItem.Description">Opis:</label>
-                    <%= Html.TextArea("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%>
+                    <%= Html.TextArea("MagazineItem.Description", Model.MagazineItem.Description )%>
+                    <%= Html.ValidationMessage("MagazineItem.Description", "*")%>
+                    <br />
                 </div>
                 <div class="formitem">
                     <label for="MagazineItem.Price">Wycena:</label>
-                    <%= Html.TextBox("MagazineItem.Price", Model.MagazineItem.Price.ToString("#0.00"), new { title = "Proszê wprowadziæ wycenê artyku³u." })%>
+                    <%= Html.TextBox("MagazineItem.Price", Model.MagazineItem.Price.ToString("#0.00"))%>
                     <%= Html.ValidationMessage("MagazineItem.Price", "*")%>
+                    <br />
                 </div>
                 <div class="formitem">
                     <label for="MagazineItem.Bonus">Bonus:</label>
-                    <%= Html.TextBox("MagazineItem.Bonus", Model.MagazineItem.Bonus.ToString("#0.00"), new { title = "Proszê wprowadziæ bonus do wyceny artyku³u." })%>
+                    <%= Html.TextBox("MagazineItem.Bonus", Model.MagazineItem.Bonus.ToString("#0.00"))%>
                     <%= Html.ValidationMessage("MagazineItem.Bonus", "*")%>
+                    <br />
                 </div>
-                <div class="submit">                
-                    <input type="submit" value="Aktualizuj" />                
+                <div>                
+                    <input type="submit" name="edit" value="Aktualizuj" />                
                 </div>
             </fieldset>        
-        <% } %>               
+         <% } %>               
     </div>
     <div>
         <%=Html.ActionLink("Powrót", "Index", "Home") %>
+        <%=Html.ClientSideValidation<MagazineItemValidation>("MagazineItem")%>
     </div>
 </asp:Content>
Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Confirm.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Confirm.aspx (revision 839)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Confirm.aspx (revision 854)
@@ -1,4 +1,4 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Core.Linq.Author>" %>
-
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.ConfirmViewData>" %>
+<%@ Import Namespace ="Wierszowki.Models" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
 	Potwierdzenie dodania wierszówki
@@ -6,23 +6,67 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
 <%
-    if (ViewData["message"] == "delete")
+    if (ViewData.Model.akcja == OperationType.Delete)
     {
 %>
-        <h4>Pomyœlnie usuniêto wierszówkê!</h4>
-<%
-    }
-    else if(ViewData["message"] == "null"){
-%>
-        <h6>Nie mo¿na wykonaæ operacji. B³êdny numer id!!! </h6>
+        <h2>Pomyœlnie usuniêto wierszówkê!</h2>
 <%  }
-    else
+    else if (ViewData.Model.akcja == OperationType.WrongId)
     {
 %>
-    <h2>Pomyœlnie dodano/zaktualizowano wierszówkê dla: <%= Html.Encode(ViewData.Model.FirstName + " " + ViewData.Model.LastName)%></h2>
+        <h2>Nie mo¿na wykonaæ operacji. B³êdny numer id!!! </h2> 
+<%  }
+    else if (ViewData.Model.akcja == OperationType.NullId)
+    {
+%>
+        <h2>Nie mo¿na wykonaæ operacji, gdy¿ nie podano numeru id wierszówki!!! </h2>
+<%  }        
+    else if (ViewData.Model.akcja == OperationType.Update)
+    {
+%>
+        <h2>Pomyœlnie zaktualizowano wierszówkê dla: <%= Html.Encode(ViewData.Model.Author.FirstName + " " + ViewData.Model.Author.LastName)%></h2>
 <%     
     }
+    else if (ViewData.Model.akcja == OperationType.Create)
+    {
 %>
-    <div>
-        <%=Html.ActionLink("Powrót", "Index", "Report") %>
+        <h2>Pomyœlnie dodano wierszówkê dla: <%= Html.Encode(ViewData.Model.Author.FirstName + " " + ViewData.Model.Author.LastName)%></h2>
+<% 
+    }
+    
+%>
+    <div>    
+        <% 
+        if (ViewData.Model.info != null)
+        {
+            if (ViewData.Model.info.powrot == "2" && (ViewData.Model.akcja == OperationType.Delete || ViewData.Model.akcja == OperationType.Update))
+            {
+                var sciezka = "All/" + ViewData.Model.info.year + "/" + ViewData.Model.info.month + "/" + ViewData.Model.info.user_id; 
+        %>
+                <%=Html.ActionLink("Powrót", sciezka, "Report")%> |  
+                <%=Html.ActionLink("Raporty", "Index", "Report")%>  
+        <%
+            }
+            else if (ViewData.Model.info.powrot == "1" && (ViewData.Model.akcja == OperationType.Delete || ViewData.Model.akcja == OperationType.Update))
+            {
+        %>
+                <%=Html.ActionLink("Powrót", "ToPrice", "Report")%> |
+                <%=Html.ActionLink("Strona G³ówna", "Index", "Home")%>        
+        <%
+            }
+        }
+        if (ViewData.Model.akcja == OperationType.Create)
+        {
+        %>
+            <%=Html.ActionLink("Powrót", "Index", "Home")%> |
+            <%=Html.ActionLink("Dodaj now¹ wierszówkê", "Create", "MagazineItem")%>
+        <% 
+        }
+        else if (ViewData.Model.akcja == OperationType.WrongId || ViewData.Model.akcja == OperationType.NullId)
+        {
+        %>
+            <%=Html.ActionLink("Strona G³ówna", "Index", "Home")%>   
+        <%   
+        }    
+        %>        
     </div>
 </asp:Content>
Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Delete.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Delete.aspx (revision 839)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Delete.aspx (revision 854)
@@ -1,3 +1,3 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.MagazineItemViewData>" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.DeleteViewData>" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
@@ -6,6 +6,14 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
- 
- <% using (Html.BeginForm("Delete","MagazineItem"))
+    <% 
+    RouteValueDictionary routeValues = ViewContext.RouteData.Values;
+    routeValues.Add("powrot", Model.Info.powrot);
+    routeValues.Add("month", Model.Info.month);
+    routeValues.Add("year", Model.Info.year);
+    routeValues.Add("user_id", Model.Info.user_id);
+        
+    
+           
+    using (Html.BeginForm("Delete","MagazineItem", routeValues,FormMethod.Post))
     { %>
         <h2>Czy napewno chcesz usun¹æ wierszówkê??? </h2>
@@ -13,9 +21,9 @@
             <input type="submit" value="Usuñ" />                
         </div>
-        <br />       
- <% } %>   
-    <div>
-        <%=Html.ActionLink("Powrót", "Index", "Home") %>
-    </div>
+        <br />
+        <div>
+            <%=Html.ActionLink("Powrót", "Index", "Report") %>
+        </div>
+ <% } %>  
 </asp:Content>
 
Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx (revision 795)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/MagazineItem/Create.aspx (revision 854)
@@ -1,4 +1,4 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.MagazineItemViewData>" %>
-
+<%@ Import namespace="Wierszowki.Core.Validation"%> 
 <asp:Content ID="js" ContentPlaceHolderID="jsContent" runat="server">
     <script src="../../Scripts/jquery-1.3.1.js" type="text/javascript"></script>
@@ -10,4 +10,8 @@
     <script src="../../Scripts/spiffy.js" type="text/javascript"></script>
     <script src="../../Scripts/jHelper.js" type="text/javascript"></script>
+    <script src="../../Scripts/jquery.validate.js" type="text/javascript" ></script>
+    <script src="../../Scripts/xVal.jquery.validate.js" type="text/javascript"></script>
+    <script src="../../Scripts/jqueryvalid.js" type="text/javascript"></script>
+    <script src="../../Scripts/xValCreateMagazineItem.js" type="text/javascript"></script>
 </asp:Content>
 
@@ -17,79 +21,85 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-<script type="text/javascript">
-    $(function() {
-        $("#Magazine").change(function() {
-        var magazineId = $("#Magazine > option:selected").attr("value");
-        var urlAction = "<%= Url.Action("FindIssuesById", "Magazine") %>";
-        urlAction = urlAction + "/" + magazineId;
-        $.getJSON(urlAction, function(data) {
-                $("#MagazineItem_IssueId").addItems(data);
-            });
+    <script type="text/javascript">
+        $(document).ready(function() {            
+            $("#Magazine_Id").change(function() {
+                var magazineId = $("#Magazine_Id > option:selected").attr("value");
+                var urlAction = "<%= Url.Action("FindIssuesById", "Magazine") %>";
+                urlAction = urlAction + "/" + magazineId;
+                $.getJSON(urlAction, function(data) {
+                    $("#IssueId").addItems(data);
+                });
+            });        
         });
-    });
-</script>
-    
+    </script>
     <h2>Dodaj wierszówkê</h2>
-    <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %>
-
-    <div>                        
-        <div id="messages"></div>
-        <% using (Html.BeginForm("Create", "MagazineItem", Model.MagazineItem))
-           { %>
+    <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.")%>
+    <div>                      
+        <% Html.BeginForm("Create", "MagazineItem", Model.MagazineItem, FormMethod.Post, new { id = "myform" }) ;
+            %>
             <fieldset>
                 <legend>Nowa wierszówka</legend>
                 <div class="formitem">
                     <label for="MagazineItem.AuthorId">Autor:</label>
-                    <%= Html.DropDownList("MagazineItem.AuthorId", ViewData.Model.AuthorList, "-- proszê wybraæ --")%>
-                    <%= Html.ValidationMessage("MagazineItem.AuthorId", "*")%>
+                    <%= Html.DropDownList("AuthorId", ViewData.Model.AuthorList, "-- proszê wybraæ --")%>
+                    <%= Html.ValidationMessage("AuthorId", "*")%>
+                    <br />
                 </div>
                 <div class="formitem">
                     <label for="Magazine">Gazeta:</label>
-                    <%= Html.DropDownList("Magazine", ViewData.Model.MagazineList, "-- proszê wybraæ --")%>
-                    <%= Html.ValidationMessage("Magazine", "*")%>
+                    <%= Html.DropDownList("Magazine.Id", ViewData.Model.MagazineList, "-- proszê wybraæ --")%>
+                    <%= Html.ValidationMessage("Magazine.Id", "*")%>
+                    <br />
                 </div>
                 <div class="formitem">
                     <label for="MagazineItem.IssueId">Wydanie:</label>
-                    <%= Html.DropDownList("MagazineItem.IssueId", ViewData.Model.IssueList, "-- proszê wybraæ --")%>
-                    <%= Html.ValidationMessage("MagazineItem.IssueId", "*")%>
+                    <%= Html.DropDownList("IssueId", ViewData.Model.IssueList, "-- proszê wybraæ --")%>
+                    <%= Html.ValidationMessage("IssueId", "*")%>
+                    <br />
                 </div>
                 <div class="formitem">
                     <label for="MagazineItem.ItemTypeId">Typ:</label>
-                    <%= Html.DropDownList("MagazineItem.ItemTypeId", ViewData.Model.ItemTypeList, "-- proszê wybraæ --")%>
-                    <%= Html.ValidationMessage("MagazineItem.ItemTypeId", "*")%>
+                    <%= Html.DropDownList("ItemTypeId", ViewData.Model.ItemTypeList, "-- proszê wybraæ --")%>
+                    <%= Html.ValidationMessage("ItemTypeId", "*")%>
+                     <br />
                 </div>
                 <div class="formitem">
                     <label for="MagazineItem.Date">Miesi¹c:</label>
-                    <%= Html.TextBox("MagazineItem.Date", Model.MagazineItem.Date, new { Class = "date-pick" })%>
-                    <%= Html.ValidationMessage("MagazineItem.Date", "*")%>
-                </div>
-                
+                    <%= Html.TextBox("Date", ViewData.Model.MagazineItem.Date, new { Class = "date-pick" })%>
+                    <%= Html.ValidationMessage("Date", "*")%>
+                    <br />
+                </div>                
                 <div class="formitem">
                     <label for="MagazineItem.Caption">Tytu³:</label>
-                    <%= Html.TextBox("MagazineItem.Caption", Model.MagazineItem.Caption, new { title = "Proszê wprowadziæ tytu³ artyku³u." })%>
-                    <%= Html.ValidationMessage("MagazineItem.Caption", "*")%>
+                    <%= Html.TextBox("Caption", ViewData.Model.MagazineItem.Caption)%>
+                    <%= Html.ValidationMessage("Caption", "*")%>
+                    <br />
                 </div>
                 <div class="formitem">
                     <label for="MagazineItem.Description">Opis:</label>
-                    <%= Html.TextArea("MagazineItem.Description", Model.MagazineItem.Description, new { title = "Proszê wprowadziæ opis artyku³u." })%>
+                    <%= Html.TextArea("Description", ViewData.Model.MagazineItem.Description)%>
+                    <br />
                 </div>
                 <div class="formitem">
                     <label for="MagazineItem.Price">Wycena:</label>
-                    <%= Html.TextBox("MagazineItem.Price", Model.MagazineItem.Price.ToString("#0.00"), new { title = "Proszê wprowadziæ wycenê artyku³u." })%>
-                    <%= Html.ValidationMessage("MagazineItem.Price", "*")%>
+                    <%= Html.TextBox("Price", ViewData.Model.MagazineItem.Price)%>
+                    <%= Html.ValidationMessage("Price", "*")%> 
+                    <br />
                 </div>
                 <div class="formitem">
                     <label for="MagazineItem.Bonus">Bonus:</label>
-                    <%= Html.TextBox("MagazineItem.Bonus", Model.MagazineItem.Bonus.ToString("#0.00"), new { title = "Proszê wprowadziæ bonus do wyceny artyku³u." })%>
-                    <%= Html.ValidationMessage("MagazineItem.Bonus", "*")%>
+                    <%= Html.TextBox("Bonus", ViewData.Model.MagazineItem.Bonus)%>
+                    <%= Html.ValidationMessage("Bonus", "*")%>
+                    <br />
                 </div>
-                <div class="submit">                
-                    <input type="submit" value="Dodaj" />                
+                <div>                
+                    <input type="submit" value="Dodaj" name="dodaj" id="dodaj"/>                
                 </div>
             </fieldset>        
-        <% } %>               
+        <% Html.EndForm();%>               
     </div>
     <div>
         <%=Html.ActionLink("Powrót", "Index", "Home") %>
+        <%=Html.ClientSideValidation<MagazineItemValidation>("MagazineItem")%>
     </div>
 </asp:Content>