Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Edit.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Edit.aspx (revision 752)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Edit.aspx (revision 854)
@@ -1,3 +1,18 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Core.Linq.User>" %>
+<%@ 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/xValUser.js" type="text/javascript"></script>
+</asp:Content>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
@@ -6,15 +21,14 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-
     <h2>Edytuj u¿ytkownika</h2>
 
-    <%= Html.ValidationSummary("Edit was unsuccessful. Please correct the errors and try again.") %>
+    <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %>
 
-    <% using (Html.BeginForm("Edit", "User", Model))
+    <% using (Html.BeginForm("Edit", "User", Model, FormMethod.Post, new { id = "myform" }))
        {%>
 
         <fieldset>
             <legend>Dane u¿ytkownika</legend>
-            <p>
+            <p> 
                 <label for="Login">Login:</label>
                 <%= Html.TextBox("Login", Model.Login) %>
@@ -26,15 +40,15 @@
                 <%= Html.ValidationMessage("Password", "*") %>
             </p>
-            <p>
+            <p> 
                 <label for="FirstName">Imiê:</label>
                 <%= Html.TextBox("FirstName", Model.FirstName) %>
                 <%= Html.ValidationMessage("FirstName", "*") %>
             </p>
-            <p>
+            <p> 
                 <label for="LastName">Nazwisko:</label>
                 <%= Html.TextBox("LastName", Model.LastName) %>
                 <%= Html.ValidationMessage("LastName", "*") %>
             </p>
-            <p>
+            <p> 
                 <input type="submit" value="Aktualizuj" />
             </p>
@@ -44,5 +58,6 @@
 
     <div>
-        <%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %>
+        <%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %>        
+        <%=Html.ClientSideValidation<UserValidation>()%>
     </div>
 </asp:Content>
Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Index.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Index.aspx (revision 752)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Index.aspx (revision 854)
@@ -45,5 +45,6 @@
 
     <p>
-        <%= Html.ActionLink("Dodaj nowego u¿ytkownika", "Create") %>
+        <%= Html.ActionLink("Strona Glówna","Index", "Home") %> | 
+        <%= Html.ActionLink("Dodaj nowego u¿ytkownika", "Create") %>        
     </p>
 </asp:Content>
Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Confirm.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Confirm.aspx (revision 839)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Confirm.aspx (revision 854)
@@ -1,28 +1,34 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Core.Linq.User>" %>
-
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.UserConfirmViewData>" %>
+<%@ Import Namespace ="Wierszowki.Models" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-	Potwierdzenie dodania u¿ytkownika
+	<%= Model.Naglowek %>
 </asp:Content>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-<%if (ViewData["message"] == "error_user")
-  {
-%>
-    <h4>Nie mo¿na edytowaæ u¿ytkownika, gdy¿ login ró¿ni siê od zalogowanego!!!</h4> 
-<%      
-  }
-  else if (ViewData["message"] == "error")
-  {
-%>
-    <h6>Nie mo¿na edytowaæ u¿ytkownika, gdy¿ u¿ytkownik o takim id nie istnieje !!!</h6> 
-<%
-  }
-  else
-  {
-%>
-    <h2>Pomyœlnie dodano/zaktualizowano u¿ytkownika: <%= Html.Encode(ViewData.Model.FirstName + " " + ViewData.Model.LastName) %></h2> 
-<%      
-  }
-%>
+    
+    <%if (ViewData.Model.ErrorInfo != "")
+    {
+    %>
+        <p class="error_info">
+            <%=ViewData.Model.ErrorInfo%>
+        </p>
+    <%      
+    }
+    else
+    {
+        if (ViewData.Model.Akcja == OperationType.Update)
+        {
+    %>
+            <h2>Pomyœlnie zaktualizowano u¿ytkownika: <%= Html.Encode(ViewData.Model.User.FullName)%></h2> 
+    <%      
+        }
+        else if (ViewData.Model.Akcja == OperationType.Create)
+        {
+    %>
+            <h2>Pomyœlnie dodano u¿ytkownika: <%= Html.Encode(ViewData.Model.User.FullName)%> %></h2>
+    <%
+        }
+    }     
+    %>
     <div>
         <%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %>
Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Create.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Create.aspx (revision 752)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/User/Create.aspx (revision 854)
@@ -1,4 +1,18 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Core.Linq.User>" %>
-
+<%@ 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/xValUser.js" type="text/javascript"></script>
+</asp:Content>
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
 	Dodaj u¿ytkownika
@@ -11,6 +25,7 @@
     <%= Html.ValidationSummary("Proszê poprawiæ b³êdy i spróbowaæ ponownie.") %>
 
-    <% using (Html.BeginForm("Create", "User", Model)) {%>
-
+    <% using (Html.BeginForm("Create", "User", Model, FormMethod.Post, new { id = "myform" })) 
+    {
+    %>
         <fieldset>
             <legend>Dane u¿ytkownika</legend>
@@ -43,5 +58,6 @@
 
     <div>
-        <%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %>
+        <%=Html.ActionLink("Powrót do listy u¿ytkowników", "Index") %>                
+        <%=Html.ClientSideValidation<UserValidation>()%>
     </div>