Merge pull request #2045 from bookwyrm-social/dashboard-display

Dashboard display small fixes
This commit is contained in:
Mouse Reeve 2022-03-19 09:33:19 -07:00 committed by GitHub
commit b134c0c2fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 30 additions and 30 deletions

View file

@ -14,7 +14,7 @@
{% block panel %} {% block panel %}
<div class="block table-container"> <div class="block table-container">
<table class="table is-striped"> <table class="table is-striped is-fullwidth">
<tr> <tr>
<th> <th>
{% url 'settings-announcements' as url %} {% url 'settings-announcements' as url %}

View file

@ -154,7 +154,7 @@
</summary> </summary>
<div class="table-container"> <div class="table-container">
<table class="table is-striped"> <table class="table is-striped is-fullwidth">
<tr> <tr>
<th> <th>
<label for="id_string_match">{% trans "String match" %}</label> <label for="id_string_match">{% trans "String match" %}</label>

View file

@ -10,26 +10,26 @@
{% block panel %} {% block panel %}
<div class="columns block has-text-centered is-mobile is-multiline"> <div class="columns block has-text-centered is-mobile is-multiline">
<div class="column is-3-desktop is-6-mobile"> <div class="column is-3-desktop is-6-mobile is-flex">
<div class="notification"> <div class="notification is-flex-grow-1">
<h3>{% trans "Total users" %}</h3> <h3>{% trans "Total users" %}</h3>
<p class="title is-5">{{ users|intcomma }}</p> <p class="title is-5">{{ users|intcomma }}</p>
</div> </div>
</div> </div>
<div class="column is-3-desktop is-6-mobile"> <div class="column is-3-desktop is-6-mobil is-flexe">
<div class="notification"> <div class="notification is-flex-grow-1">
<h3>{% trans "Active this month" %}</h3> <h3>{% trans "Active this month" %}</h3>
<p class="title is-5">{{ active_users|intcomma }}</p> <p class="title is-5">{{ active_users|intcomma }}</p>
</div> </div>
</div> </div>
<div class="column is-3-desktop is-6-mobile"> <div class="column is-3-desktop is-6-mobile is-flex">
<div class="notification"> <div class="notification is-flex-grow-1">
<h3>{% trans "Statuses" %}</h3> <h3>{% trans "Statuses" %}</h3>
<p class="title is-5">{{ statuses|intcomma }}</p> <p class="title is-5">{{ statuses|intcomma }}</p>
</div> </div>
</div> </div>
<div class="column is-3-desktop is-6-mobile"> <div class="column is-3-desktop is-6-mobile is-flex">
<div class="notification"> <div class="notification is-flex-grow-1">
<h3>{% trans "Works" %}</h3> <h3>{% trans "Works" %}</h3>
<p class="title is-5">{{ works|intcomma }}</p> <p class="title is-5">{{ works|intcomma }}</p>
</div> </div>
@ -38,8 +38,8 @@
<div class="columns block is-multiline"> <div class="columns block is-multiline">
{% if reports %} {% if reports %}
<div class="column"> <div class="column is-flex">
<a href="{% url 'settings-reports' %}" class="notification is-warning is-block"> <a href="{% url 'settings-reports' %}" class="notification is-warning is-block is-flex-grow-1">
{% blocktrans trimmed count counter=reports with display_count=reports|intcomma %} {% blocktrans trimmed count counter=reports with display_count=reports|intcomma %}
{{ display_count }} open report {{ display_count }} open report
{% plural %} {% plural %}
@ -50,8 +50,8 @@
{% endif %} {% endif %}
{% if pending_domains %} {% if pending_domains %}
<div class="column"> <div class="column is-flex">
<a href="{% url 'settings-link-domain' %}" class="notification is-primary is-block"> <a href="{% url 'settings-link-domain' %}" class="notification is-primary is-block is-flex-grow-1">
{% blocktrans trimmed count counter=pending_domains with display_count=pending_domains|intcomma %} {% blocktrans trimmed count counter=pending_domains with display_count=pending_domains|intcomma %}
{{ display_count }} domain needs review {{ display_count }} domain needs review
{% plural %} {% plural %}
@ -62,8 +62,8 @@
{% endif %} {% endif %}
{% if not site.allow_registration and site.allow_invite_requests and invite_requests %} {% if not site.allow_registration and site.allow_invite_requests and invite_requests %}
<div class="column"> <div class="column is-flex">
<a href="{% url 'settings-invite-requests' %}" class="notification is-block is-success"> <a href="{% url 'settings-invite-requests' %}" class="notification is-block is-success is-flex-grow-1">
{% blocktrans trimmed count counter=invite_requests with display_count=invite_requests|intcomma %} {% blocktrans trimmed count counter=invite_requests with display_count=invite_requests|intcomma %}
{{ display_count }} invite request {{ display_count }} invite request
{% plural %} {% plural %}
@ -74,8 +74,8 @@
{% endif %} {% endif %}
{% if current_version %} {% if current_version %}
<div class="column"> <div class="column is-flex">
<a href="https://docs.joinbookwyrm.com/updating-your-instance.html" class="notification is-block is-warning" target="_blank"> <a href="https://docs.joinbookwyrm.com/updating-your-instance.html" class="notification is-block is-warning is-flex-grow-1" target="_blank">
{% blocktrans trimmed with current=current_version available=available_version %} {% blocktrans trimmed with current=current_version available=available_version %}
An update is available! You're running v{{ current }} and the latest release is {{ available }}. An update is available! You're running v{{ current }} and the latest release is {{ available }}.
{% endblocktrans %} {% endblocktrans %}

