Index: branches/Emisje/eCard/eCardMVC/Platnosci/Views/Merchant/Merchant.aspx
===================================================================
--- branches/Emisje/eCard/eCardMVC/Platnosci/Views/Merchant/Merchant.aspx (revision 866)
+++ branches/Emisje/eCard/eCardMVC/Platnosci/Views/Merchant/Merchant.aspx (revision 895)
@@ -1,3 +1,3 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Glowna.Master" Inherits="Platnosci.Views.PlatnosciViews<Platnosci.Models.MerchantViewData>" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Glowna.Master" Inherits="System.Web.Mvc.ViewPage<Platnosci.Models.MerchantViewData>" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
Index: branches/Emisje/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx
===================================================================
--- branches/Emisje/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx (revision 866)
+++ branches/Emisje/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx (revision 895)
@@ -7,33 +7,27 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
 
-    <h4>
-        <asp:Label ID="Szczegó³y" runat="server" Text="<%$Resources:tlumaczenia,Szczegoly%>"></asp:Label>
-    </h4>
+    <div class="Tytul">
+        <asp:Label ID="Szczegoly" runat="server" Text="<%$Resources:tlumaczenia,Szczegoly%>"></asp:Label>
+    </div>
     
     <p class="bold"><asp:Label ID="SprDane" runat ="server" Text="<%$Resources:tlumaczenia,SprawdzDane%>"></asp:Label></p>  
+    
     <% using (Html.BeginForm("Show", "Platnosc", FormMethod.Post, new { id = "myform" })){ %>
+    
     <table cellpadding="0" cellspacing="0" border="0">
         <tr><td><%=Html.Hidden("Payer.Id_faktury", Model.vPlatnosciEcard.ID_faktury) %></td></tr>
               
+        <%-- sekcja: szczegó³y faktury --%> 
         <tr>
-            <td colspan="2" class="bold" id="odstep">
-                <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Kontakt").ToString()%>
+            <td colspan="2" class="naglowekTab">
+               <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "DaneFaktury").ToString()%>
             </td>                
-        </tr>    
-        <tr>
-            <td class="bold">  
-                <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "ImieNazwisko").ToString()%> 
-            </td>    
-            <td class="textbox">
-                <%=Model.vPlatnosciEcard.Imie + " " + Model.vPlatnosciEcard.Nazwisko%></td>
         </tr>
-        <tr>
-            <td class="bold"><asp:Label ID="Adres2" runat="server" Text="<%$Resources:tlumaczenia,Adres%>"></asp:Label></td>        
-            <td class="textbox"><%=Model.vPlatnosciEcard.ulica + " " + Model.vPlatnosciEcard.kod + ", " + Model.vPlatnosciEcard.miasto%></td>
-        </tr>
-        <tr>
-            <td class="bold"><asp:Label ID="Telefon" runat="server" Text="<%$Resources:tlumaczenia,Telefon%>"></asp:Label><br /><br /></td>
-            <td class="textbox"><%=Model.vPlatnosciEcard.telefon%><br /><br /></td>            
-        </tr>                        
+        <tr>            
+            <td class="col1">                
+                <asp:Label ID="Label1" runat ="server" Text="<%$Resources:tlumaczenia,Status_faktury%>"></asp:Label>
+            </td>
+            <td class="textbox" id="unpaid"><%=HttpContext.GetGlobalResourceObject("tlumaczenia", "niezaplacona").ToString()%></td>
+        </tr>                  
         <tr>            
             <td class="col1">                
@@ -66,6 +60,40 @@
             <td class="textbox"><%=Model.brutto%></td>
         </tr>
+        <tr>
+            <td class="pustaLinia"></td>
+        </tr>
+        <%-- sekcja: kontakt do opiekuna handlowego--%>
+        <tr>
+            <td colspan="2" class="naglowekTab">
+               <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Kontakt").ToString().ToUpper()%>
+            </td>                
+        </tr>    
+        <tr>
+            <td class="col1">  
+                <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "ImieNazwisko").ToString()%> 
+            </td>    
+            <td class="textbox">
+                <%=Model.vPlatnosciEcard.Imie + " " + Model.vPlatnosciEcard.Nazwisko%>
+            </td>
+        </tr>
+        <tr>
+            <td class="col1"><asp:Label ID="Adres2" runat="server" Text="<%$Resources:tlumaczenia,Adres%>"></asp:Label></td>        
+            <td class="textbox"><%=Model.vPlatnosciEcard.ulica + " " + Model.vPlatnosciEcard.kod + ", " + Model.vPlatnosciEcard.miasto%></td>
+        </tr>
+        <tr>
+            <td class="col1"><asp:Label ID="Telefon" runat="server" Text="<%$Resources:tlumaczenia,Telefon%>"></asp:Label></td>
+            <td class="textbox"><%=Model.vPlatnosciEcard.telefon%></td>            
+        </tr> 
+        <tr>
+            <td class="pustaLinia"></td>
+        </tr>
+        <%-- sekcja: dane wlasciciela karty --%>
+        <tr>
+            <td colspan="2" class="naglowekTab">
+                <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "DaneWlasciciela").ToString()%>
+            </td>                
+        </tr>
         <tr>        
