yusur/salvi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CSS + HTML change

Browse source
This commit is contained in:
Yusur 2023-12-12 19:29:43 +01:00
parent acf918f656
commit 14e69ac291
20 changed files with 292 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

38
templates/administration.jinja2
View file

@ -3,23 +3,25 @@
{% block title %}Administrative tools — {{ app_name }}{% endblock %}
{% block content %}
<h1>Administrative tools</h1>
<main>
<h1>Administrative tools</h1>
<div class="inner-content">
{% if current_user and current_user.is_admin %}
<ul>
<li>
<a href="/manage/export">Export pages</a>
</li>
<li>
<a href="/manage/import">Import pages</a>
</li>
<li>
<a href="/manage/accounts">Manage accounts</a>
</li>
</ul>
{% else %}
<p>Administrative tools can be accessed by administrator users only.</p>
{% endif %}
</div>
<div class="inner-content">
{% if current_user and current_user.is_admin %}
<ul>
<li>
<a href="/manage/export">Export pages</a>
</li>
<li>
<a href="/manage/import">Import pages</a>
</li>
<li>
<a href="/manage/accounts">Manage accounts</a>
</li>
</ul>
{% else %}
<p>Administrative tools can be accessed by administrator users only.</p>
{% endif %}
</div>
</main>
{% endblock %}

34
templates/backlinks.jinja2
View file

