diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbeditor.directive.js index 255ebf1e27..a089edba2f 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbeditor.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbeditor.directive.js @@ -8,19 +8,18 @@ angular.module("umbraco.directives") .directive('umbEditor', function (umbPropEditorHelper) { return { scope: { - view: "@", - alias: "@", - config: "=", - value: "=" + model: "=" }, restrict: 'E', replace: true, templateUrl: 'views/directives/umb-editor.html', link: function (scope, element, attrs, ctrl) { - if(!scope.alias){ - scope.alias = Math.random().toString(36).slice(2); + + if(!scope.model.alias){ + scope.model.alias = Math.random().toString(36).slice(2); } - scope.propertyEditorView = umbPropEditorHelper.getViewPath(scope.view); + + scope.propertyEditorView = umbPropEditorHelper.getViewPath(scope.model.view); } }; }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js index 7b34cd3761..d7642cde16 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js @@ -16,6 +16,5 @@ angular.module("umbraco.directives") link: function (scope, element, attrs, ctrl) { } - }; }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/common/services/_module.js b/src/Umbraco.Web.UI.Client/src/common/services/_module.js index 580677806e..d2311fab63 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/_module.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/_module.js @@ -1 +1 @@ -angular.module("umbraco.services", ["umbraco.security", "umbraco.resources"]); \ No newline at end of file +angular.module("umbraco.services", ["umbraco.security", "umbraco.resources"]); diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less index 690a1c5398..08823cc322 100644 --- a/src/Umbraco.Web.UI.Client/src/less/forms.less +++ b/src/Umbraco.Web.UI.Client/src/less/forms.less @@ -495,7 +495,6 @@ input[type="checkbox"][readonly] { } .add-on:first-child, .btn:first-child { - // FYI, `.btn:first-child` accounts for a button group that's prepended .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); } } diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less index 9956bae4b3..fc89f23f2e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/main.less +++ b/src/Umbraco.Web.UI.Client/src/less/main.less @@ -157,9 +157,10 @@ label { /* FORM GRID */ -.umb-control-group { +.umb-pane { padding: 30px 20px; } + .umb-control-group .umb-el-wrap { padding: 0 } diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html index 32efa8d5bb..1ac7877c34 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html @@ -34,34 +34,28 @@ - - - - +
+ + + + +
- - - - - +
+ - + + + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-pane.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-pane.html new file mode 100644 index 0000000000..6d1e1d2218 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-pane.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html index 34de8b5807..afb5d702ac 100644 --- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html +++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html @@ -1,4 +1,4 @@ -
+
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 ba733f861b..5b90cd2ad6 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 +1 @@ -
    -
  • +
  • {{node.name}} @@ -8,7 +8,7 @@
  • - + Add
    • 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 db5699c8a1..9757917895 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 @@ -8,7 +8,7 @@ angular.module("umbraco").controller("Umbraco.Editors.DatepickerController", //The Datepicker js and css files are available and all components are ready to use. // Get the id of the datepicker button that was clicked - var pickerId = $scope.alias; + var pickerId = $scope.model.alias; // Open the datepicker and add a changeDate eventlistener $("#" + pickerId).datepicker({ @@ -16,7 +16,7 @@ angular.module("umbraco").controller("Umbraco.Editors.DatepickerController", autoclose: true }).on("changeDate", function (e) { // When a date is clicked the date is stored in model.value as a ISO 8601 date - $scope.value = e.date.toISOString(); + $scope.model.value = e.date.toISOString(); }); }); 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 cf568d7be1..7fd2d73376 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,6 +1,6 @@
    -
    - +
    +
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdown/dropdown.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdown/dropdown.html index 84f050b59c..09cab4c2d1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdown/dropdown.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdown/dropdown.html @@ -1,4 +1,4 @@ - diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js index abd709811a..b3cb5cc6b2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js @@ -22,9 +22,9 @@ function fileUploadController($scope, $element, $compile, umbImageHelper) { $scope.files = []; //create the property to show the list of files currently saved - if ($scope.value != "") { + if ($scope.model.value != "") { - var images = $scope.value.split(","); + var images = $scope.model.value.split(","); $scope.persistedFiles = _.map(images, function (item) { return { file: item, isImage: umbImageHelper.detectIfImageByExtension(item) }; @@ -43,11 +43,11 @@ function fileUploadController($scope, $element, $compile, umbImageHelper) { //listen for clear files changes to set our model to be sent up to the server $scope.$watch("clearFiles", function (isCleared) { if (isCleared == true) { - $scope.value = "{clearFiles: true}"; + $scope.model.value = "{clearFiles: true}"; clearFiles(); } else { - $scope.value = ""; + $scope.model.value = ""; } }); @@ -55,12 +55,12 @@ function fileUploadController($scope, $element, $compile, umbImageHelper) { $scope.$on("filesSelected", function (event, args) { $scope.$apply(function () { //set the parent files collection - $scope.$parent.addFiles($scope.id, args.files); + $scope.$parent.addFiles($scope.model.id, args.files); //clear the current files $scope.files = []; for (var i = 0; i < args.files.length; i++) { //save the file object to the scope's files collection - $scope.files.push({ id: $scope.id, file: args.files[i] }); + $scope.files.push({ id: $scope.model.id, file: args.files[i] }); } //set clear files to false, this will reset the model too $scope.clearFiles = false; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.controller.js index 644b34507c..f80596a2ea 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.controller.js @@ -13,13 +13,13 @@ angular.module("umbraco") function initMap(){ //Google maps is available and all components are ready to use. - var valueArray = $scope.value.split(','); + var valueArray = $scope.model.value.split(','); var latLng = new google.maps.LatLng(valueArray[0], valueArray[1]); - var mapDiv = document.getElementById($scope.alias + '_map'); + var mapDiv = document.getElementById($scope.model.alias + '_map'); var mapOptions = { - zoom: $scope.config.zoom, + zoom: $scope.model.config.zoom, center: latLng, - mapTypeId: google.maps.MapTypeId[$scope.config.mapType] + mapTypeId: google.maps.MapTypeId[$scope.model.config.mapType] }; var geocoder = new google.maps.Geocoder(); var map = new google.maps.Map(mapDiv, mapOptions); @@ -50,8 +50,7 @@ angular.module("umbraco") codeLatLng(marker.getPosition(), geocoder); //set the model value - $scope.value = newLat + "," + newLng; - + $scope.model.vvalue = newLat + "," + newLng; }); }}); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html index a928246c8f..6c5f0b74d7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html @@ -1,3 +1,3 @@ 
    -
    +
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js index 5beee82d0c..f6ab7b5625 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js @@ -14,7 +14,7 @@ angular.module("umbraco") $scope.next = function(){ if ($scope.options.pageNumber < $scope.listViewResultSet.totalPages) { $scope.options.pageNumber++; - $scope.reloadView(); + $scope.reloadView(); } }; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js index 00678bf339..69a05b0eea 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js @@ -7,7 +7,6 @@ angular.module('umbraco').controller("Umbraco.Editors.MediaPickerController", }; function populate(data){ - $log.log(data.selection); - $scope.value = data.selection; + $scope.model.value = data.selection; } }); \ No newline at end of file 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 c8fbe70e72..b5bfffe668 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 @@ -1,8 +1,8 @@ angular.module('umbraco').controller("Umbraco.Editors.ReadOnlyValueController", function($rootScope, $scope, $filter){ - if ($scope.config && $scope.config.filter && $scope.config.format) { - $scope.displayvalue = $filter($scope.config.filter)($scope.value, $scope.config.filter); + if ($scope.model.config && $scope.model.config.filter && $scope.model.config.format) { + $scope.displayvalue = $filter($scope.model.config.filter)($scope.model.value, $scope.model.config.filter); }else{ - $scope.displayvalue = $scope.value; + $scope.displayvalue = $scope.model.value; } }); \ No newline at end of file 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 d950d59fff..c84635f7ec 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 @@ -6,7 +6,7 @@ angular.module("umbraco") tinymce.DOM.events.domLoaded = true; tinymce.init({ - selector: "#" + $scope.alias + "_rte", + selector: "#" + $scope.model.alias + "_rte", skin: "umbraco", menubar : false, statusbar: false, @@ -17,7 +17,7 @@ angular.module("umbraco") editor.on('blur', function(e) { $scope.$apply(function() { //$scope.model.value = e.getBody().innerHTML; - $scope.value = editor.getContent(); + $scope.model.value = editor.getContent(); }); }); @@ -55,7 +55,7 @@ angular.module("umbraco") }; function populate(data){ - $scope.value = data.selection; + $scope.model.value = data.selection; } }); 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 03631cc85e..818d73d5c2 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/sample/sample.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/sample/sample.html deleted file mode 100644 index fe4448a169..0000000000 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/sample/sample.html +++ /dev/null @@ -1,20 +0,0 @@ -
    - -
      -
    • - {{item[0].value}} -
      • -
    - -
    - - -
    - - - -
    - json: {{model.value|json}} -
    - -
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/sampletwo/sampletwo.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/sampletwo/sampletwo.html deleted file mode 100644 index fd2d51e499..0000000000 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/sampletwo/sampletwo.html +++ /dev/null @@ -1,6 +0,0 @@ -
    - - - - -
    \ 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 4b34a6e798..20c08c5d0b 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 @@ -11,7 +11,7 @@ angular.module("umbraco") $scope.tags = []; // Initialize bootstrap-tags.js script - var tags = $('#' + $scope.alias + "_tags").tags({ + var tags = $('#' + $scope.model.alias + "_tags").tags({ tagClass: 'label-inverse' }); 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 8a4447a688..824c85d3fc 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,5 +1,5 @@
    -
    +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html index 524a2a297a..0ec959cbfc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textstring/textstring.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textstring/textstring.html index 1192cb1af9..20fdc2f0de 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textstring/textstring.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textstring/textstring.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/validationtest/validationtest.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/validationtest/validationtest.html index d20f9b58c3..1d624353da 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/validationtest/validationtest.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/validationtest/validationtest.html @@ -1,7 +1,7 @@ 

    Enter a numeric value

    -