Standardize ordering & styling of action buttons

This commit is contained in:
Jeremy Stretch 2024-01-09 16:56:09 -05:00
parent 95d68ddacf
commit f39447698e
18 changed files with 34 additions and 30 deletions

View File

@ -14,7 +14,7 @@
{% render_field form.new_password2 %}
</div>
<div class="text-end">
<a href="{% url 'account:profile' %}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{% url 'account:profile' %}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" name="_update" class="btn btn-primary">{% trans "Save" %}</button>
</div>
</form>

View File

@ -79,7 +79,7 @@
</div>
</div>
<div class="text-end my-3">
<a class="btn btn-outline-secondary" href="{% url 'account:preferences' %}">{% trans "Cancel" %}</a>
<a href="{% url 'account:preferences' %}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" name="_update" class="btn btn-primary">{% trans "Save" %}</button>
</div>
</form>

View File

@ -77,7 +77,7 @@
<div class="controls">
<div class="control-group">
<button type="submit" name="restore" class="btn btn-primary">{% trans "Restore" %}</button>
<a href="{% url 'core:configrevision_list' %}" id="cancel" name="cancel" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{% url 'core:configrevision_list' %}" id="cancel" name="cancel" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
</div>
</div>
</div>

View File

@ -31,7 +31,7 @@
</div>
<div class="row">
<div class="col col-md-6 offset-md-3 text-end">
<a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" name="_update" class="btn btn-primary">{% trans "Save" %}</button>
</div>
</div>

View File

@ -21,9 +21,11 @@
</div>
</div>
<div class="text-end my-3">
<a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<button type="submit" name="_addanother" class="btn btn-outline-primary">{% trans "Add Another" %}</button>
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<div class="btn-group" role="group" aria-label="{% trans "Actions" %}">
<button type="submit" name="_save" class="btn btn-primary">{% trans "Save" %}</button>
<button type="submit" name="_addanother" class="btn btn-outline-primary">{% trans "Save & Add Another" %}</button>
</div>
</div>
</form>
{% endblock %}

View File

@ -100,7 +100,7 @@
</table>
</div>
<div class="text-end">
<a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
{% if vc_form.instance.pk %}
<button type="submit" name="_update" class="btn btn-primary">{% trans "Save" %}</button>
{% else %}

View File

@ -23,7 +23,7 @@
{% render_form form %}
</div>
<div class="col col-md-12 text-end my-3">
<a href="{{ object.get_absolute_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{{ object.get_absolute_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
</div>
</div>

View File

@ -33,7 +33,7 @@
{% endfor %}
</div>
<div class="float-end">
<a href="{% url 'extras:script_list' %}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{% url 'extras:script_list' %}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" name="_run" class="btn btn-primary"{% if not perms.extras.run_script %} disabled="disabled"{% endif %}><i class="mdi mdi-play"></i> {% trans "Run Script" %}</button>
</div>
</form>

View File

@ -50,7 +50,7 @@
</div>
<div class="form-group text-end">
<div class="col col-md-12">
<a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" name="_create" class="btn btn-primary">{% trans "Create" %}</button>
</div>
</div>

View File

@ -56,8 +56,8 @@ Context:
{{ field }}
{% endfor %}
<div class="text-end">
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" name="_confirm" class="btn btn-danger">{% trans "Delete" %} {{ table.rows|length }} {{ model|meta:"verbose_name_plural" }}</button>
<a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
</div>
</form>
</div>

View File

@ -113,8 +113,8 @@ Context:
{% endif %}
<div class="text-end">
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" name="_apply" class="btn btn-primary">{% trans "Apply" %}</button>
<a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
</div>
</form>

View File

@ -47,10 +47,10 @@ Context:
{% render_field form.csv_delimiter %}
<div class="form-group">
<div class="col col-md-12 text-end">
<button type="submit" name="data_submit" class="btn btn-primary">{% trans "Submit" %}</button>
{% if return_url %}
<a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
{% endif %}
<button type="submit" name="data_submit" class="btn btn-primary">{% trans "Submit" %}</button>
</div>
</div>
</form>
@ -69,10 +69,10 @@ Context:
{% render_field form.csv_delimiter %}
<div class="form-group">
<div class="col col-md-12 text-end">
<button type="submit" name="file_submit" class="btn btn-primary">{% trans "Submit" %}</button>
{% if return_url %}
<a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
{% endif %}
<button type="submit" name="file_submit" class="btn btn-primary">{% trans "Submit" %}</button>
</div>
</div>
</form>
@ -91,10 +91,10 @@ Context:
{% render_field form.csv_delimiter %}
<div class="form-group">
<div class="col col-md-12 text-end">
<button type="submit" name="file_submit" class="btn btn-primary">{% trans "Submit" %}</button>
{% if return_url %}
<a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
{% endif %}
<button type="submit" name="file_submit" class="btn btn-primary">{% trans "Submit" %}</button>
</div>
</div>
</form>

View File

@ -33,13 +33,13 @@
{% for field in form.hidden_fields %}
{{ field }}
{% endfor %}
<div class="text-center">
<div class="text-end">
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" name="_confirm" class="btn btn-danger">
{% blocktrans trimmed with count=table.rows|length %}
Delete these {{ count }} {{ obj_type_plural }}
{% endblocktrans %}
</button>
<a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
</div>
</form>
</div>

View File

@ -37,11 +37,11 @@
</div>
</div>
<div class="col col-md-12 my-3 text-end">
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" name="_preview" class="btn btn-primary">{% trans "Preview" %}</button>
{% if '_preview' in request.POST and not form.errors %}
<button type="submit" name="_apply" class="btn btn-primary">{% trans "Apply" %}</button>
{% endif %}
<a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
</div>
</form>
</div>

View File

@ -16,8 +16,8 @@
{% block message %}<p>{% trans "Are you sure" %}?</p>{% endblock %}
</div>
<div class="card-footer text-end">
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" name="_confirm" class="btn btn-{{ button_class|default:"danger" }}">{% trans "Confirm" %}</button>
<a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
</div>
</div>
</form>

View File

@ -70,12 +70,14 @@ Context:
{% trans "Save" %}
</button>
{% else %}
<div class="btn-group" role="group" aria-label="{% trans "Actions" %}">
<button type="submit" name="_create" class="btn btn-primary">
{% trans "Create" %}
</button>
<button type="submit" name="_addanother" class="btn btn-outline-primary">
{% trans "Create & Add Another" %}
</button>
</div>
{% endif %}
{% endblock buttons %}
</div>

View File

@ -28,7 +28,7 @@
</div>
<div class="row mb-3">
<div class="col col-md-8 offset-md-2 text-end">
<a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" class="btn btn-primary">{% trans "Search" %}</button>
</div>
</div>

View File

@ -27,7 +27,7 @@
</div>
<div class="row">
<div class="col col-md-6 offset-md-3 text-end noprint">
<a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
<button type="submit" name="_add" class="btn btn-primary">{% trans "Add Devices" %}</button>
</div>
</div>