gburri/recipes
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Remove trailing slash for void elements... sadly

Browse source
This commit is contained in:
Greg Burri 2025-02-14 18:58:32 +01:00
parent a1fd63ad08
commit cb2483eab1
13 changed files with 57 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/templates/ask_reset_password.html
View file

@ -7,10 +7,10 @@
<label for="email_field">{{ tr.t(Sentence::EmailAddress) }}</label> <label for="email_field">{{ tr.t(Sentence::EmailAddress) }}</label>
<input id="email_field" type="email" <input id="email_field" type="email"
name="email" value="{{ email }}" name="email" value="{{ email }}"
autocapitalize="none" autocomplete="email" autofocus="autofocus" /> autocapitalize="none" autocomplete="email" autofocus="autofocus">
{{ message_email }} {{ message_email }}
<input type="submit" name="commit" value="{{ tr.t(Sentence::AskResetButton) }}" /> <input type="submit" name="commit" value="{{ tr.t(Sentence::AskResetButton) }}">
</form> </form>
{{ message }} {{ message }}
</div> </div>

10
backend/templates/base.html
View file

@ -1,10 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ tr.current_lang_and_territory_code() }}" data-user-logged="{{ user.is_some() }}" > <html lang="{{ tr.current_lang_and_territory_code() }}" data-user-logged="{{ user.is_some() }}" >
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Recettes de cuisine</title> <title>Recettes de cuisine</title>
<link rel="stylesheet" type="text/css" href="/static/style.css" /> <link rel="stylesheet" type="text/css" href="/static/style.css">
</head> </head>
<body> <body>
@ -20,8 +20,8 @@
<dialog id="modal-dialog"> <dialog id="modal-dialog">
<div class="content"></div> <div class="content"></div>
<input type="button" class="ok" value="OK" /> <input type="button" class="ok" value="OK">
<input type="button" class="cancel" value="Cancel" /> <input type="button" class="cancel" value="Cancel">
</dialog> </dialog>
{% block body_container %}{% endblock %} {% block body_container %}{% endblock %}

2
backend/templates/base_with_header.html
View file

@ -14,7 +14,7 @@
{% else %} {% else %}
{{ user.name }} {{ user.name }}
{% endif %} {% endif %}
</a> / <a href="/signout" />{{ tr.t(Sentence::SignOut) }}</a> </a> / <a href="/signout">{{ tr.t(Sentence::SignOut) }}</a>
{% when None %} {% when None %}
<a href="/signin" >{{ tr.t(Sentence::SignInMenu) }}</a>/<a href="/signup">{{ tr.t(Sentence::SignUpMenu) }}</a>/<a href="/ask_reset_password">{{ tr.t(Sentence::LostPassword) }}</a> <a href="/signin" >{{ tr.t(Sentence::SignInMenu) }}</a>/<a href="/signup">{{ tr.t(Sentence::SignUpMenu) }}</a>/<a href="/ask_reset_password">{{ tr.t(Sentence::LostPassword) }}</a>
{% endmatch %} {% endmatch %}

3
backend/templates/calendar.html
View file

@ -34,6 +34,7 @@
] %} ] %}
<li class="weekday">{{ tr.t(*day) }}</li> <li class="weekday">{{ tr.t(*day) }}</li>
{% endfor %} {% endfor %}
</ul>
<ul class="days"> <ul class="days">
{% for i in 0..5 %} {% for i in 0..5 %}
@ -56,7 +57,7 @@
id="input-remove-ingredients-from-shopping-list" id="input-remove-ingredients-from-shopping-list"
type="checkbox" type="checkbox"
checked checked
/> >
<label for="input-remove-ingredients-from-shopping-list"> <label for="input-remove-ingredients-from-shopping-list">
{{ tr.t(Sentence::CalendarRemoveIngredientsFromShoppingList) }} {{ tr.t(Sentence::CalendarRemoveIngredientsFromShoppingList) }}
</label> </label>

2
backend/templates/home.html
View file

@ -14,7 +14,7 @@
<div id="hidden-templates"> <div id="hidden-templates">
<div class="shopping-item"> <div class="shopping-item">
<input class="item-is-checked" type="checkbox"/> <input class="item-is-checked" type="checkbox">
<div class="item-quantity"></div> <div class="item-quantity"></div>
<div class="item-name"></div> <div class="item-name"></div>
<div class="item-scheduled-recipe"><a></a></div> <div class="item-scheduled-recipe"><a></a></div>

