From 40cb2c0fa8d5922d8c1899e6e20046ac0a293cdf Mon Sep 17 00:00:00 2001
From: Richard Edwards <richard@dnnstuff.com>
Date: Tue, 19 Jan 2016 17:09:20 -0500
Subject: [PATCH] Moved to dnn7.dev.com

---
 AssemblyInfo.vb                               |   6 +-
 DNNStuff.Aggregator.vbproj                    |  33 ++--
 ...dnnstuff.aggregator.sqldataprovider.vbproj |  14 +-
 Skins/jQueryUI/_js/jquery-ui-tabs-rotate.js   | 142 ++++++++----------
 Version/All/Version_Current.html              |   3 +
 Version/All/Version_Current.md                |   7 +
 Version/Documentation/Releases.html.md        |  16 ++
 7 files changed, 117 insertions(+), 104 deletions(-)

diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb
index 520a4f8..4d4336b 100644
--- a/AssemblyInfo.vb
+++ b/AssemblyInfo.vb
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.18444
+'     Runtime Version:4.0.30319.34209
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -22,6 +22,6 @@ Imports System.Runtime.InteropServices
  Assembly: AssemblyCopyright("Copyright (c) DNNStuff 2004-2012"),  _
  Assembly: ComVisible(false),  _
  Assembly: CLSCompliant(true),  _
- Assembly: AssemblyVersion("06.04.10"),  _
- Assembly: AssemblyFileVersion("06.04.10")> 
+ Assembly: AssemblyVersion("06.04.11"),  _
+ Assembly: AssemblyFileVersion("06.04.11")> 
 
diff --git a/DNNStuff.Aggregator.vbproj b/DNNStuff.Aggregator.vbproj
index d9785e7..34d5344 100644
--- a/DNNStuff.Aggregator.vbproj
+++ b/DNNStuff.Aggregator.vbproj
@@ -50,7 +50,7 @@
     <BaseAddress>285212672</BaseAddress>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>DNNVERSION="DNN6"</DefineConstants>
+    <DefineConstants>DNNVERSION="DNN8"</DefineConstants>
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <DebugSymbols>true</DebugSymbols>
@@ -69,7 +69,7 @@
     <BaseAddress>285212672</BaseAddress>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>DNNVERSION="DNN6"</DefineConstants>
+    <DefineConstants>DNNVERSION="DNN8"</DefineConstants>
     <DefineDebug>false</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <DebugSymbols>false</DebugSymbols>
@@ -85,7 +85,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Trial|AnyCPU' ">
     <DefineTrace>true</DefineTrace>
     <OutputPath>..\..\bin\</OutputPath>
-    <DefineConstants>DNNVERSION="DNN6"</DefineConstants>
+    <DefineConstants>DNNVERSION="DNN8"</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <DocumentationFile>DNNStuff.Aggregator.xml</DocumentationFile>
     <Optimize>true</Optimize>
@@ -97,32 +97,29 @@
   <ItemGroup>
     <Reference Include="DotNetNuke">
       <Name>DotNetNuke</Name>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke7\DotNetNuke.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN5' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke5\DotNetNuke.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN6' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke6\DotNetNuke.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">D:\TOOLING\BIN\DotNetNuke7\DotNetNuke.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">D:\TOOLING\BIN\DotNetNuke8\DotNetNuke.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="DotNetNuke.WebUtility">
       <Name>DotNetNuke.WebUtility</Name>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke7\DotNetNuke.WebUtility.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN5' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke5\DotNetNuke.WebUtility.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN6' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke6\DotNetNuke.WebUtility.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">D:\TOOLING\BIN\DotNetNuke7\DotNetNuke.WebUtility.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">D:\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' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke7\SharpZipLib.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN5' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke5\SharpZipLib.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN6' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke6\SharpZipLib.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">D:\TOOLING\BIN\DotNetNuke7\SharpZipLib.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">D:\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>\\RICHARD-SERVER\Shared Files\Development\BIN\Various\RssToolkit.dll</HintPath>
+      <HintPath>D:\TOOLING\BIN\Various\RssToolkit.dll</HintPath>
     </Reference>
     <Reference Include="DNNStuff.Utilities, Version=1.0.0.14263, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>\\RICHARD-SERVER\Shared Files\Development\BIN\Various\DNNStuff.Utilities.dll</HintPath>
+      <HintPath>D:\TOOLING\BIN\Various\DNNStuff.Utilities.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic">
       <Name>Microsoft.VisualBasic</Name>
@@ -1481,7 +1478,7 @@
       <DependentUpon>Aggregator.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Compatibility\DNN6\Compatibility.vb" />
+    <Compile Include="Compatibility\DNN8\Compatibility.vb" />
     <Compile Include="Components\Data\AggregatorDB.vb">
       <SubType>Code</SubType>
     </Compile>
