Merge branch 'main' of gitlab.com:bashrc2/epicyon

epicyon-profile.css

@@ -32,6 +32,7 @@
     --main-bg-color-dm: #222;
     --main-bg-color-report: #221c27;
     --main-header-color-roles: #282237;
+    --pageslist-color: #dddddd;
     --main-fg-color: #dddddd;
     --cw-color: #dddddd;
     --cw-style: normal;
@@ -62,6 +63,7 @@
     --font-size-dropdown-header-tiny: 20px;
     --font-size-mobile: 50px;
     --font-size-tiny: 25px;
+    --font-size-pageslist: 32px;
     --font-size: 26px;
     --font-size2: 20px;
     --font-size3: 34px;
@@ -1862,6 +1864,10 @@ h3 {
     .columnIcons img {
         float: right;
     }
+    .pageslist {
+        font-size: var(--font-size-pageslist);
+        color: var(--pageslist-color);
+    }
     .pageslist mark {
     }
     .pageslistDash {
@@ -2656,6 +2662,10 @@ h3 {
         float: right;
         margin-right: 1vw;
     }
+    .pageslist {
+        font-size: var(--font-size-pageslist);
+        color: var(--pageslist-color);
+    }
     .pageslist mark {
     }
     .pageslistDash {
@@ -3447,6 +3457,10 @@ h3 {
         float: right;
         margin-right: 1vw;
     }
+    .pageslist {
+        font-size: var(--font-size-pageslist);
+        color: var(--pageslist-color);
+    }
     .pageslist mark {
     }
     .pageslistDash {

fitnessFunctions.py

@@ -120,7 +120,7 @@ def html_watch_points_graph(base_dir: str, fitness: {}, fitness_id: str,
     return html_str
 
 
-def fitness_thread(base_dir: str, fitness: {}):
+def fitness_thread(base_dir: str, fitness: {}) -> None:
     """Thread used to save fitness function scores
     """
     fitness_filename = base_dir + '/accounts/fitness.json'

theme/blue/theme.json

@@ -14,6 +14,7 @@
     "font-page-dash-mobile": "32px",
     "font-size-header": "22px",
     "font-size-header-mobile": "32px",
+    "font-size-pageslist": "45px",
     "font-size": "45px",
     "font-size2": "45px",
     "font-size3": "45px",
@@ -21,6 +22,7 @@
     "font-size5": "29px",
     "gallery-font-size": "35px",
     "gallery-font-size-mobile": "55px",
+    "pageslist-color": "#dddddd",
     "main-bg-color": "#002365",
     "login-bg-color": "#002365",
     "welcome-bg-color": "#002365",

theme/debian/theme.json

@@ -42,6 +42,7 @@
     "font-page-dash-tiny": "16px",
     "font-page-dash-mobile": "32px",
     "font-size-button-mobile": "26px",
+    "font-size-pageslist": "32px",
     "font-size": "26px",
     "font-size2": "20px",
     "font-size3": "34px",
@@ -65,6 +66,7 @@
     "main-bg-color-report": "#e3dbf0",
     "main-header-color-roles": "#ebebf0",
     "cw-color": "#2d2c37",
+    "pageslist-color": "#111",
     "main-fg-color": "#2d2c37",
     "login-fg-color": "white",
     "welcome-fg-color": "white",

theme/default/theme.json

@@ -34,6 +34,7 @@
     "font-size-dropdown-header-tiny": "20px",
     "font-size-mobile": "50px",
     "font-size-tiny": "25px",
+    "font-size-pageslist": "32px",
     "font-size-likes-mobile": "64px",
     "font-size-likes-tiny": "16px",
     "likes-margin-left-tiny": "10px",
@@ -216,6 +217,7 @@
     "main-bg-color-dm": "#222",
     "main-bg-color-report": "#221c27",
     "main-header-color-roles": "#282237",
+    "pageslist-color": "#dddddd",
     "main-fg-color": "#dddddd",
     "day-number": "#dddddd",
     "day-number2": "#bbbbbb",

theme/hacker/theme.json

@@ -18,6 +18,7 @@
     "font-size-newswire-mobile": "36px",
     "font-size-dropdown-header": "26px",
     "font-size-mobile": "40px",
+    "font-size-pageslist": "32px",
     "font-size": "26px",
     "font-size2": "16px",
     "font-size3": "36px",
@@ -57,6 +58,7 @@
     "main-bg-color-report": "#050202",
     "main-header-color-roles": "#1f192d",
     "cw-color": "#9ad791",
+    "pageslist-color": "#dddddd",
     "main-fg-color": "#9ad791",
     "login-fg-color": "#9ad791",
     "welcome-fg-color": "#9ad791",

theme/henge/theme.json

@@ -26,6 +26,7 @@
     "font-page-dash-tiny": "16px",
     "font-page-dash-mobile": "32px",
     "font-size-button-mobile": "26px",
+    "font-size-pageslist": "32px",
     "font-size": "32px",
     "font-size2": "26px",
     "font-size3": "40px",
@@ -46,6 +47,7 @@
     "main-visited-color": "#e1c4bc",
     "options-main-visited-color": "#e1c4bc",
     "cw-color": "white",
+    "pageslist-color": "white",
     "main-fg-color": "white",
     "options-fg-color": "white",
     "column-left-fg-color": "white",

theme/indymediaclassic/theme.json

@@ -30,6 +30,7 @@
     "font-page-dash-tiny": "16px",
     "font-page-dash-mobile": "32px",
     "font-size-button-mobile": "26px",
+    "font-size-pageslist": "32px",
     "font-size": "32px",
     "font-size2": "26px",
     "font-size3": "40px",
@@ -55,6 +56,7 @@
     "main-visited-color": "#ffb900",
     "options-main-visited-color": "#ffb900",
     "cw-color": "white",
+    "pageslist-color": "white",
     "main-fg-color": "white",
     "login-fg-color": "white",
     "welcome-fg-color": "white",

theme/indymediamodern/theme.json

@@ -35,6 +35,7 @@
     "header-button-padding": "0 0",
     "containericons-horizontal-spacing": "0%",
     "font-size-header": "14px",
+    "font-size-pageslist": "32px",
     "font-size": "22px",
     "font-size2": "16px",
     "font-size3": "30px",
@@ -114,6 +115,7 @@
     "main-bg-color-report": "white",
     "main-header-color-roles": "#ebebf0",
     "cw-color": "black",
+    "pageslist-color": "black",
     "main-fg-color": "black",
     "login-fg-color": "black",
     "welcome-fg-color": "black",

theme/lcd/theme.json

@@ -31,6 +31,7 @@
     "main-bg-color-dm": "#5fb42b",
     "main-header-color-roles": "#9fb42b",
     "cw-color": "#33390d",
+    "pageslist-color": "#111",
     "main-fg-color": "#33390d",
     "login-fg-color": "#33390d",
     "welcome-fg-color": "#33390d",
@@ -71,6 +72,7 @@
     "font-page-dash-mobile": "32px",
     "font-size-header": "22px",
     "font-size-header-mobile": "32px",
+    "font-size-pageslist": "45px",
     "font-size": "45px",
     "font-size2": "45px",
     "font-size3": "45px",

theme/light/theme.json

@@ -31,6 +31,7 @@
     "font-page-dash-tiny": "16px",
     "font-page-dash-mobile": "32px",
     "font-size-button-mobile": "26px",
+    "font-size-pageslist": "32px",
     "font-size": "32px",
     "font-size2": "26px",
     "font-size3": "40px",
@@ -51,6 +52,7 @@
     "main-bg-color-report": "#dbe2ea",
     "main-header-color-roles": "#ebebf0",
     "cw-color": "#777",
+    "pageslist-color": "#111",
     "main-fg-color": "#2d2c37",
     "login-fg-color": "#2d2c37",
     "welcome-fg-color": "#2d2c37",

theme/night/theme.json

@@ -25,6 +25,7 @@
     "font-page-dash-tiny": "16px",
     "font-page-dash-mobile": "32px",
     "font-size-button-mobile": "26px",
+    "font-size-pageslist": "32px",
     "font-size": "32px",
     "font-size2": "26px",
     "font-size3": "40px",
@@ -45,6 +46,7 @@
     "options-main-link-color": "#6481f5",
     "options-main-link-color-hover": "#d09338",
     "cw-color": "#0481f5",
+    "pageslist-color": "#bbbbbb",
     "main-fg-color": "#0481f5",
     "login-fg-color": "#0481f5",
     "welcome-fg-color": "#0481f5",

theme/pixel/theme.json

@@ -21,6 +21,7 @@
     "font-size-newswire-mobile": "38px",
     "font-size-dropdown-header": "34px",
     "font-size-mobile": "34px",
+    "font-size-pageslist": "34px",
     "font-size": "34px",
     "font-size2": "34px",
     "font-size3": "38px",
@@ -72,6 +73,7 @@
     "column-left-header-background": "#5152a3",
     "column-left-header-color": "white",
     "column-left-fg-color": "black",
+    "pageslist-color": "black",
     "main-fg-color": "black",
     "dropdown-fg-color": "black",
     "dropdown-fg-color-hover": "#222",

theme/purple/theme.json

@@ -23,6 +23,7 @@
     "font-page-dash-tiny": "16px",
     "font-page-dash-mobile": "32px",
     "font-size-button-mobile": "26px",
+    "font-size-pageslist": "32px",
     "font-size": "32px",
     "font-size2": "26px",
     "font-size3": "40px",
@@ -41,6 +42,7 @@
     "main-bg-color-report": "#12152d",
     "main-header-color-roles": "#1f192d",
     "cw-color": "#f98bb0",
+    "pageslist-color": "#dddddd",
     "main-fg-color": "#f98bb0",
     "login-fg-color": "#f98bb0",
     "welcome-fg-color": "#f98bb0",

theme/rc3/theme.json

@@ -46,6 +46,7 @@
     "font-size-button-mobile": "24px",
     "font-size-links": "12px",
     "font-size-newswire": "12px",
+    "font-size-pageslist": "32px",
     "font-size": "22px",
     "font-size2": "16px",
     "font-size3": "30px",
@@ -67,6 +68,7 @@
     "options-main-link-color": "#05b9ec",
     "options-main-link-color-hover": "#46eed5",
     "cw-color": "white",
+    "pageslist-color": "white",
     "main-fg-color": "white",
     "login-fg-color": "white",
     "welcome-fg-color": "white",

theme/solidaric/theme.json

@@ -36,6 +36,7 @@
     "font-page-dash-tiny": "16px",
     "font-page-dash-mobile": "32px",
     "font-size-button-mobile": "26px",
+    "font-size-pageslist": "32px",
     "font-size": "32px",
     "font-size2": "26px",
     "font-size3": "40px",
@@ -56,6 +57,7 @@
     "main-bg-color-report": "#eeeeee",
     "main-header-color-roles": "#ebebf0",
     "cw-color": "#2d2c37",
+    "pageslist-color": "#111",
     "main-fg-color": "#2d2c37",
     "login-fg-color": "#2d2c37",
     "welcome-fg-color": "#2d2c37",

theme/starlight/theme.json

@@ -21,6 +21,7 @@
     "font-page-dash-tiny": "16px",
     "font-page-dash-mobile": "32px",
     "font-size-button-mobile": "26px",
+    "font-size-pageslist": "32px",
     "font-size": "32px",
     "font-size2": "26px",
     "font-size3": "40px",
@@ -44,6 +45,7 @@
     "main-visited-color": "#e1c4bc",
     "options-main-visited-color": "#e1c4bc",
     "cw-color": "#ffc4bc",
+    "pageslist-color": "#dddddd",
     "main-fg-color": "#ffc4bc",
     "login-fg-color": "#ffc4bc",
     "welcome-fg-color": "#ffc4bc",

theme/zen/theme.json

@@ -1,6 +1,25 @@
 {
     "code-color": "blue",
+    "font-size-header": "18px",
+    "font-size-header-mobile": "32px",
+    "font-size-header-tiny": "16px",
+    "font-size-button-tiny": "13px",
+    "font-size-publish-button": "18px",
+    "font-size-newswire-tiny": "16px",
+    "font-size-dropdown-header": "40px",
+    "font-size-dropdown-header-tiny": "20px",
+    "font-size-mobile": "50px",
+    "font-size-tiny": "25px",
+    "font-size-pageslist": "32px",
     "font-size-likes-mobile": "64px",
+    "font-size-likes-tiny": "16px",
+    "font-size-pgp-key": "16px",
+    "font-size-pgp-key2": "18px",
+    "font-size-tox": "16px",
+    "font-size-tox2": "18px",
+    "font-size-emoji-reaction": "16px",
+    "font-size-emoji-reaction-mobile": "24px",
+    "font-size-emoji-reaction-tiny": "12px",
     "likes-margin-left-mobile": "20px",
     "likes-margin-right-mobile": "0px",
     "likes-margin-top-mobile": "0px",
@@ -13,6 +32,7 @@
     "avatar-rounding": "50%",
     "dropdown-bg-color-hover": "#463b35",
     "cw-color": "#d5c7b7",
+    "pageslist-color": "#dddddd",
     "main-fg-color": "#d5c7b7",
     "column-left-fg-color": "#d5c7b7",
     "button-text": "#d5c7b7",

webapp_timeline.py

@@ -432,6 +432,14 @@ def _page_number_buttons(users_path: str, box_name: str,
                          page_number: int) -> str:
     """Shows selactable page numbers at the bottom of the screen
     """
+    page_number_chars_highlighted = (
+        '⓿', '❶', '❷', '❸', '❹', '❺', '❻', '❼', '❽', '❾',
+        '❿', '⓫', '⓬', '⓭', '⓮', '⓯', '⓰', '⓱', '⓲', '⓳', '⓴'
+    )
+    page_number_chars = (
+        '⓪', '①', '②', '③', '④', '⑤', '⑥', '⑦', '⑧', '⑨',
+        '⑩', '⑪', '⑫', '⑬', '⑭', '⑮', '⑯', '⑰', '⑱', '⑲', '⑳'
+    )
     pages_width = 3
     min_page_number = page_number - pages_width
     min_page_number = max(min_page_number, 1)
@@ -443,13 +451,13 @@ def _page_number_buttons(users_path: str, box_name: str,
                 '<label class="pageslistDash">────</label>'
             num_str += html_hide_from_screen_reader(separator_str)
         aria_page_str = ''
-        page_str = ' ' + str(page) + ' '
+        page_str = ' ' + page_number_chars[page] + ' '
         curr_page_str = ''
         if page == page_number:
             page_str = \
-                html_hide_from_screen_reader('[<mark>') + \
+                html_hide_from_screen_reader('<mark>') + \
-                str(page) + \
+                page_number_chars_highlighted[page] + \
-                html_hide_from_screen_reader('</mark>]')
+                html_hide_from_screen_reader('</mark>')
             aria_page_str = ' aria-current="true"'
             curr_page_str = 'Current Page, '
         num_str += \