Merge pull request #1620 from netalertx/next_release

Merge pull request #1619 from netalertx/main

front/css/app.css

@@ -1413,15 +1413,48 @@ textarea[readonly],
 
 
 #columnFilters {
-    display: flex;
+    display: grid;
-    flex-wrap: wrap;
+    grid-template-columns: repeat(auto-fit, minmax(125px, 1fr));
-    gap: 10px; /* Add spacing between items */
+    gap: 0.75em;
+    padding: 0.5em 0;
+}
+
+#columnFilters::before,
+#columnFilters::after {
+    display: none !important;
 }
 
 .filter-group {
-    box-sizing: border-box; /* Ensure padding and borders are included in the width */
+    box-sizing: border-box;
-    padding: 1em;
+    padding: 0.4em;
-    padding-top: 0;
+    margin: 0;
+    border-radius: 3px;
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+    gap: 0.15em;
+    white-space: normal;
+}
+
+.filter-group label {
+    box-sizing: border-box;
+    margin: 0;
+    border-radius: 3px;
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+    gap: 0.15em;
+    white-space: normal;
+    padding-left: 15px;
+    padding-right: 0px;
+}
+
+.filter-dropdown {
+    width: 100%;
+}
+.filter-group select {
+    margin-left: 15px;
+    padding-right: 0px;
 }
 
 .filter-dropdown

front/php/templates/language/cs_cz.json

@@ -12,25 +12,25 @@
     "AppEvents_DateTimeCreated": "Zaznamenáno",
     "AppEvents_Extra": "Extra",
     "AppEvents_GUID": "",
-    "AppEvents_Helper1": "",
+    "AppEvents_Helper1": "Pomocník 1",
-    "AppEvents_Helper2": "",
+    "AppEvents_Helper2": "Pomocník 2",
-    "AppEvents_Helper3": "",
+    "AppEvents_Helper3": "Pomocník 3",
     "AppEvents_ObjectForeignKey": "Cizí klíč",
     "AppEvents_ObjectIndex": "Index",
-    "AppEvents_ObjectIsArchived": "",
+    "AppEvents_ObjectIsArchived": "Archivováno (dlouhodobě)",
-    "AppEvents_ObjectIsNew": "",
+    "AppEvents_ObjectIsNew": "Nové (dlouhodobě)",
-    "AppEvents_ObjectPlugin": "",
+    "AppEvents_ObjectPlugin": "Navázaný Plugin",
     "AppEvents_ObjectPrimaryID": "Primární ID",
     "AppEvents_ObjectSecondaryID": "Sekundární ID",
-    "AppEvents_ObjectStatus": "",
+    "AppEvents_ObjectStatus": "Logovaný stav",
-    "AppEvents_ObjectStatusColumn": "",
+    "AppEvents_ObjectStatusColumn": "Stavový sloupec",
-    "AppEvents_ObjectType": "",
+    "AppEvents_ObjectType": "Typ objektu",
-    "AppEvents_Plugin": "Zásuvný modul",
+    "AppEvents_Plugin": "Plugin",
     "AppEvents_Type": "Typ",
     "BACKEND_API_URL_description": "",
-    "BACKEND_API_URL_name": "",
+    "BACKEND_API_URL_name": "AP URL backendu",
-    "BackDevDetail_Actions_Ask_Run": "",
+    "BackDevDetail_Actions_Ask_Run": "Chcete akci spustit?",
-    "BackDevDetail_Actions_Not_Registered": "",
+    "BackDevDetail_Actions_Not_Registered": "Akce není zaregistrována. ",
     "BackDevDetail_Actions_Title_Run": "Spustit akci",
     "BackDevDetail_Copy_Ask": "",
     "BackDevDetail_Copy_Title": "",

front/php/templates/language/en_us.json

@@ -247,7 +247,7 @@
     "Device_TableHead_Name": "Name",
     "Device_TableHead_NetworkSite": "Network Site",
     "Device_TableHead_Owner": "Owner",
-    "Device_TableHead_ParentRelType": "Relationship Type",
+    "Device_TableHead_ParentRelType": "Relationship",
     "Device_TableHead_Parent_MAC": "Parent node",
     "Device_TableHead_Port": "Port",
     "Device_TableHead_PresentLastScan": "Presence",

front/plugins/ui_settings/config.json

@@ -456,7 +456,7 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "Columns and their order that are shown on the Devices page. Drag and drop the order of columns, click <code>x</code> to remove columns. You can also click into the field to selectivelly add fields. The <code>Name</code> and <code>Status</code> fields are required."
+          "string": "Columns and their order that are shown on the Devices page. Drag and drop to order the columns, click <code>x</code> to remove columns. You can also click into the field to selectivelly add fields. The <code>Name</code> and <code>Status</code> fields are required."
         }
       ]
     },
@@ -535,7 +535,7 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "Which column filters should be displayed in the main Devices screen. Remove all to hide the Filters section."
+          "string": "Column filters that should be displayed in the main Devices screen. Drag and drop to change the order. Remove all to hide the Filters section."
         }
       ]
     },