From 1743e426f4fa4f0c94706cc1e209d4d2c9012206 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Fri, 12 Apr 2019 09:10:44 +0300
Subject: [PATCH] Permission modal: moved css and js files

---
 .../Pages/Identity/Roles/Index.cshtml         |  5 ++++
 .../Pages/Identity/Users/Index.cshtml         |  5 ++++
 .../PermissionManagementModal.cshtml          | 24 -------------------
 .../permission-management-modal.css           | 12 ++++++++++
 .../permission-management-modal.js            |  9 +++++++
 5 files changed, 31 insertions(+), 24 deletions(-)
 create mode 100644 modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.css

diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
index 1979c87bb2..d2758f05d4 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml
@@ -12,6 +12,11 @@
     PageLayout.Content.BreadCrumb.Add(L["Menu:IdentityManagement"].Value);
     PageLayout.Content.MenuItemName = IdentityMenuNames.Roles;
 }
+@section styles {
+    <abp-style-bundle name="@typeof(IndexModel).FullName">
+        <abp-style src="/Pages/AbpPermissionManagement/permission-management-modal.css" />
+    </abp-style-bundle>
+}
 @section scripts {
     <abp-script-bundle name="@typeof(IndexModel).FullName">
         <abp-script src="/Pages/AbpPermissionManagement/permission-management-modal.js" />
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
index bcef02cc72..23f7747ac8 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
@@ -15,6 +15,11 @@
     PageLayout.Content.BreadCrumb.Add(L["Menu:IdentityManagement"].Value);
     PageLayout.Content.MenuItemName = IdentityMenuNames.Users;
 }
+@section styles {
+    <abp-style-bundle name="@typeof(IndexModel).FullName">
+        <abp-style src="/Pages/AbpPermissionManagement/permission-management-modal.css" />
+    </abp-style-bundle>
+}
 @section scripts {
     <abp-script-bundle name="@typeof(IndexModel).FullName">
         <abp-script src="/Pages/AbpPermissionManagement/permission-management-modal.js" />
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
index b78bb499d3..e95e56abe9 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
@@ -9,30 +9,6 @@
     Layout = null;
 }
 
-@*TO DO : Following styles and scripts will move*@
-<style>
-    .custom-scroll-container > .col-4 {
-        overflow: hidden;
-        overflow-y: auto;
-        max-height: 499px;
-        display: block; 
-        position: relative; 
-        z-index: 123;
-    }
-    .custom-scroll-content {
-        max-height: 440px; 
-    }
-</style>
-<script>
-    $(function () {
-        $(".custom-scroll-content").mCustomScrollbar({
-            theme: "minimal-dark"
-        });
-        $(".custom-scroll-container > .col-4").mCustomScrollbar({
-            theme: "minimal-dark"
-        });
-    });
-</script>
 <form method="post" asp-page="/AbpPermissionManagement/PermissionManagementModal" data-script-class="abp.modals.PermissionManagement">
     <abp-modal size="Large">
         <abp-modal-header title="@(L["Permissions"].Value) - @Model.EntityDisplayName"></abp-modal-header>
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.css b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.css
new file mode 100644
index 0000000000..d1f8731614
--- /dev/null
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.css
@@ -0,0 +1,12 @@
+.custom-scroll-container > .col-4 {
+    overflow: hidden;
+    overflow-y: auto;
+    max-height: 499px;
+    display: block;
+    position: relative;
+    z-index: 123;
+}
+
+.custom-scroll-content {
+    max-height: 440px;
+}
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js
index f32b00720e..cde7903a2e 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js
@@ -49,6 +49,15 @@
                     });
                 });
             });
+
+            $(function () {
+                $(".custom-scroll-content").mCustomScrollbar({
+                    theme: "minimal-dark"
+                });
+                $(".custom-scroll-container > .col-4").mCustomScrollbar({
+                    theme: "minimal-dark"
+                });
+            });
         };
     };
 })(jQuery);
\ No newline at end of file