From ae5b9c01e0915e235338d7651d1ce46ebc0a2c06 Mon Sep 17 00:00:00 2001
From: Argo-MacBookPro <Argo@163.com>
Date: Fri, 10 Aug 2018 18:34:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=EF=BC=9A?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83Administr?=
 =?UTF-8?q?ators=E7=BB=84=E5=86=85=E6=88=90=E5=91=98=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E6=A1=86=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=9A=90=E8=97=8F=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Views/Admin/Profiles.cshtml | 38 ++++++++++-----------
 Bootstrap.Admin/wwwroot/css/site.css        |  4 +++
 Bootstrap.Admin/wwwroot/js/Profiles.js      |  5 ++-
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/Bootstrap.Admin/Views/Admin/Profiles.cshtml b/Bootstrap.Admin/Views/Admin/Profiles.cshtml
index 54fb45d6..4e9c1876 100644
--- a/Bootstrap.Admin/Views/Admin/Profiles.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Profiles.cshtml
@@ -78,27 +78,26 @@
 <div class="card">
     <div class="card-header">网站皮肤</div>
     <div class="card-body">
-        <form class="form-inline">
-            <div class="form-row">
-                <div class="form-group">
-                    <label class="control-label" for="userName">样式</label>
-                    <select id="css" class="select form-control">
-                        <option value="">默认样式</option>
-                        @foreach (var css in Model.Themes)
+        <div class="form-group">
+            <div class="btn-group" role="group">
+                <button id="dictCssDefine" class="btn btn-success dropdown-select dropdown-toggle" data-toggle="dropdown" data-default-val="" value="@Model.Theme">默认样式</button>
+                <ul class="dropdown-menu" role="menu" id="cssContainer">
+                    <li><a href="#" data-val="">默认样式</a></li>
+                    @foreach (var css in Model.Themes)
+                    {
+                        if (css.Code == Model.Css)
                         {
-                            if (css.Code == Model.Css)
-                            {
-                                <option selected value="@css.Code">@css.Name</option>
-                            }
-                            else
-                            {
-                                <option value="@css.Code">@css.Name</option>
-                            }
+                            <li><a href="#" data-val="@css.Code">@css.Name</a></li>
                         }
-                    </select>
-                </div>
+                        else
+                        {
+                            <li><a href="#" data-val="@css.Code">@css.Name</a></li>
+                        }
+                    }
+
+                </ul>
             </div>
-        </form>
+        </div>
         <div class="modal-footer d-none" data-admin="@User.IsInRole("Administrators")">
             <button id="btnSaveCss" data-method="css" class="btn btn-secondary" type="button"><i class="fa fa-save"></i><span>保存</span></button>
         </div>
@@ -107,10 +106,11 @@
 <div class="card">
     <div class="card-header">修改头像</div>
     <div class="card-body">
-        <form enctype="multipart/form-data">
+        <form enctype="multipart/form-data" class="d-none" data-admin="@User.IsInRole("Administrators")">
             <div class="form-group">
                 <input id="fileIcon" class="file" type="file" data-init="@Model.Size">
             </div>
         </form>
+        <img class="card-img d-none" src="@Url.Content(Model.Icon)" />
     </div>
 </div>
diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/Bootstrap.Admin/wwwroot/css/site.css
index f902b40a..5b1b0f75 100644
--- a/Bootstrap.Admin/wwwroot/css/site.css
+++ b/Bootstrap.Admin/wwwroot/css/site.css
@@ -327,3 +327,7 @@ label.dropdown-item:first-child {
         font-size: 0.75rem;
         padding: 1px 5px;
     }
+
+.card-img {
+    max-width: 258px;
+}
diff --git a/Bootstrap.Admin/wwwroot/js/Profiles.js b/Bootstrap.Admin/wwwroot/js/Profiles.js
index bce3a05e..336c1a58 100644
--- a/Bootstrap.Admin/wwwroot/js/Profiles.js
+++ b/Bootstrap.Admin/wwwroot/js/Profiles.js
@@ -62,5 +62,8 @@
                 break;
         }
     });
-    $('button[data-admin="False"]').removeClass('d-none');
+    $('[data-admin="False"]').removeClass('d-none');
+    if ($('[enctype="multipart/form-data"]').is(":hidden")) {
+        $('.card-img').removeClass('d-none');
+    }
 });
\ No newline at end of file