Fixed 'No Container' problem in DNN

redtempo · Jun 14, 2016 · f891f3e · f891f3e
1 parent 6ab6b47
commit f891f3e
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 39 deletions.
diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb
@@ -1,4 +1,4 @@
-'------------------------------------------------------------------------------
+'------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
 '     Runtime Version:4.0.30319.42000
@@ -11,17 +11,13 @@
 Option Strict Off
 Option Explicit On
 
-Imports System
-Imports System.Reflection
-Imports System.Runtime.CompilerServices
-Imports System.Runtime.InteropServices
-<Assembly: AssemblyTitle("DNNStuff.Aggregator"),  _
- Assembly: AssemblyDescription("DNNStuff.Aggregator - DNN7 Install - .NET 3.5"),  _
- Assembly: AssemblyCompany("DNNStuff"),  _
- Assembly: AssemblyProduct("DNNStuff Aggregator"),  _
- Assembly: AssemblyCopyright("Copyright (c) DNNStuff 2004-2012"),  _
- Assembly: ComVisible(false),  _
- Assembly: CLSCompliant(true),  _
- Assembly: AssemblyVersion("06.05.00"),  _
- Assembly: AssemblyFileVersion("06.05.00")> 
+<Assembly: System.Reflection.AssemblyTitle("DNNStuff.Aggregator"),  _
+ Assembly: System.Reflection.AssemblyDescription("DNNStuff.Aggregator - DNN7 Install - .NET 3.5"),  _
+ Assembly: System.Reflection.AssemblyCompany("DNNStuff"),  _
+ Assembly: System.Reflection.AssemblyProduct("DNNStuff Aggregator"),  _
+ Assembly: System.Reflection.AssemblyCopyright("Copyright (c) DNNStuff 2004-2012"),  _
+ Assembly: System.Runtime.InteropServices.ComVisible(false),  _
+ Assembly: System.CLSCompliant(true),  _
+ Assembly: System.Reflection.AssemblyVersion("06.05.01"),  _
+ Assembly: System.Reflection.AssemblyFileVersion("06.05.01")> 
 
diff --git a/DNNStuff.Aggregator.vbproj b/DNNStuff.Aggregator.vbproj
@@ -101,29 +101,29 @@
   <ItemGroup>
     <Reference Include="DotNetNuke">
       <Name>DotNetNuke</Name>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">D:\TOOLING\BIN\DotNetNuke7\DotNetNuke.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">D:\TOOLING\BIN\DotNetNuke8\DotNetNuke.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">J:\TOOLING\BIN\DotNetNuke7\DotNetNuke.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">J:\TOOLING\BIN\DotNetNuke8\DotNetNuke.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="DotNetNuke.WebUtility">
       <Name>DotNetNuke.WebUtility</Name>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">D:\TOOLING\BIN\DotNetNuke7\DotNetNuke.WebUtility.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">D:\TOOLING\BIN\DotNetNuke8\DotNetNuke.WebUtility.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">J:\TOOLING\BIN\DotNetNuke7\DotNetNuke.WebUtility.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">J:\TOOLING\BIN\DotNetNuke8\DotNetNuke.WebUtility.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SharpZipLib, Version=0.81.0.1407, Culture=neutral">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">D:\TOOLING\BIN\DotNetNuke7\SharpZipLib.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">D:\TOOLING\BIN\DotNetNuke8\SharpZipLib.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">J:\TOOLING\BIN\DotNetNuke7\SharpZipLib.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">J:\TOOLING\BIN\DotNetNuke8\SharpZipLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="RssToolkit, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\TOOLING\BIN\Various\RssToolkit.dll</HintPath>
+      <HintPath>J:\TOOLING\BIN\Various\RssToolkit.dll</HintPath>
     </Reference>
     <Reference Include="DNNStuff.Utilities, Version=1.0.0.14263, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\TOOLING\BIN\Various\DNNStuff.Utilities.dll</HintPath>
