(ESM.CategoryPage);
}
}
diff --git a/src/Serenity.Demo.Northwind/Modules/Customer/CustomerDialog.css b/src/Serenity.Demo.Northwind/Modules/Customer/CustomerDialog.css
new file mode 100644
index 00000000..514d22ad
--- /dev/null
+++ b/src/Serenity.Demo.Northwind/Modules/Customer/CustomerDialog.css
@@ -0,0 +1,3 @@
+.s-Demo-Northwind-CustomerDialog .s-NotesEditor {
+ flex: 1 1 auto;
+}
diff --git a/src/Serenity.Demo.Northwind/Modules/Customer/CustomerDialog.tsx b/src/Serenity.Demo.Northwind/Modules/Customer/CustomerDialog.tsx
index aa0d55fe..9ded15d5 100644
--- a/src/Serenity.Demo.Northwind/Modules/Customer/CustomerDialog.tsx
+++ b/src/Serenity.Demo.Northwind/Modules/Customer/CustomerDialog.tsx
@@ -2,6 +2,7 @@ import { CustomerForm, CustomerRow, CustomerService } from "../ServerTypes/Demo"
import { Decorators, EntityDialog, TabsExtensions, WidgetProps, htmlEncode, localText, reloadLookup } from "@serenity-is/corelib";
import { DialogUtils } from "@serenity-is/extensions";
import { CustomerOrdersGrid } from "./CustomerOrdersGrid";
+import "./CustomerDialog.css";
@Decorators.registerClass('Serenity.Demo.Northwind.CustomerDialog')
export class CustomerDialog extends EntityDialog {
diff --git a/src/Serenity.Demo.Northwind/Modules/Customer/CustomerPage.cs b/src/Serenity.Demo.Northwind/Modules/Customer/CustomerPage.cs
index f29d2cc2..8b3800a9 100644
--- a/src/Serenity.Demo.Northwind/Modules/Customer/CustomerPage.cs
+++ b/src/Serenity.Demo.Northwind/Modules/Customer/CustomerPage.cs
@@ -8,7 +8,7 @@ public class CustomerPage : Controller
[Route("Northwind/Customer")]
public ActionResult Index()
{
- return this.GridPage(ESM.CustomerPage, layout: MVC.Views._NorthwindLayout);
+ return this.GridPage(ESM.CustomerPage);
}
}
diff --git a/src/Serenity.Demo.Northwind/wwwroot/index.css b/src/Serenity.Demo.Northwind/Modules/Note/NotesEditor.css
similarity index 62%
rename from src/Serenity.Demo.Northwind/wwwroot/index.css
rename to src/Serenity.Demo.Northwind/Modules/Note/NotesEditor.css
index 65c5e3b0..9197bfb2 100644
--- a/src/Serenity.Demo.Northwind/wwwroot/index.css
+++ b/src/Serenity.Demo.Northwind/Modules/Note/NotesEditor.css
@@ -1,38 +1,3 @@
-.s-Demo-Northwind-ProductDialog > .size {
- width: 650px;
-}
-
-.s-Demo-Northwind-ProductDialog .caption {
- width: 180px;
-}
-
-.s-Demo-Northwind-CustomerDialog .s-NotesEditor {
- flex: 1 1 auto;
-}
-
-.s-Demo-Northwind-OrderDialog .caption,
-.s-Demo-Northwind-CustomerOrderDialog .caption {
- width: 130px;
-}
-
-.s-Demo-Northwind-OrderDetailDialog .caption {
- width: 80px;
-}
-
-.s-Demo-Northwind-OrderGrid .s-CustomerEditor {
- min-width: 250px;
- width: 250px;
-}
-
-.s-Demo-Northwind-ProductGrid .slick-cell input[type=text] {
- text-align: right;
- width: 100%;
-}
-
-.s-Demo-Northwind-ProductGrid .slick-cell .dirty {
- background-color: var(--s-input-dirty-bg, #ffe0e0);
-}
-
.s-NotesEditor {
border: 1px solid var(--bs-border-color, #ccc);
border-radius: var(--bs-border-radius);
@@ -65,7 +30,7 @@
position: absolute;
right: 6px;
top: 4px;
- text-decoration:none;
+ text-decoration: none;
}
.s-NotesEditor .note-delete:after {
@@ -95,4 +60,4 @@
.s-NoteDialog .ui-dialog-content {
padding-bottom: 10px;
-}
\ No newline at end of file
+}
diff --git a/src/Serenity.Demo.Northwind/Modules/Note/NotesEditor.tsx b/src/Serenity.Demo.Northwind/Modules/Note/NotesEditor.tsx
index 248686b6..c9ce80c6 100644
--- a/src/Serenity.Demo.Northwind/Modules/Note/NotesEditor.tsx
+++ b/src/Serenity.Demo.Northwind/Modules/Note/NotesEditor.tsx
@@ -2,6 +2,7 @@ import { NoteRow } from "../ServerTypes/Demo";
import { Authorization, Decorators, EditorWidget, IGetEditValue, ISetEditValue, PropertyItem, Toolbar, confirmDialog, formatDate, formatISODateTimeUTC, insert } from "@serenity-is/corelib";
import * as DOMPurify from 'dompurify';
import { NoteDialog } from "./NoteDialog";
+import "./NotesEditor.css";
@Decorators.registerEditor('Serenity.Demo.Northwind.NotesEditor', [IGetEditValue, ISetEditValue])
@Decorators.element("")
diff --git a/src/Serenity.Demo.Northwind/Modules/Order/OrderDialog.css b/src/Serenity.Demo.Northwind/Modules/Order/OrderDialog.css
new file mode 100644
index 00000000..2a934ac3
--- /dev/null
+++ b/src/Serenity.Demo.Northwind/Modules/Order/OrderDialog.css
@@ -0,0 +1,5 @@
+
+.s-Demo-Northwind-OrderDialog .caption,
+.s-Demo-Northwind-CustomerOrderDialog .caption {
+ width: 130px;
+}
diff --git a/src/Serenity.Demo.Northwind/Modules/Order/OrderDialog.ts b/src/Serenity.Demo.Northwind/Modules/Order/OrderDialog.ts
index 0ad4cc49..4eec6a94 100644
--- a/src/Serenity.Demo.Northwind/Modules/Order/OrderDialog.ts
+++ b/src/Serenity.Demo.Northwind/Modules/Order/OrderDialog.ts
@@ -1,6 +1,7 @@
import { OrderForm, OrderRow, OrderService } from "../ServerTypes/Demo";
import { Decorators, EntityDialog } from "@serenity-is/corelib";
import { ReportHelper } from "@serenity-is/extensions";
+import "./OrderDialog.css";
@Decorators.registerClass('Serenity.Demo.Northwind.OrderDialog')
export class OrderDialog extends EntityDialog {
diff --git a/src/Serenity.Demo.Northwind/Modules/Order/OrderGrid.css b/src/Serenity.Demo.Northwind/Modules/Order/OrderGrid.css
new file mode 100644
index 00000000..41fc367b
--- /dev/null
+++ b/src/Serenity.Demo.Northwind/Modules/Order/OrderGrid.css
@@ -0,0 +1,5 @@
+
+.s-Demo-Northwind-OrderGrid .s-CustomerEditor {
+ min-width: 250px;
+ width: 250px;
+}
diff --git a/src/Serenity.Demo.Northwind/Modules/Order/OrderGrid.tsx b/src/Serenity.Demo.Northwind/Modules/Order/OrderGrid.tsx
index d13aa5d3..56bb7dc2 100644
--- a/src/Serenity.Demo.Northwind/Modules/Order/OrderGrid.tsx
+++ b/src/Serenity.Demo.Northwind/Modules/Order/OrderGrid.tsx
@@ -2,6 +2,7 @@ import { Decorators, EntityGrid, EnumEditor, Fluent, LookupEditor, ToolButton, f
import { ExcelExportHelper, PdfExportHelper, ReportHelper } from "@serenity-is/extensions";
import { OrderColumns, OrderListRequest, OrderRow, OrderService, ProductRow } from "../ServerTypes/Demo";
import { OrderDialog } from "./OrderDialog";
+import "./OrderGrid.css";
@Decorators.registerClass('Serenity.Demo.Northwind.OrderGrid')
@Decorators.filterable()
diff --git a/src/Serenity.Demo.Northwind/Modules/OrderDetail/OrderDetailDialog.css b/src/Serenity.Demo.Northwind/Modules/OrderDetail/OrderDetailDialog.css
new file mode 100644
index 00000000..1c111ae8
--- /dev/null
+++ b/src/Serenity.Demo.Northwind/Modules/OrderDetail/OrderDetailDialog.css
@@ -0,0 +1,4 @@
+
+.s-Demo-Northwind-OrderDetailDialog .caption {
+ width: 80px;
+}
diff --git a/src/Serenity.Demo.Northwind/Modules/OrderDetail/OrderDetailDialog.ts b/src/Serenity.Demo.Northwind/Modules/OrderDetail/OrderDetailDialog.ts
index e779727c..b01cf98e 100644
--- a/src/Serenity.Demo.Northwind/Modules/OrderDetail/OrderDetailDialog.ts
+++ b/src/Serenity.Demo.Northwind/Modules/OrderDetail/OrderDetailDialog.ts
@@ -3,7 +3,9 @@ import { toId } from "@serenity-is/corelib";
import { GridEditorDialog } from "@serenity-is/extensions";
import { OrderDetailForm, OrderDetailRow, ProductRow } from "../ServerTypes/Demo";
-@Decorators.registerClass()
+import "./OrderDetailDialog.css";
+
+@Decorators.registerClass("Serenity.Demo.Northwind.OrderDetailDialog")
export class OrderDetailDialog extends GridEditorDialog {
protected getFormKey() { return OrderDetailForm.formKey; }
protected getLocalTextPrefix() { return OrderDetailRow.localTextPrefix; }
diff --git a/src/Serenity.Demo.Northwind/Modules/Product/ProductDialog.css b/src/Serenity.Demo.Northwind/Modules/Product/ProductDialog.css
new file mode 100644
index 00000000..58f26cda
--- /dev/null
+++ b/src/Serenity.Demo.Northwind/Modules/Product/ProductDialog.css
@@ -0,0 +1,7 @@
+.s-Demo-Northwind-ProductDialog > .size {
+ width: 650px;
+}
+
+.s-Demo-Northwind-ProductDialog .caption {
+ width: 180px;
+}
diff --git a/src/Serenity.Demo.Northwind/Modules/Product/ProductDialog.ts b/src/Serenity.Demo.Northwind/Modules/Product/ProductDialog.ts
index 3266b8c8..c50edb20 100644
--- a/src/Serenity.Demo.Northwind/Modules/Product/ProductDialog.ts
+++ b/src/Serenity.Demo.Northwind/Modules/Product/ProductDialog.ts
@@ -1,5 +1,6 @@
import { Decorators, EntityDialog } from "@serenity-is/corelib";
import { ProductForm, ProductRow, ProductService } from "../ServerTypes/Demo";
+import "./ProductDialog.css";
@Decorators.registerClass()
@Decorators.maximizable()
diff --git a/src/Serenity.Demo.Northwind/Modules/Product/ProductGrid.css b/src/Serenity.Demo.Northwind/Modules/Product/ProductGrid.css
new file mode 100644
index 00000000..1b1cc98a
--- /dev/null
+++ b/src/Serenity.Demo.Northwind/Modules/Product/ProductGrid.css
@@ -0,0 +1,9 @@
+
+.s-Demo-Northwind-ProductGrid .slick-cell input[type=text] {
+ text-align: right;
+ width: 100%;
+}
+
+.s-Demo-Northwind-ProductGrid .slick-cell .dirty {
+ background-color: var(--s-input-dirty-bg, #ffe0e0);
+}
diff --git a/src/Serenity.Demo.Northwind/Modules/Product/ProductGrid.ts b/src/Serenity.Demo.Northwind/Modules/Product/ProductGrid.ts
index e4bd5c88..0c07d6be 100644
--- a/src/Serenity.Demo.Northwind/Modules/Product/ProductGrid.ts
+++ b/src/Serenity.Demo.Northwind/Modules/Product/ProductGrid.ts
@@ -3,8 +3,7 @@ import { ExcelExportHelper, PdfExportHelper } from "@serenity-is/extensions";
import { Column, FormatterContext, NonDataRow } from "@serenity-is/sleekgrid";
import { CategoryRow, ProductColumns, ProductRow, ProductService, SupplierRow } from "../ServerTypes/Demo";
import { ProductDialog } from "./ProductDialog";
-
-const fld = ProductRow.Fields;
+import "./ProductGrid.css";
@Decorators.registerClass()
@Decorators.filterable()
@@ -166,6 +165,7 @@ export class ProductGrid extends EntityGrid {
var num = (ctx: FormatterContext) => this.numericInputFormatter(ctx);
var str = (ctx: FormatterContext) => this.stringInputFormatter(ctx);
+ const fld = ProductRow.Fields;
columns.QuantityPerUnit && (columns.QuantityPerUnit.format = str);
columns.CategoryName && (columns.CategoryName.referencedFields = [fld.CategoryID]) &&
(columns.CategoryName.format = ctx => this.selectFormatter(ctx, fld.CategoryID, (CategoryRow as any).getLookup()));
diff --git a/src/Serenity.Demo.Northwind/Modules/Region/RegionPage.cs b/src/Serenity.Demo.Northwind/Modules/Region/RegionPage.cs
index 549b5495..35cebadb 100644
--- a/src/Serenity.Demo.Northwind/Modules/Region/RegionPage.cs
+++ b/src/Serenity.Demo.Northwind/Modules/Region/RegionPage.cs
@@ -8,6 +8,6 @@ public class RegionPage : Controller
[Route("Northwind/Region")]
public ActionResult Index()
{
- return this.GridPage(ESM.RegionPage, layout: MVC.Views._NorthwindLayout);
+ return this.GridPage(ESM.RegionPage);
}
}
diff --git a/src/Serenity.Demo.Northwind/Modules/Shipper/ShipperPage.cs b/src/Serenity.Demo.Northwind/Modules/Shipper/ShipperPage.cs
index 4f339a8c..a79f33d5 100644
--- a/src/Serenity.Demo.Northwind/Modules/Shipper/ShipperPage.cs
+++ b/src/Serenity.Demo.Northwind/Modules/Shipper/ShipperPage.cs
@@ -8,6 +8,6 @@ public class ShipperPage : Controller
[Route("Northwind/Shipper")]
public ActionResult Index()
{
- return this.GridPage(ESM.ShipperPage, layout: MVC.Views._NorthwindLayout);
+ return this.GridPage(ESM.ShipperPage);
}
}
diff --git a/src/Serenity.Demo.Northwind/Modules/Supplier/SupplierPage.cs b/src/Serenity.Demo.Northwind/Modules/Supplier/SupplierPage.cs
index 7c1ed3a3..2408e661 100644
--- a/src/Serenity.Demo.Northwind/Modules/Supplier/SupplierPage.cs
+++ b/src/Serenity.Demo.Northwind/Modules/Supplier/SupplierPage.cs
@@ -8,6 +8,6 @@ public class SupplierPage : Controller
[Route("Northwind/Supplier")]
public ActionResult Index()
{
- return this.GridPage(ESM.SupplierPage, layout: MVC.Views._NorthwindLayout);
+ return this.GridPage(ESM.SupplierPage);
}
}
diff --git a/src/Serenity.Demo.Northwind/Modules/Territory/TerritoryPage.cs b/src/Serenity.Demo.Northwind/Modules/Territory/TerritoryPage.cs
index 7af7a335..0b5af5df 100644
--- a/src/Serenity.Demo.Northwind/Modules/Territory/TerritoryPage.cs
+++ b/src/Serenity.Demo.Northwind/Modules/Territory/TerritoryPage.cs
@@ -8,6 +8,6 @@ public class TerritoryPage : Controller
[Route("Northwind/Territory")]
public ActionResult Index()
{
- return this.GridPage(ESM.TerritoryPage, layout: MVC.Views._NorthwindLayout);
+ return this.GridPage(ESM.TerritoryPage);
}
}