diff --git a/static/style.css b/static/style.css index b5df299..f6ba380 100644 --- a/static/style.css +++ b/static/style.css @@ -37,22 +37,23 @@ body{font-family:sans-serif;background-color:var(--bg-main); color: var(--fg-mai .article-header {text-align: center;} #firstHeading {font-family:sans-serif; text-align: center;font-size:3em; font-weight: normal} @media (min-width:800px) {.homepage #firstHeading {font-size: 4.5em}} -.inner-content{font-family:serif; margin: 1.7em auto; max-width: 1280px; line-height: 1.9; color: var(--fg-main)} -.inner-content em,.inner-content strong{color: var(--fg-sharp)} -.inner-content h1{color: var(--fg-error)} -.inner-content table {font-family: sans-serif} -.inner-content h2, .inner-content h3, .inner-content h4, .inner-content h5, .inner-content h6{font-family:sans-serif; color: var(--fg-sharp); font-weight: normal} -.inner-content h2{border-bottom: 1px solid var(--border)} -.inner-content h3{margin:0.8em 0} -.inner-content h4{margin:0.6em 0} -.inner-content h5{margin:0.5em 0} -.inner-content h6{margin:0.4em 0} -.inner-content p{text-indent: 1.9em; margin: 0} -.inner-content li{margin: .3em 0} -.inner-content blockquote{color:var(--fg-alt); border-left: 4px solid var(--bg-alt);margin-left:0;padding-left:12px} -.inner-content table{border:var(--bg-alt) 1px solid;border-collapse:collapse;line-height: 1.5;overflow-x:auto} -.inner-content table > * > tr > th, .inner-content table > tr > th {background-color:var(--bg-alt);border:var(--border) 1px solid;padding:2px} -.inner-content table > * > tr > td, .inner-content table > tr > td {border:var(--border) 1px solid;padding:2px} +.inner-content, .article-content {margin: 1.7em auto; max-width: 1280px;} +.article-content{font-family:serif; margin: 1.7em auto; max-width: 1280px; line-height: 1.9; color: var(--fg-main)} +.article-content em,.article-content strong{color: var(--fg-sharp)} +.article-content h1{color: var(--fg-error)} +.article-content table {font-family: sans-serif} +.article-content h2, .article-content h3, .article-content h4, .article-content h5, .article-content h6{font-family:sans-serif; color: var(--fg-sharp); font-weight: normal} +.article-content h2{border-bottom: 1px solid var(--border)} +.article-content h3{margin:0.8em 0} +.article-content h4{margin:0.6em 0} +.article-content h5{margin:0.5em 0} +.article-content h6{margin:0.4em 0} +.article-content p{text-indent: 1.9em; margin: 0} +.article-content li{margin: .3em 0} +.article-content blockquote{color:var(--fg-alt); border-left: 4px solid var(--bg-alt);margin-left:0;padding-left:12px} +.article-content table{border:var(--bg-alt) 1px solid;border-collapse:collapse;line-height: 1.5;overflow-x:auto} +.article-content table > * > tr > th, .article-content table > tr > th {background-color:var(--bg-alt);border:var(--border) 1px solid;padding:2px} +.article-content table > * > tr > td, .article-content table > tr > td {border:var(--border) 1px solid;padding:2px} /* spoiler styles */ .spoiler {color: var(--fg-sharp); background-color: var(--fg-sharp)} diff --git a/templates/administration.jinja2 b/templates/administration.jinja2 index 39ce634..535e175 100644 --- a/templates/administration.jinja2 +++ b/templates/administration.jinja2 @@ -5,19 +5,21 @@ {% block content %}

Administrative tools

-{% if current_user and current_user.is_admin %} - -{% else %} -

Administrative tools can be accessed by administrator users only.

-{% endif %} +
+ {% if current_user and current_user.is_admin %} + + {% else %} +

Administrative tools can be accessed by administrator users only.

+ {% endif %} +
{% endblock %} \ No newline at end of file diff --git a/templates/backlinks.jinja2 b/templates/backlinks.jinja2 index aa6bbff..e22ab81 100644 --- a/templates/backlinks.jinja2 +++ b/templates/backlinks.jinja2 @@ -10,17 +10,20 @@

{{ p.title }}

{{ T('backlinks') }}
-{% if backlinks %} - -{% else %} -

{{ T("backlinks-empty") }}

-{% endif %} +
+ {% if backlinks %} + + {% else %} +

{{ T("backlinks-empty") }}

+ {% endif %} +
+

{{ T("back-to") }} {{ p.title }}.

{% endblock %} diff --git a/templates/badrequest.jinja2 b/templates/badrequest.jinja2 index ba04376..3759000 100644 --- a/templates/badrequest.jinja2 +++ b/templates/badrequest.jinja2 @@ -5,5 +5,7 @@ {% block content %}

Bad request

-

You sent a request the server can’t understand. If you entered the URL manually please check your spelling and try again.

+
+

You sent a request the server can’t understand. If you entered the URL manually please check your spelling and try again.

+
{% endblock %} diff --git a/templates/calendar.jinja2 b/templates/calendar.jinja2 index 2d092f8..b7ccf5e 100644 --- a/templates/calendar.jinja2 +++ b/templates/calendar.jinja2 @@ -6,29 +6,31 @@

{{ T('calendar') }}

- - -

- Show more years: -

{% endblock %} \ No newline at end of file diff --git a/templates/contributions.jinja2 b/templates/contributions.jinja2 index 8b37de7..ec13a94 100644 --- a/templates/contributions.jinja2 +++ b/templates/contributions.jinja2 @@ -9,33 +9,35 @@ {% block content %}

Contributions of {{ u.username }}

-

Showing results {{ page_n * 20 - 19 }} to {{ min(page_n * 20, total_count) }} of {{ total_count }} total.

+
+

Showing results {{ page_n * 20 - 19 }} to {{ min(page_n * 20, total_count) }} of {{ total_count }} total.

- +
{% endblock %} diff --git a/templates/easter.jinja2 b/templates/easter.jinja2 index dd81ef8..54a4568 100644 --- a/templates/easter.jinja2 +++ b/templates/easter.jinja2 @@ -5,25 +5,27 @@ {% block content %}

{{ T('easter-date-calc') }}

-
-
- - - -
-
+
+
+
+ + + +
+
-{% if easter_dates %} -
-

{{ T('easter') }}: {{ easter_dates['easter'].strftime('%B %-d, %Y') }}

- -

{{ T('other-dates') }}

- + {% if easter_dates %} +
+

{{ T('easter') }}: {{ easter_dates['easter'].strftime('%B %-d, %Y') }}

+ +

{{ T('other-dates') }}

+
    +
  • Mercoledì delle Ceneri: {{ easter_dates['ceneri'].strftime('%B %-d, %Y') }}
    • +
  • Ascensione: {{ easter_dates['ascensione'].strftime('%B %-d, %Y') }}
    • +
  • Pentecoste: {{ easter_dates['pentecoste'].strftime('%B %-d, %Y') }}
    • +
  • Prima Domenica d'Avvento: {{ easter_dates['avvento1'].strftime('%B %-d, %Y') }}
    • +
+
{% endif %} {% endblock %} diff --git a/templates/edit.jinja2 b/templates/edit.jinja2 index 3ccbc37..63f0ae9 100644 --- a/templates/edit.jinja2 +++ b/templates/edit.jinja2 @@ -25,69 +25,71 @@ Remember this is only a preview. Your changes were not saved yet! Jump to editing area
-
{{ preview|safe }}
+
{{ preview|safe }}
{% endif %} -
- -
- - -
-
- -
-
- {% if not pl_readonly %} -
-

This editor is using Markdown for text formatting (e.g. bold, italic, headers and tables). More info on Markdown.

- {% if math_version and pl_enablemath %} -

Math with KaTeX is enabled. KaTeX guide

- {% endif %} +
+ + +
+ +
-
- {% else %} -
-

This page was locked by the owner, and is therefore not editable. You can still copy the source text.

+
+ +
+
+ {% if not pl_readonly %} +
+

This editor is using Markdown for text formatting (e.g. bold, italic, headers and tables). More info on Markdown.

+ {% if math_version and pl_enablemath %} +

Math with KaTeX is enabled. KaTeX guide

+ {% endif %} +
+
+ {% else %} +
+

This page was locked by the owner, and is therefore not editable. You can still copy the source text.

+
+ {% endif %} + +
+
+ + +
+ {% if not pl_readonly %} +
+ + + +
+

Advanced options

+
+ + +
+ {% if pl_owner_is_current_user %} +
+ +
{% endif %} - -
-
- - -
- {% if not pl_readonly %} -
- - - -
-

Advanced options

-
- - -
- {% if pl_owner_is_current_user %} -
- - -
- {% endif %} -
- - - -
-
- - -
- {% endif %} - +
+ + + +
+
+ + +
+ {% endif %} + +
{% endblock %} diff --git a/templates/exportpages.jinja2 b/templates/exportpages.jinja2 index 136a739..ffb1df1 100644 --- a/templates/exportpages.jinja2 +++ b/templates/exportpages.jinja2 @@ -5,20 +5,22 @@ {% block content %}

Export pages

-

You can export how many pages you want, that will be downloaded in JSON format and can be imported in another {{ app_name }} instance.

+
+

You can export how many pages you want, that will be downloaded in JSON format and can be imported in another {{ app_name }} instance.

-

In order to add page to export list, please enter exact title, /url, #tag or +id. Entering a tag will add all pages with that tag to list. Each page or tag is separated by a newline.

+

In order to add page to export list, please enter exact title, /url, #tag or +id. Entering a tag will add all pages with that tag to list. Each page or tag is separated by a newline.

-
- -
- -
-
- -
-
- -
-
+
+ +
+ +
+
+ +
+
+ +
+
+
{% endblock %} diff --git a/templates/forbidden.jinja2 b/templates/forbidden.jinja2 index 83b57b4..ab97d1d 100644 --- a/templates/forbidden.jinja2 +++ b/templates/forbidden.jinja2 @@ -5,5 +5,7 @@ {% block content %}

Forbidden

-

You don’t have permission to access this resource.

+
+

You don’t have permission to access this resource.

+
{% endblock %} diff --git a/templates/history.jinja2 b/templates/history.jinja2 index ac47106..c671e1f 100644 --- a/templates/history.jinja2 +++ b/templates/history.jinja2 @@ -10,28 +10,30 @@

{{ p.title }}

Page history
- +

{{ T("back-to") }} {{ p.title }}.

{% endblock %} diff --git a/templates/importpages.jinja2 b/templates/importpages.jinja2 index e0f54c7..0008985 100644 --- a/templates/importpages.jinja2 +++ b/templates/importpages.jinja2 @@ -5,27 +5,31 @@ {% block content %}

Import pages

-{% if current_user.is_admin %} -

- You can import files produced by the exporter tool, in JSON format. - Importing pages can be done by users with Admin permissions only. -

+
+ {% if current_user.is_admin %} + +

+ You can import files produced by the exporter tool, in JSON format. + Importing pages can be done by users with Admin permissions only. +

-
- -
- + + +
+ +
+
+ + +
+
+ +
+
-
- - -
-
- -
- -{% else %} -

Importing pages can be done by users with Admin permissions only.

-{% endif %} + {% else %} +

Importing pages can be done by users with Admin permissions only.

+ {% endif %} +
{% endblock %} \ No newline at end of file diff --git a/templates/internalservererror.jinja2 b/templates/internalservererror.jinja2 index 050f4c2..8c24e60 100644 --- a/templates/internalservererror.jinja2 +++ b/templates/internalservererror.jinja2 @@ -1,9 +1,11 @@ {% extends "base.jinja2" %} -{% block title %}Internal Server Error - {{ app_name }}{% endblock %} +{% block title %}% _ % - {{ app_name }}{% endblock %} {% block content %}

Internal Server Error

-

We’re sorry, an unexpected error occurred. Try refreshing the page.

+
+

We’re sorry, an unexpected error occurred. Try refreshing the page.

+
{% endblock %} diff --git a/templates/leaderboard.jinja2 b/templates/leaderboard.jinja2 index b8966c7..38aaa37 100644 --- a/templates/leaderboard.jinja2 +++ b/templates/leaderboard.jinja2 @@ -9,30 +9,32 @@ {% block content %}

Best pages

- - - - - - - - - - - - - {% set counters = namespace(row = 0) %} - {% for p, score, bklinks, fwlinks, length in pages %} - - {% set counters.row = counters.row + 1 %} - - - - - - - - {% endfor %} - -
#Page NameScoreLenBLFL
{{ counters.row }}{{ p.title }} (#{{ p.id }}){{ score }}{{ length }}{{ bklinks }}{{ fwlinks }}
+
+ + + + + + + + + + + + + {% set counters = namespace(row = 0) %} + {% for p, score, bklinks, fwlinks, length in pages %} + + {% set counters.row = counters.row + 1 %} + + + + + + + + {% endfor %} + +
#Page NameScoreLenBLFL
{{ counters.row }}{{ p.title }} (#{{ p.id }}){{ score }}{{ length }}{{ bklinks }}{{ fwlinks }}
+
{% endblock %} diff --git a/templates/listrecent.jinja2 b/templates/listrecent.jinja2 index 2634cfe..5df3b13 100644 --- a/templates/listrecent.jinja2 +++ b/templates/listrecent.jinja2 @@ -2,7 +2,7 @@ {% block content %}
-

Notes by date

+

Notes by date

Showing results {{ page_n * 20 - 19 }} to {{ min(page_n * 20, total_count) }} of {{ total_count }} total.

diff --git a/templates/login.jinja2 b/templates/login.jinja2 index 40c7c0d..706aca7 100644 --- a/templates/login.jinja2 +++ b/templates/login.jinja2 @@ -5,29 +5,31 @@ {% block content %}

{{ T('login') }}

-
- -
- - -
-
- - -
-
- - -
-
- -
-
+
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ +
+
+

{{ T('no-account-sign-up') }} {{ T("sign-up") }}

{% endblock %} \ No newline at end of file diff --git a/templates/manageaccounts.jinja2 b/templates/manageaccounts.jinja2 index defd67f..7689dc8 100644 --- a/templates/manageaccounts.jinja2 +++ b/templates/manageaccounts.jinja2 @@ -5,48 +5,48 @@ {% block content %}

Manage accounts

+
{% if current_user.is_admin %} -

- Here is the list of users registered on {{ app_name }}, in reverse chronological order. - Beware: you are managing sensitive informations. -

+

+ Here is the list of users registered on {{ app_name }}, in reverse chronological order. + Beware: you are managing sensitive informations. +

-

Showing results {{ page_n * 20 - 19 }} to {{ min(page_n * 20, total_count) }} of {{ total_count }} total.

+

Showing results {{ page_n * 20 - 19 }} to {{ min(page_n * 20, total_count) }} of {{ total_count }} total.

-
- - -
    - {% if page_n > 1 %} -
  • « Previous page
    • - {% endif %} + + - {% for u in users %} -
  • - - {{ u.username }} - {% if u == current_user %}(you){% endif %} - - - Groups: -
      - {% for ug in u.groups %} -
    • {{ ug.name }}
      • - {% endfor %} -
    - - - Registered on: - {{ u.join_date }} -
    • - {% endfor %} +
      + {% if page_n > 1 %} +
    • « Previous page
      • + {% endif %} + + {% for u in users %} +
    • + + {{ u.username }} + {% if u == current_user %}(you){% endif %} + - + Groups: +
        + {% for ug in u.groups %} +
      • {{ ug.name }}
        • + {% endfor %} +
      + - + Registered on: + {{ u.join_date }} +
      • + {% endfor %} - {% if page_n < total_count // 20 %} -
    • Next page »
      • - {% endif %} -
    - - - -{% else %} -

    Managing accounts can be done by users with Admin permissions only.

    -{% endif %} + {% if page_n < total_count // 20 %} +
  • Next page »
    • + {% endif %} +
+ + {% else %} +

Managing accounts can be done by users with Admin permissions only.

+ {% endif %} +
{% endblock %} \ No newline at end of file diff --git a/templates/notfound.jinja2 b/templates/notfound.jinja2 index eb4e06b..e79d893 100644 --- a/templates/notfound.jinja2 +++ b/templates/notfound.jinja2 @@ -5,5 +5,7 @@ {% block content %}

{{ T('not-found') }}

-

{{ T('not-found-text-1') }} {{ request.path }} {{ T('not-found-text-2') }}.

+
+

{{ T('not-found-text-1') }} {{ request.path }} {{ T('not-found-text-2') }}.

+
{% endblock %} diff --git a/templates/privacy.jinja2 b/templates/privacy.jinja2 index a631f98..c7cf33a 100644 --- a/templates/privacy.jinja2 +++ b/templates/privacy.jinja2 @@ -7,7 +7,7 @@

Privacy Policy

-
+
{% filter markdown %} # Privacy diff --git a/templates/register.jinja2 b/templates/register.jinja2 index 5b2f9d2..821b406 100644 --- a/templates/register.jinja2 +++ b/templates/register.jinja2 @@ -5,7 +5,8 @@ {% block content %}

{{ T('sign-up') }}

-
+
+
@@ -30,7 +31,9 @@
- + + +

{{ T('already-have-account') }} {{ T("login") }}

+
-

{{ T('already-have-account') }} {{ T("login") }}

{% endblock %} \ No newline at end of file diff --git a/templates/search.jinja2 b/templates/search.jinja2 index 01a7304..ddbf029 100644 --- a/templates/search.jinja2 +++ b/templates/search.jinja2 @@ -5,30 +5,32 @@ {% block content %}

Search

-
- -
- - -
-
- - -
-
+
+
+ +
+ + +
+
+ + +
+
-{% if results %} -

Search results for {{ q }}

+ {% if results %} +

Search results for {{ q }}

-
    - {% for n in results %} -
  • {% include "includes/nl_item.jinja2" %}
    • - {% endfor %} -
-{% elif q %} -

{{ T('search-no-results') }} {{ q }}

-{% else %} -

Please note that search queries do not search for page text.

-{% endif %} +
    + {% for n in results %} +
  • {% include "includes/nl_item.jinja2" %}
    • + {% endfor %} +
+ {% elif q %} +

{{ T('search-no-results') }} {{ q }}

+ {% else %} +

Please note that search queries do not search for page text.

+ {% endif %} +
{% endblock %} diff --git a/templates/stats.jinja2 b/templates/stats.jinja2 index 1f0812a..88511af 100644 --- a/templates/stats.jinja2 +++ b/templates/stats.jinja2 @@ -5,12 +5,14 @@ {% block content %}

Statistics

-
    -
  • {{ T("notes-count") }}: {{ notes_count }}
    • -
  • {{ T("notes-count-with-url") }}: {{ notes_with_url }}
    • -
  • {{ T("revision-count") }}: {{ revision_count }}
    • -
  • {{ T("revision-count-per-page") }}: {{ (revision_count / notes_count)|round(2) }}
    • -
  • {{ T('users-count') }}: {{ users_count }}
    • -
  • {{ T('groups-count') }}: {{ groups_count }}
    • -
+
+
    +
  • {{ T("notes-count") }}: {{ notes_count }}
    • +
  • {{ T("notes-count-with-url") }}: {{ notes_with_url }}
    • +
  • {{ T("revision-count") }}: {{ revision_count }}
    • +
  • {{ T("revision-count-per-page") }}: {{ (revision_count / notes_count)|round(2) }}
    • +
  • {{ T('users-count') }}: {{ users_count }}
    • +
  • {{ T('groups-count') }}: {{ groups_count }}
    • +
+
{% endblock %} diff --git a/templates/terms.jinja2 b/templates/terms.jinja2 index e02b8a6..69c9360 100644 --- a/templates/terms.jinja2 +++ b/templates/terms.jinja2 @@ -5,7 +5,7 @@ {% block content %}

Terms of Service

-
+
{% filter markdown %} ## Scope and Definitions diff --git a/templates/uploadinfo.jinja2 b/templates/uploadinfo.jinja2 deleted file mode 100644 index 1be8c30..0000000 --- a/templates/uploadinfo.jinja2 +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "base.jinja2" %} - -{% block title %}Info on file "{{ upl.name }}" - {{ app_name }}{% endblock %} - -{% block content %} -

Info on file "{{ upl.name }}"

- -
- {{ upl.name }} -
- -

You can include this file in other pages with {{ '{{' }}media:{{ upl.id }}{{ '}}' }}.

- -

File info

- -

Type: {{ type_list[upl.filetype] }}

- -

Upload ID: {{ upl.id }}

- -

Uploaded on: {{ upl.upload_date.strftime('%B %-d, %Y %H:%M:%S') }}

- -

Size: {{ upl.filesize }} bytes

-{% endblock %} diff --git a/templates/view.jinja2 b/templates/view.jinja2 index 0b82b77..ae0efcb 100644 --- a/templates/view.jinja2 +++ b/templates/view.jinja2 @@ -42,7 +42,7 @@
{% endif %} -
+
{{ html_and_toc[0]|safe }}