Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/Edit.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/Edit.aspx (revision 752)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/Edit.aspx (revision 854)
@@ -1,3 +1,18 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.AuthorViewData>" %>
+<%@ 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>
+    <script src="../../Scripts/jquery-1.3.1.min.js" type="text/javascript"></script>
+    <script src="../../Scripts/jquery.form.js" type="text/javascript"></script>
+    <script src="../../Scripts/jquery.blockUI.js" type="text/javascript"></script>
+    <script src="../../Scripts/date.js" type="text/javascript"></script>
+    <script src="../../Scripts/jquery.datePicker.js" type="text/javascript"></script>
+    <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/xValAuthor.js" type="text/javascript"></script>
+</asp:Content>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
@@ -6,32 +21,35 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-
     <h2>Edytuj autora</h2>
 
     <%= Html.ValidationSummary("Edycja siê nie powiod³a. Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %>
 
-    <% using (Html.BeginForm("Edit", "Author", Model.Author)) {%>
+    <% using (Html.BeginForm("Edit", "Author", Model.Author, FormMethod.Post, new { id = "myform" }))
+       {%>
 
         <fieldset>
             <legend>Dane autora</legend>
             <%= Html.Hidden("Author.Id", Model.Author.Id)%>
-            <p>
+            <div class="formitem">            
                 <label for="FirstName">Imiê:</label>
                 <%= Html.TextBox("Author.FirstName", Model.Author.FirstName)%>
                 <%= Html.ValidationMessage("Author.FirstName", "*")%>
-            </p>
-            <p>
+                <br />
+            </div>
+            <div class="formitem">           
                 <label for="LastName">Nazwisko:</label>
                 <%= Html.TextBox("Author.LastName", Model.Author.LastName)%>
                 <%= Html.ValidationMessage("Author.LastName", "*")%>
-            </p>
-            <p>
+                <br />
+            </div>
+            <div class="formitem"> 
                 <label for="LastName">Zatrudnienie:</label>
                 <%= Html.DropDownList("Author.EmploymentTypeId", ViewData.Model.EmploymentTypeList, "-- proszê wybraæ --") %>
                 <%= Html.ValidationMessage("Author.EmploymentTypeId", "*")%>
-            </p>
-            <p>
+                <br />
+            </div>
+            <div>
                 <input type="submit" value="Aktualizuj" />
-            </p>
+            </div>
         </fieldset>
 
@@ -40,4 +58,5 @@
     <div>
         <%=Html.ActionLink("Powrót do listy autorów", "Index") %>
+        <%=Html.ClientSideValidation<AuthorValidation>("Author")%>
     </div>
 </asp:Content>
Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/Index.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/Index.aspx (revision 752)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/Index.aspx (revision 854)
@@ -45,9 +45,6 @@
     
     <p>
-        <%= Html.ActionLink("Dodaj autora", "Create") %>
+        <%=Html.ActionLink("Powrót", "Index", "Home") %> | <%= Html.ActionLink("Dodaj autora", "Create") %>
     </p>
-    <p>
-        <%=Html.ActionLink("Powrót", "Index", "Home") %>
-    </p>
-
+    
 </asp:Content>
Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/Confirm.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/Confirm.aspx (revision 752)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/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/edycji autora
@@ -7,7 +7,19 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
 
-    <h2>Pomyœlnie dodano/zaktualizowano dane autora: <%= Html.Encode(ViewData.Model.FirstName + " " + ViewData.Model.LastName) %></h2>
+    <%if (Model.akcja == OperationType.Update)
+    { 
+    %>
+        <h2>Pomyœlnie zaktualizowano dane autora: <%= Html.Encode(Model.Author.FirstName + " " + Model.Author.LastName)%></h2>
+    <%
+    }
+    else if(Model.akcja == OperationType.Create)
+    {
+    %>
+        <h2>Pomyœlnie dodano autora: <%= Html.Encode(Model.Author.FirstName + " " + Model.Author.LastName)%></h2>
+    <%
+    }      
+    %>    
     <div>
-        <%=Html.ActionLink("Powrót do listy autorów", "Index") %>
+        <%= Html.ActionLink("Powrót do listy autorów", "Index") %>
     </div>
 </asp:Content>
Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/Create.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/Create.aspx (revision 752)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/Author/Create.aspx (revision 854)
@@ -1,4 +1,18 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.AuthorViewData>" %>
-
+<%@ 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>
+    <script src="../../Scripts/jquery-1.3.1.min.js" type="text/javascript"></script>
+    <script src="../../Scripts/jquery.form.js" type="text/javascript"></script>
+    <script src="../../Scripts/jquery.blockUI.js" type="text/javascript"></script>
+    <script src="../../Scripts/date.js" type="text/javascript"></script>
+    <script src="../../Scripts/jquery.datePicker.js" type="text/javascript"></script>
+    <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/xValAuthor.js" type="text/javascript"></script>
+</asp:Content>
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
 	Dodaj autora
@@ -6,31 +20,34 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-
     <h2>Dodaj autora</h2>
 
     <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.")%>
 
-    <% using (Html.BeginForm("Create", "Author", Model.Author)) {%>
+    <% using (Html.BeginForm("Create", "Author", Model.Author, FormMethod.Post, new { id = "myform" }))
+       {%>
 
         <fieldset>
             <legend>Dane autora</legend>
-            <p>
+            <div class="formitem">    
                 <label for="FirstName">Imiê:</label>
                 <%= Html.TextBox("Author.FirstName", Model.Author.FirstName)%>
                 <%= Html.ValidationMessage("FirstName", "*") %>
-            </p>
-            <p>
+                <br />
+            </div>
+            <div class="formitem">    
                 <label for="LastName">Nazwisko:</label>
                 <%= Html.TextBox("Author.LastName", Model.Author.LastName)%>
                 <%= Html.ValidationMessage("LastName", "*")%>
-            </p>
-            <p>
+                <br />
+            </div>
+            <div class="formitem">    
                 <label for="LastName">Zatrudnienie:</label>
                 <%= Html.DropDownList("Author.EmploymentTypeId", ViewData.Model.EmploymentTypeList, "-- proszê wybraæ --") %>
                 <%= Html.ValidationMessage("EmploymentTypeId", "*")%>
-            </p>
-            <p>
+                <br />
+            </div>
+            <div class="formitem">    
                 <input type="submit" value="Dodaj" />
-            </p>
+            </div>
         </fieldset>
 
@@ -39,5 +56,5 @@
     <div>
         <%=Html.ActionLink("Powrót do listy autorów", "Index")%>
+        <%=Html.ClientSideValidation<AuthorValidation>("Author")%>
     </div>
-
 </asp:Content>