cleanup and dependency updates + new nav

This commit is contained in:
vabene1111 2019-11-19 19:59:53 +01:00
parent 52b9cba93c
commit 8eca629410
28 changed files with 9194 additions and 15404 deletions

View File

@ -0,0 +1,230 @@
[
{
"model": "cookbook.keyword",
"pk": 1,
"fields": {
"name": "Hauptgang",
"icon": "\ud83c\udf7d",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:07:08.957Z",
"updated_at": "2019-11-15T14:07:08.957Z"
}
},
{
"model": "cookbook.keyword",
"pk": 2,
"fields": {
"name": "Vorspeise",
"icon": "\ud83e\udd63",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:07:31.863Z",
"updated_at": "2019-11-15T14:07:31.863Z"
}
},
{
"model": "cookbook.keyword",
"pk": 3,
"fields": {
"name": "Nachtisch",
"icon": "\ud83c\udf68",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:07:49.873Z",
"updated_at": "2019-11-15T14:07:49.873Z"
}
},
{
"model": "cookbook.keyword",
"pk": 4,
"fields": {
"name": "Salat",
"icon": "\ud83e\udd57",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:07:58.033Z",
"updated_at": "2019-11-15T14:07:58.034Z"
}
},
{
"model": "cookbook.keyword",
"pk": 5,
"fields": {
"name": "Rind",
"icon": "\ud83d\udc04",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:08:24.881Z",
"updated_at": "2019-11-15T14:08:24.881Z"
}
},
{
"model": "cookbook.keyword",
"pk": 6,
"fields": {
"name": "Schwein",
"icon": "\ud83d\udc16",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:08:35.754Z",
"updated_at": "2019-11-15T14:08:35.754Z"
}
},
{
"model": "cookbook.keyword",
"pk": 7,
"fields": {
"name": "Huhn",
"icon": "\ud83d\udc14",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:08:43.360Z",
"updated_at": "2019-11-15T14:08:43.360Z"
}
},
{
"model": "cookbook.keyword",
"pk": 8,
"fields": {
"name": "Wild",
"icon": "\ud83e\udd8c",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:08:52.137Z",
"updated_at": "2019-11-15T14:08:52.137Z"
}
},
{
"model": "cookbook.keyword",
"pk": 9,
"fields": {
"name": "Kuchen",
"icon": "\ud83c\udf70",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:09:00.433Z",
"updated_at": "2019-11-15T14:09:00.433Z"
}
},
{
"model": "cookbook.keyword",
"pk": 10,
"fields": {
"name": "Nudeln",
"icon": "\ud83c\udf5d",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:09:25.839Z",
"updated_at": "2019-11-15T14:09:25.839Z"
}
},
{
"model": "cookbook.keyword",
"pk": 11,
"fields": {
"name": "Reis",
"icon": "\ud83c\udf5a",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:09:31.879Z",
"updated_at": "2019-11-15T14:09:31.879Z"
}
},
{
"model": "cookbook.keyword",
"pk": 12,
"fields": {
"name": "Kartoffeln",
"icon": "\ud83e\udd54",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:09:39.023Z",
"updated_at": "2019-11-15T14:09:39.023Z"
}
},
{
"model": "cookbook.keyword",
"pk": 13,
"fields": {
"name": "Suppe",
"icon": "\ud83c\udf72",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:14:54.922Z",
"updated_at": "2019-11-15T14:14:54.922Z"
}
},
{
"model": "cookbook.keyword",
"pk": 14,
"fields": {
"name": "Thermomix",
"icon": "\u2699",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:15:35.806Z",
"updated_at": "2019-11-15T14:15:35.806Z"
}
},
{
"model": "cookbook.keyword",
"pk": 15,
"fields": {
"name": "S\u00fc\u00df",
"icon": "\ud83c\udf6f",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:19:03.339Z",
"updated_at": "2019-11-15T14:19:03.339Z"
}
},
{
"model": "cookbook.keyword",
"pk": 16,
"fields": {
"name": "Auflauf",
"icon": "\ud83e\udd58",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:19:21.874Z",
"updated_at": "2019-11-15T14:19:21.874Z"
}
},
{
"model": "cookbook.keyword",
"pk": 17,
"fields": {
"name": "Backen",
"icon": "\ud83d\udd25",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:21:19.399Z",
"updated_at": "2019-11-15T14:21:19.399Z"
}
},
{
"model": "cookbook.keyword",
"pk": 18,
"fields": {
"name": "Fisch",
"icon": "\ud83d\udc1f",
"description": "",
"created_by": 0,
"created_at": "2019-11-15T14:23:32.303Z",
"updated_at": "2019-11-15T14:23:32.303Z"
}
},
{
"model": "cookbook.keyword",
"pk": 19,
"fields": {
"name": "Dip",
"icon": "\ud83e\udd6b",
"description": "",
"created_by": 0,
"created_at": "2019-11-16T13:32:42.625Z",
"updated_at": "2019-11-16T13:43:28.404Z"
}
}
]

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 500 KiB

