Index: trunk/eCard/eCardMVC/Platnosci.Core/Interface/IIdentifiable.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Core/Interface/IIdentifiable.cs (revision 866) +++ trunk/eCard/eCardMVC/Platnosci.Core/Interface/IIdentifiable.cs (revision 867) @@ -8,5 +8,5 @@ public interface IIdentifiable { - int ID_faktury { get; set; } + int Id { get; } } } Index: trunk/eCard/eCardMVC/Platnosci.Core/Linq/PlatnosciEcard.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Core/Linq/PlatnosciEcard.cs (revision 866) +++ trunk/eCard/eCardMVC/Platnosci.Core/Linq/PlatnosciEcard.cs (revision 867) @@ -5,6 +5,14 @@ namespace Platnosci.Core.Linq { - public partial class PlatnosciEcard + public partial class PlatnosciEcard : IIdentifiable { + public int Id + { + get + { + return this.ORDERNUMBER; + } + } + } } Index: trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs (revision 866) +++ trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs (revision 867) @@ -30,5 +30,5 @@ public T FindOne(int id) { - return FindOne(t => t.ID_faktury == id); + return FindOne(t => t.Id == id); } public T FindOne(Expression> expression) @@ -83,5 +83,5 @@ public IQueryable Find(int id) { - return _dataContext.GetTable().Where(t => t.ID_faktury == id); + return _dataContext.GetTable().Where(t => t.Id == id); } public IQueryable Find(Expression> expression) Index: trunk/eCard/eCardMVC/Platnosci.Core/Linq/vPlatnosciEcard.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Core/Linq/vPlatnosciEcard.cs (revision 866) +++ trunk/eCard/eCardMVC/Platnosci.Core/Linq/vPlatnosciEcard.cs (revision 867) @@ -14,4 +14,9 @@ } } + + public int Id + { + get { return this.ID_faktury; } + } } } Index: trunk/eCard/eCardMVC/Platnosci/Web.config =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Web.config (revision 866) +++ trunk/eCard/eCardMVC/Platnosci/Web.config (revision 867) @@ -29,5 +29,6 @@ - + + Index: trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj.user =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj.user (revision 866) +++ trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj.user (revision 867) @@ -1,3 +1,6 @@  + + ProjectFiles + Index: trunk/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master (revision 866) +++ trunk/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master (revision 867) @@ -5,37 +5,19 @@ <asp:ContentPlaceHolder ID="TitleContent" runat="server" /> - " rel="stylesheet" type="text/css" /> - <% if (ConfigurationManager.AppSettings["Css"] == "truck"){%> - - <%}else if (ConfigurationManager.AppSettings["Css"] == "admoto"){%> - - - <%}%> + <%=Html.MainCss("Site.css")%> + <%=Html.AddCssToPortal()%> + <%=Html.Favicon()%> - - <% if (ConfigurationManager.AppSettings["Css"] == "truck"){%> - - <%} - else if (ConfigurationManager.AppSettings["Css"] == "admoto") - {%> - - <%}else{%> - - <%}%> - <%string querystring = Request.QueryString.ToString();%> + <%=Html.Logo()%> + <%string querystring = Request.QueryString.ToString();%> Index: trunk/eCard/eCardMVC/Platnosci/Helpers/helper.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Helpers/helper.cs (revision 867) +++ trunk/eCard/eCardMVC/Platnosci/Helpers/helper.cs (revision 867) @@ -0,0 +1,145 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using System.Web.Routing; +using System.Configuration; + +namespace Platnosci.Helpers +{ + public static class helper + { + public static string ImageTag(this HtmlHelper helper, string src, string alt) + { + TagBuilder tb = new TagBuilder("img"); + tb.Attributes.Add("src", helper.Encode(src)); + tb.Attributes.Add("alt", helper.Encode(alt)); + return tb.ToString(TagRenderMode.SelfClosing); + } + public static string ImageLink(this HtmlHelper htmlHelper, string filename, string alt, string querystring) + { + + var action = htmlHelper.CurrentAction(); + var controller = htmlHelper.CurrentController(); + + UrlHelper urlHelper = ((Controller)htmlHelper.ViewContext.Controller).Url; + string src = urlHelper.UrlImage(filename); + string imgtag = htmlHelper.ImageTag(src, alt); + + RouteValueDictionary tab = new RouteValueDictionary(); + string id = htmlHelper.ViewContext.RouteData.Values["id"].ToString(); + tab.Add("language", alt); + tab.Add("id", id); + + string url = urlHelper.Action(action, controller, tab); + + string[] param = querystring.ToString().Split(("&").ToCharArray(), StringSplitOptions.RemoveEmptyEntries); + for (int i = 0; i < param.Length; i++ ) + { + if (i == 0) url += "?" + param[i]; + else url += "&" + param[i]; + } + + TagBuilder link = new TagBuilder("a"); + link.Attributes.Add("href", url); + link.InnerHtml = imgtag; + return link.ToString(); + } + public static string CurrentController(this HtmlHelper htmlHelper) + { + return htmlHelper.ViewContext.RouteData.Values["controller"].ToString(); + } + public static string CurrentAction(this HtmlHelper htmlHelper) + { + return htmlHelper.ViewContext.RouteData.Values["action"].ToString(); + } + public static string Home(this UrlHelper urlHelper) + { + return urlHelper.Content("~/"); + } + public static string Css(this UrlHelper urlHelper, string fileName) + { + string url = urlHelper.Home() + "Content/" + fileName; + return urlHelper.Content(url); + } + public static string UrlImage(this UrlHelper urlHelper, string fileName) + { + string url = urlHelper.Home() + "Images/" + fileName; + return urlHelper.Content(url); + } + public static string FileUrl(this UrlHelper urlHelper, string fileName) + { + string url = urlHelper.Home() + "Images/"; + if (ConfigurationManager.AppSettings["Css"] == "truck") url += "truck/"; + else if(ConfigurationManager.AppSettings["Css"] == "admoto") url += "admoto/"; + url += fileName; + return urlHelper.Content(url); + } + public static string MainCss(this HtmlHelper htmlHelper, string filename) + { + UrlHelper urlHelper = new UrlHelper(htmlHelper.ViewContext.RequestContext); + string url = urlHelper.Css(filename); + string strCss = htmlHelper.LinkTag(url, "stylesheet", "text/css"); + return strCss; + } + public static string LinkTag(this HtmlHelper htmlHelper, string url, string rel, string type) + { + TagBuilder linkcss = new TagBuilder("link"); + linkcss.Attributes.Add("href", url); + linkcss.Attributes.Add("rel", rel); + if (type != "" ) linkcss.Attributes.Add("type", type); + return linkcss.ToString(TagRenderMode.SelfClosing); + } + public static string AddCssToPortal(this HtmlHelper htmlHelper) + { + string filename = ""; + if (ConfigurationManager.AppSettings["Css"] == "truck") filename = "truck.css" ; + else if(ConfigurationManager.AppSettings["Css"] == "admoto") filename = "admoto.css"; + + string css = htmlHelper.MainCss(filename); + return css; + } + public static string Favicon(this HtmlHelper htmlHelper){ + string url = ""; + string str = ""; + if (ConfigurationManager.AppSettings["Css"] == "admoto"){ + UrlHelper urlHelper = new UrlHelper(htmlHelper.ViewContext.RequestContext); + url = urlHelper.FileUrl("favicon.ico"); + str = htmlHelper.LinkTag(url,"shortcut icon",""); + } + return str; + } + public static string Logo(this HtmlHelper htmlHelper) + { + string rowspan = ""; + if (ConfigurationManager.AppSettings["Css"] == "truck") rowspan = ""; + else if (ConfigurationManager.AppSettings["Css"] == "admoto") rowspan = "2"; + string str = htmlHelper.TdTag("logo", rowspan); + return str; + } + public static string TdTag(this HtmlHelper helper, string tdClass, string tdRowspan) + { + UrlHelper urlHelper = new UrlHelper(helper.ViewContext.RequestContext); + string url = urlHelper.FileUrl("logo.gif"); + string logotag = helper.ImageTag(url, "logo"); + string labeltag = ""; + + TagBuilder tb = new TagBuilder("td"); + tb.Attributes.Add("class", tdClass); + if (tdRowspan != "") tb.Attributes.Add("rowspan", tdRowspan); + + if (ConfigurationManager.AppSettings["Css"] == "admoto") + { + TagBuilder lab = new TagBuilder("asp:Label"); + lab.Attributes.Add("ID", "Label1"); + lab.Attributes.Add("runat", "server"); + string txt = HttpContext.GetGlobalResourceObject("tlumaczenia", "tytul").ToString(); + lab.Attributes.Add("Text", txt); + labeltag = lab.ToString(); + } + tb.InnerHtml = logotag + labeltag; + return tb.ToString(); + } + } +} Index: trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj (revision 866) +++ trunk/eCard/eCardMVC/Platnosci/Platnosci.Web.csproj (revision 867) @@ -100,5 +100,5 @@ Global.asax - + @@ -152,9 +152,9 @@ - + - +
- <%=Html.ImageLink("/Images/pl.gif","pl",querystring)%> - <%=Html.ImageLink("/Images/gb.gif","en",querystring)%> - <%=Html.ImageLink("/Images/de.gif","de",querystring)%> - <%=Html.ImageLink("/Images/it.gif","it",querystring)%> - <%=Html.ImageLink("/Images/fr.gif","fr",querystring)%> + <%=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)%>