View file

@ -25,7 +25,7 @@
</ul> </ul>
</div> </div>
<table class="table is-striped"> <table class="table is-striped is-fullwidth">
<tr> <tr>
{% url 'settings-federation' as url %} {% url 'settings-federation' as url %}
<th> <th>

View file

@ -93,7 +93,7 @@
</ul> </ul>
{% endif %} {% endif %}
</nav> </nav>
<div class="column"> <div class="column is-clipped">
{% block panel %}{% endblock %} {% block panel %}{% endblock %}
</div> </div>
</div> </div>

View file

@ -139,6 +139,13 @@
{% trans "Allow registration" %} {% trans "Allow registration" %}
</label> </label>
</div> </div>
<div class="field">
<label class="label mb-0" for="id_require_confirm_email">
{{ site_form.require_confirm_email }}
{% trans "Require users to confirm email address" %}
</label>
<p class="help" id="desc_require_confirm_email">{% trans "(Recommended if registration is open)" %}</p>
</div>
<div class="field"> <div class="field">
<label class="label" for="id_allow_invite_requests"> <label class="label" for="id_allow_invite_requests">
{{ site_form.allow_invite_requests }} {{ site_form.allow_invite_requests }}
@ -157,13 +164,6 @@
{{ site_form.invite_question_text }} {{ site_form.invite_question_text }}
</label> </label>
</div> </div>
<div class="field">
<label class="label mb-0" for="id_require_confirm_email">
{{ site_form.require_confirm_email }}
{% trans "Require users to confirm email address" %}
</label>
<p class="help" id="desc_require_confirm_email">{% trans "(Recommended if registration is open)" %}</p>
</div>
<div class="field"> <div class="field">
<label class="label" for="id_registration_closed_text">{% trans "Registration closed text:" %}</label> <label class="label" for="id_registration_closed_text">{% trans "Registration closed text:" %}</label>
{{ site_form.registration_closed_text }} {{ site_form.registration_closed_text }}

View file

@ -88,7 +88,7 @@
<section class="block content"> <section class="block content">
<h2 class="title is-4">{% trans "Available Themes" %}</h2> <h2 class="title is-4">{% trans "Available Themes" %}</h2>
<div class="table-container"> <div class="table-container">
<table class="table is-striped"> <table class="table is-striped is-fullwidth">
<tr> <tr>
<th> <th>
{% trans "Theme name" %} {% trans "Theme name" %}

View file

@ -33,7 +33,7 @@
</div> </div>
<div class="table-container block"> <div class="table-container block">
<table class="table is-striped"> <table class="table is-striped is-fullwidth">
<tr> <tr>
{% url 'settings-users' as url %} {% url 'settings-users' as url %}
<th> <th>