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

Merge remote-tracking branch 'origin/temp-U4-10305' into temp-U4-10305

Browse Source
This commit is contained in:
Zsolt
2017-10-04 13:03:29 +02:00
parent 93237bfdb8 1c39c741b6
commit cb526170e2
13 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
View File

@@ -73,8 +73,8 @@
var element = $(scope.currentStep.element);
var offset = element.offset();
var width = element.width();
var height = element.height();
var width = element.outerWidth(true);
var height = element.outerHeight(true);
console.log("This element", element);
console.log("width", width);

2
src/Umbraco.Web.UI.Client/src/views/content/edit.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.Content.EditController">
<div data-element="editor-content" ng-controller="Umbraco.Editors.Content.EditController">
<content-editor create-options="createOptions"
content-id="contentId"
page="page"

2
src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.DataType.EditController">
<div data-element="editor-data-types" ng-controller="Umbraco.Editors.DataType.EditController">
<umb-load-indicator ng-if="page.loading"></umb-load-indicator>

2
src/Umbraco.Web.UI.Client/src/views/media/edit.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.Media.EditController">
<div data-element="editor-media" ng-controller="Umbraco.Editors.Media.EditController">
<umb-load-indicator ng-if="page.loading"></umb-load-indicator>

2
src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.MediaTypes.EditController as vm">
<div data-element="editor-media-types" ng-controller="Umbraco.Editors.MediaTypes.EditController as vm">
<umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>

2
src/Umbraco.Web.UI.Client/src/views/member/edit.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.Member.EditController">
<div data-element="editor-members" ng-controller="Umbraco.Editors.Member.EditController">
<umb-load-indicator ng-if="page.loading"></umb-load-indicator>

2
src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.MemberTypes.EditController as vm">
<div data-element="editor-member-types" ng-controller="Umbraco.Editors.MemberTypes.EditController as vm">
<umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>

2
src/Umbraco.Web.UI.Client/src/views/packager/overview.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.Packages.OverviewController as vm" class="clearfix">
<div data-element="editor-packages" ng-controller="Umbraco.Editors.Packages.OverviewController as vm" class="clearfix">
<form name="packagesForm" ng-submit="save()" novalidate val-form-manager>

2
src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.PartialViewMacros.EditController as vm">
<div data-element="editor-partial-view-macros" ng-controller="Umbraco.Editors.PartialViewMacros.EditController as vm">
<umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>

2
src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.PartialViews.EditController as vm">
<div data-element="editor-partial-views" ng-controller="Umbraco.Editors.PartialViews.EditController as vm">
<umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>

2
src/Umbraco.Web.UI.Client/src/views/scripts/edit.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.Scripts.EditController as vm">
<div data-element="editor-scripts" ng-controller="Umbraco.Editors.Scripts.EditController as vm">
<umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>

2
src/Umbraco.Web.UI.Client/src/views/templates/edit.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.Templates.EditController as vm">
<div data-element="editor-templates" ng-controller="Umbraco.Editors.Templates.EditController as vm">
<umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>

2
src/Umbraco.Web.UI.Client/src/views/users/overview.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.Users.OverviewController as vm" class="clearfix">
<div data-element="editor-users" ng-controller="Umbraco.Editors.Users.OverviewController as vm" class="clearfix">
<umb-editor-view footer="false">