From 861db9beef5cc8542a0c5f5189f51b8e60f7030a Mon Sep 17 00:00:00 2001 From: Dario Solera Date: Tue, 10 Nov 2009 08:46:03 +0000 Subject: [PATCH] Added warning for snippet editing as commented on issue #403. --- AssemblyVersion.cs | 4 ++-- WebApplication/AdminSnippets.aspx | 4 +++- WebApplication/AdminSnippets.aspx.cs | 3 +++ WebApplication/AdminSnippets.aspx.designer.cs | 11 ++++++++++- .../App_LocalResources/AdminSnippets.aspx.cs-CZ.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.da-DK.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.de-DE.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.es-ES.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.fr-FR.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.hu-HU.resx | 5 ++++- .../App_LocalResources/AdminSnippets.aspx.it-IT.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.nb-NO.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.nl-NL.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.pl-PL.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.pt-BR.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.ro-RO.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.ru-RU.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.sk-SK.resx | 3 +++ .../AdminSnippets.aspx.sr-Latn-CS.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.tr-TR.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.uk-UA.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.zh-cn.resx | 3 +++ .../App_LocalResources/AdminSnippets.aspx.zh-tw.resx | 3 +++ 24 files changed, 79 insertions(+), 5 deletions(-) diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index 83e1e52..63a4c31 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.426")] -[assembly: AssemblyFileVersion("3.0.1.426")] +[assembly: AssemblyVersion("3.0.1.427")] +[assembly: AssemblyFileVersion("3.0.1.427")] diff --git a/WebApplication/AdminSnippets.aspx b/WebApplication/AdminSnippets.aspx index 356793e..04aaec2 100644 --- a/WebApplication/AdminSnippets.aspx +++ b/WebApplication/AdminSnippets.aspx @@ -56,11 +56,13 @@ -
+

+

diff --git a/WebApplication/AdminSnippets.aspx.cs b/WebApplication/AdminSnippets.aspx.cs index 8348ea6..edafdfa 100644 --- a/WebApplication/AdminSnippets.aspx.cs +++ b/WebApplication/AdminSnippets.aspx.cs @@ -83,6 +83,7 @@ namespace ScrewTurn.Wiki { Snippet snippet = Snippets.Find(name); providerSelector.SelectedProvider = snippet.Provider.GetType().FullName; editor.SetContent(snippet.Content, Settings.UseVisualEditorAsDefault); + lblEditSnippetWarning.Visible = true; SetTitleForSnippet(); } @@ -311,6 +312,8 @@ namespace ScrewTurn.Wiki { btnDelete.Visible = false; lblResult.Text = ""; lblResult.CssClass = ""; + + lblEditSnippetWarning.Visible = false; } } diff --git a/WebApplication/AdminSnippets.aspx.designer.cs b/WebApplication/AdminSnippets.aspx.designer.cs index e2a9792..9893174 100644 --- a/WebApplication/AdminSnippets.aspx.designer.cs +++ b/WebApplication/AdminSnippets.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3074 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -85,6 +85,15 @@ namespace ScrewTurn.Wiki { /// protected global::System.Web.UI.WebControls.Literal lblEditTitleTemplate; + /// + /// lblEditSnippetWarning control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal lblEditSnippetWarning; + /// /// lblProvider control. /// diff --git a/WebApplication/App_LocalResources/AdminSnippets.aspx.cs-CZ.resx b/WebApplication/App_LocalResources/AdminSnippets.aspx.cs-CZ.resx index 527c071..0122b9a 100644 --- a/WebApplication/App_LocalResources/AdminSnippets.aspx.cs-CZ.resx +++ b/WebApplication/App_LocalResources/AdminSnippets.aspx.cs-CZ.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + <div class='warning' style='float: right;'>You are now editing a snippet. After you are done,<br />it is <b>strongly</b> suggested to rebuild the search engine index in the <i>Admin Home</i> page.</div> + diff --git a/WebApplication/App_LocalResources/AdminSnippets.aspx.da-DK.resx b/WebApplication/App_LocalResources/AdminSnippets.aspx.da-DK.resx index 846bf93..3aba417 100644 --- a/WebApplication/App_LocalResources/AdminSnippets.aspx.da-DK.resx +++ b/WebApplication/App_LocalResources/AdminSnippets.aspx.da-DK.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + <div class='warning' style='float: right;'>You are now editing a snippet. After you are done,<br />it is <b>strongly</b> suggested to rebuild the search engine index in the <i>Admin Home</i> page.</div> + Cancel diff --git a/WebApplication/App_LocalResources/AdminSnippets.aspx.de-DE.resx b/WebApplication/App_LocalResources/AdminSnippets.aspx.de-DE.resx index 846bf93..3aba417 100644 --- a/WebApplication/App_LocalResources/AdminSnippets.aspx.de-DE.resx +++ b/WebApplication/App_LocalResources/AdminSnippets.aspx.de-DE.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + <div class='warning' style='float: right;'>You are now editing a snippet. After you are done,<br />it is <b>strongly</b> suggested to rebuild the search engine index in the <i>Admin Home</i> page.</div> + Cancel diff --git a/WebApplication/App_LocalResources/AdminSnippets.aspx.es-ES.resx b/WebApplication/App_LocalResources/AdminSnippets.aspx.es-ES.resx index 0ad2aa3..6569e0f 100644 --- a/WebApplication/App_LocalResources/AdminSnippets.aspx.es-ES.resx +++ b/WebApplication/App_LocalResources/AdminSnippets.aspx.es-ES.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + <div class='warning' style='float: right;'>You are now editing a snippet. After you are done,<br />it is <b>strongly</b> suggested to rebuild the search engine index in the <i>Admin Home</i> page.</div> + Cancelar diff --git a/WebApplication/App_LocalResources/AdminSnippets.aspx.fr-FR.resx b/WebApplication/App_LocalResources/AdminSnippets.aspx.fr-FR.resx index 846bf93..3aba417 100644 --- a/WebApplication/App_LocalResources/AdminSnippets.aspx.fr-FR.resx +++ b/WebApplication/App_LocalResources/AdminSnippets.aspx.fr-FR.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + <div class='warning' style='float: right;'>You are now editing a snippet. After you are done,<br />it is <b>strongly</b> suggested to rebuild the search engine index in the <i>Admin Home</i> page.</div> + Cancel diff --git a/WebApplication/App_LocalResources/AdminSnippets.aspx.hu-HU.resx b/WebApplication/App_LocalResources/AdminSnippets.aspx.hu-HU.resx index d81b35f..576f7bd 100644 --- a/WebApplication/App_LocalResources/AdminSnippets.aspx.hu-HU.resx +++ b/WebApplication/App_LocalResources/AdminSnippets.aspx.hu-HU.resx @@ -1,4 +1,4 @@ - +