12
backend/templates/profile.html
View file

@ -17,12 +17,12 @@
value="{{ username }}" value="{{ username }}"
autocapitalize="none" autocapitalize="none"
autocomplete="title" autocomplete="title"
autofocus="autofocus" /> autofocus="autofocus">
<label for="input-email">{{ tr.t(Sentence::ProfileEmail) }}</label> <label for="input-email">{{ tr.t(Sentence::ProfileEmail) }}</label>
<input id="input-email" type="email" <input id="input-email" type="email"
name="email" value="{{ email }}" name="email" value="{{ email }}"
autocapitalize="none" autocomplete="email" autofocus="autofocus" /> autocapitalize="none" autocomplete="email" autofocus="autofocus">
{{ message_email }} {{ message_email }}
@ -32,17 +32,17 @@
type="number" type="number"
step="1" min="1" max="100" step="1" min="1" max="100"
name="default_servings" name="default_servings"
value="{{ default_servings }}"/> value="{{ default_servings }}">
<label for="input-password-1">{{ tr.tp(Sentence::ProfileNewPassword, [Box::new(common::consts::MIN_PASSWORD_SIZE)]) }}</label> <label for="input-password-1">{{ tr.tp(Sentence::ProfileNewPassword, [Box::new(common::consts::MIN_PASSWORD_SIZE)]) }}</label>
<input id="input-password-1" type="password" name="password_1" autocomplete="new-password" /> <input id="input-password-1" type="password" name="password_1" autocomplete="new-password">
<label for="input-password-2">{{ tr.t(Sentence::ReEnterPassword) }}</label> <label for="input-password-2">{{ tr.t(Sentence::ReEnterPassword) }}</label>
<input id="input-password-2" type="password" name="password_2" autocomplete="new-password" /> <input id="input-password-2" type="password" name="password_2" autocomplete="new-password">
{{ message_password }} {{ message_password }}
<input type="submit" name="commit" value="{{ tr.t(Sentence::Save) }}" /> <input type="submit" name="commit" value="{{ tr.t(Sentence::Save) }}">
</form> </form>
{{ message }} {{ message }}
</div> </div>

36
backend/templates/recipe_edit.html
View file

