Merge branch 'dev' into jq-update

tjcsl · Jul 6, 2024 · 80f9bce · 80f9bce
2 parents be9b840 + f164994
commit 80f9bce
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 0 deletions.
diff --git a/Ion.egg-info/SOURCES.txt b/Ion.egg-info/SOURCES.txt
@@ -945,6 +945,7 @@ intranet/static/css/dark/enrichment.scss
 intranet/static/css/dark/events.scss
 intranet/static/css/dark/files.scss
 intranet/static/css/dark/login.scss
+intranet/static/css/dark/logs.scss
 intranet/static/css/dark/lostfound.scss
 intranet/static/css/dark/nav.scss
 intranet/static/css/dark/oauth.scss

diff --git a/intranet/settings/__init__.py b/intranet/settings/__init__.py
@@ -385,6 +385,7 @@
     "dark/eighth.schedule",
     "dark/oauth",
     "dark/sessionmgmt",
+    "dark/logs",
 ]
 
 for name in LIST_OF_INDEPENDENT_CSS:

diff --git a/intranet/static/css/dark/logs.scss b/intranet/static/css/dark/logs.scss
@@ -0,0 +1,7 @@
+tr.shade:nth-child(even) {
+    background-color: #292929;
+}
+
+th.sticky {
+    background-color: #121212;
+}
diff --git a/intranet/static/css/logs.scss b/intranet/static/css/logs.scss
@@ -57,6 +57,10 @@ td {
     color: green;
 }
 
+tr.shade:nth-child(even) {
+    background-color: #e7e7e7;
+}
+
 .key-red {
     color: rgb(153, 0, 0);
 }

diff --git a/intranet/static/js/eighth/signup.search.js b/intranet/static/js/eighth/signup.search.js
@@ -96,6 +96,10 @@ $(function() {
                         show = true;
                     }
                 }
+                // description
+                if (activity.description.toLowerCase().indexOf(search) !== -1) {
+                    show = true;
+                }
 
                 var cmd = search.split(":");
                 if (cmd.length > 1) {

diff --git a/intranet/templates/logs/home.html b/intranet/templates/logs/home.html
@@ -20,6 +20,7 @@
     {% if dark_mode_enabled %}
         {% stylesheet 'dark/base' %}
         {% stylesheet 'dark/nav' %}
+        {% stylesheet 'dark/logs' %}
     {% endif %}
 {% endblock %}