From 3a177bbbde00b28dacf5439e3a6813ae8d427ab6 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Sat, 29 Apr 2017 16:21:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG=EF=BC=9A=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E8=8F=9C=E5=8D=95=E6=8E=88=E6=9D=83=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?checbox/radio=E6=8E=A7=E4=BB=B6=E4=B8=8B=E6=B2=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bootstrap.Admin/Content/admin.css | 8 ++++---- Bootstrap.Admin/Content/jquery.nestable.css | 2 ++ Bootstrap.Admin/Scripts/Menus.js | 2 +- Bootstrap.Admin/Scripts/Roles.js | 2 +- Bootstrap.Admin/Scripts/common-scripts.js | 6 +++--- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Bootstrap.Admin/Content/admin.css b/Bootstrap.Admin/Content/admin.css index b06f9823..abd51638 100644 --- a/Bootstrap.Admin/Content/admin.css +++ b/Bootstrap.Admin/Content/admin.css @@ -98,7 +98,7 @@ margin-top: 1px; } -.modal-body .checkbox { +.modal-body .checkbox, .modal-body .radio { min-width: 190px; overflow: hidden; white-space: nowrap; @@ -255,16 +255,16 @@ aside { } /*Modal Dialog Checkbox*/ -.modal-body .checkbox { +.modal-body .checkbox, .modal-dialog .radio { padding: 0; margin-top: 0; } - .modal-body .checkbox label { + .modal-body .checkbox label, .modal-body .radio label { padding-left: 0; } - .modal-body .checkbox label input[type='checkbox'] { + .modal-body .checkbox label input[type='checkbox'], .modal-body .radio label input[type='radio'] { margin: 0 4px 0 0; vertical-align: middle; position: relative; diff --git a/Bootstrap.Admin/Content/jquery.nestable.css b/Bootstrap.Admin/Content/jquery.nestable.css index fa21df40..d574e2df 100644 --- a/Bootstrap.Admin/Content/jquery.nestable.css +++ b/Bootstrap.Admin/Content/jquery.nestable.css @@ -176,6 +176,8 @@ .dd3-content label span i { width: 22px; display: inline-block; + text-align: center; + margin-right: 4px; } .dd3-content label input { diff --git a/Bootstrap.Admin/Scripts/Menus.js b/Bootstrap.Admin/Scripts/Menus.js index 6f30a818..ee785bf2 100644 --- a/Bootstrap.Admin/Scripts/Menus.js +++ b/Bootstrap.Admin/Scripts/Menus.js @@ -18,7 +18,7 @@ var initNestMenu = function () { $nestMenuInput = $nestMenu.find('div.dd3-content'); - $nestMenuInput.find('label:first').hide(); + $nestMenuInput.children('.checkbox').hide(); } var bsa = new BootstrapAdmin({ diff --git a/Bootstrap.Admin/Scripts/Roles.js b/Bootstrap.Admin/Scripts/Roles.js index b5fdf100..3fe8d4ab 100644 --- a/Bootstrap.Admin/Scripts/Roles.js +++ b/Bootstrap.Admin/Scripts/Roles.js @@ -144,6 +144,6 @@ if (child.hasClass('dd-list')) { child.find(':checkbox').prop('checked', val); } - }).find('label:last').hide(); + }).children('.radio').hide(); }); }); \ No newline at end of file diff --git a/Bootstrap.Admin/Scripts/common-scripts.js b/Bootstrap.Admin/Scripts/common-scripts.js index ed35dca8..52ceb78d 100644 --- a/Bootstrap.Admin/Scripts/common-scripts.js +++ b/Bootstrap.Admin/Scripts/common-scripts.js @@ -3,10 +3,10 @@ var html = ""; $.each(menus, function (index, menu) { if (menu.Menus.length == 0) { - html += $.format('
  • {5}{4}
    • ', menu.Id, menu.Icon, menu.Name, menu.Category, menu.Order, menu.CategoryName); + html += $.format('
  • {5}{4}
    • ', menu.Id, menu.Icon, menu.Name, menu.Category, menu.Order, menu.CategoryName); } else { - html += $.format('
  • {6}{5}
      {4}
    • ', menu.Id, menu.Icon, menu.Name, menu.Category, cascadeSubMenu(menu.Menus), menu.Order, menu.CategoryName); + html += $.format('
  • {6}{5}
      {4}
    • ', menu.Id, menu.Icon, menu.Name, menu.Category, cascadeSubMenu(menu.Menus), menu.Order, menu.CategoryName); } }); return html; @@ -15,7 +15,7 @@ var cascadeSubMenu = function (menus) { var html = "" $.each(menus, function (index, menu) { - html += $.format('
  • {5}{4}
    • ', menu.Id, menu.Icon, menu.Name, menu.Category, menu.Order, menu.CategoryName); + html += $.format('
  • {5}{4}
    • ', menu.Id, menu.Icon, menu.Name, menu.Category, menu.Order, menu.CategoryName); }); return html; };