From f92ee9b7680edda2aa0a1398b69f8449e62c9f00 Mon Sep 17 00:00:00 2001 From: Per Ploug Krogslund Date: Tue, 18 Jun 2013 11:44:58 +0200 Subject: [PATCH] Updates the mocked content to support new editor path --- .../mocks/resources/content.resource.js | 28 +++++++++---------- src/Umbraco.Web.UI.Client/src/index.html | 5 ++-- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/content.resource.js index cc385f2a37..f6fceb7ec0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/content.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/content.resource.js @@ -16,7 +16,7 @@ function _getNode(id){ id: 0, active: true, properties: [ - { alias: "list", label: "List", view: "umbraco.listview", value: "", hideLabel: true } + { alias: "list", label: "List", view: "listview", value: "", hideLabel: true } ] }, { @@ -24,11 +24,11 @@ function _getNode(id){ alias: "tab01", id: 1, properties: [ - { alias: "bodyText", label: "Body Text", description:"Here you enter the primary article contents", view: "umbraco.rte", value: "

askjdkasj lasjd

" }, - { alias: "textarea", label: "textarea", view: "umbraco.textarea", value: "ajsdka sdjkds", config: { rows: 4 } }, - { alias: "map", label: "Map", view: "umbraco.googlemaps", value: "37.4419,-122.1419", config: { mapType: "ROADMAP", zoom: 4 } }, - { alias: "media", label: "Media picker", view: "umbraco.mediapicker", value: "" }, - { alias: "content", label: "Content picker", view: "umbraco.contentpicker", value: "" } + { alias: "bodyText", label: "Body Text", description:"Here you enter the primary article contents", view: "rte", value: "

askjdkasj lasjd

" }, + { alias: "textarea", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } }, + { alias: "map", label: "Map", view: "googlemaps", value: "37.4419,-122.1419", config: { mapType: "ROADMAP", zoom: 4 } }, + { alias: "media", label: "Media picker", view: "mediapicker", value: "" }, + { alias: "content", label: "Content picker", view: "contentpicker", value: "" } ] }, { @@ -36,8 +36,8 @@ function _getNode(id){ alias: "tab02", id: 2, properties: [ - { alias: "datepicker", label: "Datepicker", view: "umbraco.datepicker", config: { rows: 7 } }, - { alias: "tags", label: "Tags", view: "umbraco.tags", value: ""} + { alias: "datepicker", label: "Datepicker", view: "datepicker", config: { rows: 7 } }, + { alias: "tags", label: "Tags", view: "tags", value: ""} ] }, { @@ -45,21 +45,21 @@ function _getNode(id){ alias: "tab03", id: 3, properties: [ - { alias: "grid", label: "Grid", view: "umbraco.grid", controller: "umbraco.grid", value: "test", hideLabel: true } + { alias: "grid", label: "Grid", view: "grid", controller: "umbraco.grid", value: "test", hideLabel: true } ] },{ label: "WIP", alias: "tab04", id: 4, properties: [ - { alias: "tes", label: "Stuff", view: "umbraco.test", controller: "umbraco.embeddedcontent", value: "", + { alias: "tes", label: "Stuff", view: "test", controller: "umbraco.embeddedcontent", value: "", config: { fields: [ - { alias: "embedded", label: "Embbeded", view: "umbraco.textstring", value: ""}, - { alias: "embedded2", label: "Embbeded 2", view: "umbraco.contentpicker", value: ""}, - { alias: "embedded3", label: "Embbeded 3", view: "umbraco.textarea", value: ""}, - { alias: "embedded4", label: "Embbeded 4", view: "umbraco.datepicker", value: ""} + { alias: "embedded", label: "Embbeded", view: "textstring", value: ""}, + { alias: "embedded2", label: "Embbeded 2", view: "contentpicker", value: ""}, + { alias: "embedded3", label: "Embbeded 3", view: "textarea", value: ""}, + { alias: "embedded4", label: "Embbeded 4", view: "datepicker", value: ""} ] } } diff --git a/src/Umbraco.Web.UI.Client/src/index.html b/src/Umbraco.Web.UI.Client/src/index.html index 380b49d725..577bdc1b51 100644 --- a/src/Umbraco.Web.UI.Client/src/index.html +++ b/src/Umbraco.Web.UI.Client/src/index.html @@ -14,9 +14,8 @@ -
-
- {{ui | json}} +
+