Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/Authors.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/Authors.aspx (revision 752)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/Authors.aspx (revision 854)
@@ -26,5 +26,5 @@
         <tr>
             <td>
-                <%= Html.Encode(item.FirstName + " " + item.LastName)%>
+                <%= Html.Encode(item.FirstName + " " + item.LastName)%>                
             </td>
             <td>
@@ -35,5 +35,5 @@
             </td>
             <td>
-                <%= Html.Encode(String.Format("{0:F}", item.Total)) %>
+                <%= Html.Encode(String.Format("{0:F}", item.Total))%>
             </td>
         </tr>
Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/Index.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/Index.aspx (revision 839)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/Index.aspx (revision 854)
@@ -9,5 +9,5 @@
     <h2>Raporty</h2>
     <h3>Proszê wybraæ raport:</h3>
-<table class="reportTable">
+<table class="reportTable" cellpadding=4 cellspacing=4>
     <tr>
         <td style="text-align:left; vertical-align:top;">
@@ -176,3 +176,4 @@
     </tr>
 </table>
+<%= Html.ActionLink("Strona g³ówna", "Index", "Home")%>
 </asp:Content>
Index: branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/All.aspx
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/All.aspx (revision 839)
+++ branches/Abonament/Wierszowki/Wierszowki.Web/Views/Report/All.aspx (revision 854)
@@ -1,10 +1,12 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<IEnumerable<Wierszowki.Core.Linq.MagazineItem>>" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.AllViewData>" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-	Wierszówki do wyceny
+	Wierszówki
 </asp:Content>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-    <h2>Wierszówki do wyceny</h2>
+    <%  if (ViewData.Model.naglowek != null){  %>
+            <h2><%= ViewData.Model.naglowek %></h2>
+    <%  } %>        
     <table>
         <tr>
@@ -22,30 +24,58 @@
             <th>Ostatnia aktualizacja</th>
         </tr>
-
-    <% foreach (var item in Model) { %>
     
+    <% int number = 0;
+        foreach (var item in ViewData.Model.magazine) {
+            number += 1;         
+    %>    
         <tr>
             <td>
-                <%= Html.ActionLink("Edycja", "Edit", "MagazineItem", new { id=item.Id }, null) %>
+                                   <%
+                     if (ViewData.Model.info.powrot == "1")
+                     {
+                    %>
+                        <%= Html.ActionLink("Edycja", "Edit", "MagazineItem", new { id = item.Id, powrot = "1", month = ViewData.Model.info.month, year = ViewData.Model.info.year, user_id = ViewData.Model.info.user_id }, null)%>
+                    <%
+                     }
+                     else if (ViewData.Model.info.powrot == "2")
+                     {
+                    %>
+                        <%= Html.ActionLink("Edycja", "Edit", "MagazineItem", new { id = item.Id, powrot = "2", month = ViewData.Model.info.month, year = ViewData.Model.info.year, user_id = ViewData.Model.info.user_id }, null)%>
+                    <%
+                     }
+                    %>
             </td>
             <td>
-                <%= Html.ActionLink("Usuñ", "Delete", "MagazineItem", new { id=item.Id }, null) %>
+                <%
+                if (ViewData.Model.info.powrot == "1")
+                {
+                %>
+                    <%= Html.ActionLink("Usuñ", "Delete", "MagazineItem", new { id = item.Id, powrot="1", month = ViewData.Model.info.month, year = ViewData.Model.info.year, user_id = ViewData.Model.info.user_id }, null)%> 
+                <%
+                }
+                else if (ViewData.Model.info.powrot == "2")
+                {
+                %>
+                    <%= Html.ActionLink("Usuñ", "Delete", "MagazineItem", new { id = item.Id, powrot="2", month = ViewData.Model.info.month, year = ViewData.Model.info.year, user_id = ViewData.Model.info.user_id }, null)%>
+                <%
+                }
+                %>                
             </td>
             <td>
                 <%= Html.Encode(item.Date.ToString("yyyy-MM")) %>
             </td>
-            <td>
+            <td width="85px">
                 <%= Html.Encode(item.Author.FullName) %>
             </td>
-            <td>
+            <td width="62px">
                 <%= Html.Encode(item.Issue.Identifier)%>
             </td>
-            <td>
+            <td width="48px">
                 <%= Html.Encode(item.ItemType.Name) %>
             </td>
-            <td>
+            <td width="150px">
                 <%= Html.Encode(item.Caption) %>
             </td>
-            <td>
+            <td width="140px"> 
                 <%= Html.Encode(item.Description) %>
             </td>
@@ -59,5 +89,5 @@
                 <%= Html.Encode(item.CreatedByUser.Login) %>
             </td>
-            <td>
+            <td width="140px">
                 <%= Html.Encode(item.UpdatedOn) %>
             </td>
@@ -68,5 +98,19 @@
     </table>
     <p>
-        <%= Html.ActionLink("Powrót", "Index", "Report") %>
+        <%
+            if (ViewData.Model.info.powrot == "1")
+            {
+        %>
+            <%= Html.ActionLink("Powrót", "Index", "Home")%> |
+        <%
+            }
+            else
+            {
+        %>
+            <%= Html.ActionLink("Powrót", "Index", "Report")%> |
+        <%
+            } 
+        %>    
+        Liczba wierszówek: <%=number%>
     </p>