diff --git a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/App_LocalResources/Manager.resx b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/App_LocalResources/Manager.resx index fd88fb74859..54b1f24ef02 100644 --- a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/App_LocalResources/Manager.resx +++ b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/App_LocalResources/Manager.resx @@ -117,8 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Admin + + Dynamic Content Type Manager Content Types @@ -126,9 +126,6 @@ Data Types - - DCC - Content Manager @@ -294,4 +291,7 @@ Language + + Actions + \ No newline at end of file diff --git a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/ClientScripts/Manager.js b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/ClientScripts/Manager.js index c2bfb110d24..b7d30ffe319 100644 --- a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/ClientScripts/Manager.js +++ b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/ClientScripts/Manager.js @@ -6,6 +6,7 @@ var menuClick = function (target, panel) { $rootElement.find(".dccMenu li").removeClass("selected"); + $rootElement.find(".dccPanel").hide(); var listItem = $(target); @@ -19,15 +20,7 @@ return; } - //slide panels in - var zIndex = $(panel).css("z-index"); - $(panel).css("z-index", zIndex + 10); - $(activePanel).animate({ opacity: 0 }, 400, function () { - $(this).offset({ left: -850 }); - $(this).css("opacity", 1); - $(panel).animate({ left: 0 }, 1500); - $(panel).css("z-index", zIndex); - }); + $(panel).show(); activePanel = panel; }; diff --git a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Dnn.Modules.DynamicContentManager.csproj b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Dnn.Modules.DynamicContentManager.csproj index 725f2d83846..0e30251dc08 100644 --- a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Dnn.Modules.DynamicContentManager.csproj +++ b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Dnn.Modules.DynamicContentManager.csproj @@ -138,6 +138,12 @@ + + + + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Manager.html b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Manager.html index 71fc135d0ae..8b26cd1006b 100644 --- a/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Manager.html +++ b/DNN Platform/Modules/Dnn.Modules.DynamicContentManager/Manager.html @@ -18,42 +18,31 @@ [Css:{ path: "~/Resources/Shared/components/CodeEditor/lib/codemirror.css"}]
-
-