@ -14,7 +14,7 @@
id="input-title" id="input-title"
type="text" type="text"
value="{{ recipe.title }}" value="{{ recipe.title }}"
autofocus="true" /> autofocus="true">
<label for="text-area-description">{{ tr.t(Sentence::RecipeDescription) }}</label> <label for="text-area-description">{{ tr.t(Sentence::RecipeDescription) }}</label>
<textarea <textarea
@ -28,7 +28,7 @@
value=" value="
{% if let Some(s) = recipe.servings %} {% if let Some(s) = recipe.servings %}
{{ s }} {{ s }}
{% endif %}"/> {% endif %}">
<label for="input-estimated-time">{{ tr.t(Sentence::RecipeEstimatedTime) }}</label> <label for="input-estimated-time">{{ tr.t(Sentence::RecipeEstimatedTime) }}</label>
<input <input
@ -38,7 +38,7 @@
value=" value="
{% if let Some(t) = recipe.estimated_time %} {% if let Some(t) = recipe.estimated_time %}
{{ t }} {{ t }}
{% endif %}"/> {% endif %}">
<label for="select-difficulty">{{ tr.t(Sentence::RecipeDifficulty) }}</label> <label for="select-difficulty">{{ tr.t(Sentence::RecipeDifficulty) }}</label>
<select id="select-difficulty"> <select id="select-difficulty">
@ -54,7 +54,7 @@
<input <input
id="input-tags" id="input-tags"
type="text" type="text"
value="" /> value="">
</div> </div>
<label for="select-language">{{ tr.t(Sentence::RecipeLanguage) }}</label> <label for="select-language">{{ tr.t(Sentence::RecipeLanguage) }}</label>
@ -74,15 +74,15 @@
{%+ if recipe.is_published %} {%+ if recipe.is_published %}
checked checked
{% endif %} {% endif %}
/> >
<label for="input-is-published">{{ tr.t(Sentence::RecipeIsPublished) }}</label> <label for="input-is-published">{{ tr.t(Sentence::RecipeIsPublished) }}</label>
<input id="input-delete" type="button" value="{{ tr.t(Sentence::RecipeDelete) }}" /> <input id="input-delete" type="button" value="{{ tr.t(Sentence::RecipeDelete) }}">
<div id="groups-container"> <div id="groups-container">
</div> </div>
<input id="input-add-group" type="button" value="{{ tr.t(Sentence::RecipeAddAGroup) }}" /> <input id="input-add-group" type="button" value="{{ tr.t(Sentence::RecipeAddAGroup) }}">
</div> </div>
<div id="hidden-templates"> <div id="hidden-templates">
@ -90,17 +90,17 @@
<span class="drag-handle"></span> <span class="drag-handle"></span>
<label for="input-group-name">{{ tr.t(Sentence::RecipeGroupName) }}</label> <label for="input-group-name">{{ tr.t(Sentence::RecipeGroupName) }}</label>
<input class="input-group-name" type="text" /> <input class="input-group-name" type="text">
<label for="input-group-comment">{{ tr.t(Sentence::RecipeGroupComment) }}</label> <label for="input-group-comment">{{ tr.t(Sentence::RecipeGroupComment) }}</label>
<input class="input-group-comment" type="text" /> <input class="input-group-comment" type="text">
<input class="input-group-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveGroup) }}" /> <input class="input-group-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveGroup) }}">
<div class="steps"> <div class="steps">
</div> </div>
<input class="input-add-step" type="button" value="{{ tr.t(Sentence::RecipeAddAStep) }}" /> <input class="input-add-step" type="button" value="{{ tr.t(Sentence::RecipeAddAStep) }}">
</div> </div>
<div class="step"> <div class="step">
@ -109,29 +109,29 @@
<label for="text-area-step-action">{{ tr.t(Sentence::RecipeStepAction) }}</label> <label for="text-area-step-action">{{ tr.t(Sentence::RecipeStepAction) }}</label>
<textarea class="text-area-step-action"></textarea> <textarea class="text-area-step-action"></textarea>
<input class="input-step-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveStep) }}" /> <input class="input-step-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveStep) }}">
<div class="ingredients"></div> <div class="ingredients"></div>
<input class="input-add-ingredient" type="button" value="{{ tr.t(Sentence::RecipeAddAnIngredient) }}"/> <input class="input-add-ingredient" type="button" value="{{ tr.t(Sentence::RecipeAddAnIngredient) }}">
</div> </div>
<div class="ingredient"> <div class="ingredient">
<span class="drag-handle"></span> <span class="drag-handle"></span>
<label for="input-ingredient-name">{{ tr.t(Sentence::RecipeIngredientName) }}</label> <label for="input-ingredient-name">{{ tr.t(Sentence::RecipeIngredientName) }}</label>
<input class="input-ingredient-name" type="text" /> <input class="input-ingredient-name" type="text">
<label for="input-ingredient-quantity">{{ tr.t(Sentence::RecipeIngredientQuantity) }}</label> <label for="input-ingredient-quantity">{{ tr.t(Sentence::RecipeIngredientQuantity) }}</label>
<input class="input-ingredient-quantity" type="number" step="0.1" min="0" max="10000" /> <input class="input-ingredient-quantity" type="number" step="0.1" min="0" max="10000">
<label for="input-ingredient-unit">{{ tr.t(Sentence::RecipeIngredientUnit) }}</label> <label for="input-ingredient-unit">{{ tr.t(Sentence::RecipeIngredientUnit) }}</label>
<input class="input-ingredient-unit" type="text" /> <input class="input-ingredient-unit" type="text">
<label for="input-ingredient-comment">{{ tr.t(Sentence::RecipeIngredientComment) }}</label> <label for="input-ingredient-comment">{{ tr.t(Sentence::RecipeIngredientComment) }}</label>
<input class="input-ingredient-comment" type="text" /> <input class="input-ingredient-comment" type="text">
<input class="input-ingredient-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveIngredient) }}" /> <input class="input-ingredient-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveIngredient) }}">
</div> </div>
<div class="dropzone"></div> <div class="dropzone"></div>

3
backend/templates/recipe_view.html
View file

@ -97,7 +97,8 @@
{% else %} {% else %}
4 4
{% endif %} {% endif %}
"/> "
>
<input <input
id="input-add-ingredients-to-shopping-list" id="input-add-ingredients-to-shopping-list"

2
backend/templates/recipes_list_fragment.html
View file

@ -30,7 +30,7 @@
</nav> </nav>
{% if !recipes.unpublished.is_empty() %} {% if !recipes.unpublished.is_empty() %}
<hr /> <hr>
{% endif %} {% endif %}
<nav class="recipes-list-published"> <nav class="recipes-list-published">

