Skip to content

Commit

Permalink
Finalize tag crud views
Browse files Browse the repository at this point in the history
  • Loading branch information
@MisterPhilip
MisterPhilip committed Apr 23, 2024
1 parent 4508203 commit bced665
Show file tree
Hide file tree
Showing 47 changed files with 449 additions and 402 deletions.
524 changes: 262 additions & 262 deletions babybuddy/static_src/fontello/config.json
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions babybuddy/static_src/fontello/css/babybuddy-codes.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
.icon-cancel:before { content: '\e813'; } /* '' */
.icon-head-circumference:before { content: '\e814'; } /* '' */
.icon-measurements:before { content: '\e815'; } /* '' */
.icon-tag:before { content: '\e816'; } /* '' */
.icon-height:before { content: '\f044'; } /* '' */
.icon-dashboard:before { content: '\f0e4'; } /* '' */
.icon-tummytime:before { content: '\f118'; } /* '' */
Expand Down
13 changes: 7 additions & 6 deletions babybuddy/static_src/fontello/css/babybuddy-embedded.css
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions babybuddy/static_src/fontello/css/babybuddy-ie7-codes.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
.icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-head-circumference { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-measurements { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tag { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-height { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-dashboard { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tummytime { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand Down
1 change: 1 addition & 0 deletions babybuddy/static_src/fontello/css/babybuddy-ie7.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
.icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-head-circumference { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-measurements { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tag { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-height { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-dashboard { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tummytime { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand Down
15 changes: 8 additions & 7 deletions babybuddy/static_src/fontello/css/babybuddy.css
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: 'babybuddy';
src: url('../font/babybuddy.eot?34831680');
src: url('../font/babybuddy.eot?34831680#iefix') format('embedded-opentype'),
url('../font/babybuddy.woff2?34831680') format('woff2'),
url('../font/babybuddy.woff?34831680') format('woff'),
url('../font/babybuddy.ttf?34831680') format('truetype'),
url('../font/babybuddy.svg?34831680#babybuddy') format('svg');
src: url('../font/babybuddy.eot?34829963');
src: url('../font/babybuddy.eot?34829963#iefix') format('embedded-opentype'),
url('../font/babybuddy.woff2?34829963') format('woff2'),
url('../font/babybuddy.woff?34829963') format('woff'),
url('../font/babybuddy.ttf?34829963') format('truetype'),
url('../font/babybuddy.svg?34829963#babybuddy') format('svg');
font-weight: normal;
font-style: normal;
}
Expand All @@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'babybuddy';
src: url('../font/babybuddy.svg?34831680#babybuddy') format('svg');
src: url('../font/babybuddy.svg?34829963#babybuddy') format('svg');
}
}
*/
Expand Down Expand Up @@ -76,6 +76,7 @@
.icon-cancel:before { content: '\e813'; } /* '' */
.icon-head-circumference:before { content: '\e814'; } /* '' */
.icon-measurements:before { content: '\e815'; } /* '' */
.icon-tag:before { content: '\e816'; } /* '' */
.icon-height:before { content: '\f044'; } /* '' */
.icon-dashboard:before { content: '\f0e4'; } /* '' */
.icon-tummytime:before { content: '\f118'; } /* '' */
Expand Down
33 changes: 18 additions & 15 deletions babybuddy/static_src/fontello/demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@
}
@font-face {
font-family: 'babybuddy';
src: url('./font/babybuddy.eot?50060209');
src: url('./font/babybuddy.eot?50060209#iefix') format('embedded-opentype'),
url('./font/babybuddy.woff?50060209') format('woff'),
url('./font/babybuddy.ttf?50060209') format('truetype'),
url('./font/babybuddy.svg?50060209#babybuddy') format('svg');
src: url('./font/babybuddy.eot?22207665');
src: url('./font/babybuddy.eot?22207665#iefix') format('embedded-opentype'),
url('./font/babybuddy.woff?22207665') format('woff'),
url('./font/babybuddy.ttf?22207665') format('truetype'),
url('./font/babybuddy.svg?22207665#babybuddy') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -291,14 +291,17 @@ <h1>
<div class="span3" title="Code: 0xe815">
<i class="demo-icon icon-measurements">&#xe815;</i> <span class="i-name">icon-measurements</span><span class="i-code">0xe815</span>
</div>
<div class="span3" title="Code: 0xe816">
<i class="demo-icon icon-tag">&#xe816;</i> <span class="i-name">icon-tag</span><span class="i-code">0xe816</span>
</div>
<div class="span3" title="Code: 0xf044">
<i class="demo-icon icon-height">&#xf044;</i> <span class="i-name">icon-height</span><span class="i-code">0xf044</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf0e4">
<i class="demo-icon icon-dashboard">&#xf0e4;</i> <span class="i-name">icon-dashboard</span><span class="i-code">0xf0e4</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf118">
<i class="demo-icon icon-tummytime">&#xf118;</i> <span class="i-name">icon-tummytime</span><span class="i-code">0xf118</span>
</div>
Expand All @@ -308,11 +311,11 @@ <h1>
<div class="span3" title="Code: 0xf126">
<i class="demo-icon icon-source">&#xf126;</i> <span class="i-name">icon-source</span><span class="i-code">0xf126</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf137">
<i class="demo-icon icon-angle-circled-left">&#xf137;</i> <span class="i-name">icon-angle-circled-left</span><span class="i-code">0xf137</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf138">
<i class="demo-icon icon-angle-circled-right">&#xf138;</i> <span class="i-name">icon-angle-circled-right</span><span class="i-code">0xf138</span>
</div>
Expand All @@ -322,11 +325,11 @@ <h1>
<div class="span3" title="Code: 0xf1b1">
<i class="demo-icon icon-feeding">&#xf1b1;</i> <span class="i-name">icon-feeding</span><span class="i-code">0xf1b1</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf1b3">
<i class="demo-icon icon-activities">&#xf1b3;</i> <span class="i-name">icon-activities</span><span class="i-code">0xf1b3</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf1da">
<i class="demo-icon icon-timeline">&#xf1da;</i> <span class="i-name">icon-timeline</span><span class="i-code">0xf1da</span>
</div>
Expand All @@ -336,11 +339,11 @@ <h1>
<div class="span3" title="Code: 0xf236">
<i class="demo-icon icon-sleep">&#xf236;</i> <span class="i-name">icon-sleep</span><span class="i-code">0xf236</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf249">
<i class="demo-icon icon-note">&#xf249;</i> <span class="i-name">icon-note</span><span class="i-code">0xf249</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf24e">
<i class="demo-icon icon-weight">&#xf24e;</i> <span class="i-name">icon-weight</span><span class="i-code">0xf24e</span>
</div>
Expand All @@ -350,11 +353,11 @@ <h1>
<div class="span3" title="Code: 0xf295">
<i class="demo-icon icon-bmi">&#xf295;</i> <span class="i-name">icon-bmi</span><span class="i-code">0xf295</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf2c8">
<i class="demo-icon icon-temperature">&#xf2c8;</i> <span class="i-name">icon-temperature</span><span class="i-code">0xf2c8</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf4a7">
<i class="demo-icon icon-pumping">&#xf4a7;</i> <span class="i-name">icon-pumping</span><span class="i-code">0xf4a7</span>
</div>
Expand Down
Binary file modified babybuddy/static_src/fontello/font/babybuddy.eot
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion babybuddy/static_src/fontello/font/babybuddy.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified babybuddy/static_src/fontello/font/babybuddy.ttf
View file
Binary file not shown.
Binary file modified babybuddy/static_src/fontello/font/babybuddy.woff
View file
Binary file not shown.
Binary file modified babybuddy/static_src/fontello/font/babybuddy.woff2
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion core/templates/core/tag_confirm_delete.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<a href="{% url 'core:tag-list' %}">{% trans "Tags" %}</a>
</li>
<li class="breadcrumb-item">
<a href="{% url 'core:tag-update' tag.slug %}">{{ object }}</a>
<a href="{% url 'core:tag-detail' tag.slug %}">{{ object }}</a>
</li>
<li class="breadcrumb-item active" aria-current="page">{% trans "Delete" %}</li>
{% endblock %}
Expand Down
33 changes: 29 additions & 4 deletions core/templates/core/tag_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,36 @@
<li class="breadcrumb-item">
<a href="{% url 'core:tag-list' %}">{% trans "Tags" %}</a>
</li>
<li class="breadcrumb-item active">{{ object }}</li>
<li class="breadcrumb-item active text-truncate">{{ object }}</li>
{% endblock %}
{% block content %}
<h1>{{ object }}</h1>
<div class="container">
<header class="mb-4 d-flex mb-4 d-flex align-items-center">
<h1 class="flex-grow-1 text-break mb-0">
<span class="badge badge-pill mr-2"
style="background-color:{{ object.color }};
color:{{ object.complementary_color }}">
<i class="icon-tag" aria-hidden="true"></i>
</span>
{{ object }}
</h1>
<div class="btn-group btn-group-lg border rounded border-light bg center-block"
role="group"
aria-label="{% trans "Tag actions" %}">
{% if perms.core.change_tag %}
<a class="btn d-md-inline-block"
href="{% url 'core:tag-update' object.slug %}"
title="{% trans "Edit" %}"
role="button"><i class="icon-update" aria-hidden="true"></i></a>
{% endif %}
{% if perms.core.delete_tag %}
<a class="btn d-md-inline-block"
href="{% url 'core:tag-delete' object.slug %}"
title="{% trans "Delete" %}"
role="button"><i class="icon-delete" aria-hidden="true"></i></a>
{% endif %}
</div>
</header>
<main class="container">
<div class="row gy-4">
<div class="col-12 col-md-6">
<h3>{% trans "Tagged Measurements" %}</h3>
Expand Down Expand Up @@ -78,5 +103,5 @@ <h3>{% trans "Tagged Activities" %}</h3>
</div>
</div>
</div>
</div>
</main>
{% endblock %}
3 changes: 3 additions & 0 deletions core/templates/core/tag_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<a href="{% url 'core:tag-list' %}">{% trans "Tags" %}</a>
</li>
{% if object %}
<li class="breadcrumb-item" aria-current="page">
<a href="{% url 'core:tag-detail' object.slug %}">{{ object }}</a>
</li>
<li class="breadcrumb-item active" aria-current="page">{% trans "Update" %}</li>
{% else %}
<li class="breadcrumb-item active" aria-current="page">{% trans "Add" %}</li>
Expand Down
5 changes: 2 additions & 3 deletions core/templates/core/tag_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ <h1>
<a href="{% url 'core:tag-detail' tag.slug %}">{{ tag.name }}</a>
</td>
<td class="text-center">
<span class="badge badge-pill"
style="background-color:{{ tag.color }};
margin-right: .25rem">&nbsp;</span>
<span class="badge badge-pill me-1"
style="background-color:{{ tag.color }}">&nbsp;</span>
<span class="font-monospace">{{ tag.color }}</span>
</td>
<td class="text-center">{{ tag.core_tagged_items__count }}</td>
Expand Down
9 changes: 6 additions & 3 deletions static/babybuddy/css/app.3859de688cb9.css → static/babybuddy/css/app.bed367ea9fd0.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file renamed static/babybuddy/css/app.3859de688cb9.css.gz → static/babybuddy/css/app.bed367ea9fd0.css.gz
View file
Binary file not shown.
9 changes: 6 additions & 3 deletions static/babybuddy/css/app.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified static/babybuddy/css/app.css.gz
View file
Binary file not shown.
Binary file removed static/babybuddy/font/babybuddy.1913791605fb.woff
View file
Binary file not shown.
Binary file renamed ...babybuddy/font/babybuddy.b6a356bd9752.ttf → ...babybuddy/font/babybuddy.2c5cd5a5b722.ttf
View file
Binary file not shown.
Binary file added static/babybuddy/font/babybuddy.2c5cd5a5b722.ttf.gz
View file
Binary file not shown.
Binary file added static/babybuddy/font/babybuddy.4824ee680439.woff
View file
Binary file not shown.
Binary file renamed ...babybuddy/font/babybuddy.ae7049e685dd.eot → ...babybuddy/font/babybuddy.4985d61e06fa.eot
View file
Binary file not shown.
Binary file added static/babybuddy/font/babybuddy.4985d61e06fa.eot.gz
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion ...babybuddy/font/babybuddy.ef799e0dd5c7.svg → ...babybuddy/font/babybuddy.959ca874ea2d.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/babybuddy/font/babybuddy.959ca874ea2d.svg.gz
View file
Binary file not shown.
Binary file removed static/babybuddy/font/babybuddy.998e9bc52faf.woff2
View file
Binary file not shown.
Binary file removed static/babybuddy/font/babybuddy.ae7049e685dd.eot.gz
View file
Binary file not shown.
Binary file removed static/babybuddy/font/babybuddy.b6a356bd9752.ttf.gz
View file
Binary file not shown.
Binary file added static/babybuddy/font/babybuddy.db3801dbfb43.woff2
View file
Binary file not shown.
Binary file removed static/babybuddy/font/babybuddy.ef799e0dd5c7.svg.gz
View file
Binary file not shown.
Binary file modified static/babybuddy/font/babybuddy.eot
View file
Binary file not shown.
Binary file modified static/babybuddy/font/babybuddy.eot.gz
View file
Binary file not shown.

0 comments on commit bced665

Please sign in to comment.