diff --git a/zero.Debug/Controllers/TestController.cs b/zero.Debug/Controllers/TestController.cs index efffe938..a450adab 100644 --- a/zero.Debug/Controllers/TestController.cs +++ b/zero.Debug/Controllers/TestController.cs @@ -142,6 +142,8 @@ namespace zero.Debug.Controllers Order order = new Order() { + ChannelId = "channels.1-A", + Name = "23-0001", Number = "23-0001", LanguageId = "languages.2-A", CurrencyId = "currencies.33-A", diff --git a/zero.Web.UI/App/components/forms/form-header.vue b/zero.Web.UI/App/components/forms/form-header.vue index 46a0dbaf..6b78bcf6 100644 --- a/zero.Web.UI/App/components/forms/form-header.vue +++ b/zero.Web.UI/App/components/forms/form-header.vue @@ -2,7 +2,7 @@ @@ -44,6 +44,10 @@ type: Boolean, default: false }, + titleDisabled: { + type: Boolean, + default: false + }, state: { type: String }, diff --git a/zero.Web.UI/Sass/Core/_forms.scss b/zero.Web.UI/Sass/Core/_forms.scss index d7454576..4772ef44 100644 --- a/zero.Web.UI/Sass/Core/_forms.scss +++ b/zero.Web.UI/Sass/Core/_forms.scss @@ -30,7 +30,7 @@ textarea, .ui-native-select box-sizing: border-box; width: 100%; - &:focus + &:not(:disabled):not([readonly]):focus { background-color: var(--color-input-focus-bg); border: var(--color-input-focus-border); diff --git a/zero.Web.UI/Sass/Modules/_box.scss b/zero.Web.UI/Sass/Modules/_box.scss index 8ca8be06..c0178c0e 100644 --- a/zero.Web.UI/Sass/Modules/_box.scss +++ b/zero.Web.UI/Sass/Modules/_box.scss @@ -43,6 +43,8 @@ .ui-tabs + .ui-box.is-connected { margin-top: -31px; + border-top-left-radius: 0; + border-top-right-radius: 0; } .ui-blank-box diff --git a/zero.Web/Resources/Localization/zero.en-us.json b/zero.Web/Resources/Localization/zero.en-us.json index 5d9c6d27..48a575fe 100644 --- a/zero.Web/Resources/Localization/zero.en-us.json +++ b/zero.Web/Resources/Localization/zero.en-us.json @@ -13,6 +13,7 @@ "save": "Save", "create": "Create", "createdDate": "Created at", + "modifiedDate": "Last modified at", "id": "ID", "active": "Active", "inactive": "Inactive",