-            <td colspan="2" class="bold" id="odstep"><br />
+            <td colspan="2" class="col">
                 <asp:Label ID="w_karty" runat ="server" Text="<%$Resources:tlumaczenia,WlascicielKarty%>"></asp:Label>
             </td>            
@@ -89,14 +117,9 @@
             <td>
                 <br />
-                <span class="but"><input type="submit" value="<%$Resources:tlumaczenia,Place%>" runat="server"/>
+                <span class="but">
+                    <input id="place" name="id" type="submit" value="<%=HttpContext.GetGlobalResourceObject("tlumaczenia","Place").ToString()%>"/>
                 </span>
             </td>
-        </tr> 
-        <tr>
-            <td>
-                <% string jezyk = UICulture; %>
-                <%= Html.Hidden("Payer.Jezyk", jezyk)%>
-            </td>
-        </tr>
+        </tr>         
     </table>
     <%}%>
Index: branches/Emisje/eCard/eCardMVC/Platnosci/Views/Platnosc/Potwierdzenie.aspx
===================================================================
--- branches/Emisje/eCard/eCardMVC/Platnosci/Views/Platnosc/Potwierdzenie.aspx (revision 866)
+++  (revision )
@@ -1,27 +1,0 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="Platnosci.Views.PlatnosciViews<Platnosci.Models.InvoiceDetailsViewData>"%>
-
-<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
-	 <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "PotwierdzenieTitle").ToString()%>
-</asp:Content>
-
-<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-
-    <%if (Model.Status == "1"){ %>    
-        <asp:Label ID="lab1" runat="server" Text="<%$Resources:tlumaczenia,podziekowania%>"></asp:Label>
-        <%=Model.vPlatnosciEcard.Faktura_Numer%>
-        <%string link1 = HttpContext.GetGlobalResourceObject("tlumaczenia","Powrot").ToString(); %>
-        <p id="link1"><%=Html.ActionLink(link1, "LogOn", "Account")%></p>
-    
-    <%}else{%>
-    
-        <p class="pay_error">
-            <asp:Label ID="lab2" runat="server" Text="<%$Resources:tlumaczenia,blad1%>"></asp:Label>
-            <%=Model.vPlatnosciEcard.Faktura_Numer%>
-            <asp:Label ID="lab3" runat="server" Text="<%$Resources:tlumaczenia,blad2%>"></asp:Label>
-        </p>
-        <%string link2 = HttpContext.GetGlobalResourceObject("tlumaczenia","KolejnaProba").ToString();%>
-        <p id="link1"><%=Html.ActionLink(link2, "Show", "Platnosc", new { id = ViewData.Model.vPlatnosciEcard.ID_faktury}, null)%></p>
-    
-    <% } %>
-
-</asp:Content>
Index: branches/Emisje/eCard/eCardMVC/Platnosci/Views/Shared/Glowna.Master
===================================================================
--- branches/Emisje/eCard/eCardMVC/Platnosci/Views/Shared/Glowna.Master (revision 866)
+++ branches/Emisje/eCard/eCardMVC/Platnosci/Views/Shared/Glowna.Master (revision 895)
@@ -7,9 +7,10 @@
     <title><asp:ContentPlaceHolder ID="head" runat="server"/></title>    
 </head>
-<body> <%//onload="javascript:document.forms[0].submit()">%>
+<body onload="javascript:document.forms[0].submit()">
+<%--<body>--%>
     <p>
         <asp:Label ID="ecardLoad" runat="server" Text="<%$Resources:tlumaczenia,Informacja %>"></asp:Label>
     </p>
-    <form method="post" action=""><%//"https://pay.ecard.pl/servlet/PSTEST">%>
+    <form method="post" action="https://pay.ecard.pl/servlet/PSTEST">
     
         <asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
Index: branches/Emisje/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master
===================================================================
--- branches/Emisje/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master (revision 867)
+++ branches/Emisje/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master (revision 895)
@@ -10,28 +10,34 @@
     </head> 
     <body>
