Skip to content

Commit 29a00de

Browse files
burrbullburrbull
authored
Merge pull request #201 from erdnaxe/css
html/template.html: code improvements
2 parents 0963854 + 0a63e7f commit 29a00de

File tree

1 file changed

+61
-63
lines changed

1 file changed

+61
-63
lines changed

‎src/html/template.html‎

Lines changed: 61 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
.vertical div {
2929
writing-mode: vertical-lr;
3030
}
31-
.doccol {
32-
color: rgb(92, 184, 92);
33-
}
3431
.headerlink {
3532
font-size: 50%;
3633
}
@@ -92,14 +89,13 @@
9289
</div>
9390
</div>
9491
<nav class="menu">
95-
{% for peripheral in device.peripherals %}
96-
<a href="#{{ peripheral.name }}">{{ peripheral.name }}</a>
97-
{% endfor %}
92+
{%- for peripheral in device.peripherals %}
93+
<a href="#{{ peripheral.name }}">{{ peripheral.name }}</a>
94+
{%- endfor %}
9895
</nav>
9996
{% for peripheral in device.peripherals %}{% assign pname = peripheral.name %}
10097
<div class="peripheral">
101-
<h3>
102-
<a name="{{ pname }}"></a>
98+
<h3 id="{{ pname }}">
10399
{{ pname }}
104100
<a class="headerlink" href="#{{ pname }}">
105101
<span class="glyphicon glyphicon-link"></span>
@@ -119,41 +115,46 @@ <h3>
119115
<details class="register-map" id="{{ pname }}-register-map">
120116
<summary>Toggle register map</summary>
121117
<table class="table table-bordered register-map-table">
122-
<tbody><tr>
118+
<tr>
123119
<th>Offset</th>
124120
<th>Name</th>
125-
{% for i in (0..31) reversed %}
121+
{%- for i in (0..31) reversed %}
126122
<th class="vertical"><div>{{ i }}</div></th>
127-
{% endfor %}
123+
{%- endfor %}
124+
</tr>
125+
{%- for register in peripheral.registers %}
126+
<tr>
127+
<td>{{ register.offset }}{% if register.size != 32 %} ({{ register.size }}-bit){% endif %}</td>
128+
<td>{{ register.name }}</td>
129+
{%- for row in register.table %}
130+
{%- if row %}
131+
{%- for field in row.fields %}
132+
{%- unless field.name %}
133+
{%- for _ in (1..field.width) %}
134+
<td{% if field.separated %} class="separated"{% endif %}></td>
135+
{%- endfor %}
136+
{%- endunless %}
137+
{%- if field.name %}
138+
<td colspan="{{ field.width }}" class="vertical{% if field.separated %} separated{% endif %}">
139+
<div><a class="fieldlink" href="#{{ pname }}:{{ register.name }}:{{ field.name }}">{{ field.name }}</a></div>
140+
</td>
141+
{%- endif %}
142+
{%- endfor %}
143+
{%- else %}
144+
{%- for _ in (1..16) %}
145+
<td></td>
146+
{%- endfor %}
147+
{%- endif %}
148+
{%- endfor %}
128149
</tr>
129-
{% for register in peripheral.registers %}
130-
<tr>
131-
<td>{{ register.offset }}{% if register.size != 32 %} ({{ register.size }}-bit){% endif %}</td>
132-
<td>{{ register.name }}</td>
133-
{% for row in register.table %}{% if row %}
134-
{% for field in row.fields %}
135-
{% unless field.name %}
136-
{% for _ in (1..field.width) %}
137-
<td{% if field.separated %} class="separated"{% endif %}></td>
138-
{% endfor %}
139-
{% endunless %}
140-
{% if field.name %}
141-
<td colspan="{{ field.width }}" class="vertical{% if field.separated %} separated{% endif %}">
142-
<div><a class="fieldlink" href="#{{ pname }}:{{ register.name }}:{{ field.name }}">{{ field.name }}</a></div>
143-
</td>
144-
{% endif %}
145-
{% endfor %}
146-
{% else %}{% for _ in (1..16) %}<td></td>{% endfor %}{% endif %}{% endfor %}
147-
</tr>
148-
{% endfor %}
149-
</tbody></table>
150+
{%- endfor %}
151+
</table>
150152
</details>
151153
<details class="registers" id="{{ pname }}-registers">
152154
<summary>Toggle registers</summary>
153155
{% for register in peripheral.registers %}
154156
<div class="register">
155-
<h4>
156-
<a name="{{ pname }}:{{ register.name }}"></a>
157+
<h4 id="{{ pname }}:{{ register.name }}">
157158
{{ register.name }}
158159
<a class="headerlink" href="#{{ pname }}:{{ register.name }}">
159160
<span class="glyphicon glyphicon-link"></span>
@@ -177,61 +178,58 @@ <h4>
177178
</p>
178179
<div class="bitfield">
179180
<table class="table table-striped table-bordered bitfield">
180-
<tbody>{% for row in register.table %}{% if row %}
181+
{%- for row in register.table %}
182+
{%- if row %}
181183
<tr>
182-
{% for header in row.headers %}
184+
{%- for header in row.headers %}
183185
<th>{{ header }}</th>
184-
{% endfor %}
186+
{%- endfor %}
185187
</tr>
186188
<tr>
187-
{% for field in row.fields %}
189+
{%- for field in row.fields %}
188190
<td colspan="{{ field.width }}"{% if field.separated %} class="separated"{% endif %}>
189-
{% if field.name %}
190-
<a class="fieldlink" href="#{{ pname }}:{{ register.name }}:{{ field.name }}">
191-
{% if field.doc %}
192-
<span class="doccol">
193-
{% else %}
194-
<span>
195-
{% endif %}
196-
{{ field.name }}</span></a>
191+
{%- if field.name %}
192+
<a class="fieldlink{% if field.doc %} text-success{% endif %}" href="#{{ pname }}:{{ register.name }}:{{ field.name }}">
193+
{{ field.name }}
194+
</a>
197195
<br>
198196
{{ field.access }}
199-
{% endif %}
197+
{%- endif %}
200198
</td>
201-
{% endfor %}
199+
{%- endfor %}
202200
</tr>
203-
{% endif %}{% endfor %}
204-
</tbody></table>
201+
{%- endif %}
202+
{%- endfor %}
203+
</table>
205204
</div>
206205
{% endif %}
207206
<details class="fields" id="{{ pname }}-{{ register.name }}-fields">
208207
<summary>Toggle fields</summary>
209-
{% for field in register.fields %}
210-
<h4>
211-
<a name="{{ pname }}:{{ register.name }}:{{ field.name }}">
212-
</a>
208+
{%- for field in register.fields %}
209+
<h4 id="{{ pname }}:{{ register.name }}:{{ field.name }}">
213210
{{ field.name }}
214211
<a class="headerlink" href="#{{ pname }}:{{ register.name }}:{{ field.name }}">
215212
<span class="glyphicon glyphicon-link"></span>
216213
</a>
217214
</h4>
218215
<p>
219-
{% if field.width > 1 %}
216+
{%- if field.width > 1 %}
220217
Bits {{ field.offset }}-{{ field.msb }}:
221-
{% else %}
218+
{%- else %}
222219
Bit {{ field.offset }}:
223-
{% endif %}
224-
{{ field.description }}.</p>
225-
{% if field.doc %}
220+
{%- endif %}
221+
{{ field.description }}.
222+
</p>
223+
{%- if field.doc %}
226224
<p>{{ field.doc }}</p>
227-
{% endif %}
228-
{% endfor %}
225+
{%- endif %}
226+
{%- endfor %}
229227
</details>
230228
</div>
231-
{% endfor %}
229+
{%- endfor %}
232230
</details>
233231
</div>
234-
{% endfor %}
232+
{%- endfor %}
235233
</div>
236234

237235
<script>

0 commit comments

Comments
 (0)