Skip to content

Commit 6626be5

Browse files
erdnaxeerdnaxe
committed
html/template.html: fix one-column rows overlapping on the side
1 parent b6a545c commit 6626be5

File tree

1 file changed

+134
-142
lines changed

1 file changed

+134
-142
lines changed

‎src/html/template.html

Lines changed: 134 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@
77
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
88
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
99
<style>
10-
.peripheral, .register, .field {
10+
.peripheral, .register {
1111
border-radius: 3px;
1212
border: solid 1px #eee;
13-
margin-bottom: 5px;
13+
margin: 1rem 0;
14+
padding: 1rem;
15+
}
16+
.peripheral h3, .register h4 {
17+
margin-top: 0;
1418
}
1519
.bitfield td, .bitfield th {
1620
text-align: center;
@@ -93,151 +97,139 @@
9397
{% endfor %}
9498
</nav>
9599
{% for peripheral in device.peripherals %}{% assign pname = peripheral.name %}
96-
<div class="row">
97-
<div class="col-sm-12 peripheral">
98-
<h3>
99-
<a name="{{ pname }}"></a>
100-
{{ pname }}
101-
<a class="headerlink" href="#{{ pname }}">
102-
<span class="glyphicon glyphicon-link"></span>
103-
</a>
104-
</h3>
105-
<p>{{ peripheral.base }}: {{ peripheral.description }}</p>
106-
<div class="progress">
107-
108-
<div class="progress-bar progress-bar-success" style="width: {{ peripheral.progress }}%"></div>
109-
</div>
110-
<p>
111-
<em>
112-
{{ peripheral.fields_documented }}/{{peripheral.fields_total }}
113-
fields covered.
114-
</em>
115-
</p>
116-
<details class="register-map" id="{{ pname }}-register-map">
117-
<summary>Toggle register map</summary>
118-
<table class="table table-bordered register-map-table">
119-
<tbody><tr>
120-
<th>Offset</th>
121-
<th>Name</th>
122-
{% for i in (0..31) reversed %}
123-
<th class="vertical"><div>{{ i }}</div></th>
124-
{% endfor %}
100+
<div class="peripheral">
101+
<h3>
102+
<a name="{{ pname }}"></a>
103+
{{ pname }}
104+
<a class="headerlink" href="#{{ pname }}">
105+
<span class="glyphicon glyphicon-link"></span>
106+
</a>
107+
</h3>
108+
<p>{{ peripheral.base }}: {{ peripheral.description }}</p>
109+
<div class="progress">
110+
111+
<div class="progress-bar progress-bar-success" style="width: {{ peripheral.progress }}%"></div>
112+
</div>
113+
<p>
114+
<em>
115+
{{ peripheral.fields_documented }}/{{peripheral.fields_total }}
116+
fields covered.
117+
</em>
118+
</p>
119+
<details class="register-map" id="{{ pname }}-register-map">
120+
<summary>Toggle register map</summary>
121+
<table class="table table-bordered register-map-table">
122+
<tbody><tr>
123+
<th>Offset</th>
124+
<th>Name</th>
125+
{% for i in (0..31) reversed %}
126+
<th class="vertical"><div>{{ i }}</div></th>
127+
{% endfor %}
128+
</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 %}
125147
</tr>
126-
{% for register in peripheral.registers %}
148+
{% endfor %}
149+
</tbody></table>
150+
</details>
151+
<details class="registers" id="{{ pname }}-registers">
152+
<summary>Toggle registers</summary>
153+
{% for register in peripheral.registers %}
154+
<div class="register">
155+
<h4>
156+
<a name="{{ pname }}:{{ register.name }}"></a>
157+
{{ register.name }}
158+
<a class="headerlink" href="#{{ pname }}:{{ register.name }}">
159+
<span class="glyphicon glyphicon-link"></span>
160+
</a>
161+
</h4>
162+
<p>{{ register.description }}</p>
163+
<p>
164+
Offset: {{ register.offset }}, size: {{ register.size }}, reset: {{ register.resetValue }}, access: {{ register.access
165+
}}{% if register.writeConstraint.range %}, allowed values: {{ register.writeConstraint.range.minimum }}-{{ register.writeConstraint.range.maximum }}{% endif %}
166+
</p>
167+
<div class="progress">
168+
169+
<div class="progress-bar progress-bar-success" style="width: {{ register.progress }}%"></div>
170+
</div>
171+
{% if register.fields_total > 0 %}
172+
<p>
173+
<em>
174+
{{ register.fields_documented}}/{{ register.fields_total }}
175+
fields covered.
176+
</em>
177+
</p>
178+
<div class="bitfield">
179+
<table class="table table-striped table-bordered bitfield">
180+
<tbody>{% for row in register.table %}{% if row %}
127181
<tr>
128-
<td>{{ register.offset }}{% if register.size != 32 %} ({{ register.size }}-bit){% endif %}</td>
129-
<td>{{ register.name }}</td>
130-
{% for row in register.table %}{% 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 %}{% for _ in (1..16) %}<td></td>{% endfor %}{% endif %}{% endfor %}
182+
{% for header in row.headers %}
183+
<th>{{ header }}</th>
184+
{% endfor %}
144185
</tr>
145-
{% endfor %}
146-
</tbody></table>
147-
</details>
148-
<details class="registers" id="{{ pname }}-registers">
149-
<summary>Toggle registers</summary>
150-
{% for register in peripheral.registers %}
151-
<div class="row">
152-
<div class="col-sm-11 register">
153-
<h4>
154-
<a name="{{ pname }}:{{ register.name }}"></a>
155-
{{ register.name }}
156-
<a class="headerlink" href="#{{ pname }}:{{ register.name }}">
157-
<span class="glyphicon glyphicon-link"></span>
158-
</a>
159-
</h4>
160-
<p>{{ register.description }}</p>
161-
<p>
162-
Offset: {{ register.offset }}, size: {{ register.size }}, reset: {{ register.resetValue }}, access: {{ register.access
163-
}}{% if register.writeConstraint.range %}, allowed values: {{ register.writeConstraint.range.minimum }}-{{ register.writeConstraint.range.maximum }}{% endif %}
164-
</p>
165-
<div class="progress">
166-
167-
<div class="progress-bar progress-bar-success" style="width: {{ register.progress }}%"></div>
168-
</div>
169-
{% if register.fields_total > 0 %}
170-
<p>
171-
<em>
172-
{{ register.fields_documented}}/{{ register.fields_total }}
173-
fields covered.
174-
</em>
175-
</p>
176-
<div class="container bitfield">
177-
<div class="row">
178-
<div class="col-sm-10">
179-
<table class="table table-striped table-bordered bitfield">
180-
<tbody>{% for row in register.table %}{% if row %}
181-
<tr>
182-
{% for header in row.headers %}
183-
<th>{{ header }}</th>
184-
{% endfor %}
185-
</tr>
186-
<tr>
187-
{% for field in row.fields %}
188-
<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>
197-
<br>
198-
{{ field.access }}
199-
{% endif %}
200-
</td>
201-
{% endfor %}
202-
</tr>
203-
{% endif %}{% endfor %}
204-
</tbody></table>
205-
</div>
206-
</div>
207-
</div>
208-
{% endif %}
209-
<details class="fields" id="{{ pname }}-{{ register.name }}-fields">
210-
<summary>Toggle fields</summary>
211-
{% for field in register.fields %}
212-
<div class="row">
213-
<div class="col-sm-10">
214-
<h4>
215-
<a name="{{ pname }}:{{ register.name }}:{{ field.name }}">
216-
</a>
217-
{{ field.name }}
218-
<a class="headerlink" href="#{{ pname }}:{{ register.name }}:{{ field.name }}">
219-
<span class="glyphicon glyphicon-link"></span>
220-
</a>
221-
</h4>
222-
<p>
223-
{% if field.width > 1 %}
224-
Bits {{ field.offset }}-{{ field.msb }}:
225-
{% else %}
226-
Bit {{ field.offset }}:
227-
{% endif %}
228-
{{ field.description }}.</p>
229-
{% if field.doc %}
230-
<p>{{ field.doc }}</p>
231-
{% endif %}
232-
</div>
233-
</div>
186+
<tr>
187+
{% for field in row.fields %}
188+
<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>
197+
<br>
198+
{{ field.access }}
199+
{% endif %}
200+
</td>
234201
{% endfor %}
235-
</details>
236-
</div>
202+
</tr>
203+
{% endif %}{% endfor %}
204+
</tbody></table>
237205
</div>
238-
{% endfor %}
239-
</details>
240-
</div>
206+
{% endif %}
207+
<details class="fields" id="{{ pname }}-{{ register.name }}-fields">
208+
<summary>Toggle fields</summary>
209+
{% for field in register.fields %}
210+
<h4>
211+
<a name="{{ pname }}:{{ register.name }}:{{ field.name }}">
212+
</a>
213+
{{ field.name }}
214+
<a class="headerlink" href="#{{ pname }}:{{ register.name }}:{{ field.name }}">
215+
<span class="glyphicon glyphicon-link"></span>
216+
</a>
217+
</h4>
218+
<p>
219+
{% if field.width > 1 %}
220+
Bits {{ field.offset }}-{{ field.msb }}:
221+
{% else %}
222+
Bit {{ field.offset }}:
223+
{% endif %}
224+
{{ field.description }}.</p>
225+
{% if field.doc %}
226+
<p>{{ field.doc }}</p>
227+
{% endif %}
228+
{% endfor %}
229+
</details>
230+
</div>
231+
{% endfor %}
232+
</details>
241233
</div>
242234
{% endfor %}
243235
</div>

0 commit comments

Comments
 (0)