diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index 47d178c..04b3d8f 100644 --- a/AssemblyVersion.cs +++ b/AssemblyVersion.cs @@ -16,5 +16,5 @@ using System.Reflection; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.0.1.464")] -[assembly: AssemblyFileVersion("3.0.1.464")] +[assembly: AssemblyVersion("3.0.1.465")] +[assembly: AssemblyFileVersion("3.0.1.465")] diff --git a/WebApplication/Print.aspx.cs b/WebApplication/Print.aspx.cs index 4ce4a31..77b1f7f 100644 --- a/WebApplication/Print.aspx.cs +++ b/WebApplication/Print.aspx.cs @@ -4,6 +4,7 @@ using System.Data; using System.Configuration; using System.Collections; using System.Collections.Generic; +using System.Linq; using System.Web; using System.Web.Security; using System.Web.UI; @@ -51,9 +52,20 @@ namespace ScrewTurn.Wiki { string title = FormattingPipeline.PrepareTitle(content.Title, false, FormattingContext.PageContent, page); if(Request["Discuss"] == null) { + string[] categories = + (from c in Pages.GetCategoriesForPage(page) + select NameTools.GetLocalName(c.FullName)).ToArray(); + sb.Append(@"

"); sb.Append(title); sb.Append("

"); + sb.AppendFormat("{0} {1} {2} {3} — {4}: {5}

", + Properties.Messages.ModifiedOn, + Preferences.AlignWithTimezone(content.LastModified).ToString(Settings.DateTimeFormat), + Properties.Messages.By, + Users.GetDisplayName(Users.FindUser(content.User)), + Properties.Messages.CategorizedAs, + categories.Length == 0 ? Properties.Messages.Uncategorized : string.Join(", ", categories)); sb.Append(Content.GetFormattedPageContent(page, true)); } else {