Zbiór zmian 895 dla branches/Emisje/eCard/eCardMVC/Platnosci/Views
- Data:
- 2009-11-24 12:21:39 (16 years ago)
- Lokalizacja:
- branches/Emisje
- Pliki:
-
- 1 usunięte
- 6 zmodyfikowane
-
. (zmodyfikowane) (1 prop)
-
eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx (zmodyfikowane) (2 diffs)
-
eCard/eCardMVC/Platnosci/Views/Merchant/Merchant.aspx (zmodyfikowane) (1 diff)
-
eCard/eCardMVC/Platnosci/Views/Platnosc/Potwierdzenie.aspx (usunięte)
-
eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx (zmodyfikowane) (3 diffs)
-
eCard/eCardMVC/Platnosci/Views/Shared/Glowna.Master (zmodyfikowane) (1 diff)
-
eCard/eCardMVC/Platnosci/Views/Shared/Site.Master (zmodyfikowane) (1 diff)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
branches/Emisje
- Property svn:mergeinfo
-
old new 1 /branches/Abonament:701-884 1 2 /branches/AutoShopper:815-818 2 3 /branches/ReklamaReorganizacja:568-731 3 4 /tags/BazaReklam_1.1.28:831 4 /trunk:774-8 685 /trunk:774-893
-
- Property svn:mergeinfo
-
branches/Emisje/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx
r866 r895 24 24 <tr> 25 25 <td> 26 <asp:Label ID="info" Text="<%$ 26 <asp:Label ID="info" Text="<%$Resources:tlumaczenia,info %>" runat="server"></asp:Label> 27 27 <br /><br /> 28 28 </td> 29 29 </tr> 30 30 <tr> 31 <td class="label_w"><asp:Label ID="nip" Text="<%$ 31 <td class="label_w"><asp:Label ID="nip" Text="<%$Resources:tlumaczenia,Nip %>" runat="server"></asp:Label></td> 32 32 </tr> 33 33 <tr> 34 34 <td> 35 35 <%= Html.TextBox("nip")%> 36 <%= Html.ValidationMessage("nip" )%>36 <%= Html.ValidationMessage("nip","*")%> 37 37 </td> 38 38 </tr> 39 39 <tr> 40 <td class="label_w"><asp:Label ID="numerfaktury" Text="<%$ 40 <td class="label_w"><asp:Label ID="numerfaktury" Text="<%$Resources:tlumaczenia,NumerFaktury %>" runat="server"></asp:Label></td> 41 41 </tr> 42 42 <tr> 43 43 <td> 44 44 <%= Html.TextBox("numer_faktury")%> 45 <%= Html.ValidationMessage("numer_faktury" )%>45 <%= Html.ValidationMessage("numer_faktury","*")%> 46 46 </td> 47 47 </tr> … … 49 49 <td> 50 50 <br /> 51 <input id=" but" type="submit" value="<%$Resources:tlumaczenia,Zaloguj%>" runat="server"></input>51 <input id="loguj" name="id" type="submit" value="<%=HttpContext.GetGlobalResourceObject("tlumaczenia","Zaloguj").ToString()%>"/> 52 52 </td> 53 53 </tr> -
branches/Emisje/eCard/eCardMVC/Platnosci/Views/Merchant/Merchant.aspx
r866 r895 1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Glowna.Master" Inherits=" Platnosci.Views.PlatnosciViews<Platnosci.Models.MerchantViewData>" %>1 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Glowna.Master" Inherits="System.Web.Mvc.ViewPage<Platnosci.Models.MerchantViewData>" %> 2 2 3 3 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server"> -
branches/Emisje/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx
r866 r895 7 7 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 8 8 9 < h4>10 <asp:Label ID="Szczeg ó³y" runat="server" Text="<%$Resources:tlumaczenia,Szczegoly%>"></asp:Label>11 </ h4>9 <div class="Tytul"> 10 <asp:Label ID="Szczegoly" runat="server" Text="<%$Resources:tlumaczenia,Szczegoly%>"></asp:Label> 11 </div> 12 12 13 13 <p class="bold"><asp:Label ID="SprDane" runat ="server" Text="<%$Resources:tlumaczenia,SprawdzDane%>"></asp:Label></p> 14 14 15 <% using (Html.BeginForm("Show", "Platnosc", FormMethod.Post, new { id = "myform" })){ %> 16 15 17 <table cellpadding="0" cellspacing="0" border="0"> 16 18 <tr><td><%=Html.Hidden("Payer.Id_faktury", Model.vPlatnosciEcard.ID_faktury) %></td></tr> 17 19 20 <%-- sekcja: szczegó³y faktury --%> 18 21 <tr> 19 <td colspan="2" class=" bold" id="odstep">20 <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Kontakt").ToString()%>22 <td colspan="2" class="naglowekTab"> 23 <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "DaneFaktury").ToString()%> 21 24 </td> 22 </tr>23 <tr>24 <td class="bold">25 <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "ImieNazwisko").ToString()%>26 </td>27 <td class="textbox">28 <%=Model.vPlatnosciEcard.Imie + " " + Model.vPlatnosciEcard.Nazwisko%></td>29 25 </tr> 30 <tr> 31 <td class="bold"><asp:Label ID="Adres2" runat="server" Text="<%$Resources:tlumaczenia,Adres%>"></asp:Label></td> 32 <td class="textbox"><%=Model.vPlatnosciEcard.ulica + " " + Model.vPlatnosciEcard.kod + ", " + Model.vPlatnosciEcard.miasto%></td> 33 </tr> 34 <tr> 35 <td class="bold"><asp:Label ID="Telefon" runat="server" Text="<%$Resources:tlumaczenia,Telefon%>"></asp:Label><br /><br /></td> 36 <td class="textbox"><%=Model.vPlatnosciEcard.telefon%><br /><br /></td> 37 </tr> 26 <tr> 27 <td class="col1"> 28 <asp:Label ID="Label1" runat ="server" Text="<%$Resources:tlumaczenia,Status_faktury%>"></asp:Label> 29 </td> 30 <td class="textbox" id="unpaid"><%=HttpContext.GetGlobalResourceObject("tlumaczenia", "niezaplacona").ToString()%></td> 31 </tr> 38 32 <tr> 39 33 <td class="col1"> … … 66 60 <td class="textbox"><%=Model.brutto%></td> 67 61 </tr> 62 <tr> 63 <td class="pustaLinia"></td> 64 </tr> 65 <%-- sekcja: kontakt do opiekuna handlowego--%> 66 <tr> 67 <td colspan="2" class="naglowekTab"> 68 <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "Kontakt").ToString().ToUpper()%> 69 </td> 70 </tr> 71 <tr> 72 <td class="col1"> 73 <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "ImieNazwisko").ToString()%> 74 </td> 75 <td class="textbox"> 76 <%=Model.vPlatnosciEcard.Imie + " " + Model.vPlatnosciEcard.Nazwisko%> 77 </td> 78 </tr> 79 <tr> 80 <td class="col1"><asp:Label ID="Adres2" runat="server" Text="<%$Resources:tlumaczenia,Adres%>"></asp:Label></td> 81 <td class="textbox"><%=Model.vPlatnosciEcard.ulica + " " + Model.vPlatnosciEcard.kod + ", " + Model.vPlatnosciEcard.miasto%></td> 82 </tr> 83 <tr> 84 <td class="col1"><asp:Label ID="Telefon" runat="server" Text="<%$Resources:tlumaczenia,Telefon%>"></asp:Label></td> 85 <td class="textbox"><%=Model.vPlatnosciEcard.telefon%></td> 86 </tr> 87 <tr> 88 <td class="pustaLinia"></td> 89 </tr> 90 <%-- sekcja: dane wlasciciela karty --%> 91 <tr> 92 <td colspan="2" class="naglowekTab"> 93 <%=HttpContext.GetGlobalResourceObject("tlumaczenia", "DaneWlasciciela").ToString()%> 94 </td> 95 </tr> 68 96 <tr> 69 <td colspan="2" class=" bold" id="odstep"><br />97 <td colspan="2" class="col"> 70 98 <asp:Label ID="w_karty" runat ="server" Text="<%$Resources:tlumaczenia,WlascicielKarty%>"></asp:Label> 71 99 </td> … … 89 117 <td> 90 118 <br /> 91 <span class="but"><input type="submit" value="<%$Resources:tlumaczenia,Place%>" runat="server"/> 119 <span class="but"> 120 <input id="place" name="id" type="submit" value="<%=HttpContext.GetGlobalResourceObject("tlumaczenia","Place").ToString()%>"/> 92 121 </span> 93 122 </td> 94 </tr> 95 <tr> 96 <td> 97 <% string jezyk = UICulture; %> 98 <%= Html.Hidden("Payer.Jezyk", jezyk)%> 99 </td> 100 </tr> 123 </tr> 101 124 </table> 102 125 <%}%> -
branches/Emisje/eCard/eCardMVC/Platnosci/Views/Shared/Glowna.Master
r866 r895 7 7 <title><asp:ContentPlaceHolder ID="head" runat="server"/></title> 8 8 </head> 9 <body> <%//onload="javascript:document.forms[0].submit()">%> 9 <body onload="javascript:document.forms[0].submit()"> 10 <%--<body>--%> 10 11 <p> 11 12 <asp:Label ID="ecardLoad" runat="server" Text="<%$Resources:tlumaczenia,Informacja %>"></asp:Label> 12 13 </p> 13 <form method="post" action=" "><%//"https://pay.ecard.pl/servlet/PSTEST">%>14 <form method="post" action="https://pay.ecard.pl/servlet/PSTEST"> 14 15 15 16 <asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server"> -
branches/Emisje/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master
r867 r895 10 10 </head> 11 11 <body> 12 <table class="page" cellpadding="0" cellspacing="0"> 13 <tr class="black"> 14 <%=Html.Logo()%> 15 <%string querystring = Request.QueryString.ToString();%> 16 <td id="flagi"> 17 <%=Html.ImageLink("pl.gif","pl",querystring)%> 18 <%=Html.ImageLink("gb.gif","en",querystring)%> 19 <%=Html.ImageLink("de.gif","de",querystring)%> 20 <%=Html.ImageLink("it.gif","it",querystring)%> 21 <%=Html.ImageLink("fr.gif","fr",querystring)%> 22 </td> 23 </tr> 24 <tr class="black"> 25 <%if (ConfigurationManager.AppSettings["Css"] != "admoto"){%> 26 <td> 27 <div id="title"> 28 <h1><asp:Label ID="napis" runat="server" Text="<%$Resources:tlumaczenia,tytul%>"></asp:Label></h1> 29 </div> 30 </td> 31 <%}%> 32 <td class="kontrolkaLogowania"> 33 <div id="logindisplay"><br /><br /><% Html.RenderPartial("LogOnUserControl"); %></div> 34 </td> 35 </tr> 12 <table class="wtab" cellpadding="0" cellspacing="0" border="0"> 13 <tr> 14 <td class="tlo"> 15 <table class= "wtab" cellpadding="0" cellspacing="0" border="0"> 16 <tr class="padding"> 17 <%=Html.Logo()%> 18 <%string querystring = Request.QueryString.ToString();%> 19 <td id="flagi"> 20 <%=Html.ImageLink("pl.gif","pl",querystring)%> 21 <%=Html.ImageLink("gb.gif","en",querystring)%> 22 <%=Html.ImageLink("de.gif","de",querystring)%> 23 <%=Html.ImageLink("it.gif","it",querystring)%> 24 <%=Html.ImageLink("fr.gif","fr",querystring)%> 25 </td> 26 </tr> 27 <tr class="padding"> 28 <%if (ConfigurationManager.AppSettings["Css"] != "admoto"){%> 29 <td> 30 <div id="title"> 31 <h1><asp:Label ID="napis" runat="server" Text="<%$Resources:tlumaczenia,tytul%>"></asp:Label></h1> 32 </div> 33 </td> 34 <%}%> 35 <td class="kontrolkaLogowania" 36 <div id="logindisplay"><br /><br /><% Html.RenderPartial("LogOnUserControl"); %></div> 37 </td> 38 </tr> 39 </table> 40 </td> 41 </tr> 36 42 <tr> 37 43 <td colspan="2" class="pagecontent">
