From bc82933c071afeed34d72d6cac54752b43fe9ecd Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Fri, 12 Apr 2019 17:39:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=EF=BC=9A=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E7=BD=91=E7=AB=99=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8E=E7=BD=91=E7=AB=99=E8=AE=BE=E7=BD=AE=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=88=86=E5=BC=80=E5=A4=84=E7=90=86=20closed?=
 =?UTF-8?q?=20#IVBF3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#Issue
https://gitee.com/LongbowEnterprise/dashboard/issues?id=IVBF3
---
 Bootstrap.Admin/Models/HeaderBarModel.cs      | 99 ++++++++++---------
 Bootstrap.Admin/Models/ModelBase.cs           | 80 +++++++--------
 Bootstrap.Admin/Views/Admin/Profiles.cshtml   |  7 +-
 Bootstrap.Admin/Views/Admin/Settings.cshtml   |  3 +
 .../Views/Shared/_Bootstrap.cshtml            | 72 +++++++-------
 5 files changed, 139 insertions(+), 122 deletions(-)

diff --git a/Bootstrap.Admin/Models/HeaderBarModel.cs b/Bootstrap.Admin/Models/HeaderBarModel.cs
index 73925e1f..af7585e1 100644
--- a/Bootstrap.Admin/Models/HeaderBarModel.cs
+++ b/Bootstrap.Admin/Models/HeaderBarModel.cs
@@ -1,45 +1,56 @@
-using Bootstrap.DataAccess;
-using System.Security.Principal;
-
-namespace Bootstrap.Admin.Models
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public class HeaderBarModel : ModelBase
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="identity"></param>
-        public HeaderBarModel(IIdentity identity)
-        {
-            var user = UserHelper.RetrieveUserByUserName(identity.Name);
-            Icon = string.Format("{0}{1}", DictHelper.RetrieveIconFolderPath(), user.Icon);
-            DisplayName = user.DisplayName;
-            UserName = user.UserName;
-            AppCode = user.App;
-            if (!string.IsNullOrEmpty(user.Css)) Theme = user.Css;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public string UserName { get; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public string DisplayName { get; }
-
-        /// <summary>
-        /// 获得/设置 用户头像地址
-        /// </summary>
-        public string Icon { get; }
-
-        /// <summary>
-        /// 获得 当前设置的默认应用
-        /// </summary>
-        public string AppCode { get; }
-    }
+using Bootstrap.DataAccess;
+using System.Security.Principal;
+
+namespace Bootstrap.Admin.Models
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class HeaderBarModel : ModelBase
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="identity"></param>
+        public HeaderBarModel(IIdentity identity)
+        {
+            var user = UserHelper.RetrieveUserByUserName(identity.Name);
+            Icon = string.Format("{0}{1}", DictHelper.RetrieveIconFolderPath(), user.Icon);
+            DisplayName = user.DisplayName;
+            UserName = user.UserName;
+            AppCode = user.App;
+            Css = user.Css;
+            ActiveCss = string.IsNullOrEmpty(Css) ? Theme : Css;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string UserName { get; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string DisplayName { get; }
+
+        /// <summary>
+        /// 获得/设置 用户头像地址
+        /// </summary>
+        public string Icon { get; }
+
+        /// <summary>
+        /// 获取/设置 个人网站样式
+        /// </summary>
+        public string Css { get; }
+
+        /// <summary>
+        /// 获得 当前设置的默认应用
+        /// </summary>
+        public string AppCode { get; }
+
+        /// <summary>
+        /// 获得 当前样式
+        /// </summary>
+        public string ActiveCss { get; }
+    }
 }
\ No newline at end of file
diff --git a/Bootstrap.Admin/Models/ModelBase.cs b/Bootstrap.Admin/Models/ModelBase.cs
index 1b55d0e6..c778ea2b 100644
--- a/Bootstrap.Admin/Models/ModelBase.cs
+++ b/Bootstrap.Admin/Models/ModelBase.cs
@@ -1,41 +1,41 @@
-using Bootstrap.DataAccess;
-
-namespace Bootstrap.Admin.Models
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public class ModelBase
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        public ModelBase()
-        {
-            Title = DictHelper.RetrieveWebTitle();
-            Footer = DictHelper.RetrieveWebFooter();
-            Theme = DictHelper.RetrieveActiveTheme();
-            IsDemo = DictHelper.RetrieveSystemModel();
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Title { get; private set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Footer { get; private set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Theme { get; protected set; }
-
-        /// <summary>
-        /// 是否为演示系统
-        /// </summary>
-        public bool IsDemo { get; protected set; }
-    }
+using Bootstrap.DataAccess;
+
+namespace Bootstrap.Admin.Models
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class ModelBase
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public ModelBase()
+        {
+            Title = DictHelper.RetrieveWebTitle();
+            Footer = DictHelper.RetrieveWebFooter();
+            Theme = DictHelper.RetrieveActiveTheme();
+            IsDemo = DictHelper.RetrieveSystemModel();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Title { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Footer { get; private set; }
+
+        /// <summary>
+        /// 网站样式全局设置
+        /// </summary>
+        public string Theme { get; protected set; }
+
+        /// <summary>
+        /// 是否为演示系统
+        /// </summary>
+        public bool IsDemo { get; protected set; }
+    }
 }
\ No newline at end of file
diff --git a/Bootstrap.Admin/Views/Admin/Profiles.cshtml b/Bootstrap.Admin/Views/Admin/Profiles.cshtml
index d70433a9..3d862b15 100644
--- a/Bootstrap.Admin/Views/Admin/Profiles.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Profiles.cshtml
@@ -102,11 +102,14 @@
     </div>
 </div>
 <div class="card">
-    <div class="card-header">网站皮肤</div>
+    <div class="card-header">网站样式</div>
     <div class="card-body">
+        <div class="alert alert-info" role="alert">
+            <span>注意：本设置将覆盖<b><a class="badge-pill" href="./Settings">网站设置</a></b>中已经设置的网站样式</span>
+        </div>
         <div class="form-group">
             <div class="btn-group" role="group">
-                <button id="css" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown" data-default-val="" value="@Model.Theme">默认样式</button>
+                <button id="css" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown" data-default-val="" value="@Model.Css">默认样式</button>
                 <div class="dropdown-menu">
                     <a href="#" data-val="">默认样式</a>
                     @foreach (var css in Model.Themes)
diff --git a/Bootstrap.Admin/Views/Admin/Settings.cshtml b/Bootstrap.Admin/Views/Admin/Settings.cshtml
index 790249fb..7e3df0c0 100644
--- a/Bootstrap.Admin/Views/Admin/Settings.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Settings.cshtml
@@ -50,6 +50,9 @@
 <div class="card">
     <div class="card-header">网站样式</div>
     <div class="card-body">
+        <div class="alert alert-info" role="alert">
+            <span>注意：如果<b><a class="badge-pill" href="./Profiles">个人中心</a></b>中已经设置了网站样式，此处设置对当前用户不生效，对其他用户生效</span>
+        </div>
         <div class="form-group text-right">
             <div class="btn-group" role="group">
                 <div class="btn-group" role="group">
diff --git a/Bootstrap.Admin/Views/Shared/_Bootstrap.cshtml b/Bootstrap.Admin/Views/Shared/_Bootstrap.cshtml
index 5b3e737e..1d2dadf7 100644
--- a/Bootstrap.Admin/Views/Shared/_Bootstrap.cshtml
+++ b/Bootstrap.Admin/Views/Shared/_Bootstrap.cshtml
@@ -1,37 +1,37 @@
-@model ModelBase
-@{
-    Layout = "_Layout";
-}
-@section css {
-    <environment include="Development">
-        <link href="~/lib/twitter-bootstrap/css/bootstrap.css" rel="stylesheet" />
-        <link href="~/lib/font-awesome/css/font-awesome.css" rel="stylesheet" />
-    </environment>
-    <environment exclude="Development">
-        <link href="~/lib/twitter-bootstrap/css/bootstrap.min.css" rel="stylesheet" />
-        <link href="~/lib/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
-    </environment>
-    @RenderSection("css", false)
-    <link href="~/css/theme.css" rel="stylesheet" asp-append-version="true" />
-    <link href="~/css/theme-responsive.css" rel="stylesheet" asp-append-version="true" />
-    <link href="~/css/site.css" rel="stylesheet" asp-append-version="true" />
-    <link href="~/css/site-responsive.css" rel="stylesheet" asp-append-version="true" />
-    @if (!string.IsNullOrEmpty(Model.Theme))
-    {
-        <link href="~/css/@Model.Theme" rel="stylesheet" asp-append-version="true" />
-    }
-}
-@section javascript {
-    <environment include="Development">
-        <script src="~/lib/twitter-bootstrap/js/bootstrap.bundle.js"></script>
-    </environment>
-    <environment exclude="Development">
-        <script src="~/lib/twitter-bootstrap/js/bootstrap.bundle.min.js"></script>
-    </environment>
-    <script src="~/lib/longbow/longbow.common.js" asp-append-version="true"></script>
-    @RenderSection("javascript", false)
-}
-@await Html.PartialAsync("Header")
-@RenderBody()
-@await Html.PartialAsync("Footer")
+@model HeaderBarModel
+@{
+    Layout = "_Layout";
+}
+@section css {
+    <environment include="Development">
+        <link href="~/lib/twitter-bootstrap/css/bootstrap.css" rel="stylesheet" />
+        <link href="~/lib/font-awesome/css/font-awesome.css" rel="stylesheet" />
+    </environment>
+    <environment exclude="Development">
+        <link href="~/lib/twitter-bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+        <link href="~/lib/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+    </environment>
+    @RenderSection("css", false)
+    <link href="~/css/theme.css" rel="stylesheet" asp-append-version="true" />
+    <link href="~/css/theme-responsive.css" rel="stylesheet" asp-append-version="true" />
+    <link href="~/css/site.css" rel="stylesheet" asp-append-version="true" />
+    <link href="~/css/site-responsive.css" rel="stylesheet" asp-append-version="true" />
+    @if (!string.IsNullOrEmpty(Model.ActiveCss))
+    {
+        <link href="~/css/@Model.ActiveCss" rel="stylesheet" asp-append-version="true" />
+    }
+}
+@section javascript {
+    <environment include="Development">
+        <script src="~/lib/twitter-bootstrap/js/bootstrap.bundle.js"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="~/lib/twitter-bootstrap/js/bootstrap.bundle.min.js"></script>
+    </environment>
+    <script src="~/lib/longbow/longbow.common.js" asp-append-version="true"></script>
+    @RenderSection("javascript", false)
+}
+@await Html.PartialAsync("Header")
+@RenderBody()
+@await Html.PartialAsync("Footer")
 @RenderSection("modal", false)
\ No newline at end of file