From f7a31007774d41c46beee6de2ae47f9bc4b37d13 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 17 Aug 2019 16:22:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?db:=20=E5=A2=9E=E5=8A=A0=E7=BD=91=E7=AB=99U?= =?UTF-8?q?I=E8=AE=BE=E7=BD=AE=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bootstrap.Admin/BootstrapAdmin.db | Bin 94208 -> 94208 bytes DatabaseScripts/MongoDB/Dicts.js | 84 ++++-------------------- DatabaseScripts/MongoDB/Navigations.js | 12 ++++ DatabaseScripts/MySQL/initData.sql | 5 ++ DatabaseScripts/Postgresql/initData.sql | 5 ++ DatabaseScripts/SQLite/InitData.sql | 5 ++ DatabaseScripts/SqlServer/InitData.sql | 5 ++ 7 files changed, 44 insertions(+), 72 deletions(-) diff --git a/Bootstrap.Admin/BootstrapAdmin.db b/Bootstrap.Admin/BootstrapAdmin.db index ed123775446b037a4fa0788aa51f700058497d6b..ed3dab6e202f6f6e4ed71da386f81a65ccb543bd 100644 GIT binary patch delta 203 zcmZp8z}oPDb%HeG-ib2KjC(gGEU9O9WNMkr-q6Uz)UsJn;1{F4ts^%BqamZLCcii% zKhu-_bDyrA@qF*Z=c{MFShw%_-gP!u+Fvf30adp7@(tbT0ID`zTL1t6 delta 55 zcmZp8z}oPDb%HeGu8A_vjJq}_EU9O9U^+aRy`gclpnx^g=EF^nzRa2&mnXAd2nLE& La%{eQLw7m=RC5)D diff --git a/DatabaseScripts/MongoDB/Dicts.js b/DatabaseScripts/MongoDB/Dicts.js index 782fe4f4..85cf3e31 100644 --- a/DatabaseScripts/MongoDB/Dicts.js +++ b/DatabaseScripts/MongoDB/Dicts.js @@ -119,54 +119,6 @@ "Code": "~/Home/Index", "Define": NumberInt(0) }, - { - "Category": "应用程序", - "Name": "组垛平台", - "Code": "4", - "Define": NumberInt(0) - }, - { - "Category": "组垛平台", - "Name": "网站标题", - "Code": "托盘组垛程序", - "Define": NumberInt(1) - }, - { - "Category": "组垛平台", - "Name": "网站页脚", - "Code": "版权所有：中烟信息", - "Define": NumberInt(1) - }, - { - "Category": "组垛平台", - "Name": "个人中心地址", - "Code": "http://localhost:50852/Admin/Profiles", - "Define": NumberInt(1) - }, - { - "Category": "组垛平台", - "Name": "系统设置地址", - "Code": "http://localhost:50852/Admin/Index", - "Define": NumberInt(1) - }, - { - "Category": "设备厂商", - "Name": "远望谷", - "Code": "Invengo", - "Define": NumberInt(1) - }, - { - "Category": "设备厂商", - "Name": "测试", - "Code": "Test", - "Define": NumberInt(1) - }, - { - "Category": "远程数据库", - "Name": "组垛数据库", - "Code": "Corp_Scan", - "Define": NumberInt(1) - }, { "Category": "网站样式", "Name": "黑色样式", @@ -185,18 +137,6 @@ "Code": "lte.css", "Define": NumberInt(0) }, - { - "Category": "设备天线", - "Name": "天线1", - "Code": "1", - "Define": NumberInt(1) - }, - { - "Category": "设备天线", - "Name": "天线2", - "Code": "2", - "Define": NumberInt(1) - }, { "Category": "应用程序", "Name": "测试平台", @@ -233,18 +173,6 @@ "Code": "http://localhost:50852/Admin/Notifications", "Define": NumberInt(1) }, - { - "Category": "设备驱动", - "Name": "Invengo", - "Code": "Longbow.Invengo.Device, Longbow.Invengo", - "Define": NumberInt(1) - }, - { - "Category": "设备驱动", - "Name": "Test", - "Code": "Pallet.DeviceInterface.Device, Pallet.DeviceHub", - "Define": NumberInt(1) - }, { "Category": "应用首页", "Name": "2", @@ -317,5 +245,17 @@ "Name": "验证码图床", "Code": "http://images.sdgxgz.com/", "Define": NumberInt(0) + }, + { + "Category": "网站设置", + "Name": "侧边栏状态", + "Code": "1", + "Define": NumberInt(0) + }, + { + "Category": "网站设置", + "Name": "卡片标题状态", + "Code": "1", + "Define": NumberInt(0) } ]; \ No newline at end of file diff --git a/DatabaseScripts/MongoDB/Navigations.js b/DatabaseScripts/MongoDB/Navigations.js index df38b43c..e977128e 100644 --- a/DatabaseScripts/MongoDB/Navigations.js +++ b/DatabaseScripts/MongoDB/Navigations.js @@ -83,6 +83,18 @@ "IsResource": NumberInt(2), "Application": "0" }, + { + "_id": ObjectId("5bd7b8445fa31256f77e4a06"), + "ParentId": "5bd7b8445fa31256f77e4b91", + "Name": "保存网站设置", + "Order": NumberInt(60), + "Icon": "fa fa-fa", + "Url": "saveUISettings", + "Category": "0", + "Target": "_self", + "IsResource": NumberInt(2), + "Application": "0" + }, { "_id": ObjectId("5bd7b8445fa31256f77e4b92"), "ParentId": "0", diff --git a/DatabaseScripts/MySQL/initData.sql b/DatabaseScripts/MySQL/initData.sql index 0c12dac8..9ebbb379 100644 --- a/DatabaseScripts/MySQL/initData.sql +++ b/DatabaseScripts/MySQL/initData.sql @@ -29,6 +29,10 @@ INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站样式', 'AdminL INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('当前样式', '使用样式', 'blue.css', 0); INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站设置', '前台首页', '~/Home/Index', 0); +-- 网站UI设置 +INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站设置', '侧边栏状态', '1', 0); +INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站设置', '卡片标题状态', '1', 0); + -- 时长单位 月 INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('系统设置', '程序异常保留时长', '1', 0); INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('系统设置', '操作日志保留时长', '12', 0); @@ -54,6 +58,7 @@ INSERT INTO Navigations (ParentId, Name, `Order`, Icon, Url, Category, IsResourc INSERT INTO Navigations (ParentId, Name, `Order`, Icon, Url, Category, IsResource) VALUES (@@identity - 2, '保存应用', 30, 'fa fa-fa', 'saveApp', '0', 2); INSERT INTO Navigations (ParentId, Name, `Order`, Icon, Url, Category, IsResource) VALUES (@@identity - 3, '保存样式', 40, 'fa fa-fa', 'saveTheme', '0', 2); INSERT INTO Navigations (ParentId, Name, `Order`, Icon, Url, Category, IsResource) VALUES (@@identity - 4, '保存头像', 50, 'fa fa-fa', 'saveIcon', '0', 2); +INSERT INTO Navigations (ParentId, Name, `Order`, Icon, Url, Category, IsResource) VALUES (@@identity - 5, '保存网站设置', 60, 'fa fa-fa', 'saveUISettings', '0', 2); INSERT INTO Navigations (ParentId, Name, `Order`, Icon, Url, Category) VALUES (0, '返回前台', 30, 'fa fa-hand-o-left', '~/Home/Index', '0'); INSERT INTO Navigations (ParentId, Name, `Order`, Icon, Url, Category) VALUES (0, '网站设置', 40, 'fa fa-fa', '~/Admin/Settings', '0'); INSERT INTO Navigations (ParentId, Name, `Order`, Icon, Url, Category, IsResource) VALUES (@@identity, '保存系统名称', 10, 'fa fa-fa', 'saveTitle', '0', 2); diff --git a/DatabaseScripts/Postgresql/initData.sql b/DatabaseScripts/Postgresql/initData.sql index 26db7fa6..213ca3bf 100644 --- a/DatabaseScripts/Postgresql/initData.sql +++ b/DatabaseScripts/Postgresql/initData.sql @@ -29,6 +29,10 @@ INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站样式', 'AdminL INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('当前样式', '使用样式', 'blue.css', 0); INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站设置', '前台首页', '~/Home/Index', 0); +-- 网站UI设置 +INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站设置', '侧边栏状态', '1', 0); +INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('网站设置', '卡片标题状态', '1', 0); + -- 时长单位 月 INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('系统设置', '程序异常保留时长', '1', 0); INSERT INTO Dicts (Category, Name, Code, Define) VALUES ('系统设置', '操作日志保留时长', '12', 0); @@ -54,6 +58,7 @@ INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (currval('navigations_id_seq') - 3, '保存应用', 30, 'fa fa-fa', 'saveApp', '0', 2); INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (currval('navigations_id_seq') - 4, '保存样式', 40, 'fa fa-fa', 'saveTheme', '0', 2); INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (currval('navigations_id_seq') - 5, '保存头像', 50, 'fa fa-fa', 'saveIcon', '0', 2); +INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (currval('navigations_id_seq') - 6, '保存网站设置', 60, 'fa fa-fa', 'saveUISettings', '0', 2); INSERT INTO Navigations (ParentId, Name, "order", Icon, Url, Category) VALUES (0, '返回前台', 30, 'fa fa-hand-o-left', '~/Home/Index', '0'); INSERT INTO Navigations (ParentId, Name, "order", Icon, Url, Category) VALUES (0, '网站设置', 40, 'fa fa-fa', '~/Admin/Settings', '0'); INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (currval('navigations_id_seq') - 1, '保存系统名称', 10, 'fa fa-fa', 'saveTitle', '0', 2); diff --git a/DatabaseScripts/SQLite/InitData.sql b/DatabaseScripts/SQLite/InitData.sql index b44f5afc..7f960b18 100644 --- a/DatabaseScripts/SQLite/InitData.sql +++ b/DatabaseScripts/SQLite/InitData.sql @@ -29,6 +29,10 @@ INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('网站样式 INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('当前样式', '使用样式', 'blue.css', 0); INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('网站设置', '前台首页', '~/Home/Index', 0); +-- 网站UI设置 +INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('网站设置', '侧边栏状态', '1', 0); +INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('网站设置', '卡片标题状态', '1', 0); + -- 时长单位 月 INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('系统设置', '程序异常保留时长', '1', 0); INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('系统设置', '操作日志保留时长', '12', 0); @@ -54,6 +58,7 @@ INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (last_insert_rowid() - 2, '保存应用', 30, 'fa fa-fa', 'saveApp', '0', 2); INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (last_insert_rowid() - 3, '保存样式', 40, 'fa fa-fa', 'saveTheme', '0', 2); INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (last_insert_rowid() - 4, '保存头像', 50, 'fa fa-fa', 'saveIcon', '0', 2); +INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (last_insert_rowid() - 5, '保存网站设置', 60, 'fa fa-fa', 'saveUISettings', '0', 2); INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (0, '返回前台', 30, 'fa fa-hand-o-left', '~/Home/Index', '0'); INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (0, '网站设置', 40, 'fa fa-fa', '~/Admin/Settings', '0'); INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (last_insert_rowid(), '保存系统名称', 10, 'fa fa-fa', 'saveTitle', '0', 2); diff --git a/DatabaseScripts/SqlServer/InitData.sql b/DatabaseScripts/SqlServer/InitData.sql index c12a765b..5587b0f5 100644 --- a/DatabaseScripts/SqlServer/InitData.sql +++ b/DatabaseScripts/SqlServer/InitData.sql @@ -32,6 +32,10 @@ INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'网站样 INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'当前样式', N'使用样式', N'blue.css', 0) INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'网站设置', N'前台首页', N'~/Home/Index', 0) +-- 网站UI设置 +INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'网站设置', N'侧边栏状态', N'1', 0) +INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'网站设置', N'卡片标题状态', N'1', 0) + -- 时长单位 月 INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'系统设置', N'程序异常保留时长', '1', 0) INSERT [dbo].[Dicts] ([Category], [Name], [Code], [Define]) VALUES (N'系统设置', N'操作日志保留时长', '12', 0) @@ -57,6 +61,7 @@ INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (@@Identity - 2, N'保存应用', 30, 'fa fa-fa', 'saveApp', '0', 2); INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (@@Identity - 3, N'保存样式', 40, 'fa fa-fa', 'saveTheme', '0', 2); INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (@@Identity - 4, N'保存头像', 50, 'fa fa-fa', 'saveIcon', '0', 2); +INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (@@Identity - 5, N'保存网站设置', 60, 'fa fa-fa', 'saveUISettings', '0', 2); INSERT [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (0, N'返回前台', 30, N'fa fa-hand-o-left', N'~/Home/Index', N'0') INSERT [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category]) VALUES (0, N'网站设置', 40, N'fa fa-fa', N'~/Admin/Settings', N'0') INSERT INTO [Navigations] ([ParentId], [Name], [Order], [Icon], [Url], [Category], IsResource) VALUES (@@Identity, N'保存系统名称', 10, 'fa fa-fa', 'saveTitle', '0', 2); From 2da783dda32cedc3026fadbcd4ad5fbe3828bbe4 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 17 Aug 2019 16:24:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=BD=91?= =?UTF-8?q?=E7=AB=99=E8=AE=BE=E7=BD=AE=E8=AF=BB=E5=8F=96=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bootstrap.DataAccess/Dict.cs | 6 ++++++ Bootstrap.DataAccess/Helper/DictHelper.cs | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Bootstrap.DataAccess/Dict.cs b/Bootstrap.DataAccess/Dict.cs index 2d11aa8b..e6b809fd 100644 --- a/Bootstrap.DataAccess/Dict.cs +++ b/Bootstrap.DataAccess/Dict.cs @@ -186,5 +186,11 @@ namespace Bootstrap.DataAccess /// /// public string RetrieveImagesLibUrl() => DictHelper.RetrieveDicts().FirstOrDefault(d => d.Category == "系统设置" && d.Name == "验证码图床" && d.Define == 0)?.Code ?? "http://images.sdgxgz.com/"; + + /// + /// 获得 数据库标题是否显示 + /// + /// + public bool RetrieveCardTitleStatus() => (DictHelper.RetrieveDicts().FirstOrDefault(d => d.Category == "网站设置" && d.Name == "卡片标题状态" && d.Define == 0)?.Code ?? "") == "1"; } } diff --git a/Bootstrap.DataAccess/Helper/DictHelper.cs b/Bootstrap.DataAccess/Helper/DictHelper.cs index 30e82fc0..3ae25900 100644 --- a/Bootstrap.DataAccess/Helper/DictHelper.cs +++ b/Bootstrap.DataAccess/Helper/DictHelper.cs @@ -202,5 +202,11 @@ namespace Bootstrap.DataAccess /// /// public static string RetrieveImagesLibUrl() => DbContextManager.Create().RetrieveImagesLibUrl(); + + /// + /// 获得数据区卡片标题是否显示 + /// + /// + public static bool RetrieveCardTitleStatus() => DbContextManager.Create().RetrieveCardTitleStatus(); } } From 5a91330bf62bac508969c582d3e9ad737dce8632 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 17 Aug 2019 17:22:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=A0=87=E9=A2=98=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/SettingsController.cs | 2 +- Bootstrap.Admin/Models/ModelBase.cs | 16 +- Bootstrap.Admin/Views/Admin/Settings.cshtml | 30 +++ Bootstrap.Admin/Views/Shared/_Admin.cshtml | 5 +- Bootstrap.Admin/wwwroot/css/blue.css | 10 +- Bootstrap.Admin/wwwroot/css/theme.css | 35 +++- Bootstrap.Admin/wwwroot/js/settings.js | 15 ++ .../bootstrap-toggle/css/bootstrap-toggle.css | 83 ++++++++ .../css/bootstrap-toggle.min.css | 28 +++ .../bootstrap-toggle/js/bootstrap-toggle.js | 184 ++++++++++++++++++ .../js/bootstrap-toggle.min.js | 9 + 11 files changed, 403 insertions(+), 14 deletions(-) create mode 100644 Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css create mode 100644 Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css create mode 100644 Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js create mode 100644 Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.min.js diff --git a/Bootstrap.Admin/Controllers/Api/SettingsController.cs b/Bootstrap.Admin/Controllers/Api/SettingsController.cs index 88338e39..98825f89 100644 --- a/Bootstrap.Admin/Controllers/Api/SettingsController.cs +++ b/Bootstrap.Admin/Controllers/Api/SettingsController.cs @@ -19,7 +19,7 @@ namespace Bootstrap.Admin.Controllers.Api /// /// [HttpPost] - [ButtonAuthorize(Url = "~/Admin/Settings", Auth = "saveTitle,saveFooter,saveTheme")] + [ButtonAuthorize(Url = "~/Admin/Settings", Auth = "saveTitle,saveFooter,saveTheme,saveUISettings")] public bool Post([FromBody]BootstrapDict value) => DictHelper.SaveSettings(value); /// diff --git a/Bootstrap.Admin/Models/ModelBase.cs b/Bootstrap.Admin/Models/ModelBase.cs index 92c88be4..cf3f08a7 100644 --- a/Bootstrap.Admin/Models/ModelBase.cs +++ b/Bootstrap.Admin/Models/ModelBase.cs @@ -3,12 +3,12 @@ namespace Bootstrap.Admin.Models { /// - /// + /// ModelBase 基础类 /// public class ModelBase { /// - /// + /// 默认构造函数 /// public ModelBase() { @@ -16,15 +16,16 @@ namespace Bootstrap.Admin.Models Footer = DictHelper.RetrieveWebFooter(); Theme = DictHelper.RetrieveActiveTheme(); IsDemo = DictHelper.RetrieveSystemModel(); + ShowCardTitle = DictHelper.RetrieveCardTitleStatus() ? "" : "no-card-header"; } /// - /// + /// 获取 网站标题 /// public string Title { get; private set; } /// - /// + /// 获取 网站页脚 /// public string Footer { get; private set; } @@ -37,5 +38,10 @@ namespace Bootstrap.Admin.Models /// 是否为演示系统 /// public bool IsDemo { get; protected set; } + + /// + /// 是否显示卡片标题 + /// + public string ShowCardTitle { get; protected set; } } -} \ No newline at end of file +} diff --git a/Bootstrap.Admin/Views/Admin/Settings.cshtml b/Bootstrap.Admin/Views/Admin/Settings.cshtml index 63a84831..df265ebc 100644 --- a/Bootstrap.Admin/Views/Admin/Settings.cshtml +++ b/Bootstrap.Admin/Views/Admin/Settings.cshtml @@ -2,14 +2,24 @@ @{ ViewBag.Title = "网站设置"; } +@section css { + + + + + + +} @section javascript { + + @@ -70,6 +80,26 @@ +
+
网站调整
+
+
+
+
+ + +
+
+ + +
+
+
+
+ +
+
+
diff --git a/Bootstrap.Admin/Views/Shared/_Admin.cshtml b/Bootstrap.Admin/Views/Shared/_Admin.cshtml index 39343a95..503380f3 100644 --- a/Bootstrap.Admin/Views/Shared/_Admin.cshtml +++ b/Bootstrap.Admin/Views/Shared/_Admin.cshtml @@ -1,4 +1,5 @@ -@{ +@model ModelBase +@{ Layout = "_Bootstrap"; } @section css { @@ -35,7 +36,7 @@ } @await Html.PartialAsync("Navigator") -
+
  1. 首页
    2. diff --git a/Bootstrap.Admin/wwwroot/css/blue.css b/Bootstrap.Admin/wwwroot/css/blue.css index 8daada31..a8ff3064 100644 --- a/Bootstrap.Admin/wwwroot/css/blue.css +++ b/Bootstrap.Admin/wwwroot/css/blue.css @@ -51,20 +51,20 @@ border-bottom: solid 1px #307eb6; } -.card { +.main-content:not(.no-card-header) .card { border-top-width: 1px; } - .card:hover { - border-top-color: #84bbe2; - } - .card, .modal-footer, .form-control, .popover, .date .input-group-text, .input-group .btn:not(.btn-secondary):not(.btn-primary):not(.btn-warning):not(.btn-info):not(.btn-danger), .form-select-input:hover { border-color: #84bbe2; } + .card:hover { + border-top-color: #337ab7; + } + .card .card-header, .modal-header { background-image: linear-gradient(to bottom, #5893be 0%, #63a6d7 100%); } diff --git a/Bootstrap.Admin/wwwroot/css/theme.css b/Bootstrap.Admin/wwwroot/css/theme.css index 4e40174d..8aa0595e 100644 --- a/Bootstrap.Admin/wwwroot/css/theme.css +++ b/Bootstrap.Admin/wwwroot/css/theme.css @@ -557,6 +557,10 @@ input.pending { margin-top: -10px; } +.no-card-header .card-header { + display: none; +} + .btn i + span { margin-left: 4px; } @@ -868,4 +872,33 @@ label[for] { .badge-md { font-size: 0.75rem; padding: 4px 6px; -} \ No newline at end of file +} + +.toggle .btn-default, .toggle.btn-default { + text-shadow: 0 1px 0 #fff; + background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%); + background-image: -o-linear-gradient(top, #fff 0%, #e0e0e0 100%); + background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#e0e0e0)); + background-image: linear-gradient(to bottom, #fff 0%, #e0e0e0 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + border-color: #ccc; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075); +} + + .toggle .btn-default.active { + background-image: none; + background-color: #e0e0e0; + border-color: #dbdbdb; + } + + .toggle .btn-default.active:hover { + color: #333; + background-color: #d4d4d4; + border-color: #8c8c8c; + } + +.toggle.btn .toggle-handle { + display: inline-block; + margin-left: 0; +} diff --git a/Bootstrap.Admin/wwwroot/js/settings.js b/Bootstrap.Admin/wwwroot/js/settings.js index b7de9cf0..7b953590 100644 --- a/Bootstrap.Admin/wwwroot/js/settings.js +++ b/Bootstrap.Admin/wwwroot/js/settings.js @@ -37,6 +37,21 @@ $(function () { } }); break; + case 'UISettings': + var uiSettings = $('#sider').prop('checked') ? "1" : "0"; + $.bc({ + url: Settings.url, data: { name: '侧边栏状态', code: uiSettings, category: '网站设置' }, method: "post" + }); + var cardTitle = $('#cardTitle').prop('checked') ? "1" : "0"; + $.bc({ + url: Settings.url, data: { name: '卡片标题状态', code: cardTitle, category: '网站设置' }, title: '保存网站设置', method: "post", + callback: function (result) { + if (result) { + window.setTimeout(function () { window.location.reload(true); }, 1000); + } + } + }); + break; } }); diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css b/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css new file mode 100644 index 00000000..057d08b3 --- /dev/null +++ b/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css @@ -0,0 +1,83 @@ +/*! ======================================================================== + * Bootstrap Toggle: bootstrap-toggle.css v2.2.0 + * http://www.bootstraptoggle.com + * ======================================================================== + * Copyright 2014 Min Hur, The New York Times Company + * Licensed under MIT + * ======================================================================== */ + + +.checkbox label .toggle, +.checkbox-inline .toggle { + margin-left: -20px; + margin-right: 5px; +} + +.toggle { + position: relative; + overflow: hidden; +} +.toggle input[type="checkbox"] { + display: none; +} +.toggle-group { + position: absolute; + width: 200%; + top: 0; + bottom: 0; + left: 0; + transition: left 0.35s; + -webkit-transition: left 0.35s; + -moz-user-select: none; + -webkit-user-select: none; +} +.toggle.off .toggle-group { + left: -100%; +} +.toggle-on { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 50%; + margin: 0; + border: 0; + border-radius: 0; +} +.toggle-off { + position: absolute; + top: 0; + bottom: 0; + left: 50%; + right: 0; + margin: 0; + border: 0; + border-radius: 0; +} +.toggle-handle { + position: relative; + margin: 0 auto; + padding-top: 0px; + padding-bottom: 0px; + height: 100%; + width: 0px; + border-width: 0 1px; +} + +.toggle.btn { min-width: 59px; min-height: 34px; } +.toggle-on.btn { padding-right: 24px; } +.toggle-off.btn { padding-left: 24px; } + +.toggle.btn-lg { min-width: 79px; min-height: 45px; } +.toggle-on.btn-lg { padding-right: 31px; } +.toggle-off.btn-lg { padding-left: 31px; } +.toggle-handle.btn-lg { width: 40px; } + +.toggle.btn-sm { min-width: 50px; min-height: 30px;} +.toggle-on.btn-sm { padding-right: 20px; } +.toggle-off.btn-sm { padding-left: 20px; } + +.toggle.btn-xs { min-width: 35px; min-height: 22px;} +.toggle-on.btn-xs { padding-right: 12px; } +.toggle-off.btn-xs { padding-left: 12px; } + diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css b/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css new file mode 100644 index 00000000..0d42ed09 --- /dev/null +++ b/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css @@ -0,0 +1,28 @@ +/*! ======================================================================== + * Bootstrap Toggle: bootstrap-toggle.css v2.2.0 + * http://www.bootstraptoggle.com + * ======================================================================== + * Copyright 2014 Min Hur, The New York Times Company + * Licensed under MIT + * ======================================================================== */ +.checkbox label .toggle,.checkbox-inline .toggle{margin-left:-20px;margin-right:5px} +.toggle{position:relative;overflow:hidden} +.toggle input[type=checkbox]{display:none} +.toggle-group{position:absolute;width:200%;top:0;bottom:0;left:0;transition:left .35s;-webkit-transition:left .35s;-moz-user-select:none;-webkit-user-select:none} +.toggle.off .toggle-group{left:-100%} +.toggle-on{position:absolute;top:0;bottom:0;left:0;right:50%;margin:0;border:0;border-radius:0} +.toggle-off{position:absolute;top:0;bottom:0;left:50%;right:0;margin:0;border:0;border-radius:0} +.toggle-handle{position:relative;margin:0 auto;padding-top:0;padding-bottom:0;height:100%;width:0;border-width:0 1px} +.toggle.btn{min-width:59px;min-height:34px} +.toggle-on.btn{padding-right:24px} +.toggle-off.btn{padding-left:24px} +.toggle.btn-lg{min-width:79px;min-height:45px} +.toggle-on.btn-lg{padding-right:31px} +.toggle-off.btn-lg{padding-left:31px} +.toggle-handle.btn-lg{width:40px} +.toggle.btn-sm{min-width:50px;min-height:30px} +.toggle-on.btn-sm{padding-right:20px} +.toggle-off.btn-sm{padding-left:20px} +.toggle.btn-xs{min-width:35px;min-height:22px} +.toggle-on.btn-xs{padding-right:12px} +.toggle-off.btn-xs{padding-left:12px} \ No newline at end of file diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js b/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js new file mode 100644 index 00000000..c3ad054d --- /dev/null +++ b/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js @@ -0,0 +1,184 @@ +/*! ======================================================================== + * Bootstrap Toggle: bootstrap-toggle.js v2.2.0 + * http://www.bootstraptoggle.com + * ======================================================================== + * Copyright 2014 Min Hur, The New York Times Company + * Licensed under MIT + * ======================================================================== */ + + + +function ($) { + 'use strict'; + + // TOGGLE PUBLIC CLASS DEFINITION + // ============================== + + var Toggle = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, this.defaults(), options) + this.render() + } + + Toggle.VERSION = '2.2.0' + + Toggle.DEFAULTS = { + on: 'On', + off: 'Off', + onstyle: 'primary', + offstyle: 'default', + size: 'normal', + style: '', + width: null, + height: null, + defaultVal: '' + } + + Toggle.prototype.defaults = function() { + return { + on: this.$element.attr('data-on') || Toggle.DEFAULTS.on, + off: this.$element.attr('data-off') || Toggle.DEFAULTS.off, + onstyle: this.$element.attr('data-onstyle') || Toggle.DEFAULTS.onstyle, + offstyle: this.$element.attr('data-offstyle') || Toggle.DEFAULTS.offstyle, + size: this.$element.attr('data-size') || Toggle.DEFAULTS.size, + style: this.$element.attr('data-style') || Toggle.DEFAULTS.style, + width: this.$element.attr('data-width') || Toggle.DEFAULTS.width, + height: this.$element.attr('data-height') || Toggle.DEFAULTS.height, + defaultVal: this.$element.attr('data-default-val') || Toggle.DEFAULTS.defaultVal, + } + } + + Toggle.prototype.render = function () { + if(this.options.defaultVal === '') this.$element.prop('checked', true); + + this._onstyle = 'btn-' + this.options.onstyle + this._offstyle = 'btn-' + this.options.offstyle + var size = this.options.size === 'large' ? 'btn-lg' + : this.options.size === 'small' ? 'btn-sm' + : this.options.size === 'mini' ? 'btn-xs' + : '' + var $toggleOn = $('