Merge branch 'temp-U4-7178-media-library' of https://github.com/umbraco/Umbraco-CMS into temp-U4-7178-media-library

src/Umbraco.Web.UI.Client/src/common/directives/components/umbbreadcrumbs.directive.js

@@ -8,7 +8,8 @@
       replace: true,
       templateUrl: 'views/components/umb-breadcrumbs.html',
       scope: {
-        ancestors: "="
+        ancestors: "=",
+        entityType: "@"
       }
     };
 

src/Umbraco.Web.UI.Client/src/views/components/umb-breadcrumbs.html

@@ -1,7 +1,7 @@
 <ul class="umb-breadcrumbs">
    <li class="umb-breadcrumbs__ancestor" ng-repeat="ancestor in ancestors">
 
-      <a ng-if="!$last" href="#/content/content/edit/{{ancestor.id}}" class="umb-breadcrumbs__ancestor-link">{{ancestor.name}}</a>
+      <a ng-if="!$last" href="#/{{entityType}}/{{entityType}}/edit/{{ancestor.id}}" class="umb-breadcrumbs__ancestor-link">{{ancestor.name}}</a>
       <span ng-if="!$last" class="umb-breadcrumbs__seperator">&#47;</span>
 
       <span class="umb-breadcrumbs__ancestor-text" ng-if="$last">{{ancestor.name}}</span>

src/Umbraco.Web.UI.Client/src/views/content/edit.html

@@ -35,7 +35,13 @@
          <umb-editor-footer>
 
             <umb-editor-footer-content-left>
-               <umb-breadcrumbs ancestors="ancestors" ng-if="ancestors && ancestors.length > 0"></umb-breadcrumbs>
+
+               <umb-breadcrumbs
+                  ng-if="ancestors && ancestors.length > 0"
+                  ancestors="ancestors"
+                  entity-type="content">
+               </umb-breadcrumbs>
+
             </umb-editor-footer-content-left>
 
 

src/Umbraco.Web.UI.Client/src/views/media/edit.html

@@ -32,7 +32,13 @@
          <umb-editor-footer>
 
             <umb-editor-footer-content-left>
-               <umb-breadcrumbs ng-if="ancestors && ancestors.length > 0" ancestors="ancestors"></umb-breadcrumbs>
+
+               <umb-breadcrumbs
+                  ng-if="ancestors && ancestors.length > 0"
+                  ancestors="ancestors"
+                  entity-type="media">
+               </umb-breadcrumbs>
+
             </umb-editor-footer-content-left>