diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index 15c601c..30017b7 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.2.542")] -[assembly: AssemblyFileVersion("3.0.2.542")] +[assembly: AssemblyVersion("3.0.2.543")] +[assembly: AssemblyFileVersion("3.0.2.543")] diff --git a/Core/Settings.cs b/Core/Settings.cs index 5dc4315..b5383d6 100644 --- a/Core/Settings.cs +++ b/Core/Settings.cs @@ -67,6 +67,16 @@ namespace ScrewTurn.Wiki { } } + /// + /// Gets direction of the application + /// + public static string Direction { + get { + if(Tools.IsRightToLeftCulture()) return "rtl"; + else return "ltr"; + } + } + /// /// Gets the bytes of the MasterPassword. /// diff --git a/Core/Tools.cs b/Core/Tools.cs index ea98c04..a08b452 100644 --- a/Core/Tools.cs +++ b/Core/Tools.cs @@ -235,6 +235,21 @@ namespace ScrewTurn.Wiki { else return ""; } + /// + /// Gets the current culture. + /// + public static string CurrentCulture { + get { return CultureInfo.CurrentUICulture.Name; } + } + + /// + /// Get the direction of the current culture. + /// + /// true if the current culture is RTL, false otherwise. + public static bool IsRightToLeftCulture() { + return new CultureInfo(CurrentCulture).TextInfo.IsRightToLeft; + } + /// /// Computes the Hash of a Username, mixing it with other data, in order to avoid illegal Account activations. /// diff --git a/WebApplication/Admin.master b/WebApplication/Admin.master index 72dff46..ee41e88 100644 --- a/WebApplication/Admin.master +++ b/WebApplication/Admin.master @@ -2,7 +2,7 @@ - + Administration @@ -65,8 +65,8 @@


- -
+ +

GNU General Public License v2

This Program is released under the GNU General Public License v2. You cannot remove this statement.
View the GNU General Public License v2 or visit the GNU website.