@@ -1638,12 +1635,12 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>1124</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://dev.dnn6/DesktopModules/DNNStuff - Aggregator</IISUrl>
+          <IISUrl>http://dnn7.dev.com/DesktopModules/DNNStuff - Aggregator</IISUrl>
           <OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
-          <IISAppRootUrl>http://dev.dnn6/</IISAppRootUrl>
+          <IISAppRootUrl>http://dnn7.dev.com/</IISAppRootUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>http://dev.dnn6/</CustomServerUrl>
+          <CustomServerUrl>http://dnn7.dev.com/</CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/Providers/SqlDataProvider/dnnstuff.aggregator.sqldataprovider.vbproj b/Providers/SqlDataProvider/dnnstuff.aggregator.sqldataprovider.vbproj
index e9594cf..c9d4191 100644
--- a/Providers/SqlDataProvider/dnnstuff.aggregator.sqldataprovider.vbproj
+++ b/Providers/SqlDataProvider/dnnstuff.aggregator.sqldataprovider.vbproj
@@ -50,7 +50,7 @@
     <BaseAddress>285212672</BaseAddress>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>DNNVERSION="DNN6"</DefineConstants>
+    <DefineConstants>DNNVERSION="DNN8"</DefineConstants>
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <DebugSymbols>true</DebugSymbols>
@@ -70,7 +70,7 @@
     <BaseAddress>285212672</BaseAddress>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>DNNVERSION="DNN6"</DefineConstants>
+    <DefineConstants>DNNVERSION="DNN8"</DefineConstants>
     <DefineDebug>false</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <DebugSymbols>false</DebugSymbols>
@@ -88,7 +88,7 @@
     <DefineTrace>true</DefineTrace>
     <OutputPath>..\..\..\..\bin\</OutputPath>
     <DocumentationFile>DNNStuff.Aggregator.SqlDataProvider.xml</DocumentationFile>
-    <DefineConstants>DNNVERSION="DNN6"</DefineConstants>
+    <DefineConstants>DNNVERSION="DNN8"</DefineConstants>
     <BaseAddress>285212672</BaseAddress>
     <Optimize>true</Optimize>
     <WarningLevel>1</WarningLevel>
@@ -99,14 +99,14 @@
   <ItemGroup>
     <Reference Include="DotNetNuke">
       <Name>DotNetNuke</Name>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke7\DotNetNuke.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN6' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke6\DotNetNuke.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN7' ">D:\TOOLING\BIN\DotNetNuke7\DotNetNuke.dll</HintPath>
+      <HintPath Condition=" '$(DNNVERSION)' == 'DNN8' ">D:\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' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke7\Microsoft.ApplicationBlocks.Data.dll</HintPath>
-      <HintPath Condition=" '$(DNNVERSION)' == 'DNN6' ">\\RICHARD-SERVER\Shared Files\Development\BIN\DotNetNuke6\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+      <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>
       <Private>False</Private>
     </Reference>
     <Reference Include="System">