After

Width:  |  Height:  |  Size: 684 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 759 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 699 KiB

After

Width:  |  Height:  |  Size: 141 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 593 KiB

After

Width:  |  Height:  |  Size: 823 KiB

View File

@ -24,7 +24,7 @@
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/css/select2.min.css" rel="stylesheet"/> <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/css/select2.min.css" rel="stylesheet"/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>
<link rel="stylesheet" href="{% static "fontawesome/fontawesome-all.css" %}"> <link rel="stylesheet" href="{% static "fontawesome/fontawesome_all.min.css" %}">
<link rel="stylesheet" href="{% static "emojionearea/emojionearea.min.css" %}"> <link rel="stylesheet" href="{% static "emojionearea/emojionearea.min.css" %}">
<script type="text/javascript" src="{% static "emojionearea/emojionearea.min.js" %}"></script> <script type="text/javascript" src="{% static "emojionearea/emojionearea.min.js" %}"></script>
@ -59,29 +59,29 @@
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false">
{% trans 'List' %} {% trans 'Tags' %}
</a> </a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="{% url 'list_keyword' %}"><i <a class="dropdown-item" href="{% url 'list_keyword' %}"><i
class="fas fa-tags"></i> {% trans 'Keyword' %}</a> class="fas fa-tags"></i> {% trans 'Keyword' %}</a>
<a class="dropdown-item" href="{% url 'list_storage' %}"><i <a class="dropdown-item" href="{% url 'data_batch_edit' %}"><i
class="fas fa-database"></i> {% trans 'Storage Backends' %}</a> class="fas fa-edit"></i> {% trans 'Batch Edit' %}</a>
</div> </div>
</li> </li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false">
{% trans 'Manage Data' %} {% trans 'Storage Data' %}
</a> </a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="{% url 'list_storage' %}"><i
class="fas fa-database"></i> {% trans 'Storage Backends' %}</a>
<a class="dropdown-item" href="{% url 'data_sync' %}"><i <a class="dropdown-item" href="{% url 'data_sync' %}"><i
class="fas fa-sync-alt"></i> {% trans 'Configure Sync' %}</a> class="fas fa-sync-alt"></i> {% trans 'Configure Sync' %}</a>
<a class="dropdown-item" href="{% url 'list_import' %}"><i <a class="dropdown-item" href="{% url 'list_import' %}"><i
class="far fa-file-alt"></i> {% trans 'Import Recipes' %}</a> class="far fa-file-alt"></i> {% trans 'Import Recipes' %}</a>
<a class="dropdown-item" href="{% url 'list_import_log' %}"><i <a class="dropdown-item" href="{% url 'list_import_log' %}"><i
class="fas fa-history"></i> {% trans 'Import Log' %}</a> class="fas fa-history"></i> {% trans 'Import Log' %}</a>
<a class="dropdown-item" href="{% url 'data_batch_edit' %}"><i
class="fas fa-edit"></i> {% trans 'Batch Edit' %}</a>
<a class="dropdown-item" href="{% url 'data_stats' %}"><i <a class="dropdown-item" href="{% url 'data_stats' %}"><i
class="fas fa-chart-line"></i> {% trans 'Statistics' %}</a> class="fas fa-chart-line"></i> {% trans 'Statistics' %}</a>
</div> </div>

View File

@ -21,7 +21,7 @@
<div class="card-body"> <div class="card-body">
<form action="" method="get" id="search_form"> <form action="" method="get" id="search_form">
{{ filter.form|crispy }} {{ filter.form|crispy }}
<input class="btn btn-primary" type="submit"/> <input class="btn btn-primary" type="submit" value="{% trans 'Search' %}"/>
<a href="#" onclick="window.location = window.location.pathname;" <a href="#" onclick="window.location = window.location.pathname;"
class="btn btn-warning">{% trans 'Reset' %}</a> class="btn btn-warning">{% trans 'Reset' %}</a>
<a href="{% url 'new_recipe' %}" class="btn btn-success">{% trans 'New' %}</a> <a href="{% url 'new_recipe' %}" class="btn btn-success">{% trans 'New' %}</a>