diff --git a/WebApplication/Admin.master.cs b/WebApplication/Admin.master.cs index f204f41..8d36caf 100644 --- a/WebApplication/Admin.master.cs +++ b/WebApplication/Admin.master.cs @@ -30,6 +30,9 @@ namespace ScrewTurn.Wiki { SetupButtons(); SetupButtonsVisibility(); + + // This applies text direction + DataBind(); } /// diff --git a/WebApplication/AdminPages.aspx b/WebApplication/AdminPages.aspx index 8b1c310..46160e7 100644 --- a/WebApplication/AdminPages.aspx +++ b/WebApplication/AdminPages.aspx @@ -26,7 +26,7 @@ OnClick="btnNewPage_Click" meta:resourcekey="btnNewPageResource1" />

+ AutoUpdateAfterCallback="true" OnClick="btnBulkMigrate_Click" meta:resourcekey="btnBulkMigrateResource1" />
diff --git a/WebApplication/AdminPages.aspx.designer.cs b/WebApplication/AdminPages.aspx.designer.cs index 548bbab..f51f2b6 100644 --- a/WebApplication/AdminPages.aspx.designer.cs +++ b/WebApplication/AdminPages.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4016 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.af-ZA.resx b/WebApplication/App_LocalResources/AdminPages.aspx.af-ZA.resx index aa30c92..81152b5 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.af-ZA.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.af-ZA.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Approve diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.cs-CZ.resx b/WebApplication/App_LocalResources/AdminPages.aspx.cs-CZ.resx index dd6f80a..f89be85 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.cs-CZ.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.cs-CZ.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.da-DK.resx b/WebApplication/App_LocalResources/AdminPages.aspx.da-DK.resx index eb77081..a799be2 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.da-DK.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.da-DK.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Back diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.de-DE.resx b/WebApplication/App_LocalResources/AdminPages.aspx.de-DE.resx index 5862d56..6d26ccd 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.de-DE.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.de-DE.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Zurück Back diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.es-ES.resx b/WebApplication/App_LocalResources/AdminPages.aspx.es-ES.resx index bd2d248..4ccf8a7 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.es-ES.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.es-ES.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Atrás diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.fr-FR.resx b/WebApplication/App_LocalResources/AdminPages.aspx.fr-FR.resx index 15a87c8..e4e4945 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.fr-FR.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.fr-FR.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Retour diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.hu-HU.resx b/WebApplication/App_LocalResources/AdminPages.aspx.hu-HU.resx index 8e14316..36ab8e8 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.hu-HU.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.hu-HU.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Vissza diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.it-IT.resx b/WebApplication/App_LocalResources/AdminPages.aspx.it-IT.resx index 2db2245..2d5ab3f 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.it-IT.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.it-IT.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Approva diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.ja-JP.resx b/WebApplication/App_LocalResources/AdminPages.aspx.ja-JP.resx index 58d8cb3..034e514 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.ja-JP.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.ja-JP.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + 承認 diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.nb-NO.resx b/WebApplication/App_LocalResources/AdminPages.aspx.nb-NO.resx index eb77081..a799be2 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.nb-NO.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.nb-NO.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Back diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.nl-NL.resx b/WebApplication/App_LocalResources/AdminPages.aspx.nl-NL.resx index eb77081..a799be2 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.nl-NL.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.nl-NL.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Back diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.pl-PL.resx b/WebApplication/App_LocalResources/AdminPages.aspx.pl-PL.resx index 14d28a8..eb3e4cf 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.pl-PL.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.pl-PL.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Wróć diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.pt-PT.resx b/WebApplication/App_LocalResources/AdminPages.aspx.pt-PT.resx index 9797844..0765668 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.pt-PT.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.pt-PT.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Aprovar diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.resx b/WebApplication/App_LocalResources/AdminPages.aspx.resx index aa30c92..c61702e 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.resx @@ -570,4 +570,10 @@ Target Namespace is required + + Bulk Migrate + + + Migrate many Pages to another namespace + \ No newline at end of file diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.ro-RO.resx b/WebApplication/App_LocalResources/AdminPages.aspx.ro-RO.resx index eb77081..a799be2 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.ro-RO.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.ro-RO.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Back diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.ru-RU.resx b/WebApplication/App_LocalResources/AdminPages.aspx.ru-RU.resx index dacc7d8..b2b06e6 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.ru-RU.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.ru-RU.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Назад diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.sk-SK.resx b/WebApplication/App_LocalResources/AdminPages.aspx.sk-SK.resx index eb77081..a799be2 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.sk-SK.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.sk-SK.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Back diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.sr-Latn-CS.resx b/WebApplication/App_LocalResources/AdminPages.aspx.sr-Latn-CS.resx index eb77081..a799be2 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.sr-Latn-CS.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.sr-Latn-CS.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Back diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.tr-TR.resx b/WebApplication/App_LocalResources/AdminPages.aspx.tr-TR.resx index 2593918..f448843 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.tr-TR.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.tr-TR.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Migrate diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.uk-UA.resx b/WebApplication/App_LocalResources/AdminPages.aspx.uk-UA.resx index 57e895d..151f40f 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.uk-UA.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.uk-UA.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + Повернутися diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.zh-cn.resx b/WebApplication/App_LocalResources/AdminPages.aspx.zh-cn.resx index f05497d..7b4daf3 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.zh-cn.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.zh-cn.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + 返回 diff --git a/WebApplication/App_LocalResources/AdminPages.aspx.zh-tw.resx b/WebApplication/App_LocalResources/AdminPages.aspx.zh-tw.resx index 9ab789b..ea49a5e 100644 --- a/WebApplication/App_LocalResources/AdminPages.aspx.zh-tw.resx +++ b/WebApplication/App_LocalResources/AdminPages.aspx.zh-tw.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Bulk Migrate + + + Migrate many Pages to another namespace + 返回 @@ -570,4 +576,4 @@ 1. 選擇頁面 - + \ No newline at end of file diff --git a/WebApplication/MasterPage.master b/WebApplication/MasterPage.master index ccebf87..90d4c0c 100644 --- a/WebApplication/MasterPage.master +++ b/WebApplication/MasterPage.master @@ -2,7 +2,7 @@ - + diff --git a/WebApplication/MasterPage.master.cs b/WebApplication/MasterPage.master.cs index 7cb7154..15bb8b7 100644 --- a/WebApplication/MasterPage.master.cs +++ b/WebApplication/MasterPage.master.cs @@ -35,6 +35,9 @@ namespace ScrewTurn.Wiki { PrintSidebar(); PrintFooter(); PrintPageHeaderAndFooter(); + + // This applies text direction + DataBind(); } /// diff --git a/WebApplication/MasterPageSA.Master b/WebApplication/MasterPageSA.Master index ed0af3c..7e97b2e 100644 --- a/WebApplication/MasterPageSA.Master +++ b/WebApplication/MasterPageSA.Master @@ -2,7 +2,7 @@ - + diff --git a/WebApplication/MasterPageSA.Master.cs b/WebApplication/MasterPageSA.Master.cs index 2abf0f9..b3c97b1 100644 --- a/WebApplication/MasterPageSA.Master.cs +++ b/WebApplication/MasterPageSA.Master.cs @@ -37,6 +37,9 @@ namespace ScrewTurn.Wiki { PrintHtmlHead(); PrintHeader(); PrintFooter(); + + // This applies text direction + DataBind(); } /// diff --git a/WebApplication/Popup.aspx b/WebApplication/Popup.aspx index e12908f..8d46d99 100644 --- a/WebApplication/Popup.aspx +++ b/WebApplication/Popup.aspx @@ -5,7 +5,7 @@ - + ScrewTurn Wiki diff --git a/WebApplication/Popup.aspx.cs b/WebApplication/Popup.aspx.cs index 85ffa33..cac53e2 100644 --- a/WebApplication/Popup.aspx.cs +++ b/WebApplication/Popup.aspx.cs @@ -70,6 +70,9 @@ namespace ScrewTurn.Wiki { chkImageAttachments.Visible = currentPage != null; SetupFeature(); + + // This applies text direction + DataBind(); } } diff --git a/WebApplication/PopupWYSIWYG.aspx b/WebApplication/PopupWYSIWYG.aspx index 25924a7..1028e28 100644 --- a/WebApplication/PopupWYSIWYG.aspx +++ b/WebApplication/PopupWYSIWYG.aspx @@ -5,7 +5,7 @@ - + ScrewTurn Wiki diff --git a/WebApplication/PopupWYSIWYG.aspx.cs b/WebApplication/PopupWYSIWYG.aspx.cs index 09210b9..24e7497 100644 --- a/WebApplication/PopupWYSIWYG.aspx.cs +++ b/WebApplication/PopupWYSIWYG.aspx.cs @@ -71,6 +71,9 @@ namespace ScrewTurn.Wiki { chkImageAttachments.Visible = currentPage != null; SetupFeature(); + + // This applies text direction + DataBind(); } } diff --git a/WebApplication/Print.aspx b/WebApplication/Print.aspx index c3dfa20..ea7ebed 100644 --- a/WebApplication/Print.aspx +++ b/WebApplication/Print.aspx @@ -2,7 +2,7 @@ - + Print diff --git a/WebApplication/Print.aspx.cs b/WebApplication/Print.aspx.cs index 8efb9d2..8e6889b 100644 --- a/WebApplication/Print.aspx.cs +++ b/WebApplication/Print.aspx.cs @@ -41,7 +41,10 @@ namespace ScrewTurn.Wiki { Page.Title = FormattingPipeline.PrepareTitle(content.Title, false, FormattingContext.PageContent, page) + " - " + Settings.WikiTitle; - PrintContent(); + PrintContent(); + + // This applies text direction + DataBind(); } ///