From 4c6fbd29a5ed4a50258b225cfa96f2ddc0ea9391 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 24 Sep 2014 13:52:09 +0200 Subject: [PATCH] Document model : render the same text in //head/title and //body/h1 See UserPost to customize the title --- web/Models/App.master | 23 +++++++++++++++++++---- web/Views/Account/Register.aspx | 3 --- web/Views/Blogs/Index.aspx | 8 +------- web/Views/Blogs/UserPost.aspx | 10 +++++++--- web/Views/Home/Index.aspx | 3 +-- 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/web/Models/App.master b/web/Models/App.master index 0ae55003..b1836c53 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -7,10 +7,13 @@ + + - <asp:ContentPlaceHolder ID="titleContent" runat="server" /> + <%= Page.Title %> <asp:Literal runat="server" Text=" - " /><%= YavscHelpers.SiteName %> + @@ -30,11 +33,21 @@ <% } %> <%= Html.ActionLink( "Accueil", "Index", "Home" ) %> + - - -

<%=Html.Encode(YavscHelpers.SiteName)%>

+ + + +

+ <%= Page.Title %> + + + <%= YavscHelpers.SiteName %> +

+ + + <% if (ViewData["Error"]!=null) { %>
<%= Html.Encode(ViewData["Error"]) %> @@ -45,6 +58,8 @@ <%= Html.Encode(ViewData["Message"]) %>
<% } %> + +
diff --git a/web/Views/Account/Register.aspx b/web/Views/Account/Register.aspx index b501dddf..d4c5e638 100644 --- a/web/Views/Account/Register.aspx +++ b/web/Views/Account/Register.aspx @@ -1,7 +1,4 @@ <%@ Page Title="Register" Language="C#" Inherits="Yavsc.RegisterPage" MasterPageFile="~/Models/App.master" %> - - -

Créez votre compte utilisateur <%= Html.Encode(YavscHelpers.SiteName) %>

diff --git a/web/Views/Blogs/Index.aspx b/web/Views/Blogs/Index.aspx index e88ab358..92ad7ce2 100644 --- a/web/Views/Blogs/Index.aspx +++ b/web/Views/Blogs/Index.aspx @@ -1,11 +1,5 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master"%> +<%@ Page Title="Blogs - Les dernières parutions" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master"%> <%@ Register Assembly="Yavsc.WebControls" TagPrefix="yavsc" Namespace="Yavsc.WebControls" %> - - <%= "Les dernières parutions - " + Html.Encode(YavscHelpers.SiteName) + "" %> - - -

Les dernières parutions

- <% foreach (BlogEntry e in this.Model) { %> diff --git a/web/Views/Blogs/UserPost.aspx b/web/Views/Blogs/UserPost.aspx index cfecddd0..7837d56f 100644 --- a/web/Views/Blogs/UserPost.aspx +++ b/web/Views/Blogs/UserPost.aspx @@ -1,8 +1,12 @@ <%@ Page Title="Billet" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master"%> -<%=Html.Encode(Model.Title)%> - <%=Html.Encode(ViewData["BlogTitle"])%> - + +<% Title = Model.Title+" - "+ViewData["BlogTitle"]; %> + +

<%= Html.ActionLink(Model.Title,"UserPost",new{user=Model.UserName,title=Model.Title}) %> - - <%=ViewData["BlogTitle"]%>

+ <%=ViewData["BlogTitle"]%> + + <%= YavscHelpers.SiteName %>
(Id:<%=Model.Id%>, <%= Model.Posted.ToString("yyyy/MM/dd") %> - <%= Model.Modified.ToString("yyyy/MM/dd") %> <%= Model.Visible? "":", Invisible!" %>) diff --git a/web/Views/Home/Index.aspx b/web/Views/Home/Index.aspx index c25d9f59..a381b3f4 100644 --- a/web/Views/Home/Index.aspx +++ b/web/Views/Home/Index.aspx @@ -1,5 +1,4 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master"%> -Indexe +<%@ Page Title="Yavsc - indexe" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/App.master"%>
<%= Html.ActionLink("blogs","Index","Blogs") %>