();
}
}
diff --git a/zero.Web.UI/App/components/forms/property.vue b/zero.Web.UI/App/components/forms/property.vue
index 516f7af1..f3bc91ee 100644
--- a/zero.Web.UI/App/components/forms/property.vue
+++ b/zero.Web.UI/App/components/forms/property.vue
@@ -50,8 +50,9 @@
.ui-split + .ui-property,
.ui-property + .ui-property
{
- padding-top: 30px;
- margin-top: 30px;
+ margin-top: 50px;
+ //padding-top: 30px;
+ //margin-top: 30px;
//border-top: 1px solid var(--color-line);
}
diff --git a/zero.Web.UI/App/components/loading.vue b/zero.Web.UI/App/components/loading.vue
index ab4d2ed8..a0e6a99c 100644
--- a/zero.Web.UI/App/components/loading.vue
+++ b/zero.Web.UI/App/components/loading.vue
@@ -1,11 +1,18 @@
-
+
@@ -16,12 +23,17 @@
width: 28px;
height: 28px;
border-radius: 40px;
- border: 2px solid var(--color-bg-mid);
+ border: 2px solid var(--color-bg-bright-two);
border-left-color: var(--color-fg);
- opacity: 1;
will-change: transform;
- animation: loadingRotation .8s linear infinite;
- transition: opacity .25s ease;
+ animation: loadingRotation 0.8s linear infinite;
+
+ &.is-big
+ {
+ width: 36px;
+ height: 36px;
+ border-width: 2px;
+ }
}
@keyframes loadingRotation
diff --git a/zero.Web.UI/App/components/modules/edit-module.vue b/zero.Web.UI/App/components/modules/edit-module.vue
index ba00aa46..04e76217 100644
--- a/zero.Web.UI/App/components/modules/edit-module.vue
+++ b/zero.Web.UI/App/components/modules/edit-module.vue
@@ -1,46 +1,66 @@
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -45,7 +101,7 @@
margin-top: var(--padding);
}
- .ui-modules-start
+ .ui-modules-start, .ui-module-item
{
margin: 0;
padding: var(--padding);
@@ -56,6 +112,17 @@
justify-content: center;
}
+ .ui-module-item
+ {
+ display: block;
+ }
+
+ .ui-module-item + .ui-module-item,
+ .ui-module-item + .ui-modules-start
+ {
+ margin-top: 3px;
+ }
+
.ui-modules-start-button
{
color: var(--color-fg);
diff --git a/zero.Web.UI/App/navigation.vue b/zero.Web.UI/App/navigation.vue
index 7ba0a8ef..37b40427 100644
--- a/zero.Web.UI/App/navigation.vue
+++ b/zero.Web.UI/App/navigation.vue
@@ -38,7 +38,7 @@
diff --git a/zero.Web.UI/App/resources/modules.js b/zero.Web.UI/App/resources/modules.js
index d234e222..b324772e 100644
--- a/zero.Web.UI/App/resources/modules.js
+++ b/zero.Web.UI/App/resources/modules.js
@@ -12,5 +12,10 @@ export default {
getModuleType(alias)
{
return Axios.get(base + 'getModuleType', { params: { alias } }).then(res => Promise.resolve(res.data));
- }
+ },
+
+ getEmpty(alias)
+ {
+ return Axios.get(base + 'getEmpty', { params: { alias } }).then(res => Promise.resolve(res.data));
+ },
};
\ No newline at end of file
diff --git a/zero.Web.UI/App/resources/pages.js b/zero.Web.UI/App/resources/pages.js
index 36bd6510..9e60488d 100644
--- a/zero.Web.UI/App/resources/pages.js
+++ b/zero.Web.UI/App/resources/pages.js
@@ -24,9 +24,9 @@ export default {
return Axios.get(base + 'getEmpty', { params: { type, parent } }).then(res => Promise.resolve(res.data));
},
- getRevisions(id)
+ getRevisions(id, page)
{
- return Axios.get(base + 'getRevisions', { params: { id } }).then(res => Promise.resolve(res.data));
+ return Axios.get(base + 'getRevisions', { params: { id, page } }).then(res => Promise.resolve(res.data));
},
getAll(query)
diff --git a/zero.Web.UI/Sass/Canvas/_navigation.scss b/zero.Web.UI/Sass/Canvas/_navigation.scss
index 39a21f2b..9b2473c5 100644
--- a/zero.Web.UI/Sass/Canvas/_navigation.scss
+++ b/zero.Web.UI/Sass/Canvas/_navigation.scss
@@ -164,14 +164,14 @@ a.app-nav-child
.-image
{
- height: 36px;
- width: 36px;
+ height: 32px;
+ width: 32px;
border-radius: 18px;
position: relative;
top: -1px;
background: var(--color-bg-bright-two);
text-align: center;
- line-height: 37px;
+ line-height: 33px;
font-size: 16px;
}
@@ -182,7 +182,7 @@ a.app-nav-child
strong
{
- font-weight: 700;
+ font-weight: 400;
color: var(--color-fg);
}
}
diff --git a/zero.Web.UI/Sass/Modules/Buttons/_button.scss b/zero.Web.UI/Sass/Modules/Buttons/_button.scss
index d6d9686b..86c02fa3 100644
--- a/zero.Web.UI/Sass/Modules/Buttons/_button.scss
+++ b/zero.Web.UI/Sass/Modules/Buttons/_button.scss
@@ -41,6 +41,8 @@ button::-moz-focus-inner
padding: 0 20px;
height: 42px;
border-radius: var(--radius);
+ //border-bottom-left-radius: 15px;
+ //border-top-right-radius: 15px;
font-size: var(--font-size);
font-weight: 700;
margin: 0;
diff --git a/zero.Web/Controllers/BackofficeController.cs b/zero.Web/Controllers/BackofficeController.cs
index 0a22a723..e64970ea 100644
--- a/zero.Web/Controllers/BackofficeController.cs
+++ b/zero.Web/Controllers/BackofficeController.cs
@@ -57,7 +57,7 @@ namespace zero.Web.Controllers
///
/// Creates an edit model with appropriate options and permissions
///
- public JsonResult Edit(T data, bool typed = true, Action transform = null) where T : IZeroEntity
+ public JsonResult Edit(T data, bool typed = true, Action transform = null) where T : IZeroIdEntity
{
Type type = typeof(T);
bool canBeShared = AppAwareShareableType.IsAssignableFrom(type);
diff --git a/zero.Web/Controllers/ModulesController.cs b/zero.Web/Controllers/ModulesController.cs
index c131e7e4..0867097c 100644
--- a/zero.Web/Controllers/ModulesController.cs
+++ b/zero.Web/Controllers/ModulesController.cs
@@ -1,5 +1,8 @@
using Microsoft.AspNetCore.Mvc;
+using System;
using zero.Core.Api;
+using zero.Core.Entities;
+using zero.Core.Utils;
namespace zero.Web.Controllers
{
@@ -16,5 +19,17 @@ namespace zero.Web.Controllers
public IActionResult GetModuleTypes() => Json(Api.GetModuleTypes());
public IActionResult GetModuleType([FromQuery] string alias) => Json(Api.GetModuleType(alias));
+
+ public IActionResult GetEmpty(string alias)
+ {
+ ModuleType moduleType = Api.GetModuleType(alias);
+ IModule module = Activator.CreateInstance(moduleType.ContentType) as IModule;
+
+ module.ModuleTypeAlias = moduleType.Alias;
+ module.Id = IdGenerator.Create(8);
+ module.IsActive = true;
+
+ return Edit(module);
+ }
}
}
diff --git a/zero.Web/Controllers/PagesController.cs b/zero.Web/Controllers/PagesController.cs
index 1e716bba..0e755557 100644
--- a/zero.Web/Controllers/PagesController.cs
+++ b/zero.Web/Controllers/PagesController.cs
@@ -30,7 +30,7 @@ namespace zero.Web.Controllers
ParentId = parent
});
- public async Task GetRevisions([FromQuery] string id) => Json(await RevisionsApi.GetPaged(id));
+ public async Task GetRevisions([FromQuery] string id, [FromQuery] int page = 1) => Json(await RevisionsApi.GetPaged(id, page));
public async Task Save([FromBody] T model) => Json(await Api.Save(model));