Merge pull request #8007 from ita-social-projects/refactoring/7918/re…

…factoring-Admin-Section-Files Small fixes in admin section files
ita-social-projects · Jan 8, 2025 · fac0a46 · fac0a46
2 parents 62c7a04 + d83f37d
commit fac0a46
Show file tree

Hide file tree

Showing 4 changed files with 297 additions and 367 deletions.
diff --git a/core/src/main/resources/static/css/slider.css b/core/src/main/resources/static/css/slider.css
diff --git a/core/src/main/resources/static/css/table_Modal_Pagination.css b/core/src/main/resources/static/css/table_Modal_Pagination.css
@@ -362,7 +362,8 @@ table.table .avatar {
     height: 26px;
     padding: 0px;
     margin-top: 12px;
-    margin-left: 0px;
+    margin-left: 0;
+    margin-right: 0;
 }
 
 .dropdown-content.userpage {

diff --git a/core/src/main/resources/templates/core/management_habit_statistics.html b/core/src/main/resources/templates/core/management_habit_statistics.html
@@ -5,11 +5,7 @@
     <meta charset="utf-8"/>
     <title>Eco News Statistic</title>
     <link rel="icon" type="image/x-icon" th:href="@{/img/favicon.ico}"/>
-    <link rel="stylesheet" th:href="@{/css/header.css}">
-    <link rel="stylesheet" th:href="@{/css/footer.css}">
-    <link rel="stylesheet" th:href="@{/css/position.css}">
     <link rel="stylesheet" th:href="@{/css/main.css}">
-
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
           integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"/>
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css"
@@ -27,12 +23,10 @@
             src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/js/bootstrap-datepicker.min.js"></script>
     <link rel="stylesheet"
           href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/css/bootstrap-datepicker3.css"/>
-    <link rel="stylesheet" th:href="@{/management/css/table_Modal_Pagination.css}">
-    <link rel="stylesheet" th:href="@{/management/css/slider.css}">
-    <link rel="stylesheet" th:href="@{/css/sidebar.css}">
     <script th:src="@{/management/localization/buttonsAJAX.js}"></script>
     <script th:src="@{/management/econews/buttonsAJAX.js}"></script>
     <script th:src="@{/management/tinymce/tinymce.min.js}" referrerpolicy="origin"></script>
+    <script defer type="text/javascript" th:src="@{/management/sidebar/sidebar.js}"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/randomColor.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/moment.min.js"></script>
@@ -148,10 +142,8 @@
 </head>
 <body>
 <div id="header" th:insert="core/header"></div>
-<div>
-    <div id="sidebar" th:insert="core/sidepanel"></div>
-</div>
 <div class="main-content">
+    <div id="sidebar" th:insert="core/sidepanel"></div>
     <div class="container-xl">
         <h2>Habit Statistics</h2>
         <!-- Menu Button -->
@@ -186,8 +178,8 @@ <h3>User interaction</h3>
 
             </div>
         </div>
+        <div class="grid-stack" id="chartsGrid"></div>
     </div>
-    <div class="grid-stack" id="chartsGrid"></div>
 </div>
 <div id="footer" th:insert="core/footer"></div>
 <script type="module">