Skip to content

Commit 1774896

Browse files
smotornyuksmotornyuk
committed
chore: fix tables
1 parent 82d98bf commit 1774896

16 files changed

Lines changed: 221 additions & 335 deletions

File tree

‎ckanext/theming/themes/bare/templates/admin/index.html‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,21 @@
33
{%- block primary_content_inner %}
44
<h2>{{ _('Current Sysadmins') }}</h2>
55

6-
{%- call ui.table_block(bordered=true, striped=true) -%}
7-
{%- call ui.table_head_block() -%}
8-
{{ ui.table_row([_('User'), ''], heading=true) }}
9-
{%- endcall %}
6+
{%- call ui.util.call(ui.table, bordered=true, striped=true) -%}
7+
{{ ui.table_head(ui.table_row(cells=[_('User'), ''], heading=true)) }}
108

11-
{%- call ui.table_body_block() -%}
9+
{%- call ui.util.call(ui.table_body) -%}
1210
{%- for user in sysadmins %}
13-
{%- call ui.table_row_block() -%}
11+
{%- call ui.util.call(ui.table_row) -%}
1412
{{ ui.table_cell(h.linked_user(user)) }}
15-
<td>
13+
{%- call ui.util.call(ui.table_cell) -%}
1614
<form method="POST" action="{{ h.url_for('user.sysadmin') }}">
1715
{{ h.csrf_input() }}
1816
<input type="hidden" value="{{ user }}" name="username" />
1917
<input type="hidden" value="0" name="status" />
2018
{{ ui.button(_('Revoke'), type="submit", attrs={"class": "btn btn-danger btn-sm"}) }}
2119
</form>
22-
</td>
20+
{%- endcall %}
2321
{%- endcall %}
2422
{%- endfor %}
2523
{%- endcall %}
@@ -31,14 +29,14 @@ <h2>{{ _('Current Sysadmins') }}</h2>
3129
<h2>{{ _('Promote user to Sysadmin') }}</h2>
3230

3331
{{ ui.form_start(method="POST", action=h.url_for('user.sysadmin')) }}
34-
{{ h.csrf_input() }}
32+
{{ h.csrf_input() }}
3533

