Merge pull request #2102 from LuckyCyborg/4.0

Overall improvements
nova-framework · Aug 13, 2018 · 08f6799 · 08f6799
2 parents 5f357f7 + b2a25ce
commit 08f6799
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 69 deletions.
diff --git a/app/Platform/Bootstrap.php b/app/Platform/Bootstrap.php
@@ -14,7 +14,7 @@
 // Define The Application Version
 //--------------------------------------------------------------------------
 
-define('VERSION', '4.0.82');
+define('VERSION', '4.0.83');
 
 //--------------------------------------------------------------------------
 // Set PHP Error Reporting Options

diff --git a/modules/Content/Views/Admin/Attachments/Index.php b/modules/Content/Views/Admin/Attachments/Index.php
@@ -11,18 +11,20 @@
 
 <?= View::fetch('Partials/Messages'); ?>
 
-<p>
-    <button id="addNewUploads" class="btn btn-success btn-sm pull-right"><?= __d('content', 'Add New'); ?></button>
-    <div class="clearfix"></div>
-</p>
-
-<form action="<?= site_url('admin/media/upload'); ?>" id="fm_dropzone_main" enctype="multipart/form-data" method="POST">
-    <?= csrf_field() ?>
-    <a id="closeDZ1"><i class="fa fa-times"></i></a>
-    <div class="dz-message"><i class="fa fa-cloud-upload"></i><br><?= __d('content', 'Drop files here to upload'); ?></div>
-</form>
-
 <div class="box box-default">
+    <div class="box-body">
+        <button id="addNewUploads" class="btn btn-success btn-sm col-sm-2 pull-right"><?= __d('content', 'Add New'); ?></button>
+        <div class="clearfix"></div>
+
+        <form action="<?= site_url('admin/media/upload'); ?>" id="fm_dropzone_main" enctype="multipart/form-data" method="POST" style="display: none;">
+            <?= csrf_field() ?>
+            <a id="closeDZ1"><i class="fa fa-times"></i></a>
+            <div class="dz-message"><i class="fa fa-cloud-upload"></i><br><?= __d('content', 'Drop files here to upload'); ?></div>
+        </form>
+    </div>
+</div>
+
+<div class="box box-widget">
     <div class="box-header with-border">
         <h3 class="box-title"><?= __d('content', 'Uploaded files'); ?></h3>
     </div>

diff --git a/modules/Roles/Views/Admin/Roles/Index.php b/modules/Roles/Views/Admin/Roles/Index.php
@@ -1,31 +1,5 @@
 <style>
-#rolesTable td {
-    vertical-align: middle;
-}
-
-#rolesTable td.compact {
-    padding: 5px;
-}
-
-#rolesTable {
-    border-bottom: 1px solid #f4f4f4;
-}
-
-#rolesTable_length {
-    padding: 10px 0 0 10px;
-}
-
-#rolesTable_filter {
-    padding: 10px 10px 0 0;
-}
-
-#rolesTable_info {
-    padding: 9px 0 15px 20px;
-}
-
-#rolesTable_paginate {
-    padding: 2px 10px 4px 0;
-}
+<?= View::fetch('Modules/Roles::Partials/RolesDataTable'); ?>
 </style>
 
 <section class="content-header">

diff --git a/modules/Roles/Views/Partials/RolesDataTable.css b/modules/Roles/Views/Partials/RolesDataTable.css
@@ -0,0 +1,27 @@
+#rolesTable td {
+    vertical-align: middle;
+}
+
+#rolesTable td.compact {
+    padding: 5px;
+}
+
+#rolesTable {
+    border-bottom: 1px solid #f4f4f4;
+}
+
+#rolesTable_length {
+    padding: 10px 0 0 10px;
+}
+
+#rolesTable_filter {
+    padding: 10px 10px 0 0;
+}
+
+#rolesTable_info {
+    padding: 9px 0 15px 20px;
+}
+
+#rolesTable_paginate {
+    padding: 2px 10px 4px 0;
+}
diff --git a/modules/Users/Views/Admin/Users/Index.php b/modules/Users/Views/Admin/Users/Index.php
@@ -1,31 +1,5 @@
 <style>
-#usersTable td {
-    vertical-align: middle;
-}
-
-#usersTable td.compact {
-    padding: 5px;
-}
-
-#usersTable {
-    border-bottom: 1px solid #f4f4f4;
-}
-
-#usersTable_length {
-    padding: 10px 0 0 10px;
-}
-
-#usersTable_filter {
-    padding: 10px 10px 0 0;
-}
-
-#usersTable_info {
-    padding: 9px 0 15px 20px;
-}
-
-#usersTable_paginate {
-    padding: 2px 10px 4px 0;
-}
+<?= View::fetch('Modules/Users::Partials/UsersDataTable'); ?>
 </style>
 
 <section class="content-header">

diff --git a/modules/Users/Views/Partials/UsersDataTable.css b/modules/Users/Views/Partials/UsersDataTable.css
@@ -0,0 +1,27 @@
+#usersTable td {
+    vertical-align: middle;
+}
+
+#usersTable td.compact {
+    padding: 5px;
+}
+
+#usersTable {
+    border-bottom: 1px solid #f4f4f4;
+}
+
+#usersTable_length {
+    padding: 10px 0 0 10px;
+}
+
+#usersTable_filter {
+    padding: 10px 10px 0 0;
+}
+
+#usersTable_info {
+    padding: 9px 0 15px 20px;
+}
+
+#usersTable_paginate {
+    padding: 2px 10px 4px 0;
+}
diff --git a/themes/AdminLite/Assets/css/style.css b/themes/AdminLite/Assets/css/style.css
@@ -79,11 +79,10 @@
 
 #fm_dropzone_main {
   border: 1px dashed #0087F7;
-  border-radius: 5px;
+  border-radius: 10px;
   background: white;
   text-align: center;
-  margin-top: 15px;
-  margin-bottom: 15px;
+  margin-top: 10px;
   /*min-height: 100px;*/
   padding: 8px;
   vertical-align: middle;