From 25c1bfe55c1fc05a1fd2e317276e7e3e526273ad Mon Sep 17 00:00:00 2001
From: Rune Hem Strand <rune@umbraco.com>
Date: Mon, 8 Jun 2015 17:55:35 +0200
Subject: [PATCH] Releases & Docs

---
 .../installed/installedPackages.config        | 26 +++++++++++++++++++
 .../Documenation/Navigation.cshtml            |  5 ++++
 .../config/ClientDependency.config            |  2 +-
 OurUmbraco.Site/masterpages/Release.master    | 22 +++++++---------
 .../masterpages/ReleaseLanding.master         | 16 ++----------
 5 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/OurUmbraco.Site/App_Data/packages/installed/installedPackages.config b/OurUmbraco.Site/App_Data/packages/installed/installedPackages.config
index f4bd91a1..37c5ffd5 100644
--- a/OurUmbraco.Site/App_Data/packages/installed/installedPackages.config
+++ b/OurUmbraco.Site/App_Data/packages/installed/installedPackages.config
@@ -26,4 +26,30 @@
     <loadcontrol>
     </loadcontrol>
   </package>
+  <package id="5" version="1" url="Export" name="OurMacros" folder="0f138bc7-2c29-42f0-a980-81d2fbb32bcf" packagepath="" repositoryGuid="" packageGuid="" hasUpdate="False" enableSkins="False" skinRepoGuid="00000000-0000-0000-0000-000000000000">
+    <license url="http://opensource.org/licenses/MIT">MIT License</license>
+    <author url="-">-</author>
+    <readme><![CDATA[]]></readme>
+    <actions>
+    </actions>
+    <datatypes>
+    </datatypes>
+    <content nodeId="" loadChildNodes="False">
+    </content>
+    <templates>
+    </templates>
+    <stylesheets>
+    </stylesheets>
+    <documenttypes>
+    </documenttypes>
+    <macros>3,139,140,141,142,144,145,146,147,1147,1148,1149,1159,1158,1167,1162,1155,1161,1164,1154,1168,1156,1150,1163,1169</macros>
+    <files>
+    </files>
+    <languages>
+    </languages>
+    <dictionaryitems>
+    </dictionaryitems>
+    <loadcontrol>
+    </loadcontrol>
+  </package>
 </packages>
\ No newline at end of file
diff --git a/OurUmbraco.Site/Views/MacroPartials/Documenation/Navigation.cshtml b/OurUmbraco.Site/Views/MacroPartials/Documenation/Navigation.cshtml
index 77abbf1d..b02c8453 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Documenation/Navigation.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Documenation/Navigation.cshtml
@@ -23,6 +23,10 @@
 	<ul class="level-1">
 	    @foreach (dynamic item in sitemap.directories)
         {
+            if (item.name != "images" && item.name != "Development-Guidelines" && item.name != "Extending-Umbraco" && item.name != "Using-Umbraco" && item.name!="Reference")
+            {
+                
+            
             <li class=" @IsActive(root+item.path, "active open")">
                 <a href="@(root + item.path)/"><h3>@item.name</h3></a>
                 @if((bool)item.hasChildren)
@@ -44,6 +48,7 @@
                     </ul>
                 }
             </li>
+            }
         }
     </ul>
 </nav>
\ No newline at end of file
diff --git a/OurUmbraco.Site/config/ClientDependency.config b/OurUmbraco.Site/config/ClientDependency.config
index e58e2fdb..5c12e04a 100644
--- a/OurUmbraco.Site/config/ClientDependency.config
+++ b/OurUmbraco.Site/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="420359568" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="1066481571" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/OurUmbraco.Site/masterpages/Release.master b/OurUmbraco.Site/masterpages/Release.master
index 5df36444..873ae6ab 100644
--- a/OurUmbraco.Site/masterpages/Release.master
+++ b/OurUmbraco.Site/masterpages/Release.master
@@ -39,18 +39,6 @@
 					        </li>
 							<li>
 								<a href="/contribute/progress"><h3>In Progress</h3></a>
-								<ul class="level-2">
-									<li>
-										<a href=""><h4>7.2.3</h4></a>
-									</li>
-									<li>
-										<a href=""><h4>7.3</h4></a>
-									</li>
-									<li>
-										<a href=""><h4>8.0</h4></a>
-									</li>
-									
-								</ul>
 							</li>
 							<li>
 								<a href="/contribute/releases"><h3>All Releases</h3></a>
@@ -249,7 +237,7 @@
     <umbraco:Macro runat="server" Language="cshtml">
  
         <script type="text/javascript">
-            (function () {
+           /* (function () {
                 var currentVersions = [];
                 var inProgressVersions = [];
                 var futureVersions = [];
@@ -260,6 +248,14 @@
                 // Load data
                 loadData('@Model.Name');
 
+            })();*/
+
+            (function () {
+
+                // Apply bindings
+                ko.applyBindings(viewModel);
+                // Load data
+                loadAllData();
             })();
             
 
diff --git a/OurUmbraco.Site/masterpages/ReleaseLanding.master b/OurUmbraco.Site/masterpages/ReleaseLanding.master
index b7764543..89074754 100644
--- a/OurUmbraco.Site/masterpages/ReleaseLanding.master
+++ b/OurUmbraco.Site/masterpages/ReleaseLanding.master
@@ -1,8 +1,7 @@
 <%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %>
   
-  
 <asp:Content ID="Content1" ContentPlaceHolderId="Head" runat="server">
-  <link rel="stylesheet" type="text/css" href="/css/releases.css?v=4" />
+  <!--<link rel="stylesheet" type="text/css" href="/css/releases.css?v=4" />-->
   <!-- release scripts -->
   <script src="/Scripts/jquery.cookie.js" type="text/javascript"></script>
   <script src="/Scripts/knockout-2.0.0.js" type="text/javascript"></script>
@@ -28,18 +27,7 @@
 					    </li>
 					    <li>
 						    <a href="/contribute/progress"><h3>In Progress</h3></a>
-						    <ul class="level-2">
-							    <li>
-								    <a href=""><h4>7.2.3</h4></a>
-							    </li>
-							    <li>
-								    <a href=""><h4>7.3</h4></a>
-							    </li>
-							    <li>
-								    <a href=""><h4>8.0</h4></a>
-							    </li>
-									
-						    </ul>
+						    
 					    </li>
 					    <li class="active open">
 						    <a href="/contribute/releases"><h3>All Releases</h3></a>