Merge pull request #3109 from umbraco/update-dashboards

Merge dashboards from Developer to Settings section

src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html

@@ -1,21 +0,0 @@
-
-<umb-box>
-    <umb-box-content>
-        <h3 class="bold">Hours of Umbraco training videos are only a click away</h3>
-        <p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco, then visit <a class="btn-link -underline"  href="https://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos.</p>
-    </umb-box-content>
-</umb-box>
-
-<div ng-init="init('https://umbraco.tv/videos/developer/chapterrss?sort=no')"
-    ng-controller="Umbraco.Dashboard.StartupVideosController">
-    
-	<div class="umb-getstartedcards">
-        <a class="umb-getstartedcard" ng-repeat="video in videos" href="{{video.link}}" title="{{video.title}}" target="_blank" rel="noopener">
-            <img ng-src="{{video.thumbnail}}" alt="{{video.title}}">
-            <div class="umb-getstartedbody">
-                <p>{{video.title}}</p>
-            </div>
-        </a>
-    </div>
-
-</div>

src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js

@@ -27,25 +27,28 @@
                 {
                     "name": "Packages",
                     "icon": "icon-cloud",
-                    "view": "views/packager/views/repo.html",
-                    "active": !installPackageUri || installPackageUri === "navigation"
+                    "view": "views/packages/views/repo.html",
+                    "active": !installPackageUri || installPackageUri === "navigation",
+                    "alias": "umbPackages"
                 },
                 {
                     "name": "Installed",
                     "icon": "icon-box",
-                    "view": "views/packager/views/installed.html",
-                    "active": installPackageUri === "installed"
+                    "view": "views/packages/views/installed.html",
+                    "active": installPackageUri === "installed",
+                    "alias": "umbInstalled"
                 },
                 {
                     "name": "Install local",
                     "icon": "icon-add",
-                    "view": "views/packager/views/install-local.html",
-                    "active": installPackageUri === "local"
+                    "view": "views/packages/views/install-local.html",
+                    "active": installPackageUri === "local",
+                    "alias": "umbInstallLocal"
                 }
             ];
 
             $timeout(function () {
-                navigationService.syncTree({ tree: "packager", path: "-1" });
+                navigationService.syncTree({ tree: "packages", path: "-1" });
             });
         }
 

src/Umbraco.Web.UI.Client/src/views/packages/overview.html

@@ -16,7 +16,7 @@
             <umb-editor-container>
 
                 <umb-editor-sub-views
-                    sub-views="vm.page.navigation">
+                    sub-views="vm.page.navigation" model="vm.page">
                 </umb-editor-sub-views>
 
             </umb-editor-container>