@ -7,24 +7,26 @@
{% endblock %}
{% block content %}
<h1 id="firstHeading">{{ p.title }}</h1>
<div class="preview-subtitle">{{ T('backlinks') }}</div>
<main>
<h1 id="firstHeading">{{ p.title }}</h1>
<div class="preview-subtitle">{{ T('backlinks') }}</div>
<div class="inner-content">
{% if backlinks %}
<ul>
{% for op in backlinks %}
<li><a href="{{ op.get_url() }}">
{{ op.title }} (<strong>#{{ op.id }}</strong>)
</a></li>
{% endfor %}
</ul>
{% else %}
<p class="placeholder">{{ T("backlinks-empty") }}</p>
{% endif %}
</div>
<div class="inner-content">
{% if backlinks %}
<ul>
{% for op in backlinks %}
<li><a href="{{ op.get_url() }}">
{{ op.title }} (<strong>#{{ op.id }}</strong>)
</a></li>
{% endfor %}
</ul>
{% else %}
<p class="placeholder">{{ T("backlinks-empty") }}</p>
{% endif %}
</div>
<p>{{ T("back-to") }} <a href="{{ p.get_url() }}">{{ p.title }}</a>.</p>
<p>{{ T("back-to") }} <a href="{{ p.get_url() }}">{{ p.title }}</a>.</p>
</main>
{% endblock %}

10
templates/badrequest.jinja2
View file

@ -3,9 +3,11 @@
{% block title %}Bad Request - {{ app_name }}{% endblock %}
{% block content %}
<h1>Bad request</h1>
<main class="error-page">
<h1 id="firstHeading">Bad request</h1>
<div class="inner-content">
<p>You sent a request the server can’t understand. If you entered the URL manually please check your spelling and try again.</p>
</div>
<div class="inner-content">
<p>You sent a request the server can’t understand. If you entered the URL manually please check your spelling and try again.</p>
</div>
</main>
{% endblock %}

4
templates/calendar.jinja2
View file

@ -3,7 +3,7 @@
{% block title %}Calendar – {{ app_name }}{% endblock %}
{% block content %}
<article>
<main>
<h1 id="firstHeading">{{ T('calendar') }}</h1>
<div class="inner-content">
@ -32,5 +32,5 @@
</ul>
</p>
</div>
</article>
</main>
{% endblock %}

61
templates/contributions.jinja2
View file

@ -7,37 +7,40 @@
{% endblock %}
{% block content %}
<h1>Contributions of {{ u.username }}</h1>
<main>
<h1 id="firstHeading">{{ u.username }}</h1>
<p class="preview-subtitle">Contributions</p>
<div class="inner-content">
<p class="nl-pagination">Showing results <strong>{{ page_n * 20 - 19 }}</strong> to <strong>{{ min(page_n * 20, total_count) }}</strong> of <strong>{{ total_count }}</strong> total.</p>
<div class="inner-content">
<p class="nl-pagination">Showing results <strong>{{ page_n * 20 - 19 }}</strong> to <strong>{{ min(page_n * 20, total_count) }}</strong> of <strong>{{ total_count }}</strong> total.</p>
<ul>
{% if page_n > 1 %}
<li class="nl-prev"><a href="?page={{ page_n - 1 }}">&laquo; Previous page</a></li>
{% endif %}
<ul>
{% if page_n > 1 %}
<li class="nl-prev"><a href="?page={{ page_n - 1 }}">&laquo; Previous page</a></li>
{% endif %}
{% for rev in contributions %}
<li>
<a href="/history/revision/{{ rev.id }}/">
#{{ rev.id }}
&middot;
{{ rev.pub_date.strftime("%B %-d, %Y %H:%M:%S") }}
{% if rev.comment %}
“{{ rev.comment }}”
{% endif %}
</a>
on
<a href="{{ rev.page.get_url() }}">
{{ rev.page.title }}
</a>
</li>
{% endfor %}
{% for rev in contributions %}
<li>
<a href="/history/revision/{{ rev.id }}/">
#{{ rev.id }}
&middot;
{{ rev.pub_date.strftime("%B %-d, %Y %H:%M:%S") }}
{% if rev.comment %}
“{{ rev.comment }}”
{% endif %}
</a>
on
<a href="{{ rev.page.get_url() }}">
{{ rev.page.title }}
</a>
</li>
{% endfor %}
{% if page_n < total_count // 20 %}
<li class="nl-next"><a href="?page={{ page_n + 1 }}">Next page &raquo;</a></li>
{% endif %}
</ul>
</div>
{% if page_n < total_count // 20 %}
<li class="nl-next"><a href="?page={{ page_n + 1 }}">Next page &raquo;</a></li>
{% endif %}
</ul>
</div>
</main>
{% endblock %}

10
templates/forbidden.jinja2
View file

@ -3,9 +3,11 @@
{% block title %}Access Denied - {{ app_name }}{% endblock %}
{% block content %}
<h1>Forbidden</h1>
<main class="error-page">
<h1 id="firstHeading">Forbidden</h1>
<div class="inner-content">
<p>You don’t have permission to access this resource.</p>
</div>
<div class="inner-content">
<p>You don’t have permission to access this resource.</p>
</div>
</main>
{% endblock %}

54
templates/history.jinja2
View file

@ -7,33 +7,35 @@
{% endblock %}
{% block content %}
<h1 id="firstHeading">{{ p.title }}</h1>
<div class="preview-subtitle">Page history</div>
<main>
<h1 id="firstHeading">{{ p.title }}</h1>
<div class="preview-subtitle">Page history</div>
<div class="inner-content">
<ul>
{% for rev in history %}
<li>
<a href="/history/revision/{{ rev.id }}/">
#{{ rev.id }}
&middot;
{{ rev.pub_date.strftime("%B %-d, %Y %H:%M:%S") }}
{% if rev.comment %}
“{{ rev.comment }}”
<div class="inner-content">
<ul>
{% for rev in history %}
<li>
<a href="/history/revision/{{ rev.id }}/">
#{{ rev.id }}
&middot;
{{ rev.pub_date.strftime("%B %-d, %Y %H:%M:%S") }}
{% if rev.comment %}
“{{ rev.comment }}”
{% endif %}
</a>
by
{% if rev.user_id %}
<a href="/u/{{ rev.user.username }}">
{{ rev.user.username }}
</a>
{% else %}
<span>&lt;Unknown User&gt;</span>
{% endif %}
</a>
by
{% if rev.user_id %}
<a href="/u/{{ rev.user.username }}">
{{ rev.user.username }}
</a>
{% else %}
<span>&lt;Unknown User&gt;</span>
{% endif %}
</li>
{% endfor %}
</ul>
</div>
</li>
{% endfor %}
</ul>
</div>
<p>{{ T("back-to") }} <a href="{{ p.get_url() }}">{{ p.title }}</a>.</p>
<p>{{ T("back-to") }} <a href="{{ p.get_url() }}">{{ p.title }}</a>.</p>
</main>
{% endblock %}

28
templates/home.jinja2
View file

@ -3,22 +3,24 @@
{% block title %}{{ T('homepage') }} - {{ app_name }}{% endblock %}
{% block content %}
<article class="homepage">
<main class="homepage">
<h1 id="firstHeading">{{ T('welcome').format(app_name) }}</h1>
<div class="nl-new">
<a href="/create/">
<button class="submit-primary"><span class="material-icons">create</span> {{ T('new-note') }}</button>
</a>
<div class="inner-content">
<div class="nl-new">
<a href="/create/">
<button class="submit-primary"><span class="material-icons">create</span> {{ T('new-note') }}</button>
</a>
</div>
<h2>{{ T('latest-notes') }}</h2>
<br style="clear:both">
{% from "macros/nl.jinja2" import nl_list with context %}
{{ nl_list(new_notes) }}
</div>
<h2>{{ T('latest-notes') }}</h2>
<br style="clear:both">
{% from "macros/nl.jinja2" import nl_list with context %}
{{ nl_list(new_notes) }}
</article>
</main>
{% endblock %}

5
templates/includes/nl_item.jinja2
View file

@ -1,3 +1,8 @@
{# DEPRECATED #}
{# Use "macros/nl.jinja2" instead. #}
<div class="flash">DEPRECATED</div>
<p class="nl-title">
<a href="{{ n.get_url() }}" class="nl-title">{{ n.title }}</a>
</p>

10
templates/internalservererror.jinja2
View file

@ -3,9 +3,11 @@
{% block title %}% _ % - {{ app_name }}{% endblock %}
{% block content %}
<h1>Internal Server Error</h1>
<main class="error-page">
<h1 id="firstHeading">Internal Server Error</h1>
<div class="inner-content">
<p>We’re sorry, an unexpected error occurred. Try refreshing the page.</p>
</div>
<div class="inner-content">
<p>We’re sorry, an unexpected error occurred. Try refreshing the page.</p>
</div>
</main>
{% endblock %}

10
templates/listrecent.jinja2
View file

@ -1,10 +1,12 @@
{% extends "base.jinja2" %}
{% block content %}
<article>
<main>
<h1 id="firstHeading">Notes by date</h1>
{% from "macros/nl.jinja2" import nl_list with context %}
{{ nl_list(notes, page_n=page_n, total_count=total_count) }}
</article>
<div class="inner-content">
{% from "macros/nl.jinja2" import nl_list with context %}
{{ nl_list(notes, page_n=page_n, total_count=total_count) }}
</div>
</main>
{% endblock %}

18
templates/listtag.jinja2
View file

@ -3,17 +3,19 @@
{% block title %}Notes tagged #{{ tagname }} - {{ app_name }}{% endblock %}
{% block content %}
<article>
<main>
<h1 id="firstHeading">#{{ tagname }}</h1>
<div class="preview-subtitle">{{ T('notes-tagged') }}</div>
{% if total_count > 0 %}
{% from "macros/nl.jinja2" import nl_list with context %}
{{ nl_list(l, page_n=page_n, total_count=total_count, hl_tags=(tagname,)) }}
{% else %}
<p class="nl-placeholder">{{ T('notes-tagged-empty') }}</p>
{% endif %}
<div class="inner-content">
{% if total_count > 0 %}
{% from "macros/nl.jinja2" import nl_list with context %}
{{ nl_list(tagged_notes, page_n=page_n, total_count=total_count, hl_tags=(tagname,), other_url='tags/' + tagname) }}
{% else %}
<p class="nl-placeholder">{{ T('notes-tagged-empty') }}</p>
{% endif %}
</div>
</article>
</main>
{% endblock %}

62
templates/macros/nl.jinja2
View file

@ -1,6 +1,10 @@
{#
Recommendations: Always import this macro with context,
otherwise it fails. It depends on a couple context-defined functions.
#}
{% macro nl_list(l, page_n=None, total_count=None, hl_tags=(), other_url='p/most_recent') %}
{% macro nl_list(l, page_n=None, total_count=None, hl_tags=(), hl_calendar=None, other_url='p/most_recent') %}
{% if page_n and total_count %}
<p class="nl-pagination">
Showing results <strong>{{ page_n * 20 - 19 }}</strong> to <strong>{{ min(page_n * 20, total_count) }}</strong>
@ -13,36 +17,44 @@
{% endif %}
{% for n in l %}
<li>
<a href="{{ n.get_url() }}" class="nl-title">{{ n.title }}</a>
<p class="nl-desc">{{ n.short_desc() }}</p>
{% if n.tags %}
<p class="nl-tags">
<span class="material-icons">tag</span>
{{ T('tags') }}:
{% for tag in n.tags %}
{% set tn = tag.name %}
{% if tn in hl_tags %}
<strong class="nl-tag-hl">#{{ tn }}</strong>
{% else %}
<a href="/tags/{{ tn }}/" class="nl-tag">#{{ tn }}</a>
<article class="nl-item">
<a href="{{ n.get_url() }}" class="nl-title">{{ n.title }}</a>
<p class="nl-desc">{{ n.short_desc() }}</p>
{% if n.tags %}
<p class="nl-tags">
<span class="material-icons">tag</span>
{{ T('tags') }}:
{% for tag in n.tags %}
{% set tn = tag.name %}
{% if tn in hl_tags %}
<strong class="nl-tag-hl">#{{ tn }}</strong>
{% else %}
<a href="/tags/{{ tn }}/" class="nl-tag">#{{ tn }}</a>
{% endif %}
{% endfor %}
</p>
{% endif %}
{% endfor %}
</p>
{% endif %}
{% if n.calendar %}
<p class="nl-calendar">
<span class="material-icons">calendar_today</span>
<a href="/calendar/{{ n.calendar.year }}/{{ n.calendar.month }}">
<time datetime="{{ n.calendar.isoformat() }}">{{ n.calendar.strftime('%B %-d, %Y') }}</time>
</a>
</p>
{% endif %}
{% if n.calendar %}
<p class="nl-calendar">
<span class="material-icons">calendar_today</span>
{% if hl_calendar and hl_calendar.y == n.calendar.y and hl_calendar.m == n.calendar.m %}
<strong>
<time datetime="{{ n.calendar.isoformat() }}">{{ n.calendar.strftime('%B %-d, %Y') }}</time>
</strong>
{% else %}
<a href="/calendar/{{ n.calendar.year }}/{{ n.calendar.month }}">
<time datetime="{{ n.calendar.isoformat() }}">{{ n.calendar.strftime('%B %-d, %Y') }}</time>
</a>
{% endif %}
</p>
{% endif %}
</article>
</li>
{% endfor %}
{% if page_n is none %}
<li class="nl-next"><a href="/{{ other_url }}/">{{ T('show-all') }}</a></li>
{% elif page_n <= total_count // 20 %}
{% elif page_n <= (total_count - 1) // 20 %}
<li class="nl-next"><a href="/{{ other_url }}/?page={{ page_n + 1 }}">Next page &raquo;</a></li>
{% endif %}
</ul>

87
templates/month.jinja2
View file

@ -3,61 +3,48 @@
{% block title %}{{ d.strftime("%B %Y") }} – {{ app_name }}{% endblock %}
{% block content %}
<article>
<main>
<h1 id="firstHeading">{{ d.strftime("%B %Y") }}</h1>
{% if total_count > 0 %}
<p class="nl-pagination">Showing results <strong>{{ page_n * 20 - 19 }}</strong> to <strong>{{ min(page_n * 20, total_count) }}</strong> of <strong>{{ total_count }}</strong> total.</p>
<div class="inner-content">
{% if total_count > 0 %}
{% from "macros/nl.jinja2" import nl_list with context %}
{{ nl_list(notes, total_count=total_count, page_n=page_n, hl_calendar=d) }}
{% else %}
<p class="nl-placeholder">{{ T('notes-month-empty') }}</p>
{% endif %}
<ul class="nl-list">
{% for n in notes %}
<li>
<a href="{{ n.get_url() }}" class="nl-title">{{ n.title }}</a>
<p class="nl-desc">{{ n.short_desc() }}</p>
{% if n.tags %}
<p class="nl-tags">{{ T('tags') }}:
{% for tag in n.tags %}
{% set tn = tag.name %}
<a href="/tags/{{ tn }}/" class="nl-tag">#{{ tn }}</a>
{% endfor %}
</p>
{% endif %}
{% if n.calendar %}
<p class="nl-calendar">
<span class="material-icons">calendar_today</span>
{% if n.calendar.year == d.year and n.calendar.month == d.month %}
<strong>
<time datetime="{{ n.calendar.isoformat() }}">{{ n.calendar.strftime('%B %-d, %Y') }}</time>
</strong>
{% else %}
<a href="/calendar/{{ n.calendar.year }}/{{ n.calendar.month }}">
<time datetime="{{ n.calendar.isoformat() }}">{{ n.calendar.strftime('%B %-d, %Y') }}</time>
</a>
{% endif %}
</p>
{% endif %}
</li>
{% endfor %}
</ul>
{% else %}
<p class="nl-placeholder">{{ T('notes-month-empty') }}</p>
{% endif %}
{% set past_year = advance_calendar(d, -2) %}
{% set past_month = advance_calendar(d, -1) %}
{% set next_month = advance_calendar(d, 1) %}
{% set next_year = advance_calendar(d, 2) %}
<div class="calendar-navigation">
<ul class="inline">
<li>&laquo; <a href="/calendar/{{ past_year.year }}/{{ past_year.month }}">{{ past_year.strftime("%B %Y") }}</a></li>
<li><a href="/calendar/{{ past_month.year }}/{{ past_month.month }}">{{ past_month.strftime("%B %Y") }}</a></li>
<li><strong>{{ d.strftime("%B %Y") }}</strong></li>
<li><a href="/calendar/{{ next_month.year }}/{{ next_month.month }}">{{ next_month.strftime("%B %Y") }}</a></li>
<li><a href="/calendar/{{ next_year.year }}/{{ next_year.month }}">{{ next_year.strftime("%B %Y") }}</a> &raquo;</li>
</ul>
</div>
{% set past_year = advance_calendar(d, -2) %}
{% set past_month = advance_calendar(d, -1) %}
{% set next_month = advance_calendar(d, 1) %}
{% set next_year = advance_calendar(d, 2) %}
<div class="calendar-navigation">
<ul class="inline">
<li>&laquo; <a href="/calendar/{{ past_year.year }}/{{ past_year.month }}">{{ past_year.strftime("%B %Y") }}</a></li>
<li><a href="/calendar/{{ past_month.year }}/{{ past_month.month }}">{{ past_month.strftime("%B %Y") }}</a></li>
<li><strong>{{ d.strftime("%B %Y") }}</strong></li>
<li><a href="/calendar/{{ next_month.year }}/{{ next_month.month }}">{{ next_month.strftime("%B %Y") }}</a></li>
<li><a href="/calendar/{{ next_year.year }}/{{ next_year.month }}">{{ next_year.strftime("%B %Y") }}</a> &raquo;</li>
</ul>
<p>{{ T('back-to') }} <a href="/calendar">{{ T('calendar') }}</a></p>
</div>
</main>
{% endblock %}
<p>{{ T('back-to') }} <a href="/calendar">{{ T('calendar') }}</a></p>
</article>
{% block toc %}
<nav class="toc">
<h3>{{ d.year }}</h3>
<ul>
{#% for i in range(1, 13) %}
<li>
<a href="/calendar/{{ d.year }}/{{ i }}">{{ nd.strftime("%B") }}</a>
<strong>({{ toc[i] }})</strong>
</li>
{% endfor %#}
</ul>
</nav>
{% endblock %}

10
templates/notfound.jinja2
View file

@ -3,9 +3,11 @@
{% block title %}{{ T('not-found') }} - {{ app_name }}{% endblock %}
{% block content %}
<h1>{{ T('not-found') }}</h1>
<main class="error-page">
<h1 id="firstHeading">{{ T('not-found') }}</h1>
<div class="inner-content">
<p>{{ T('not-found-text-1') }} <strong>{{ request.path }}</strong> {{ T('not-found-text-2') }}.</p>
</div>
<div class="inner-content">
<p>{{ T('not-found-text-1') }} <strong>{{ request.path }}</strong> {{ T('not-found-text-2') }}.</p>
</div>
</main>
{% endblock %}

48
templates/search.jinja2
View file

@ -3,31 +3,33 @@
{% block title %}{% if q %}Search results for "{{ q }}"{% else %}Search{% endif %} - {{ app_name }}{% endblock %}
{% block content %}
<h1>Search</h1>
<main>
<h1>Search</h1>
<div class="inner-content">
<form method="POST">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
<div class="search-wrapper">
<label for="q">Search for: </label>
<input type="search" name="q" value="{{ q }}" class="search-input">
</div>
<div>
<input type="checkbox" name="include-tags" value="1" {% if pl_include_tags %}checked{% endif %}>
<label for="include-tags">{{ T('include-tags') }}</label>
</div>
</form>
<div class="inner-content">
<form method="POST">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
<div class="search-wrapper">
<label for="q">Search for: </label>
<input type="search" name="q" value="{{ q }}" class="search-input">
</div>
<div>
<input type="checkbox" name="include-tags" value="1" {% if pl_include_tags %}checked{% endif %}>
<label for="include-tags">{{ T('include-tags') }}</label>
</div>
</form>
{% if results %}
<h2>Search results for <em>{{ q }}</em></h2>
{% if results %}
<h2>Search results for <em>{{ q }}</em></h2>
{% from "macros/nl.jinja2" import nl_list with context %}
{{ nl_list(l, other_url=None) }}
{% elif q %}
<h2>{{ T('search-no-results') }} <em>{{ q }}</em></h2>
{% else %}
<p>Please note that search queries do not search for page text.</p>
{% endif %}
</div>
{% from "macros/nl.jinja2" import nl_list with context %}
{{ nl_list(results, other_url=None) }}
{% elif q %}
<h2>{{ T('search-no-results') }} <em>{{ q }}</em></h2>
{% else %}
<p>Please note that search queries do not search for page text.</p>
{% endif %}
</div>
</main>
{% endblock %}

32
templates/upload.jinja2
View file

@ -1,21 +1,23 @@
{% extends "base.jinja2" %}
{% block content %}
<h1>Upload new file</h1>
<main>
<h1>Upload new file</h1>
<p>Uploads are no more supported. Please use this syntax instead for external images: <code>![alt text](https://www.example.com/path/to/image.jpg)</code>.</p>
<p>Uploads are no more supported. Please use this syntax instead for external images: <code>![alt text](https://www.example.com/path/to/image.jpg)</code>.</p>
<form method="POST" enctype="multipart/form-data">
<div>
<label for="name">Name: </label>
<input type="text" id="name-input" name="name" required maxlength="256" disabled="">
</div>
<div>
<label for="file">File: </label>
<input type="file" id="file-input" name="file" accept="image/jpeg, image/png" disabled="">
</div>
<div>
<input type="submit" value="Upload" disabled="">
</div>
</form>
<form method="POST" enctype="multipart/form-data">
<div>
<label for="name">Name: </label>
<input type="text" id="name-input" name="name" required maxlength="256" disabled="">
</div>
<div>
<label for="file">File: </label>
<input type="file" id="file-input" name="file" accept="image/jpeg, image/png" disabled="">
</div>
<div>
<input type="submit" value="Upload" disabled="">
</div>
</form>
</main>
{% endblock %}