mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-03 13:19:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

recipe switcher and navbar fixes

Browse Source 
also added left_hand to global preferences
This commit is contained in:
Kaibu
2022-04-18 14:13:23 +02:00
parent d1065c8ac4
commit 45a86a22e3
5 changed files with 115 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
cookbook/templates/base.html
View File

@@ -56,23 +56,46 @@
{% block extra_head %} <!-- block for templates to put stuff into header -->
{% endblock %}
<style>
{% if request.user.userpreference.left_handed %}
@media screen and (max-width: 600px) {
#switcher .btn-circle {
left: 80px !important;
}
}
{% endif %}
</style>
</head>
<body>
<nav class="navbar navbar-expand-lg navbar-dark bg-{% nav_color request %} bg-header" id="id_main_nav"
style="{% sticky_nav request %}">
{% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %}
<a class="navbar-brand p-0 me-2 justify-content-center" href="{% base_path request 'base' %}" aria-label="Tandoor">
<img class="brand-icon" src="{% static 'assets/brand_logo.svg' %}" alt="Logo">
</a>
<nav class="navbar navbar-expand-lg navbar-dark bg-{% nav_color request %} bg-header"
id="id_main_nav"
style="{% sticky_nav request %}">
{% if not request.user.userpreference.left_handed %}
{% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %}
<a class="navbar-brand p-0 me-2 justify-content-center" href="{% base_path request 'base' %}"
aria-label="Tandoor">
<img class="brand-icon" src="{% static 'assets/brand_logo.svg' %}" alt="Logo">
</a>
{% endif %}
{% endif %}
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText"
aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
{% if request.user.userpreference.left_handed %}
{% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %}
<a class="navbar-brand p-0 me-2 justify-content-center" href="{% base_path request 'base' %}"
aria-label="Tandoor">
<img class="brand-icon" src="{% static 'assets/brand_logo.svg' %}" alt="Logo">
</a>
{% endif %}
{% endif %}
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav mr-auto">
<li class="nav-item {% if request.resolver_match.url_name in 'view_search' %}active{% endif %}">
@@ -104,141 +127,140 @@
<i class="fas fa-toolbox fa-lg"></i>
</a>
<div class="dropdown-menu dropdown-menu-center dropdown-menu-center-large">
<div class="row m-0">
<div class="row m-0 mt-2 mt-md-0">
<div class="col-4">
<a href="{% url 'list_keyword' %}" class="p-1">
<a href="{% url 'list_keyword' %}" class="p-0 p-md-1">
<div class="card p-0 no-gutters border-0">
<div class="card-body text-center p-0 no-gutters">
<i class="fas fa-tags fa-2x"></i>
</div>
<div class="card-body text-break text-center p-0 no-gutters text-muted">
<div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
{% trans 'Keyword' %}
</div>
</div>
</a>
</div>
<div class="col-4">
<a href="{% url 'list_food' %}" class="p-1">
<a href="{% url 'list_food' %}" class="p-0 p-md-1">
<div class="card p-0 no-gutters border-0">
<div class="card-body text-center p-0 no-gutters">
<i class="fas fa-leaf fa-2x"></i>
</div>
<div class="card-body text-break text-center p-0 no-gutters text-muted">
<div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
{% trans 'Foods' %}
</div>
</div>
</a>
</div>
<div class="col-4">
<a href="{% url 'list_unit' %}" class="p-1">
<a href="{% url 'list_unit' %}" class="p-0 p-md-1">
<div class="card p-0 no-gutters border-0">
<div class="card-body text-center p-0 no-gutters">
<i class="fas fa-balance-scale fa-2x"></i>
</div>
<div class="card-body text-break text-center p-0 no-gutters text-muted">
<div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
{% trans 'Units' %}
</div>
</div>
</a>
</div>
</div>
<div class="row m-0">
<div class="row m-0 mt-2 mt-md-0">
<div class="col-4">
<a href="{% url 'list_supermarket' %}" class="p-1">
<a href="{% url 'list_supermarket' %}" class="p-0 p-md-1">
<div class="card p-0 no-gutters border-0">
<div class="card-body text-center p-0 no-gutters">
<i class="fas fa-store-alt fa-2x"></i>
</div>
<div class="card-body text-break text-center p-0 no-gutters text-muted">
<div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
{% trans 'Supermarket' %}
</div>
</div>
</a>
</div>
<div class="col-4">
<a href="{% url 'list_supermarket_category' %}" class="p-1">
<a href="{% url 'list_supermarket_category' %}" class="p-0 p-md-1">
<div class="card p-0 no-gutters border-0">
<div class="card-body text-center p-0 no-gutters">
<i class="fas fa-cubes fa-2x"></i>
</div>
<div class="card-body text-break text-center p-0 no-gutters text-muted">
<div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
{% trans 'Supermarket Category' %}
</div>
</div>
</a>
</div>
<div class="col-4">
<a href="{% url 'list_automation' %}" class="p-1">
<a href="{% url 'list_automation' %}" class="p-0 p-md-1">
<div class="card p-0 no-gutters border-0">
<div class="card-body text-center p-0 no-gutters">
<i class="fas fa-robot fa-2x"></i>
</div>
<div class="card-body text-break text-center p-0 no-gutters text-muted">
<div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
{% trans 'Automations' %}
</div>
</div>
</a>
</div>
</div>
<div class="row m-0">
<div class="row m-0 mt-2 mt-md-0">
<div class="col-4">
<a href="{% url 'list_user_file' %}" class="p-1">
<a href="{% url 'list_user_file' %}" class="p-0 p-md-1">
<div class="card p-0 no-gutters border-0">
<div class="card-body text-center p-0 no-gutters">
<i class="fas fa-file fa-2x"></i>
</div>
<div class="card-body text-break text-center p-0 no-gutters text-muted">
<div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
{% trans 'Files' %}
</div>
</div>
</a>
</div>
<div class="col-4">
<a href="{% url 'data_batch_edit' %}" class="p-1">
<a href="{% url 'data_batch_edit' %}" class="p-0 p-md-1">
<div class="card p-0 no-gutters border-0">
<div class="card-body text-center p-0 no-gutters">
<i class="fas fa-edit fa-2x"></i>
</div>
<div class="card-body text-break text-center p-0 no-gutters text-muted">
<div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
{% trans 'Batch Edit' %}
</div>
</div>
</a>
</div>
<div class="col-4">
<a href="{% url 'view_history' %}" class="p-1">
<a href="{% url 'view_history' %}" class="p-0 p-md-1">
<div class="card p-0 no-gutters border-0">
<div class="card-body text-center p-0 no-gutters">
<i class="fas fa-history fa-2x"></i>
</div>
<div class="card-body text-break text-center p-0 no-gutters text-muted">
<div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
{% trans 'History' %}
</div>
</div>
</a>
</div>
</div>
<div class="row m-0">
<div class="row m-0 mt-2 mt-md-0">
<div class="col-4">
<a href="{% url 'view_ingredient_editor' %}" class="p-1">
<a href="{% url 'view_ingredient_editor' %}" class="p-0 p-md-1">
<div class="card p-0 no-gutters border-0">
<div class="card-body text-center p-0 no-gutters">
<i class="fas fa-th-list fa-2x"></i>
</div>
<div class="card-body text-break text-center p-0 no-gutters text-muted">
<div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
{% trans 'Ingredient Editor' %}
</div>
</div>
</a>
</div>
<div class="col-4">
<a href="{% url 'view_export' %}" class="p-1">
<a href="{% url 'view_export' %}" class="p-0 p-md-1">
<div class="card p-0 no-gutters border-0">
<div class="card-body text-center p-0 no-gutters">
<i class="fas fa-file-export fa-2x"></i>
</div>
<div class="card-body text-break text-center p-0 no-gutters text-muted">
<div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
{% trans 'Export' %}
</div>
</div>
@@ -315,7 +337,8 @@
</div>
{% endif %}
<div class="container-fluid mt-2 mt-md-5 mt-xl-5 mt-lg-5" id="id_base_container">
<div class="container-fluid mt-2 mt-md-5 mt-xl-5 mt-lg-5{% if request.user.userpreference.left_handed %} left-handed {% endif %}"
id="id_base_container">
<div class="row">
<div class="col-xl-2 d-none d-xl-block">
{% block content_xl_left %}
@@ -350,7 +373,7 @@
{% block content_fluid %}
{% endblock %}
{% user_prefs request as prefs%}
{% user_prefs request as prefs %}
{{ prefs|json_script:'user_preference' }}
</div>