36-
{{ ui.input("username", label=_('Username'), placeholder=_('Username'),
34+
{{ ui.input("username", label=_('Username'), placeholder=_('Username'),
3735
attrs={"data-module": "autocomplete",
3836
"data-module-source": "/api/2/util/user/autocomplete?ignore_self=true&q=?"}) }}
39-
<input type="hidden" value="1" name="status" />
37+
<input type="hidden" value="1" name="status" />
4038

41-
{{ ui.button(_('Promote'), type="submit", attrs={"class": "btn btn-primary"}) }}
39+
{{ ui.button(_('Promote'), type="submit", attrs={"class": "btn btn-primary"}) }}
4240
{{ ui.form_end() }}
4341
{%- endblock %}
4442

‎ckanext/theming/themes/bare/templates/base.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<meta name="{{ g.csrf_field_name }}" content="{{ csrf_token() }}" />
1212
{% endblock meta_csrf %}
1313
{%- block meta_generator %}<meta name="generator" content="ckan {{ h.ckan_version() }}" />{% endblock %}
14-
{%- block meta_viewport %}<meta name="viewport" content="width=device-width, initial-scale=1.0">{% endblock %}
14+
{%- block meta_viewport %}<meta name="viewport" content="width=device-width, initial-scale=1">{% endblock %}
1515
{%- endblock meta -%}
1616

1717
<title>

‎ckanext/theming/themes/bare/templates/macros/ui.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848

4949
{% set datetime = misc.datetime %}
5050

51-
{% set table_block = data.table_block %}
52-
{% set table_head_block = data.table_head_block %}
53-
{% set table_body_block = data.table_body_block %}
51+
{% set table = data.table %}
52+
{% set table_head = data.table_head %}
53+
{% set table_body = data.table_body %}
5454
{% set table_row_block = data.table_row_block %}
5555
{% set table_row = data.table_row %}
5656
{% set table_cell = data.table_cell %}

‎ckanext/theming/themes/bare/templates/macros/ui/data.html‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
1-
{%- macro table_block(striped=false, bordered=false) -%}
2-
{%- do kwargs -%}
3-
<table class="{{ 'table-bordered' if bordered }} {{ 'table-striped' if striped }}">
4-
{{ caller() }}
1+
{%- macro table(content, striped=false, bordered=false) -%}
2+
<table {{ ui.util.attrs(kwargs) }} class="{{ 'table-bordered' if bordered }} {{ 'table-striped' if striped }}">
3+
{{ content }}
54
</table>
65
{%- endmacro %}
76

8-
{%- macro table_head_block() -%}
9-
{%- do kwargs -%}
10-
<thead>{{ caller() }}</thead>
11-
7+
{%- macro table_head(content) -%}
8+
<thead {{ ui.util.attrs(kwargs) }}>{{ content }}</thead>
129
{%- endmacro %}
1310

1411

15-
{%- macro table_body_block() -%}
12+
{%- macro table_body(content) -%}
1613
{%- do kwargs -%}
17-
<tbody>{{ caller() }}</tbody>
14+
<tbody>{{ content }}</tbody>
1815
{%- endmacro %}
1916

20-
{%- macro table_row_block() -%}
21-
{%- do kwargs -%}
22-
<tr>
23-
{{ caller() }}
17+
{%- macro table_row(content, cells=[], heading=false) -%}
18+
<tr {{ ui.util.attrs(kwargs) }}>
19+
{%- if content -%}
20+
{{ content }}
21+
{%- else -%}
22+
{%- for cell in cells %}
23+
{{ ui.table_cell(cell, heading) }}
24+
{%- endfor %}
25+
{%- endif %}
2426
</tr>
2527
{%- endmacro %}
2628

27-
{%- macro table_row(columns, heading=false) -%}
28-
{%- do kwargs -%}
29-
{%- call ui.table_row_block() %}
30-
{%- for column in columns %}
31-
{{ ui.table_cell(column, heading) }}
32-
{%- endfor %}
33-
{%- endcall %}
34-
{%- endmacro %}
35-
3629
{%- macro table_cell(content, heading=false) -%}
3730
{%- do kwargs -%}
3831
{% set tag = "th" if heading else "td" %}

‎ckanext/theming/themes/bare/templates/package/read.html‎

Lines changed: 16 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -39,88 +39,57 @@
3939
{%- endif %}
4040

4141
{%- call ui.accordion_item(_("Additional details")) %}
42-
{%- call ui.table_block(bordered=true, striped=true) %}
43-
{%- call ui.table_head_block() %}
44-
{{ ui.table_row([_("Field"), _("Value")], heading=true) }}
45-
{%- endcall %}
46-
47-
{%- call ui.table_body_block() %}
4842

43+
{%- call ui.util.call(ui.table, bordered=true, striped=true) -%}
44+
{{ ui.table_head(ui.table_row(cells=[_("Field"), _("Value")], heading=true)) }}
4945

46+
{%- call ui.util.call(ui.table_body) -%}
5047
{%- if pkg_dict.url %}
51-
{%- call ui.table_row_block() %}
52-
{{ ui.table_cell(_('Source'), heading=true) }}
53-
{{ ui.table_cell(ui.link(pkg_dict.url)) }}
54-
{%- endcall %}
48+
{{ ui.table_row(ui.table_cell(_('Source'), heading=true) ~ ui.table_cell(ui.link(pkg_dict.url))) }}
5549
{%- endif %}
5650

5751
{%- if pkg_dict.author_email %}
58-
{%- call ui.table_row_block() %}
59-
{{ ui.table_cell(_("Author"), heading=true) }}
60-
{{ ui.table_cell(h.mail_to(email_address=pkg_dict.author_email, name=pkg_dict.author)) }}
61-
{%- endcall %}
52+
{{ ui.table_row(ui.table_cell(_("Author"), heading=true) ~ ui.table_cell(h.mail_to(email_address=pkg_dict.author_email, name=pkg_dict.author))) }}
6253

6354
{%- elif pkg_dict.author %}
64-
{%- call ui.table_row_block() %}
65-
{{ ui.table_cell(_("Author"), heading=true) }}
66-
{{ ui.table_cell(pkg_dict.author) }}
67-
{%- endcall %}
55+
{{ ui.table_row(ui.table_cell(_("Author"), heading=true) ~ ui.table_cell(pkg_dict.author)) }}
6856
{%- endif %}
6957

7058
{%- if pkg_dict.maintainer_email %}
71-
{%- call ui.table_row_block() %}
72-
{{ ui.table_cell(_('Maintainer'), heading=true) }}
73-
{{ ui.table_cell(h.mail_to(email_address=pkg_dict.maintainer_email, name=pkg_dict.maintainer)) }}
74-
{%- endcall %}
59+
{{ ui.table_row(ui.table_cell(_('Maintainer'), heading=true) ~ ui.table_cell(h.mail_to(email_address=pkg_dict.maintainer_email, name=pkg_dict.maintainer))) }}
7560

7661
{%- elif pkg_dict.maintainer %}
77-
{%- call ui.table_row_block() %}
78-
{{ ui.table_cell(_('Maintainer'), heading=true) }}
79-
{{ ui.table_cell(pkg_dict.maintainer) }}
80-
{%- endcall %}
62+
{{ ui.table_row(ui.table_cell(_('Maintainer'), heading=true) ~ ui.table_cell(pkg_dict.maintainer)) }}
8163
{%- endif %}
8264

8365
{%- if pkg_dict.version %}
84-
{%- call ui.table_row_block() %}
85-
{{ ui.table_cell(_("Version"), heading=true) }}
86-
{{ ui.table_cell(pkg_dict.version) }}
87-
{%- endcall %}
66+
{{ ui.table_row(ui.table_cell(_("Version"), heading=true) ~ ui.table_cell(pkg_dict.version)) }}
8867
{%- endif %}
8968

9069
{%- if h.check_access('package_update',{'id':pkg_dict.id}) %}
91-
{%- call ui.table_row_block() %}
92-
{{ ui.table_cell(_("State"), heading=true) }}
93-
{{ ui.table_cell(_(pkg_dict.state)) }}
94-
{%- endcall %}
70+
{{ ui.table_row(ui.table_cell(_("State"), heading=true) ~ ui.table_cell(_(pkg_dict.state))) }}
9571
{%- endif %}
9672

9773
{%- if pkg_dict.metadata_modified %}
98-
{%- call ui.table_row_block() %}
99-
{{ ui.table_cell(_("Last Updated"), heading=true) }}
100-
{{ ui.table_cell(ui.datetime(pkg_dict.metadata_modified)) }}
101-
{%- endcall %}
74+
{{ ui.table_row(ui.table_cell(_("Last Updated"), heading=true) ~ ui.table_cell(ui.datetime(pkg_dict.metadata_modified))) }}
10275
{%- endif %}
10376

10477
{%- if pkg_dict.metadata_created %}
105-
{%- call ui.table_row_block() %}
106-
{{ ui.table_cell(_("Created"), heading=true) }}
107-
{{ ui.table_cell(ui.datetime(pkg_dict.metadata_created)) }}
108-
{%- endcall %}
78+
{{ ui.table_row(ui.table_cell(_("Created"), heading=true) ~ ui.table_cell(ui.datetime(pkg_dict.metadata_created))) }}
10979
{%- endif %}
11080

11181
{%- block extras scoped %}
11282
{%- for extra in h.sorted_extras(pkg_dict.extras) %}
11383
{% set key, value = extra %}
114-
{%- call ui.table_row_block() %}
115-
{{ ui.table_cell(_(key|e), heading=true) }}
116-
{{ ui.table_cell(value) }}
117-
{%- endcall %}
84+
{{ ui.table_row(ui.table_cell(_(key|e), heading=true) ~ ui.table_cell(value)) }}
11885
{%- endfor %}
11986
{%- endblock %}
12087

12188
{%- endcall %}
12289

123-
{%- endcall %}
90+
{%- endcall %}
91+
92+
12493
{%- endcall %}
12594
{%- endcall %}
12695

‎ckanext/theming/themes/bs5/templates/base.html‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,3 @@
1212
{%- asset "theming/bs5/scripts" -%}
1313
{%- endblock %}
1414
{%- endblock %}
15-
16-
{%- block head_extras %}
17-
<meta name="viewport" content="width=device-width, initial-scale=1">
18-
{%- endblock %}

‎ckanext/theming/themes/bs5/templates/macros/ui.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
{% set account_block = meta.account_block %}
6161

6262
{# Data macros #}
63-
{% set table_block = data.table_block %}
64-
{% set table_head_block = data.table_head_block %}
65-
{% set table_body_block = data.table_body_block %}
63+
{% set table = data.table %}
64+
{% set table_head = data.table_head %}
65+
{% set table_body = data.table_body %}
6666
{% set table_row_block = data.table_row_block %}
6767
{% set table_row = data.table_row %}
6868
{% set table_cell = data.table_cell %}

‎ckanext/theming/themes/bs5/templates/macros/ui/data.html‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,35 @@
1-
{%- macro table_block(striped=false, bordered=false) -%}
1+
{%- macro table(content, striped=false, bordered=false) -%}
22
<div {{ ui.util.attrs(kwargs) }} class="table-responsive">
33
<table class="table {{ 'table-striped' if striped }} {{ 'table-bordered' if bordered }}">
4-
{{ caller() }}
4+
{{ content }}
55
</table>
66
</div>
77
{%- endmacro %}
88

9-
{%- macro table_head_block() -%}
9+
{%- macro table_head(content) -%}
1010
<thead {{ ui.util.attrs(kwargs) }}>
11-
{{ caller() }}
11+
{{ content }}
1212
</thead>
1313
{%- endmacro %}
1414

15-
{%- macro table_body_block() -%}
15+
{%- macro table_body(content) -%}
1616
<tbody {{ ui.util.attrs(kwargs) }}>
17-
{{ caller() }}
17+
{{ content }}
1818
</tbody>
1919
{%- endmacro %}
2020

21-
{%- macro table_row_block() -%}
21+
{%- macro table_row(content, cells=[], heading=false) -%}
2222
<tr {{ ui.util.attrs(kwargs) }}>
23-
{{ caller() }}
23+
{%- if content -%}
24+
{{ content }}
25+
{%- else -%}
26+
{%- for cell in cells %}
27+
{{ ui.table_cell(cell, heading) }}
28+
{%- endfor %}
29+
{%- endif %}
2430
</tr>
2531
{%- endmacro %}
2632

27-
{%- macro table_row(columns, heading=false) -%}
28-
{%- call ui.table_row_block() %}
29-
{%- for column in columns %}
30-
{{ ui.table_cell(column, heading) }}
31-
{%- endfor %}
32-
{%- endcall %}
33-
{%- endmacro %}
34-
3533
{%- macro table_cell(content, heading=false) -%}
3634
{% set tag = "th" if heading else "td" %}
3735
<{{ tag }} {{ ui.util.attrs(kwargs) }}>{{ content }}</{{ tag }}>

0 commit comments

Comments
 (0)