diff --git a/zero.TestData/Lists/SocialContentRenderer.cs b/zero.TestData/Lists/SocialContentRenderer.cs index a1105ddb..9eecfafb 100644 --- a/zero.TestData/Lists/SocialContentRenderer.cs +++ b/zero.TestData/Lists/SocialContentRenderer.cs @@ -15,11 +15,11 @@ namespace zero.TestData.Lists Field(x => x.IsVisible).Toggle(); Field(x => x.xIconPicker).IconPicker(); Field(x => x.xTextarea).Textarea(); - Field(x => x.Addresses, required: true).Nested(new SocialAddressRenderer(), opts => - { - opts.Limit = 5; - opts.AddLabel = "Add address"; - }); + //Field(x => x.Addresses, required: true).Nested(new SocialAddressRenderer(), opts => + //{ + // opts.Limit = 5; + // opts.AddLabel = "Add address"; + //}); Field(x => x.xRte).Rte(); Field(x => x.xMedia).Media(opts => opts.Type = MediaOptionsType.Image); Field(x => x.xTextarea).Output(); diff --git a/zero.TestData/Lists/TeamMemberRenderer.cs b/zero.TestData/Lists/TeamMemberRenderer.cs index b3b9c296..e7dea8db 100644 --- a/zero.TestData/Lists/TeamMemberRenderer.cs +++ b/zero.TestData/Lists/TeamMemberRenderer.cs @@ -7,8 +7,8 @@ namespace zero.TestData.Lists { public TeamMemberRenderer() { - LabelTemplate = "@team.fields.{0}"; - DescriptionTemplate = "@team.fields.{0}_text"; + LabelTemplate = "@_test.fields.{0}"; + DescriptionTemplate = "@_test.fields.{0}_text"; Validator = new TeamMemberValidator(); @@ -30,15 +30,16 @@ namespace zero.TestData.Lists { public AddressRenderer() { - LabelTemplate = "@team.fields.address.{0}"; + LabelTemplate = "@_test.fields.address.{0}"; + DescriptionTemplate = "@{0}"; Field(x => x.City, required: true).Text(); Field(x => x.Street).Text(); Field(x => x.No).Text(opts => opts.Classes.Add("is-short")); - Field(x => x.CountryId).Custom("plugins/countryPicker/countrypicker", () => new - { - startId = 107 - }); + //Field(x => x.CountryId).Custom("plugins/countryPicker/countrypicker", () => new + //{ + // startId = 107 + //}); } } diff --git a/zero.Web/App/Components/Forms/form.vue b/zero.Web/App/Components/Forms/form.vue index 675cf9e1..c5e034ff 100644 --- a/zero.Web/App/Components/Forms/form.vue +++ b/zero.Web/App/Components/Forms/form.vue @@ -40,6 +40,10 @@ }), watch: { + '$route': function () + { + this.$emit('load', this); + }, state(val) { this.slotProps.state = val; diff --git a/zero.Web/App/Pages/spaces/routes.js b/zero.Web/App/Pages/spaces/routes.js index 00a71cd2..c29ede6b 100644 --- a/zero.Web/App/Pages/spaces/routes.js +++ b/zero.Web/App/Pages/spaces/routes.js @@ -6,12 +6,12 @@ let routes = []; if (section) { - //routes.push({ - // path: 'edit/:id', - // props: true, - // name: 'spaceitem', - // component: () => import('zero/pages/' + alias + '/item') - //}); + routes.push({ + path: ':alias/edit/:id', + props: true, + name: 'space-item', + component: () => import('zero/pages/' + alias + '/spaces') + }); routes.push({ path: ':alias', diff --git a/zero.Web/App/Pages/spaces/spaces.vue b/zero.Web/App/Pages/spaces/spaces.vue index 2e6b4a3b..12554112 100644 --- a/zero.Web/App/Pages/spaces/spaces.vue +++ b/zero.Web/App/Pages/spaces/spaces.vue @@ -90,7 +90,7 @@ this.space = _find(this.spaces, space => space.alias === this.$route.params.alias); - if (this.space.view === 'editor') + if (this.space.view === 'editor' || this.$route.params.id) { this.component = SpaceEditor; } diff --git a/zero.Web/App/Pages/spaces/views/editor.vue b/zero.Web/App/Pages/spaces/views/editor.vue index a94088c5..7563038f 100644 --- a/zero.Web/App/Pages/spaces/views/editor.vue +++ b/zero.Web/App/Pages/spaces/views/editor.vue @@ -1,20 +1,21 @@  \ No newline at end of file diff --git a/zero.Web/Resources/Localization/zero.en-us.json b/zero.Web/Resources/Localization/zero.en-us.json index f662abbf..66f05025 100644 --- a/zero.Web/Resources/Localization/zero.en-us.json +++ b/zero.Web/Resources/Localization/zero.en-us.json @@ -228,6 +228,11 @@ "_test": { "fields": { + "name": "Name", + "position": "Position", + "image": "Image", + "email": "Email", + "videoUri": "Video URL", "isvisible": "Visible", "facebook": "Facebook", "facebook_text": "Link to facebook page",