This page has been deleted
“{{ page_name }}” is gone. Append ?r=N to view a specific revision, or restore it from the page's history.
+
+ {% block content %}{% endblock %}
+
+
+{% endblock %}
diff --git a/jottit/templates/diff.html b/jottit/templates/diff.html
index d769b02..0411fb2 100644
--- a/jottit/templates/diff.html
+++ b/jottit/templates/diff.html
@@ -1,20 +1,16 @@
-{% extends "base.html" %}
+{% extends "site_base.html" %}
{% block title %}Diff: {{ page_name or "Home" }}{% endblock %}
{% block content %}
- Diff: {{ page_name or "Home" }}
-- Comparing - revision {{ a.revision }} - with - revision {{ b.revision }}. -
-Diff: {{ page_name or "Home" }}
++ Comparing + revision {{ a.revision }} + with + revision {{ b.revision }}. +
-{{ diff_html|safe }}
-
- Edit: {{ page_name or "Home" }}
+
{% endblock %}
diff --git a/jottit/templates/forgot_password.html b/jottit/templates/forgot_password.html
index 3ed320c..5751aee 100644
--- a/jottit/templates/forgot_password.html
+++ b/jottit/templates/forgot_password.html
@@ -1,16 +1,19 @@
-{% extends "base.html" %}
+{% extends "dialog_base.html" %}
{% block title %}Forgot your password?{% endblock %}
+
{% block content %}
- Editing: {{ page_name or "Home" }}
- - +Forgot your password?
Forgot your password?
- {% if sent %} -We've emailed a password-reset link to the address on file. The link works once — if you need another, come back to this page.
- {% else %} -We'll email a one-time password-reset link to the email address on file for this site.
- - {% endif %} -We've emailed a password-reset link to the address on file. The link works once — if you need another, come back to this page.
+ + {% else %} +We'll email a one-time password-reset link to the email address on file for this site.
+ + {% endif %} {% endblock %} diff --git a/jottit/templates/history.html b/jottit/templates/history.html index 3a9e384..939c2a1 100644 --- a/jottit/templates/history.html +++ b/jottit/templates/history.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "site_base.html" %} {% block title %}History: {{ page_name or "Home" }}{% endblock %} {% block head %} @@ -11,26 +11,22 @@ {% endblock %} {% block content %} -History: {{ page_name or "Home" }}
-{{ total }} revision{{ "s" if total != 1 }}.
-History: {{ page_name or "Home" }}
+{{ total }} revision{{ "s" if total != 1 }}.
--
- {% for r in revisions %}
-
- - Revision {{ r.revision }} - - {% if r.changes %}{{ r.changes|safe }}{% endif %} - - {% endfor %} -
-
+ {% for r in revisions %}
+
- + Revision {{ r.revision }} + + {% if r.changes %}{{ r.changes|safe }}{% endif %} + + {% endfor %} +
Jottit
-Getting a website should be as easy as filling out a textbox.
- }})
+ {% endblock %}
+ Not found
There's no page named “{{ page_name }}” on this site.
- {% if is_signed_in or is_unclaimed %} - - {% endif %} -Not found
+There's no page named “{{ page_name }}” on this site.
+ {% if is_signed_in or is_unclaimed %} + + {% endif %} {% endblock %} diff --git a/jottit/templates/partials/design_style.html b/jottit/templates/partials/design_style.html index 628f361..0b5cbc1 100644 --- a/jottit/templates/partials/design_style.html +++ b/jottit/templates/partials/design_style.html @@ -1,23 +1,14 @@ -{# Inline CSS variables sourced from the site's design row. - - The 2007 site embedded full per-site CSS rules here; we surface the - values as custom properties instead and let the global stylesheet - reference them. That keeps the per-request payload small and lets - the M9 stylesheet rewrite without coordinating with this template. #} +{# Per-site overrides written into :root so the global stylesheet + picks them up via var(--…). Empty values leave the token defaults + from tokens.css in place. #} diff --git a/jottit/templates/partials/site_header.html b/jottit/templates/partials/site_header.html deleted file mode 100644 index 3cf80fe..0000000 --- a/jottit/templates/partials/site_header.html +++ /dev/null @@ -1,34 +0,0 @@ -{# Header chrome rendered on every site page: title, subtitle, primary nav. - The unclaimed-site banner sits above the header so it's the most visible - action for a brand-new site. #} -{{ site.title or "Untitled site" }}
- {% if site.subtitle %}{{ site.subtitle }}
{% endif %} - - - -Sign in
Sign in
- + {% include "partials/form_error.html" %} - -
+
+
+
+
+ {{ site.title or "" }}
+{{ site.subtitle or "" }}
+
+
+{% endblock %}
diff --git a/jottit/templates/view_page.html b/jottit/templates/view_page.html
index 44327f6..2072d59 100644
--- a/jottit/templates/view_page.html
+++ b/jottit/templates/view_page.html
@@ -1,6 +1,6 @@
-{% extends "base.html" %}
+{% extends "site_base.html" %}
-{% block title %}{{ page_name or "Home" }}{% if site and site.title %} — {{ site.title }}{% endif %}{% endblock %}
+{% block title %}{% if site and site.title %}{{ site.title }}: {% endif %}{{ page_name or "Home" }}{% endblock %}
{% block head %}
-
+
+ {% block content %}{% endblock %}
+
+
+
+
+ {{ page_name or "Home" }}
- {% if is_old_revision %} - + {% if site.show_primer and (is_signed_in or is_unclaimed) and not page_name %} + + {% endif %} - {% if is_signed_in or is_unclaimed %} - + {% if is_old_revision %} +
+
+ Viewing revision {{ revision.revision }} of {{ latest_revision_number }}. + Latest + {% if revision.revision > 1 %} + | « prev + {% endif %} + {% if revision.revision < latest_revision_number %} + | next » {% endif %} +
+ {% if is_signed_in or is_unclaimed %} + {% endif %} - - -
- {{ content_html|safe }}
+ {% endif %}
-
-
+ {{ content_html|safe }}
+
+
{% endblock %}
diff --git a/jottit/views/site.py b/jottit/views/site.py
index 0cdedfc..5e449b9 100644
--- a/jottit/views/site.py
+++ b/jottit/views/site.py
@@ -12,6 +12,7 @@
get_request_conn,
recover_password,
set_change_pwd_token,
+ sites,
)
from jottit.render import format_content
from jottit.urls import page_slug, site_root
@@ -320,5 +321,11 @@ def _absolute_url(path: str) -> str:
return f"{request.scheme}://{request.host}{site_root()}{path}"
-def hide_primer(site_slug: str) -> str:
- return f"site:{site_slug} site/hide-primer POST (TODO)"
+def hide_primer(site_slug: str) -> ResponseReturnValue:
+ if g.site is None:
+ abort(404)
+ conn = get_request_conn()
+ if conn is None:
+ abort(500)
+ conn.execute(sites.update().where(sites.c.id == g.site.id).values(show_primer=False))
+ return redirect(site_root(), code=303)
diff --git a/tests/test_page_view.py b/tests/test_page_view.py
index b8931f6..c57a033 100644
--- a/tests/test_page_view.py
+++ b/tests/test_page_view.py
@@ -40,7 +40,7 @@ def test_home_on_public_subdomain_renders_latest_revision(
assert response.status_code == 200
body = response.data.decode()
assert "hi there" in body
- assert "Revision 1" in body
+ assert "changed" in body # dateline footer
def test_named_page_renders_content(client: FlaskClient, db_engine: Engine) -> None:
diff --git a/tests/test_secret_routing.py b/tests/test_secret_routing.py
index e3fdc90..eb0e1fa 100644
--- a/tests/test_secret_routing.py
+++ b/tests/test_secret_routing.py
@@ -1,29 +1,13 @@
from __future__ import annotations
-import pytest
from flask.testing import FlaskClient
APEX = "http://jottit.test/"
-@pytest.mark.parametrize(
- ("method", "path", "expected_substring"),
- [
- # /site/claim, /site/signin, /site/signout, /site/forgot-password,
- # /site/change-password, /site/changes, /site/changes.rss, and
- # /site/changes.json are exercised end-to-end in their respective
- # test files.
- ("POST", "/abc123/site/hide-primer", "site/hide-primer POST"),
- ],
-)
-def test_secret_site_routes(
- client: FlaskClient, method: str, path: str, expected_substring: str
-) -> None:
- response = client.open(path, method=method, base_url=APEX)
- assert response.status_code == 200
- body = response.data.decode()
- assert body.startswith("site:abc123 ")
- assert expected_substring in body
+# /site/claim, /site/signin, /site/signout, /site/forgot-password,
+# /site/change-password, /site/changes, /site/changes.rss, /site/changes.json,
+# and /site/hide-primer are exercised end-to-end in their respective test files.
# /admin/* routes via the secret blueprint are exercised end-to-end in
diff --git a/tests/test_subdomain_routing.py b/tests/test_subdomain_routing.py
index 1d4206e..5107e57 100644
--- a/tests/test_subdomain_routing.py
+++ b/tests/test_subdomain_routing.py
@@ -1,29 +1,10 @@
from __future__ import annotations
-import pytest
from flask.testing import FlaskClient
-SITE_BASE = "http://mysite.jottit.test/"
-
-
-@pytest.mark.parametrize(
- ("method", "path", "expected_substring"),
- [
- # /site/claim, /site/signin, /site/signout, /site/forgot-password,
- # /site/change-password, /site/changes, /site/changes.rss, and
- # /site/changes.json are exercised end-to-end in their respective
- # test files.
- ("POST", "/site/hide-primer", "site/hide-primer POST"),
- ],
-)
-def test_site_blueprint(
- client: FlaskClient, method: str, path: str, expected_substring: str
-) -> None:
- response = client.open(path, method=method, base_url=SITE_BASE)
- assert response.status_code == 200
- body = response.data.decode()
- assert body.startswith("site:mysite ")
- assert expected_substring in body
+# /site/claim, /site/signin, /site/signout, /site/forgot-password,
+# /site/change-password, /site/changes, /site/changes.rss, /site/changes.json,
+# and /site/hide-primer are exercised end-to-end in their respective test files.
# /admin/* routes are exercised end-to-end in tests/test_admin_*.py.