zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed and closed #497: keywords, meta description and change comment are displayed in ?Code=1 mode.

Browse source
This commit is contained in:
Dario Solera 2010-02-28 10:23:54 +00:00
parent 52771e5fa1
commit f443187b6d
25 changed files with 246 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -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.2.502")]
[assembly: AssemblyFileVersion("3.0.2.502")]
[assembly: AssemblyVersion("3.0.2.503")]
[assembly: AssemblyFileVersion("3.0.2.503")]

17
WebApplication/Default.aspx.cs
View file

@ -328,8 +328,8 @@ namespace ScrewTurn.Wiki {
/// <summary>
/// Prints the keywords in a CSV list.
/// </summary>
/// <param name="keywords"></param>
/// <returns></returns>
/// <param name="keywords">The keywords.</param>
/// <returns>The list.</returns>
private string PrintKeywords(string[] keywords) {
StringBuilder sb = new StringBuilder(50);
for(int i = 0; i < keywords.Length; i++) {
@ -700,6 +700,19 @@ namespace ScrewTurn.Wiki {
sb.Append(@"<textarea style=""width: 98%; height: 500px;"" readonly=""true"">");
sb.Append(Server.HtmlEncode(currentContent.Content));
sb.Append("</textarea>");
sb.Append("<br /><br />");
sb.Append(Properties.Messages.MetaKeywords);
sb.Append(": <b>");
sb.Append(PrintKeywords(currentContent.Keywords));
sb.Append("</b><br />");
sb.Append(Properties.Messages.MetaDescription);
sb.Append(": <b>");
sb.Append(currentContent.Description);
sb.Append("</b><br />");
sb.Append(Properties.Messages.ChangeComment);
sb.Append(": <b>");
sb.Append(currentContent.Comment);
sb.Append("</b>");
literal.Text = sb.ToString();
plhContent.Controls.Add(literal);
}

11
WebApplication/Properties/Messages.af-ZA.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AccessDeniedTitle" xml:space="preserve">
<value>Access Denied</value>
</data>

9
WebApplication/Properties/Messages.cs-CZ.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="OrderedList" xml:space="preserve">
<value>Tříděný seznam</value>
</data>

9
WebApplication/Properties/Messages.da-DK.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Auto-update available</value>
</data>

9
WebApplication/Properties/Messages.de-DE.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>automatische aktualisierung verfügbar</value>
<comment>Auto-update available</comment>

27
WebApplication/Properties/Messages.designer.cs generated
View file

@ -933,6 +933,15 @@ namespace ScrewTurn.Wiki.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Change Comment.
/// </summary>
public static string ChangeComment {
get {
return ResourceManager.GetString("ChangeComment", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Click to enable email notifications for this page.
/// </summary>
@ -2643,6 +2652,24 @@ namespace ScrewTurn.Wiki.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Meta Description.
/// </summary>
public static string MetaDescription {
get {
return ResourceManager.GetString("MetaDescription", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Meta Keywords.
/// </summary>
public static string MetaKeywords {
get {
return ResourceManager.GetString("MetaKeywords", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Modified.
/// </summary>

9
WebApplication/Properties/Messages.es-ES.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Autoactualización disponible</value>
</data>

9
WebApplication/Properties/Messages.fr-FR.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Mise à jour automatique disponible</value>
</data>

11
WebApplication/Properties/Messages.hu-HU.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Az automatikus frissítés elérhető</value>
</data>

9
WebApplication/Properties/Messages.it-IT.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Commento alla modifica</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keyword</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Auto-aggiornam. disponibile</value>
</data>

11
WebApplication/Properties/Messages.ja-JP.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AccessDeniedTitle" xml:space="preserve">
<value>アクセスは拒否されました</value>
</data>

9
WebApplication/Properties/Messages.nb-NO.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Auto-update available</value>
</data>

9
WebApplication/Properties/Messages.nl-NL.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Auto-update available</value>
</data>

9
WebApplication/Properties/Messages.pl-PL.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Automatyczna aktualizacja dostępna</value>
</data>

9
WebApplication/Properties/Messages.pt-BR.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Auto-update available</value>
</data>

9
WebApplication/Properties/Messages.resx
View file

@ -1654,4 +1654,13 @@
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Auto-update available</value>
</data>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
</root>

9
WebApplication/Properties/Messages.ro-RO.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Auto-update available</value>
</data>

9
WebApplication/Properties/Messages.ru-RU.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Автообновление доступно</value>
</data>

9
WebApplication/Properties/Messages.sk-SK.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Auto-update available</value>
</data>

9
WebApplication/Properties/Messages.sr-Latn-CS.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Auto-update available</value>
</data>

9
WebApplication/Properties/Messages.tr-TR.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="CouldNotMigratePage" xml:space="preserve">
<value>Could not migrate Page</value>
</data>

9
WebApplication/Properties/Messages.uk-UA.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>Автооновлення доступне</value>
</data>

9
WebApplication/Properties/Messages.zh-cn.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>自动更新可用</value>
</data>

10
WebApplication/Properties/Messages.zh-tw.resx
View file

@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChangeComment" xml:space="preserve">
<value>Change Comment</value>
</data>
<data name="MetaDescription" xml:space="preserve">
<value>Meta Description</value>
</data>
<data name="MetaKeywords" xml:space="preserve">
<value>Meta Keywords</value>
</data>
<data name="AutoUpdateAvailable" xml:space="preserve">
<value>自動更新可用</value>
</data>
@ -1355,7 +1364,6 @@
<value>頁面設置為公開</value>
</data>
<data name="PagesOfCategory" xml:space="preserve">
<value>分類的所有頁面</value>
</data>
<data name="PageTitle" xml:space="preserve">