diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index d7f72ba..f1110fd 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.0.352")] -[assembly: AssemblyFileVersion("3.0.0.352")] +[assembly: AssemblyVersion("3.0.0.353")] +[assembly: AssemblyFileVersion("3.0.0.353")] diff --git a/WebApplication/Default.aspx b/WebApplication/Default.aspx index 214d284..ded0854 100644 --- a/WebApplication/Default.aspx +++ b/WebApplication/Default.aspx @@ -42,13 +42,23 @@ var __attachmentsMenuJustShown = false; var __adminToolsMenuJustShown = false; + var __ie7Mode = false; - function __ToggleAttachmentsMenu() { + function __ToggleAttachmentsMenu(cx, cy) { var element = document.getElementById("PageAttachmentsDiv"); if(element) { if(element.style["display"] == "none") { element.style["display"] = ""; - __RepositionDiv(document.getElementById("PageAttachmentsLink"), element); + var pos = __AbsolutePosition(element); + if(pos.left - cx > 0) { + __ie7Mode = true; + element.style["position"] = "absolute"; + element.style["top"] = cy + "px"; + element.style["left"] = (cx - pos.width) + "px"; + } + else { + __RepositionDiv(document.getElementById("PageAttachmentsLink"), element); + } __attachmentsMenuJustShown = true; } } @@ -58,17 +68,27 @@ var element = document.getElementById("PageAttachmentsDiv"); if(element && !__attachmentsMenuJustShown) { element.style["display"] = "none"; + if (__ie7Mode) element.style["left"] = "10000px"; } __attachmentsMenuJustShown = false; return true; // Needed to enabled next clicks' action (file download) } - function __ToggleAdminToolsMenu() { + function __ToggleAdminToolsMenu(cx, cy) { var element = document.getElementById("AdminToolsDiv"); if(element) { if(element.style["display"] == "none") { element.style["display"] = ""; - __RepositionDiv(document.getElementById("AdminToolsLink"), element); + var pos = __AbsolutePosition(element); + if(pos.left - cx > 0) { + __ie7Mode = true; + element.style["position"] = "absolute"; + element.style["top"] = cy + "px"; + element.style["left"] = (cx - pos.width) + "px"; + } + else { + __RepositionDiv(document.getElementById("AdminToolsLink"), element); + } __adminToolsMenuJustShown = true; } } @@ -78,6 +98,7 @@ var element = document.getElementById("AdminToolsDiv"); if(element && !__adminToolsMenuJustShown) { element.style["display"] = "none"; + if(__ie7Mode) element.style["left"] = "10000px"; } __adminToolsMenuJustShown = false; return true; // Needed to enable next clicks' action (admin tools) @@ -233,11 +254,11 @@ -
+
-
+
diff --git a/WebApplication/Default.aspx.cs b/WebApplication/Default.aspx.cs index 23c11b7..a547013 100644 --- a/WebApplication/Default.aspx.cs +++ b/WebApplication/Default.aspx.cs @@ -154,7 +154,7 @@ namespace ScrewTurn.Wiki { int attachmentCount = GetAttachmentCount(); lblAttachmentsLink.Visible = canDownloadAttachments && !discussMode && !viewCodeMode && attachmentCount > 0; if(lblAttachmentsLink.Visible) { - lblAttachmentsLink.Text = string.Format(@"{1}", + lblAttachmentsLink.Text = string.Format(@"{1}", Properties.Messages.Attachments, Properties.Messages.Attachments); } attachmentViewer.Visible = lblAttachmentsLink.Visible; @@ -163,7 +163,7 @@ namespace ScrewTurn.Wiki { lblAdminToolsLink.Visible = Settings.EnablePageToolbar && !discussMode && !viewCodeMode && ((canRollback && bakCount > 0)|| canAdmin || canSetPerms); if(lblAdminToolsLink.Visible) { - lblAdminToolsLink.Text = string.Format(@"{1}", + lblAdminToolsLink.Text = string.Format(@"{1}", Properties.Messages.AdminTools, Properties.Messages.Admin); if(canRollback && bakCount > 0) {