diff --git a/Skins/jQueryUI/_js/jquery-ui-tabs-rotate.js b/Skins/jQueryUI/_js/jquery-ui-tabs-rotate.js
index 9f46c01..36563e7 100644
--- a/Skins/jQueryUI/_js/jquery-ui-tabs-rotate.js
+++ b/Skins/jQueryUI/_js/jquery-ui-tabs-rotate.js
@@ -1,76 +1,66 @@
-; (function ($) {
-    $.extend($.ui.tabs.prototype, {
-        rotation: null,
-        rotationDelay: null,
-        continuing: null,
-        rotate: function (ms, continuing) {
-            var self = this,
-				o = this.options;
-
-            if ((ms > 1 || self.rotationDelay === null) && ms !== undefined) {//only set rotationDelay if this is the first time through or if not immediately moving on from an unpause
-                self.rotationDelay = ms;
-            }
-
-            if (continuing !== undefined) {
-                self.continuing = continuing;
-            }
-
-            var rotate = self._rotate || (self._rotate = function (e) {
-                clearTimeout(self.rotation);
-                self.rotation = setTimeout(function () {
-                    var t = o.active;
-                    self.option("active", ++t < self.anchors.length ? t : 0);
-                }, ms);
-
-                if (e) {
-                    e.stopPropagation();
-                }
-            });
-
-            var stop = self._unrotate || (self._unrotate = !continuing
-				? function (e) {
-				    if (e.clientX) { // in case of a true click
-				        self.rotate(null);
-				    }
-				}
-				: function (e) {
-				    t = o.active;
-				    rotate();
-				});
-
-            // start rotation
-            if (ms) {
-                this.element.bind("tabsactivate", rotate);
-                this.anchors.bind(o.event + ".tabs", self.pause);
-                rotate();
-                // stop rotation
-            } else {
-                clearTimeout(self.rotation);
-                this.element.unbind("tabsactivate", rotate);
-                this.anchors.unbind(o.event + ".tabs", self.pause);
-                delete this._rotate;
-                delete this._unrotate;
-            }
-
-            //rotate immediately and then have normal rotation delay
-            if (ms === 1) {
-                //set ms back to what it was originally set to
-                ms = self.rotationDelay;
-            }
-
-            return this;
-        },
-        pause: function () {
-            var self = this,
-				o = this.options;
-
-            self.rotate(0);
-        },
-        unpause: function () {
-            var self = this,
-				o = this.options;
-
-            self.rotate(1, self.continuing);
-        }
-    });
-})(jQuery);
+;(function($){
+$.extend( $.ui.tabs.prototype, {
+rotation: null,
+rotationDelay: null,
+continuing: null,
+rotate: function( ms, continuing ) {
+var self = this,
+o = this.options;
+if((ms > 1 || self.rotationDelay === null) && ms !== undefined){//only set rotationDelay if this is the first time through or if not immediately moving on from an unpause
+self.rotationDelay = ms;
+}
+if(continuing !== undefined){
+self.continuing = continuing;
+}
+var rotate = self._rotate || ( self._rotate = function( e ) {
+clearTimeout( self.rotation );
+self.rotation = setTimeout(function() {
+var t = o.active;
+self.option( "active", ++t < self.anchors.length ? t : 0 );
+}, ms );
+if ( e ) {
+e.stopPropagation();
+}
+});
+var stop = self._unrotate || ( self._unrotate = !continuing
+? function(e) {
+if (e.clientX) { // in case of a true click
+self.rotate(null);
+}
+}
+: function( e ) {
+t = o.active;
+rotate();
+});
+// start rotation
+if ( ms ) {
+this.element.bind( "tabsactivate", rotate );
+this.anchors.bind( o.event + ".tabs", $.proxy(self.unpause, self) );
+rotate();
+// stop rotation
+} else {
+clearTimeout( self.rotation );
+this.element.unbind( "tabsactivate", rotate );
+this.anchors.unbind( o.event + ".tabs", $.proxy(self.pause, self) );
+delete this._rotate;
+delete this._unrotate;
+}
+//rotate immediately and then have normal rotation delay
+if(ms === 1){
+//set ms back to what it was originally set to
+ms = self.rotationDelay;
+}
+return this;
+},
+pause: function() {
+var self = this,
+o = this.options;
+self.rotate(0);
+},
+unpause: function(){
+var self = this,
+o = this.options;
+self.rotate(1, self.continuing);
+}
+});
+})(jQuery);
\ No newline at end of file
diff --git a/Version/All/Version_Current.html b/Version/All/Version_Current.html
index e131b97..45c4060 100644
--- a/Version/All/Version_Current.html
+++ b/Version/All/Version_Current.html
@@ -1,3 +1,5 @@
+<h2>06.04.11</h2>
+<p>01/Jun/2015</p>
 <h2>06.04.10</h2>
 <p>12/Feb/2015</p>
 <ul>
@@ -9,3 +11,4 @@ <h2>06.04.10</h2>
 </li>
 </ul>
 <p>For additional release history please visit the <a href="http://docs.dnnstuff.com/pages/aggregator">documentation</a>.</p>
+<p>For additional release history please visit the <a href="http://docs.dnnstuff.com/pages/aggregator">documentation</a>.</p>
diff --git a/Version/All/Version_Current.md b/Version/All/Version_Current.md
index 9ef1fe1..c07e6c7 100644
--- a/Version/All/Version_Current.md
+++ b/Version/All/Version_Current.md
@@ -1,4 +1,9 @@
 
+## 06.04.11
+
+01/Jun/2015
+
+
 ## 06.04.10
 
 12/Feb/2015
@@ -8,3 +13,5 @@
 
 
 For additional release history please visit the [documentation](http://docs.dnnstuff.com/pages/aggregator).
+
+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
index 91223f7..e113fc9 100644
--- a/Version/Documentation/Releases.html.md
+++ b/Version/Documentation/Releases.html.md
@@ -7,6 +7,22 @@ tags: ['intro','page']
 
 <!-- insert-newversion -->
 
+## 06.04.11
+
+01/Jun/2015
+
+
+## 06.04.10
+
+12/Feb/2015
+
+* Fixes
+	* Added a jQueryUI 1.10.x specific version of the jQuery Accordion - in the list as Accordion_1_10
+
+
+For additional release history please visit the [documentation](http://docs.dnnstuff.com/pages/aggregator).
+
+
 ## 06.04.10
 
 12/Feb/2015