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

Merge branch 'temp8-3539-support-for-variants-in-redirects' into temp8

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Routing/RedirectTrackingComponent.cs
This commit is contained in:
Claus
2019-01-04 14:36:55 +01:00
parent b0ccdaa4f9 6ad2adf4a2
commit 2fad3c745a
19 changed files with 188 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web.UI.Client/src/views/dashboard/content/redirecturls.html
View File

@@ -54,9 +54,10 @@
<div class="umb-table-head">
<div class="umb-table-row">
<div class="umb-table-cell not-fixed flx-s1 flx-g1 flx-b4"><localize key="redirectUrls_originalUrl">Original URL</localize></div>
<div class="umb-table-cell not-fixed flx-s1 flx-g1 flx-b1"><localize key="redirectUrls_culture">Culture</localize></div>
<div class="umb-table-cell flx-s1 flx-g1 flx-b4"><localize key="redirectUrls_originalUrl">Original URL</localize></div>
<div class="umb-table-cell flx-s0 flx-g0" style="flex-basis: 20px;"></div>
<div class="umb-table-cell flx-s1 flx-g1 flx-b6"><localize key="redirectUrls_redirectedTo">Redirected To</localize></div>
<div class="umb-table-cell flx-s1 flx-g1 flx-b5"><localize key="redirectUrls_redirectedTo">Redirected To</localize></div>
</div>
</div>
@@ -64,8 +65,10 @@
<div class="umb-table-row -solid" ng-repeat="redirectUrl in vm.redirectUrls">
<div class="umb-table-cell not-fixed flx-s1 flx-g1 flx-b4">
<div class="umb-table-cell not-fixed flx-s1 flx-g1 flx-b1">
{{redirectUrl.culture ||'*'}}
</div>
<div class="umb-table-cell flx-s1 flx-g1 flx-b4">
<a class="umb-table-body__link" href="{{redirectUrl.originalUrl}}" target="_blank" title="{{redirectUrl.originalUrl}}">{{redirectUrl.originalUrl}}</a>
</div>
@@ -73,7 +76,7 @@
<i class="umb-table-body__icon umb-table-body__fileicon icon-arrow-right" style="font-size: 12px; line-height: 1;"></i>
</div>
<div class="umb-table-cell flx-s1 flx-g1 flx-b6 items-center">
<div class="umb-table-cell flx-s1 flx-g1 flx-b5 items-center">
<div class="flx-s1 flx-g1 flx-b0" style="margin-right: 20px;">
<a class="umb-table-body__link" href="{{redirectUrl.destinationUrl}}" target="_blank" title="{{redirectUrl.destinationUrl}}">{{redirectUrl.destinationUrl}}</a>
</div>