git ssb - Rename blocks · Grey the earthling/gkn.me.uk@a6924367

Commit a69243673b022c68aae9ed62d69c212758bcce23

Rename blocks

The new names are:
* simpler
* more descriptive of purpose
* not tied to their position in the page structure

Greg K Nicholson committed on 2/4/2018, 4:59:42 PM
Parent: 9580ea2c1599f615b0cb08aceb855c4aa016cf97

Files changed

themes/ran/templates/archives.html	changed
themes/ran/templates/article.html	changed
themes/ran/templates/base.html	changed
themes/ran/templates/index.html	changed
themes/ran/templates/page.html	changed
themes/ran/templates/period_archives.html	changed
themes/ran/templates/tag.html	changed

themes/ran/templates/archives.htmlView
		@@ -1,7 +1,7 @@
1	1 …	{% extends "base.html" %}
2	2 …	{%- block title -%}{{- ARCHIVES_TITLE -}}{%- endblock -%}
3		-{%- block body_main_header_details_main -%}
	3 …	+{%- block pagedetails -%}
4	4 …	{{- super() -}}
5	5 …	<section class="smalllinks">
6	6 …	<h1>Years:</h1>
7	7 …	<ul>

themes/ran/templates/article.htmlView
		@@ -12,9 +12,9 @@
12	12 …	title="{{ SITENAME }} - {{ tag }}">
13	13 …	{%- endfor -%}
14	14 …	{%- endfor -%}
15	15 …	{% endblock %}
16		-{%- block body_main_header_details_main -%}
	16 …	+{%- block pagedetails -%}
17	17 …	{%- for author in article.authors -%}
18	18 …	<address>
19	19 …	<span>by </span>
20	20 …	<a href="/{{- article.author.url -}}" rel="author">
		@@ -44,9 +44,9 @@