8
backend/templates/reset_password.html
View file

@ -5,16 +5,16 @@
<div class="content" id="reset-password"> <div class="content" id="reset-password">
<form action="/reset_password" method="post"> <form action="/reset_password" method="post">
<label for="password_field_1">Choose a new password (minimum 8 characters)</label> <label for="password_field_1">Choose a new password (minimum 8 characters)</label>
<input id="password_field_1" type="password" name="password_1" /> <input id="password_field_1" type="password" name="password_1">
<label for="password_field_1">Re-enter password</label> <label for="password_field_1">Re-enter password</label>
<input id="password_field_2" type="password" name="password_2" /> <input id="password_field_2" type="password" name="password_2">
{{ message_password }} {{ message_password }}
<input type="hidden" name="reset_token" value="{{ reset_token }}" /> <input type="hidden" name="reset_token" value="{{ reset_token }}">
<input type="submit" name="commit" value="Reset password" /> <input type="submit" name="commit" value="Reset password">
</form> </form>
{{ message }} {{ message }}
</div> </div>

9
backend/templates/sign_in_form.html
View file

@ -8,14 +8,15 @@
<form action="/signin" method="post"> <form action="/signin" method="post">
<label for="input-email">{{ tr.t(Sentence::EmailAddress) }}</label> <label for="input-email">{{ tr.t(Sentence::EmailAddress) }}</label>
<input id="input-email" type="email" name="email" value="{{ email }}" autocapitalize="none" autocomplete="email" autofocus="autofocus" /> <input id="input-email" type="email" name="email" value="{{ email }}"
autocapitalize="none" autocomplete="email" autofocus="autofocus">
<label for="input-password">{{ tr.t(Sentence::Password) }}</label> <label for="input-password">{{ tr.t(Sentence::Password) }}</label>
<input id="input-password" type="password" name="password" autocomplete="current-password" /> <input id="input-password" type="password" name="password" autocomplete="current-password">
<input type="submit" value="{{ tr.t(Sentence::SignInMenu) }}" /> <input type="submit" value="{{ tr.t(Sentence::SignInMenu) }}">
</form> </form>
{{ message }} <span class="user-message">{{ message }}</span>
</div> </div>
{% endblock %} {% endblock %}

16
backend/templates/sign_up_form.html
View file

@ -10,23 +10,25 @@
<label for="input-email">{{ tr.t(Sentence::EmailAddress) }}</label> <label for="input-email">{{ tr.t(Sentence::EmailAddress) }}</label>
<input id="input-email" type="email" <input id="input-email" type="email"
name="email" value="{{ email }}" name="email" value="{{ email }}"
autocapitalize="none" autocomplete="email" autofocus="autofocus" /> autocapitalize="none" autocomplete="email" autofocus="autofocus"
>
{{ message_email }} <span class="user-message">{{ message_email }}</span>
<label for="input-password-1"> <label for="input-password-1">
{{ tr.tp(Sentence::ChooseAPassword, [Box::new(common::consts::MIN_PASSWORD_SIZE)]) }} {{ tr.tp(Sentence::ChooseAPassword, [Box::new(common::consts::MIN_PASSWORD_SIZE)]) }}
</label> </label>
<input id="input-password-1" type="password" name="password_1" autocomplete="new-password" /> <input id="input-password-1" type="password" name="password_1" autocomplete="new-password">
<label for="input-password-2">{{ tr.t(Sentence::ReEnterPassword) }}</label> <label for="input-password-2">{{ tr.t(Sentence::ReEnterPassword) }}</label>
<input id="input-password-2" type="password" name="password_2" autocomplete="new-password" /> <input id="input-password-2" type="password" name="password_2" autocomplete="new-password">
{{ message_password }} <span class="user-message">{{ message_password }}</span>
<input type="submit" name="commit" value="{{ tr.t(Sentence::SignUpButton) }}" /> <input type="submit" name="commit" value="{{ tr.t(Sentence::SignUpButton) }}">
</form> </form>
{{ message }}
<span class="user-message">{{ message }}</span>
</div> </div>
{% endblock %} {% endblock %}

2
backend/templates/title.html
View file

@ -1 +1 @@
<a class="title" href="/"><img class="logo" src="/static/logo.svg" alt="logo"/>{{ tr.t(Sentence::MainTitle) }}</a> <a class="title" href="/"><img class="logo" src="/static/logo.svg" alt="logo">{{ tr.t(Sentence::MainTitle) }}</a>