diff --git a/daemon.py b/daemon.py index e3f68b272..3e2d766be 100644 --- a/daemon.py +++ b/daemon.py @@ -17082,7 +17082,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.text_mode_banner, access_keys, False, self.server.system_language, - self.server.default_timeline) + self.server.default_timeline, + self.server.theme_name) if msg: msg = msg.encode('utf-8') msglen = len(msg) @@ -17125,7 +17126,8 @@ class PubServer(BaseHTTPRequestHandler): access_keys, True, self.server.system_language, - self.server.default_timeline) + self.server.default_timeline, + self.server.theme_name) if msg: msg = msg.encode('utf-8') msglen = len(msg) diff --git a/epicyon-calendar.css b/epicyon-calendar.css index 64d0acabb..770c41e5b 100644 --- a/epicyon-calendar.css +++ b/epicyon-calendar.css @@ -16,6 +16,9 @@ --title-text: white; --title-background: grey; --focus-color: white; + --banner-height: 20vh; + --banner-height-mobile: 10vh; + --banner-height-tiny: 10vh; --calendar-horizontal-padding: 0; --calendar-cell-size: 1.5vw; --calendar-cell-size-mobile: 1.5vw; @@ -250,6 +253,12 @@ tr:nth-child(even) > .calendar__day__cell:nth-child(even) { } @media screen and (min-width: 400px) { + .timeline-banner { + vertical-align: top; + object-fit: cover; + width: 100%; + max-height: var(--banner-height); + } .calendar { table-display: fixed; margin: 0 20%; @@ -274,6 +283,12 @@ tr:nth-child(even) > .calendar__day__cell:nth-child(even) { } @media screen and (max-width: 1000px) { + .timeline-banner { + vertical-align: top; + object-fit: cover; + width: 98vw; + max-height: var(--banner-height-mobile); + } .calendar { table-display: fixed; margin: 0 0; @@ -298,6 +313,12 @@ tr:nth-child(even) > .calendar__day__cell:nth-child(even) { } @media screen and (max-width: 480px) { + .timeline-banner { + vertical-align: top; + object-fit: cover; + width: 98vw; + max-height: var(--banner-height-tiny); + } .calendar { table-display: fixed; margin: 0 0; diff --git a/epicyon-profile.css b/epicyon-profile.css index 72a267f2a..daccec120 100644 --- a/epicyon-profile.css +++ b/epicyon-profile.css @@ -44,6 +44,8 @@ --border-color: #505050; --border-width: 2px; --border-width-header: 2px; + --font-page-dash-tiny: 16px; + --font-page-dash-mobile: 32px; --font-size-header: 18px; --font-size-header-mobile: 32px; --font-size-header-tiny: 13px; @@ -1848,7 +1850,9 @@ h3 { .columnIcons img { float: right; } - .pageslist { + .pageslist mark { + } + .pageslistDash { } .voteresult { width: var(--voteresult-width); @@ -2640,7 +2644,10 @@ h3 { float: right; margin-right: 1vw; } - .pageslist { + .pageslist mark { + } + .pageslistDash { + font-size: var(--font-page-dash-mobile); } .voteresult { width: var(--voteresult-width-mobile); @@ -3428,7 +3435,10 @@ h3 { float: right; margin-right: 1vw; } - .pageslist { + .pageslist mark { + } + .pageslistDash { + font-size: var(--font-page-dash-tiny); } .voteresult { width: var(--voteresult-width-tiny); diff --git a/theme/blue/theme.json b/theme/blue/theme.json index b6dfaca2f..411b27ccd 100644 --- a/theme/blue/theme.json +++ b/theme/blue/theme.json @@ -9,6 +9,8 @@ "banner-height": "20vh", "banner-height-mobile": "10vh", "newswire-date-color": "blue", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-header": "22px", "font-size-header-mobile": "32px", "font-size": "45px", diff --git a/theme/debian/theme.json b/theme/debian/theme.json index 606a62c09..f9c07d159 100644 --- a/theme/debian/theme.json +++ b/theme/debian/theme.json @@ -38,6 +38,8 @@ "banner-height-mobile": "10vh", "hashtag-background-color": "grey", "focus-color": "grey", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-button-mobile": "26px", "font-size": "26px", "font-size2": "20px", diff --git a/theme/default/theme.json b/theme/default/theme.json index 912c1f3de..3bd900619 100644 --- a/theme/default/theme.json +++ b/theme/default/theme.json @@ -21,6 +21,8 @@ "cw-style": "normal", "cw-weight": "bold", "column-right-fg-color-voted-on": "red", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-header": "18px", "font-size-header-mobile": "32px", "font-size-header-tiny": "16px", diff --git a/theme/hacker/theme.json b/theme/hacker/theme.json index b04e03639..cf569f784 100644 --- a/theme/hacker/theme.json +++ b/theme/hacker/theme.json @@ -6,6 +6,8 @@ "dropdown-bg-color-hover": "#444", "dropdown-fg-color-hover": "#9ad791", "column-left-header-background": "#035103", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-header": "12px", "font-size-header-mobile": "20px", "font-size-button-mobile": "20px", diff --git a/theme/henge/theme.json b/theme/henge/theme.json index 1114a84af..e306adfd4 100644 --- a/theme/henge/theme.json +++ b/theme/henge/theme.json @@ -22,6 +22,8 @@ "banner-height": "25vh", "column-left-image-width-mobile": "40vw", "column-right-image-width-mobile": "40vw", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-button-mobile": "26px", "font-size": "32px", "font-size2": "26px", diff --git a/theme/indymediaclassic/theme.json b/theme/indymediaclassic/theme.json index f92f806cd..17a6599e5 100644 --- a/theme/indymediaclassic/theme.json +++ b/theme/indymediaclassic/theme.json @@ -26,6 +26,8 @@ "button-corner-radius": "5px", "timeline-border-radius": "5px", "focus-color": "blue", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-button-mobile": "26px", "font-size": "32px", "font-size2": "26px", diff --git a/theme/indymediamodern/theme.json b/theme/indymediamodern/theme.json index 5698be677..3c7c55732 100644 --- a/theme/indymediamodern/theme.json +++ b/theme/indymediamodern/theme.json @@ -23,6 +23,8 @@ "follow-text-size2": "30px", "hashtag-size1": "20px", "hashtag-size2": "30px", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-calendar-header": "2rem", "font-size-calendar-cell": "2rem", "time-vertical-align": "1.1%", diff --git a/theme/lcd/theme.json b/theme/lcd/theme.json index e022d8c9d..addd123a7 100644 --- a/theme/lcd/theme.json +++ b/theme/lcd/theme.json @@ -66,6 +66,8 @@ "event-foreground": "white", "title-text": "white", "gallery-text-color": "#33390d", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-header": "22px", "font-size-header-mobile": "32px", "font-size": "45px", diff --git a/theme/light/theme.json b/theme/light/theme.json index 22dedfcbc..2f2993d84 100644 --- a/theme/light/theme.json +++ b/theme/light/theme.json @@ -27,6 +27,8 @@ "banner-height-mobile": "10vh", "hashtag-background-color": "lightblue", "focus-color": "grey", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-button-mobile": "26px", "font-size": "32px", "font-size2": "26px", diff --git a/theme/night/theme.json b/theme/night/theme.json index 9deb74bc0..da679cdc7 100644 --- a/theme/night/theme.json +++ b/theme/night/theme.json @@ -21,6 +21,8 @@ "banner-height": "15vh", "banner-height-mobile": "10vh", "focus-color": "blue", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-button-mobile": "26px", "font-size": "32px", "font-size2": "26px", diff --git a/theme/pixel/theme.json b/theme/pixel/theme.json index 1b69a0111..883e9ac91 100644 --- a/theme/pixel/theme.json +++ b/theme/pixel/theme.json @@ -11,6 +11,8 @@ "font-size-header": "18px", "font-size-header-mobile": "34px", "font-color-header": "#ccc", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-button-mobile": "34px", "font-size-links": "18px", "font-size-publish-button": "18px", diff --git a/theme/purple/theme.json b/theme/purple/theme.json index 23fbf3a5f..c85bb9b58 100644 --- a/theme/purple/theme.json +++ b/theme/purple/theme.json @@ -19,6 +19,8 @@ "publish-button-at-top": "False", "search-banner-height": "25vh", "search-banner-height-mobile": "10vh", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-button-mobile": "26px", "font-size": "32px", "font-size2": "26px", diff --git a/theme/rc3/theme.json b/theme/rc3/theme.json index fecf4e002..87ff129f6 100644 --- a/theme/rc3/theme.json +++ b/theme/rc3/theme.json @@ -38,6 +38,8 @@ "banner-height": "15vh", "banner-height-mobile": "10vh", "focus-color": "blue", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-header": "14px", "font-size-header-mobile": "24px", "font-size-button-mobile": "24px", diff --git a/theme/solidaric/theme.json b/theme/solidaric/theme.json index 0b6f8b142..4598b5e78 100644 --- a/theme/solidaric/theme.json +++ b/theme/solidaric/theme.json @@ -32,6 +32,8 @@ "button-selected-highlighted": "darkred", "newswire-date-color": "grey", "focus-color": "grey", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-button-mobile": "26px", "font-size": "32px", "font-size2": "26px", diff --git a/theme/starlight/theme.json b/theme/starlight/theme.json index 8ccf0df2c..df5d57992 100644 --- a/theme/starlight/theme.json +++ b/theme/starlight/theme.json @@ -17,6 +17,8 @@ "column-left-image-width-mobile": "40vw", "line-spacing-newswire": "120%", "focus-color": "darkred", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px", "font-size-button-mobile": "26px", "font-size": "32px", "font-size2": "26px", diff --git a/theme/zen/theme.json b/theme/zen/theme.json index 5753cc501..24769fd42 100644 --- a/theme/zen/theme.json +++ b/theme/zen/theme.json @@ -64,5 +64,7 @@ "header-font": "'Barlow-Regular'", "*font-family": "'Barlow-Regular'", "*src": "url('fonts/Barlow-Regular.woff2') format('woff2')", - "reply-icon-direction": "-1" + "reply-icon-direction": "-1", + "font-page-dash-tiny": "16px", + "font-page-dash-mobile": "32px" } diff --git a/translations/ar.json b/translations/ar.json index 00b0f94f5..feda12563 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -558,5 +558,6 @@ "Color contrast is too low": "تباين الألوان منخفض جدًا", "View Larger Map": "عرض خريطة أكبر", "Start Time": "وقت البدء", - "End Time": "وقت النهاية" + "End Time": "وقت النهاية", + "Switch to calendar view": "قم بالتبديل إلى عرض التقويم" } diff --git a/translations/ca.json b/translations/ca.json index d3143e6ee..00ea1e77e 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -558,5 +558,6 @@ "Color contrast is too low": "El contrast de color és massa baix", "View Larger Map": "Veure mapa més gran", "Start Time": "L'hora d'inici", - "End Time": "Temps esgotat" + "End Time": "Temps esgotat", + "Switch to calendar view": "Canvia a la vista del calendari" } diff --git a/translations/cy.json b/translations/cy.json index 952b1f799..0eee51f46 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Mae cyferbyniad lliw yn rhy isel", "View Larger Map": "Gweld Map Mwy", "Start Time": "Amser Dechrau", - "End Time": "Amser Gorffen" + "End Time": "Amser Gorffen", + "Switch to calendar view": "Newid i wedd calendr" } diff --git a/translations/de.json b/translations/de.json index 853c7637b..0322902d6 100644 --- a/translations/de.json +++ b/translations/de.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Der Farbkontrast ist zu gering", "View Larger Map": "größere Karte ansehen", "Start Time": "Startzeit", - "End Time": "Endzeit" + "End Time": "Endzeit", + "Switch to calendar view": "Zur Kalenderansicht wechseln" } diff --git a/translations/el.json b/translations/el.json index d47daffbc..afb14d205 100644 --- a/translations/el.json +++ b/translations/el.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Η χρωματική αντίθεση είναι πολύ χαμηλή", "View Larger Map": "Δείτε Μεγαλύτερο Χάρτη", "Start Time": "Ωρα έναρξης", - "End Time": "Τέλος χρόνου" + "End Time": "Τέλος χρόνου", + "Switch to calendar view": "Μετάβαση σε προβολή ημερολογίου" } diff --git a/translations/en.json b/translations/en.json index 11fc757b5..cbe837417 100644 --- a/translations/en.json +++ b/translations/en.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Color contrast is too low", "View Larger Map": "View Larger Map", "Start Time": "Start Time", - "End Time": "End Time" + "End Time": "End Time", + "Switch to calendar view": "Switch to calendar view" } diff --git a/translations/es.json b/translations/es.json index 49010720e..0f62fbd87 100644 --- a/translations/es.json +++ b/translations/es.json @@ -558,5 +558,6 @@ "Color contrast is too low": "El contraste de color es demasiado bajo", "View Larger Map": "Ver mapa más grande", "Start Time": "Hora de inicio", - "End Time": "Hora de finalización" + "End Time": "Hora de finalización", + "Switch to calendar view": "Cambiar a vista de calendario" } diff --git a/translations/fr.json b/translations/fr.json index 4239f3de1..99d8a6678 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Le contraste des couleurs est trop faible", "View Larger Map": "Agrandir le plan", "Start Time": "Heure de début", - "End Time": "Heure de fin" + "End Time": "Heure de fin", + "Switch to calendar view": "Basculer vers la vue calendrier" } diff --git a/translations/ga.json b/translations/ga.json index 0f67fcc5e..8e3e2317a 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Tá codarsnacht dath ró-íseal", "View Larger Map": "Féach ar Léarscáil Níos Mó", "Start Time": "Am Tosaigh", - "End Time": "Am Deiridh" + "End Time": "Am Deiridh", + "Switch to calendar view": "Athraigh go hamharc féilire" } diff --git a/translations/hi.json b/translations/hi.json index 0ae7d0233..e93efd9ea 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -558,5 +558,6 @@ "Color contrast is too low": "रंग कंट्रास्ट बहुत कम है", "View Larger Map": "बड़ा नक्शा देखें", "Start Time": "समय शुरू", - "End Time": "अंत समय" + "End Time": "अंत समय", + "Switch to calendar view": "कैलेंडर दृश्य पर स्विच करें" } diff --git a/translations/it.json b/translations/it.json index f8dbc9327..1ab2be811 100644 --- a/translations/it.json +++ b/translations/it.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Il contrasto del colore è troppo basso", "View Larger Map": "Visualizza mappa più grande", "Start Time": "Ora di inizio", - "End Time": "Tempo scaduto" + "End Time": "Tempo scaduto", + "Switch to calendar view": "Passa alla visualizzazione del calendario" } diff --git a/translations/ja.json b/translations/ja.json index dd7cab762..cabc747d4 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -558,5 +558,6 @@ "Color contrast is too low": "色のコントラストが低すぎる", "View Larger Map": "大きな地図を見る", "Start Time": "始まる時間", - "End Time": "終了時間" + "End Time": "終了時間", + "Switch to calendar view": "カレンダービューに切り替えます" } diff --git a/translations/ko.json b/translations/ko.json index 3379fa644..df9c1f93f 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -558,5 +558,6 @@ "Color contrast is too low": "색상 대비가 너무 낮습니다.", "View Larger Map": "큰 지도 보기", "Start Time": "시작 시간", - "End Time": "종료 시간" + "End Time": "종료 시간", + "Switch to calendar view": "캘린더 보기로 전환" } diff --git a/translations/ku.json b/translations/ku.json index 74ba81884..8a83ba024 100644 --- a/translations/ku.json +++ b/translations/ku.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Berevajî reng pir kêm e", "View Larger Map": "Nexşeya Mezin bibînin", "Start Time": "Demjimêra Destpêkê", - "End Time": "Dema Dawî" + "End Time": "Dema Dawî", + "Switch to calendar view": "Biguherîne bo dîtina salnameyê" } diff --git a/translations/nl.json b/translations/nl.json index 6b629ed57..c9beb6b23 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Kleurcontrast is te laag", "View Larger Map": "zie grotere kaart", "Start Time": "Starttijd", - "End Time": "Eindtijd" + "End Time": "Eindtijd", + "Switch to calendar view": "Overschakelen naar kalenderweergave" } diff --git a/translations/oc.json b/translations/oc.json index 2b7439e61..b02b8e0bd 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -554,5 +554,6 @@ "Color contrast is too low": "Color contrast is too low", "View Larger Map": "View Larger Map", "Start Time": "Start Time", - "End Time": "End Time" + "End Time": "End Time", + "Switch to calendar view": "Switch to calendar view" } diff --git a/translations/pl.json b/translations/pl.json index fbe4f932a..1ca071148 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Kontrast kolorów jest zbyt niski", "View Larger Map": "Wyświetl Większą Mapę", "Start Time": "Czas rozpoczęcia", - "End Time": "Koniec czasu" + "End Time": "Koniec czasu", + "Switch to calendar view": "Przełącz na widok kalendarza" } diff --git a/translations/pt.json b/translations/pt.json index 442a8ea9e..e29923a55 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -558,5 +558,6 @@ "Color contrast is too low": "O contraste de cores é muito baixo", "View Larger Map": "ver o mapa maior", "Start Time": "Hora de início", - "End Time": "Fim do tempo" + "End Time": "Fim do tempo", + "Switch to calendar view": "Mudar para a vista de calendário" } diff --git a/translations/ru.json b/translations/ru.json index e2a770d3d..aec2b1305 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Цветовой контраст слишком низкий", "View Larger Map": "Посмотреть увеличенную карту", "Start Time": "Время начала", - "End Time": "Время окончания" + "End Time": "Время окончания", + "Switch to calendar view": "Переключиться на представление календаря" } diff --git a/translations/sw.json b/translations/sw.json index b7e54566b..74a12eab6 100644 --- a/translations/sw.json +++ b/translations/sw.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Utofautishaji wa rangi uko chini sana", "View Larger Map": "Tazama Ramani Kubwa", "Start Time": "Wakati wa Kuanza", - "End Time": "Wakati wa Mwisho" + "End Time": "Wakati wa Mwisho", + "Switch to calendar view": "Badili hadi mwonekano wa kalenda" } diff --git a/translations/tr.json b/translations/tr.json index 518661ed5..522f707ba 100644 --- a/translations/tr.json +++ b/translations/tr.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Renk kontrastı çok düşük", "View Larger Map": "Daha Büyük Haritayı Görüntüle", "Start Time": "Başlangıç ​​saati", - "End Time": "Bitiş zamanı" + "End Time": "Bitiş zamanı", + "Switch to calendar view": "Takvim görünümüne geç" } diff --git a/translations/uk.json b/translations/uk.json index 9fb5a4900..396446efe 100644 --- a/translations/uk.json +++ b/translations/uk.json @@ -558,5 +558,6 @@ "Color contrast is too low": "Колірна контрастність надто низька", "View Larger Map": "Переглянути більшу карту", "Start Time": "Час початку", - "End Time": "Час закінчення" + "End Time": "Час закінчення", + "Switch to calendar view": "Перейти до перегляду календаря" } diff --git a/translations/yi.json b/translations/yi.json index 7f31b6ce9..f56936d30 100644 --- a/translations/yi.json +++ b/translations/yi.json @@ -558,5 +558,6 @@ "Color contrast is too low": "קאָליר קאַנטראַסט איז אויך נידעריק", "View Larger Map": "View גרעסערע מאַפּע", "Start Time": "אָנהייב צייט", - "End Time": "סוף צייט" + "End Time": "סוף צייט", + "Switch to calendar view": "באַשטימען צו די קאַלענדאַר מיינונג" } diff --git a/translations/zh.json b/translations/zh.json index c33c957ba..9e9718dc3 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -558,5 +558,6 @@ "Color contrast is too low": "颜色对比度太低", "View Larger Map": "查看更大的地图", "Start Time": "开始时间", - "End Time": "时间结束" + "End Time": "时间结束", + "Switch to calendar view": "切换到日历视图" } diff --git a/webapp_calendar.py b/webapp_calendar.py index 6dce2591a..75baad34d 100644 --- a/webapp_calendar.py +++ b/webapp_calendar.py @@ -26,6 +26,7 @@ from happening import get_todays_events from happening import get_calendar_events from happening import get_todays_events_icalendar from happening import get_month_events_icalendar +from webapp_utils import get_banner_file from webapp_utils import set_custom_background from webapp_utils import html_header_with_external_style from webapp_utils import html_footer @@ -106,7 +107,8 @@ def _html_calendar_day(person_cache: {}, css_cache: {}, translate: {}, base_dir: str, path: str, year: int, month_number: int, day_number: int, nickname: str, domain: str, day_events: [], - month_name: str, actor: str) -> str: + month_name: str, actor: str, + theme: str, access_keys: {}) -> str: """Show a day within the calendar """ account_dir = acct_dir(base_dir, nickname, domain) @@ -128,12 +130,29 @@ def _html_calendar_day(person_cache: {}, css_cache: {}, translate: {}, instance_title = get_config_param(base_dir, 'instanceTitle') calendar_str = \ html_header_with_external_style(css_filename, instance_title, None) + + calendar_link = cal_actor + \ + '/calendar?year=' + str(year) + '?month=' + str(month_number) + + # show banner + banner_file, _ = \ + get_banner_file(base_dir, nickname, domain, theme) + calendar_str += \ + '
\n\n' + calendar_str += \ + '\n' + \ + '
\n
\n' + calendar_str += '
\n' # day header calendar_str += \ - '
\n

\n\n' + '

\n

\n\n' datetime_str = str(year) + '-' + str(month_number) + '-' + str(day_number) calendar_str += \ '

\n\n' + calendar_str += '\n' + \ + '
\n' + # the main graphical calendar as a table - calendar_str = '
\n
\n

\n' + calendar_str += '

\n
\n

\n' # previous month calendar_str += \ ' ────' + num_str += html_hide_from_screen_reader(separator_str) aria_page_str = '' - page_str = str(page) + page_str = ' ' + str(page) + ' ' + curr_page_str = '' if page == page_number: - page_str = '' + str(page) + '' + page_str = \ + html_hide_from_screen_reader('[') + \ + str(page) + \ + html_hide_from_screen_reader(']') aria_page_str = ' aria-current="true"' + curr_page_str = 'Current Page, ' num_str += \ '' + page_str + '' return '

\n' + \ '
\n' tl_str += _page_number_buttons(users_path, box_name, page_number) + tl_str += '
' tl_str += text_mode_separator elif item_ctr == 0: tl_str += _get_help_for_timeline(base_dir, box_name) @@ -1200,6 +1208,7 @@ def _html_shares_timeline(translate: {}, page_number: int, items_per_page: int, '
\n' timeline_str += \ _page_number_buttons(actor, 'tl' + sharesFileType, page_number) + timeline_str += '
' return timeline_str