yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7

Browse Source
This commit is contained in:
Shannon
2016-08-09 15:30:54 +02:00
parent 2ee71ecb96 213a25e3fe
commit 5b88f35471
4 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build/NuSpecs/tools/Dashboard.config.install.xdt
View File

@@ -30,16 +30,21 @@
</section>
<section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
<tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
<tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
<control>
views/dashboard/developer/examinemanagement.html
</control>
</tab>
<tab caption="Xml Data Integrity Report" xdt:Transform="InsertIfMissing">
</tab>
<tab caption="Health Check" xdt:Transform="InsertIfMissing" xdt:Locator="Match(caption)">
<control>
views/dashboard/developer/xmldataintegrityreport.html
views/dashboard/developer/healthcheck.html
</control>
</tab>
</tab>
<tab caption="Redirect URL Management" xdt:Transform="InsertIfMissing" xdt:Locator="Match(caption)">
<control>
views/dashboard/developer/redirecturls.html
</control>
</tab>
</section>
<section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">

7
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
View File

@@ -11,6 +11,13 @@
on-click-name="vm.goToItem">
</umb-content-grid>
<umb-empty-state
ng-if="!items && options.filter.length === 0 && !vm.isRecycleBin"
position="center">
<div ng-if="entityType === 'content'">No content has been added</div>
<div ng-if="entityType === 'member'">No members have been added</div>
</umb-empty-state>
<umb-empty-state
ng-if="!items && options.filter.length > 0"
position="center">

7
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
View File

@@ -49,6 +49,13 @@
on-sort="vm.sort">
</umb-table>
<umb-empty-state
ng-if="!items && options.filter.length === 0 && !vm.isRecycleBin"
position="center">
<div ng-if="entityType === 'content'">No content has been added</div>
<div ng-if="entityType === 'member'">No members have been added</div>
</umb-empty-state>
</div>
<umb-empty-state

11
src/Umbraco.Web.UI/config/Dashboard.Release.config
View File

@@ -102,5 +102,14 @@
</control>
</tab>
</section>
<section alias="RedirectUrlManagement">
<areas>
<area>developer</area>
</areas>
<tab caption="Redirect URL Management">
<control>
views/dashboard/developer/redirecturls.html
</control>
</tab>
</section>
</dashBoard>