Pokaż
Ignoruj:
Data:
2009-10-15 15:45:07 (17 years ago)
Autor:
marek
Opis:

re #184 - merged with latest trunk

Lokalizacja:
branches/Abonament
Pliki:
3 zmodyfikowane

Legenda:

Bez zmian
Dodane
Usunięte

  • branches/Abonament

    • Property svn:mergeinfo

      •  

        old new  
        22/branches/ReklamaReorganizacja:568-731 
        33/tags/BazaReklam_1.1.28:831 
        4 /trunk:708-758,760-838 
         4/trunk:708-758,760-853 

  • branches/Abonament/Wierszowki/Wierszowki.Web/Views/Shared/Error.aspx

    r752 r854  
    1 <%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<System.Web.Mvc.HandleErrorInfo>" %> 
     1<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage<Wierszowki.Models.AllViewData>" %> 
    22 
    3 <asp:Content ID="errorTitle" ContentPlaceHolderID="TitleContent" runat="server"> 
    4     Error 
     3<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> 
     4        Wierszówki 
     5</asp:Content> 
     6<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 
     7    <p class="error_info"><%=ViewData.Model.error %></p> 
    58</asp:Content> 
    69 
    7 <asp:Content ID="errorContent" ContentPlaceHolderID="MainContent" runat="server"> 
    8     <h2> 
    9         Sorry, an error occurred while processing your request. 
    10     </h2> 
    11 </asp:Content> 

  • branches/Abonament/Wierszowki/Wierszowki.Web/Views/Shared/Site.Master

    r752 r854  
    88    <asp:ContentPlaceHolder ID="cssContent" runat="server" /> 
    99    <link href="~/Content/Site.css" rel="stylesheet" type="text/css" /> 
    10     <link href="~/Content/print.css" media="print" rel="stylesheet" type="text/css" /> 
     10    <link href="~/Content/print.css" media="print" rel="stylesheet" type="text/css" />     
    1111</head> 
    1212<body>