diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index ae854db66a..dba73d1c07 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -58,7 +58,7 @@ h1.headline{height: 40px; padding: 30px 0 0 20px;} position: absolute; padding: 0px 0px 0px 20px; } -.umb-panel-header h1, { +.umb-panel-header h1 { margin: 0; font-size: @fontSizeMedium; font-weight: 400; @@ -71,7 +71,6 @@ h1.headline{height: 40px; padding: 30px 0 0 20px;} .umb-headline-editor-wrapper input { background: none; border: none; - width: auto; margin: -9px 0 0 0; padding: 0 0 2px 0; border-radius: 0; diff --git a/src/Umbraco.Web.UI.Client/src/views/member/create.html b/src/Umbraco.Web.UI.Client/src/views/member/create.html index d25d8c0c15..815cdd74a0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/member/create.html @@ -1,74 +1,26 @@ -
-
-
+
+
-
Create a new member
+
Create a new member
+ +
-
- -
- -
- -
- -
- - -
+ + + +
+
- +
+ +
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js index d749fc8fe0..adbf4dfd7f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/member/member.create.controller.js @@ -7,34 +7,7 @@ * The controller for the member creation dialog */ function memberCreateController($scope, $routeParams, memberTypeResource, iconHelper) { - - $scope.currentStep = 1; - $scope.memberModel = null; - $scope.memberType = null; - - $scope.submitMember = function () { - - //we need to broadcast the saving event for the toggle validators to work - $scope.$broadcast("saving"); - //ensure the drop down is dirty so the styles validate - $scope.memberCreate.$setDirty(true); - - if ($scope.memberCreate.$invalid) { - return; - } - - alert("whoohoo!"); - - //#media/media/edit/{{currentNode.id}}?doctype={{docType.alias}}&create=true - }; - $scope.selectMemberType = function (alias) { - $scope.memberType = alias; - $scope.currentStep = 2; - }; - - - memberTypeResource.getTypes($scope.currentNode.id).then(function (data) { $scope.allowedTypes = iconHelper.formatContentTypeIcons(data); }); diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js index 493739842b..df2b122ed0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js @@ -13,7 +13,7 @@ function MemberEditController($scope, $routeParams, $q, $timeout, $window, membe if ($routeParams.create) { //we are creating so get an empty member item - memberResource.getScaffold($routeParams.id, $routeParams.doctype) + memberResource.getScaffold($routeParams.doctype) .then(function(data) { $scope.loaded = true; $scope.content = data; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js index bafd28e90b..1891e628c6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js @@ -23,4 +23,4 @@ function booleanEditorController($scope, $rootScope, assetsService) { }; } -angular.module("umbraco").controller("Umbraco.Editors.BooleanController", booleanEditorController); \ No newline at end of file +angular.module("umbraco").controller("Umbraco.PropertyEditors.BooleanController", booleanEditorController); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html index 37e1030614..afdeca161f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html @@ -1,3 +1,3 @@ -
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js index d343fe903e..fe31c6ad78 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js @@ -1,4 +1,4 @@ -angular.module("umbraco").controller("Umbraco.Editors.CheckboxListController", +angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListController", function($scope) { if (!angular.isObject($scope.model.config.items)) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html index cfed867ae2..ae691215e7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.html @@ -1,4 +1,4 @@ -
+
  • diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.controller.js index b5876a1c2b..3a5bae3e4f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.controller.js @@ -1,4 +1,4 @@ -angular.module("umbraco").controller("Umbraco.Editors.CodeMirrorController", +angular.module("umbraco").controller("Umbraco.PropertyEditors.CodeMirrorController", function ($scope, $rootScope, assetsService) { /* diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.html index 2e42f2c702..39a9b4a6f4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/code/code.html @@ -1,4 +1,4 @@ -
    +
    {{model.value}}
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js index ff649c1e72..47aa5ee4b9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js @@ -4,4 +4,4 @@ function ColorPickerController($scope) { }; } -angular.module("umbraco").controller("Umbraco.Editors.ColorPickerController", ColorPickerController); +angular.module("umbraco").controller("Umbraco.PropertyEditors.ColorPickerController", ColorPickerController); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html index bf44552a3e..d18548105e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html @@ -1,4 +1,4 @@ -
    +
    • diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js index c623865994..4870733f51 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js @@ -1,7 +1,7 @@ //this controller simply tells the dialogs service to open a mediaPicker window //with a specified callback, this callback will receive an object with a selection on it angular.module('umbraco') -.controller("Umbraco.Editors.ContentPickerController", +.controller("Umbraco.PropertyEditors.ContentPickerController", function($scope, dialogService, entityResource, $log, iconHelper){ $scope.ids = $scope.model.value.split(','); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html index 257b906e0e..6bf89d233f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html @@ -1,4 +1,4 @@ -
      +
      • diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js index 36d9e07348..2ee3c3bcf7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js @@ -1,4 +1,4 @@ -angular.module("umbraco").controller("Umbraco.Editors.DatepickerController", +angular.module("umbraco").controller("Umbraco.PropertyEditors.DatepickerController", function ($scope, notificationsService, assetsService) { //setup the default config diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html index bbaa8b3c23..64ef2d271a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.html @@ -1,4 +1,4 @@ -
        +
        +
        diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js index f226a4ddfc..e1764e1750 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.controller.js @@ -45,4 +45,4 @@ function ReadOnlyValueController($rootScope, $scope, $filter) { }); } -angular.module('umbraco').controller("Umbraco.Editors.ReadOnlyValueController", ReadOnlyValueController); \ No newline at end of file +angular.module('umbraco').controller("Umbraco.PropertyEditors.ReadOnlyValueController", ReadOnlyValueController); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html index df58ca6acc..84483c56a7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/readonlyvalue/readonlyvalue.html @@ -1,3 +1,3 @@ -
        +
        {{displayvalue}}
        \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js index 7a56fe947e..82912a3ae2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js @@ -1,5 +1,5 @@ angular.module("umbraco") - .controller("Umbraco.Editors.RelatedLinksController", + .controller("Umbraco.PropertyEditors.RelatedLinksController", function ($rootScope, $scope, dialogService, $routeParams, contentResource, contentTypeResource, editorContextService, notificationsService) { $scope.newCaption = ''; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html index cc05a78cf5..0be042777a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html @@ -1,4 +1,4 @@ -
        +
        diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index 3c1015109c..f79a776ab7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -1,5 +1,5 @@ angular.module("umbraco") - .controller("Umbraco.Editors.RTEController", + .controller("Umbraco.PropertyEditors.RTEController", function ($rootScope, $element, $scope, dialogService, $log, imageHelper, assetsService, $timeout, tinyMceService, angularHelper) { tinyMceService.configuration().then(function(tinyMceConfig){ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html index 51a07d5335..1bd0495864 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html @@ -1,3 +1,3 @@ -
        +
        \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js index 7465cc2197..f21e619915 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js @@ -1,5 +1,5 @@ angular.module("umbraco") -.controller("Umbraco.Editors.TagsController", +.controller("Umbraco.PropertyEditors.TagsController", function ($rootScope, $scope, $log, assetsService) { assetsService.loadJs( diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html index b1df58ed91..933857e78d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html @@ -1,4 +1,4 @@ -
        +
        diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/embeddedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/embeddedcontent.controller.js index 4d546ba690..255abd85f4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/embeddedcontent.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/embeddedcontent.controller.js @@ -1,6 +1,6 @@ //this controller simply tells the dialogs service to open a mediaPicker window //with a specified callback, this callback will receive an object with a selection on it -angular.module('umbraco').controller("Umbraco.Editors.EmbeddedContentController", +angular.module('umbraco').controller("Umbraco.PropertyEditors.EmbeddedContentController", function($rootScope, $scope, $log){ $scope.showForm = false; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/test.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/test.html index dd533b4287..113aeae349 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/test.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/test/test.html @@ -1,4 +1,4 @@ -
        +
        • {{item[0].value}}... diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.controller.js index 24a754b4f5..2a7462cc1b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.controller.js @@ -1,4 +1,4 @@ -angular.module('umbraco').controller("Umbraco.Editors.UrlListController", +angular.module('umbraco').controller("Umbraco.PropertyEditors.UrlListController", function($rootScope, $scope, $filter) { function formatDisplayValue() { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html index 1653896c1a..d3561654b1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html @@ -1,4 +1,4 @@ -
          +
          • {{value.url}} diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js index ef48de19f7..163f58dec6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js @@ -1,4 +1,4 @@ -angular.module('umbraco').controller("Umbraco.Editors.UserPickerController", +angular.module('umbraco').controller("Umbraco.PropertyEditors.UserPickerController", function($rootScope, $scope, $log, userResource){ userResource.getAll().then(function (userArray) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html index d2fb30e34a..badfdbfd69 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.html @@ -1,5 +1,5 @@