44	44 …	<i>{{- article.small \| trim -}}</i>
45	45 …	{%- endif -%}
46	46 …	{# <!--XXX skip links --> #}
47	47 …	{%- endblock -%}
WritePreview
48		-{%- block body_main_header_footer_x -%}
	48 …	+{%- block maincontentintro -%}
49	49 …	{%- if article.image -%}
50	50 …	<footer class="image" style="
51	51 …	background-image: url('{{- article.image.filename -}}');
52	52 …	{%- if article.image.position -%}
		@@ -64,12 +64,12 @@
64	64 …	">
65	65 …	</footer>
66	66 …	{%- endif -%}
67	67 …	{%- endblock -%}
68		-{%- block body_main_main -%}
	68 …	+{%- block maincontent -%}
69	69 …	{{- article.content \| trim -}}
70	70 …	{%- endblock -%}
71		-{%- block body_main -%}
	71 …	+{%- block main -%}
72	72 …	<article>
73	73 …	{{- super() -}}
74	74 …	{%- if article.links or article.related_posts -%}
75	75 …	{#- <!-- article.related_posts implies that
		@@ -121,9 +121,9 @@
121	121 …	</footer>
122	122 …	{%- endif -%}
123	123 …	</article>
124	124 …	{%- endblock -%}
125		-{%- block body_footer -%}
	125 …	+{%- block bottomnav -%}
126	126 …	{%- if article.related_posts -%}
127	127 …	<ul class="biglinks">
128	128 …	{%- for article in article.related_posts -%}
129	129 …	<li>

themes/ran/templates/base.htmlView
		@@ -33,9 +33,9 @@
33	33 …	{%- endblock -%}
34	34 …	</head>
35	35 …	<body>
36	36 …	<header>
37		- {%- block body_header -%}
	37 …	+ {%- block topnav -%}
38	38 …	<nav>
39	39 …	{%- block logo -%}
40	40 …	<a class="logo" href="/">
41	41 …	{%- include "logo.svg" -%}
		@@ -45,11 +45,11 @@
45	45 …	</nav>
46	46 …	{%- endblock -%}
47	47 …	</header>
48	48 …	<main>
49		- {%- block body_main -%}
	49 …	+ {%- block main -%}
50	50 …	<header>
51		- {%- block body_main_header -%}
	51 …	+ {%- block pagetitle -%}
52	52 …	<details>
53	53 …	<summary>
54	54 …	<header>
55	55 …	<h1 class="pagetitle">
		@@ -57,9 +57,9 @@
57	57 …	</h1>
58	58 …	</header>
59	59 …	</summary>
60	60 …	<main>
61		- {%- block body_main_header_details_main -%}
	61 …	+ {%- block pagedetails -%}
62	62 …	<address>
63	63 …	<span>by </span>
64	64 …	<a href="/{{- AUTHOR_URL -}}"
65	65 …	rel="author">
		@@ -68,14 +68,14 @@
68	68 …	</address>
69	69 …	{%- endblock -%}
70	70 …	</main>
71	71 …	</details>
72		- {%- block body_main_header_footer_x -%}
	72 …	+ {%- block maincontentintro -%}
73	73 …	{%- endblock -%}
74	74 …	{%- endblock -%}
75	75 …	</header>
76	76 …	<main>
77		- {%- block body_main_main -%}
	77 …	+ {%- block maincontent -%}
78	78 …	<ol class="biglinks">
79	79 …	{%- for article in dates -%}
80	80 …	{{- entry_link(article) -}}
81	81 …	{%- endfor -%}
		@@ -84,9 +84,9 @@
84	84 …	</main>
85	85 …	{%- endblock -%}
86	86 …	</main>
87	87 …	<footer>
88		- {%- block body_footer -%}
	88 …	+ {%- block bottomnav -%}
89	89 …	<nav>
90	90 …	{{- self.logo() -}}
91	91 …	</nav>
92	92 …	{%- endblock -%}

themes/ran/templates/index.htmlView
		@@ -1,14 +1,14 @@
1	1 …	{% extends "base.html" %}
2		-{%- block body_header -%}
	2 …	+{%- block topnav -%}
3	3 …	{%- include "logo.svg" -%}
4	4 …	{%- endblock -%}
5		-{%- block body_main_header -%}
	5 …	+{%- block pagetitle -%}
6	6 …	<h1 class="pagetitle">
7	7 …	{{- self.title() -}}
8	8 …	</h1>
9	9 …	{%- endblock -%}
10		-{%- block body_main_main -%}
	10 …	+{%- block maincontent -%}
11	11 …	<ul class="biglinks">
12	12 …	{%- for article in dates -%}
13	13 …	{%- if loop.index <= 3 or article.slug == AUTHOR_URL -%}
14	14 …	{{- entry_link(article) -}}
		@@ -20,8 +20,8 @@
20	20 …	</a>
21	21 …	</li>
22	22 …	</ul>
23	23 …	{%- endblock -%}
24		-{%- block body_footer -%}
	24 …	+{%- block bottomnav -%}
25	25 …	{%- include "logo.svg" -%}
26	26 …	{%- endblock -%}
27	27 …

themes/ran/templates/page.htmlView
		@@ -1,11 +1,11 @@
1	1 …	{% extends "base.html" %}
2	2 …	{%- block title -%}{{- page.title \| trim -}}{%- endblock -%}
3		-{%- block body_main_header -%}
	3 …	+{%- block pagetitle -%}
4	4 …	<h1 class="pagetitle">
5	5 …	{{- self.title() -}}
6	6 …	</h1>
7	7 …	{%- endblock -%}
8		-{%- block body_main_main -%}
	8 …	+{%- block maincontent -%}
9	9 …	{{- page.content \| trim -}}
10	10 …	{%- endblock -%}
11	11 …

themes/ran/templates/period_archives.htmlView
		@@ -8,9 +8,9 @@
8	8 …	{%- else -%}
9	9 …	{{- dates[0].date \| strftime(DATE_FORMAT_DAY) -}}
10	10 …	{%- endif -%}
11	11 …	{%- endblock -%}
12		-{%- block body_main_header_details_main -%}
	12 …	+{%- block pagedetails -%}
13	13 …	{{- super() -}}
14	14 …	{%- if period \| length == 1 and
15	15 …	dates \| unique(attribute="date.month") \| list \| length > 1 -%}
16	16 …	<section class="smalllinks">
		@@ -54,9 +54,9 @@
54	54 …	</ul>
55	55 …	</section>
56	56 …	{%- endif -%}
57	57 …	{%- endblock -%}
58		-{%- block body_main_main -%}
	58 …	+{%- block maincontent -%}
59	59 …	<nav class="nearby">
60	60 …	{%- if period \| length == 1 -%}
61	61 …	<a href="/entries" rel="up">
62	62 …	<span> ↑ </span>

themes/ran/templates/tag.htmlView
		@@ -6,9 +6,9 @@
6	6 …	rel="alternate"
7	7 …	type="application/atom+xml"
8	8 …	title="{{ SITENAME }} - {{ tag }}">
9	9 …	{% endblock %}
10		-{% block body_main_main %}
	10 …	+{% block maincontent %}
11	11 …	<nav class="nearby">
12	12 …	<a href="/entries" rel="up">
13	13 …	<span> ↑ </span>
14	14 …	{{- ARCHIVES_TITLE -}}

Built with git-ssb-web

Grey the earthling / gkn.me.uk

Commit a69243673b022c68aae9ed62d69c212758bcce23

Rename blocks

Files changed