forked from mirrors/bookwyrm
Merge branch 'main' into production
This commit is contained in:
commit
4c73e53b9a
4 changed files with 24 additions and 15 deletions
|
@ -293,6 +293,7 @@ class AuthorForm(CustomForm):
|
||||||
"inventaire_id",
|
"inventaire_id",
|
||||||
"librarything_key",
|
"librarything_key",
|
||||||
"goodreads_key",
|
"goodreads_key",
|
||||||
|
"isni",
|
||||||
]
|
]
|
||||||
widgets = {
|
widgets = {
|
||||||
"name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
|
"name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
|
||||||
|
|
|
@ -101,6 +101,13 @@
|
||||||
{% include 'snippets/form_errors.html' with errors_list=form.goodreads_key.errors id="desc_goodreads_key" %}
|
{% include 'snippets/form_errors.html' with errors_list=form.goodreads_key.errors id="desc_goodreads_key" %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<label class="label" for="id_isni">{% trans "ISNI:" %}</label>
|
||||||
|
{{ form.isni }}
|
||||||
|
|
||||||
|
{% include 'snippets/form_errors.html' with errors_list=form.isni.errors id="desc_isni" %}
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -32,11 +32,11 @@
|
||||||
<body>
|
<body>
|
||||||
<nav class="navbar" aria-label="main navigation">
|
<nav class="navbar" aria-label="main navigation">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="navbar-brand is-align-items-end">
|
<div class="navbar-brand">
|
||||||
<a class="navbar-item" href="/">
|
<a class="navbar-item" href="/">
|
||||||
<img class="image logo" src="{% if site.logo_small %}{% get_media_prefix %}{{ site.logo_small }}{% else %}{% static "images/logo-small.png" %}{% endif %}" alt="Home page">
|
<img class="image logo" src="{% if site.logo_small %}{% get_media_prefix %}{{ site.logo_small }}{% else %}{% static "images/logo-small.png" %}{% endif %}" alt="Home page">
|
||||||
</a>
|
</a>
|
||||||
<form class="navbar-item mt-1" action="{% url 'search' %}">
|
<form class="navbar-item column" action="{% url 'search' %}">
|
||||||
<div class="field has-addons">
|
<div class="field has-addons">
|
||||||
<div class="control">
|
<div class="control">
|
||||||
{% if user.is_authenticated %}
|
{% if user.is_authenticated %}
|
||||||
|
@ -159,7 +159,7 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="navbar-item mt-1">
|
<div class="navbar-item">
|
||||||
{% if request.path != '/login' and request.path != '/login/' %}
|
{% if request.path != '/login' and request.path != '/login/' %}
|
||||||
<div class="columns">
|
<div class="columns">
|
||||||
<div class="column">
|
<div class="column">
|
||||||
|
|
|
@ -17,7 +17,8 @@ server {
|
||||||
|
|
||||||
# # redirect http to https
|
# # redirect http to https
|
||||||
# return 301 https://your-domain.com$request_uri;
|
# return 301 https://your-domain.com$request_uri;
|
||||||
# }
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# server {
|
# server {
|
||||||
# listen [::]:443 ssl http2;
|
# listen [::]:443 ssl http2;
|
||||||
|
@ -54,7 +55,7 @@ server {
|
||||||
# location /static/ {
|
# location /static/ {
|
||||||
# alias /app/static/;
|
# alias /app/static/;
|
||||||
# }
|
# }
|
||||||
}
|
# }
|
||||||
|
|
||||||
# Reverse-Proxy server
|
# Reverse-Proxy server
|
||||||
# server {
|
# server {
|
||||||
|
|
Loading…
Reference in a new issue