+      <HintPath>J:\TOOLING\BIN\Various\DNNStuff.Utilities.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic">
       <Name>Microsoft.VisualBasic</Name>

diff --git a/No Container.ascx b/No Container.ascx
@@ -1,5 +1,2 @@
-<%@ Control language="vb" CodeBehind="~/admin/Containers/container.vb" AutoEventWireup="false" Explicit="True" Inherits="DotNetNuke.UI.Containers.Container" %>
-<%@ Register TagPrefix="dnn" TagName="ACTIONS" Src="~/Admin/Containers/Actions.ascx" %>
-<div runat="server" id="ContentPane">
-   <dnn:ACTIONS runat="server" id="dnnACTIONS" ProviderName="DNNMenuNavigationProvider" ExpandDepth="1" PopulateNodesFromClient="False" />
-</div>
+<%@ Control Language="C#" CodeBehind="~/admin/Containers/container.cs" AutoEventWireup="false" Inherits="DotNetNuke.UI.Containers.Container" %>
+<div runat="server" id="ContentPane" />
diff --git a/Providers/SqlDataProvider/dnnstuff.aggregator.sqldataprovider.vbproj b/Providers/SqlDataProvider/dnnstuff.aggregator.sqldataprovider.vbproj
@@ -99,14 +99,14 @@
   <ItemGroup>
     <Reference Include="DotNetNuke">
       <Name>DotNetNuke</Name>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">D:\TOOLING\BIN\DotNetNuke7\DotNetNuke.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">D:\TOOLING\BIN\DotNetNuke8\DotNetNuke.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">J:\TOOLING\BIN\DotNetNuke7\DotNetNuke.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">J:\TOOLING\BIN\DotNetNuke8\DotNetNuke.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">D:\TOOLING\BIN\DotNetNuke7\Microsoft.ApplicationBlocks.Data.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">D:\TOOLING\BIN\DotNetNuke8\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">J:\TOOLING\BIN\DotNetNuke7\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">J:\TOOLING\BIN\DotNetNuke8\Microsoft.ApplicationBlocks.Data.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System">

diff --git a/Version/All/Version_Current.html b/Version/All/Version_Current.html
@@ -1,11 +1,10 @@
-<h2>06.05.00</h2>
-<p>21/Jan/2016</p>
+<h2>06.05.01</h2>
+<p>14/Jun/2016</p>
 <ul>
 <li>
 Fixes
 <ul>
-<li>Added support for DNN8</li>
-<li>Minimum configuration is now DNN 7.1.2+ (.NET 4.0) / DNN 8+ (.NET 4.5)</li>
+<li>Fixed a bug in DNN8 when hiding container of embedded modules</li>
 </ul>
 </li>
 </ul>

diff --git a/Version/All/Version_Current.md b/Version/All/Version_Current.md
@@ -1,12 +1,12 @@
 
-## 06.05.00
+## 06.05.01
 
-21/Jan/2016
+14/Jun/2016
 
 
 * Fixes
-	* Added support for DNN8
-    * Minimum configuration is now DNN 7.1.2+ (.NET 4.0) / DNN 8+ (.NET 4.5)
+	* Fixed a bug in DNN8 when hiding container of embedded modules
+
 
 
 For additional release history please visit the [documentation](http://docs.dnnstuff.com/pages/aggregator).
diff --git a/Version/Documentation/Releases.html.md b/Version/Documentation/Releases.html.md
@@ -7,6 +7,24 @@ tags: ['intro','page']
 
 <!-- insert-newversion -->
 
+## 06.05.01
+
+14/Jun/2016
+
+
+## 06.05.00
+
+21/Jan/2016
+
+
+* Fixes
+	* Added support for DNN8
+    * Minimum configuration is now DNN 7.1.2+ (.NET 4.0) / DNN 8+ (.NET 4.5)
+
+
+For additional release history please visit the [documentation](http://docs.dnnstuff.com/pages/aggregator).
+
+
 ## 06.05.00
 
 21/Jan/2016