-    <table class="page" cellpadding="0" cellspacing="0">
-        <tr class="black">
-            <%=Html.Logo()%>
-            <%string querystring = Request.QueryString.ToString();%>
-            <td id="flagi">            
-                <%=Html.ImageLink("pl.gif","pl",querystring)%>
-                <%=Html.ImageLink("gb.gif","en",querystring)%>
-                <%=Html.ImageLink("de.gif","de",querystring)%>
-                <%=Html.ImageLink("it.gif","it",querystring)%>
-                <%=Html.ImageLink("fr.gif","fr",querystring)%>                                 
-            </td>
-        </tr>       
-        <tr class="black">
-            <%if (ConfigurationManager.AppSettings["Css"] != "admoto"){%>
-                <td>
-                    <div id="title">
-                        <h1><asp:Label ID="napis" runat="server" Text="<%$Resources:tlumaczenia,tytul%>"></asp:Label></h1>
-                    </div>
-                </td>  
-            <%}%>        
-            <td class="kontrolkaLogowania">                    
-                <div id="logindisplay"><br /><br /><% Html.RenderPartial("LogOnUserControl"); %></div>
-            </td>            
-        </tr>         
+    <table class="wtab" cellpadding="0" cellspacing="0" border="0">
+        <tr>
+            <td class="tlo">
+                <table class= "wtab" cellpadding="0" cellspacing="0" border="0">
+                    <tr class="padding">
+                        <%=Html.Logo()%>
+                        <%string querystring = Request.QueryString.ToString();%>
+                        <td id="flagi">            
+                            <%=Html.ImageLink("pl.gif","pl",querystring)%>
+                            <%=Html.ImageLink("gb.gif","en",querystring)%>
+                            <%=Html.ImageLink("de.gif","de",querystring)%>
+                            <%=Html.ImageLink("it.gif","it",querystring)%>
+                            <%=Html.ImageLink("fr.gif","fr",querystring)%>                                 
+                        </td>
+                    </tr>       
+                    <tr class="padding">
+                        <%if (ConfigurationManager.AppSettings["Css"] != "admoto"){%>
+                            <td>
+                                <div id="title">
+                                    <h1><asp:Label ID="napis" runat="server" Text="<%$Resources:tlumaczenia,tytul%>"></asp:Label></h1>
+                                </div>
+                            </td>  
+                        <%}%>        
+                        <td class="kontrolkaLogowania"                   
+                            <div id="logindisplay"><br /><br /><% Html.RenderPartial("LogOnUserControl"); %></div>
+                        </td>            
+                    </tr> 
+                 </table>
+             </td>
+        </tr>                     
         <tr>
             <td colspan="2"  class="pagecontent">
Index: branches/Emisje/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx
===================================================================
--- branches/Emisje/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx (revision 866)
+++ branches/Emisje/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx (revision 895)
@@ -24,24 +24,24 @@
             <tr>
                 <td>
-                    <asp:Label ID="info" Text="<%$ Resources:tlumaczenia,info %>" runat="server"></asp:Label>
+                    <asp:Label ID="info" Text="<%$Resources:tlumaczenia,info %>" runat="server"></asp:Label>
                     <br /><br /> 
                 </td>
             </tr>                        
             <tr>
-                <td class="label_w"><asp:Label ID="nip" Text="<%$ Resources:tlumaczenia,Nip %>" runat="server"></asp:Label></td>
+                <td class="label_w"><asp:Label ID="nip" Text="<%$Resources:tlumaczenia,Nip %>" runat="server"></asp:Label></td>
             </tr>
             <tr>    
                 <td>
                     <%= Html.TextBox("nip")%>
-                    <%= Html.ValidationMessage("nip")%>
+                    <%= Html.ValidationMessage("nip","*")%>
                 </td>
             </tr>
             <tr>
-                <td class="label_w"><asp:Label ID="numerfaktury" Text="<%$ Resources:tlumaczenia,NumerFaktury %>" runat="server"></asp:Label></td>
+                <td class="label_w"><asp:Label ID="numerfaktury" Text="<%$Resources:tlumaczenia,NumerFaktury %>" runat="server"></asp:Label></td>
             </tr>
             <tr>    
                 <td>
                     <%= Html.TextBox("numer_faktury")%>
-                    <%= Html.ValidationMessage("numer_faktury")%>
+                    <%= Html.ValidationMessage("numer_faktury","*")%>
                 </td>
             </tr>
@@ -49,5 +49,5 @@
                 <td>
                     <br />
-                    <input id="but" type="submit" value="<%$Resources:tlumaczenia,Zaloguj%>" runat="server"></input>
+                    <input id="loguj" name="id" type="submit" value="<%=HttpContext.GetGlobalResourceObject("tlumaczenia","Zaloguj").ToString()%>"/>
                 </td>
             </tr>