mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-12 22:10:16 +02:00
Merge branch 'bootstrap-class-fixes' into 'master'
[CHANGE] Remove unnecessary bootstrap classes from the dashboard See merge request allianceauth/allianceauth!1631
This commit is contained in:
commit
255cb0da8d
@ -7,7 +7,7 @@
|
|||||||
{% translate "Dashboard" %}
|
{% translate "Dashboard" %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="d-flex justify-content-around align-self-center flex-wrap">
|
<div class="row">
|
||||||
{% for dash in views %}
|
{% for dash in views %}
|
||||||
{{ dash | safe }}
|
{{ dash | safe }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
<div id="aa-dashboard-panel-characters" class="col-12 col-xl-8 align-self-stretch p-2 ps-0 pe-0 ps-xl-0 pe-xl-2">
|
<div id="aa-dashboard-panel-characters" class="col-12 col-xl-8 mb-3">
|
||||||
<div class="card h-100">
|
<div class="card h-100">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
{% translate "Characters" as widget_title %}
|
{% translate "Characters" as widget_title %}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 align-self-stretch py-2 ps-xl-2">
|
<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 mb-3">
|
||||||
<div class="card h-100">
|
<div class="card h-100">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
{% translate "Membership" as widget_title %}
|
{% translate "Membership" as widget_title %}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{#Usage:#}
|
{#Usage:#}
|
||||||
{# {% include "framework/dashboard/widget-title.html" with title="Foobar" %}#}
|
{# {% include "framework/dashboard/widget-title.html" with title="Foobar" %}#}
|
||||||
|
|
||||||
<div class="d-flex align-items-center">
|
<div class="text-center">
|
||||||
<h4 class="ms-auto me-auto mb-3">
|
<h4 class="ms-auto me-auto mb-3">
|
||||||
{{ title }}
|
{{ title }}
|
||||||
</h4>
|
</h4>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% load evelinks %}
|
{% load evelinks %}
|
||||||
|
|
||||||
<div class="col-12 align-self-stretch py-2">
|
<div class="col-12 mb-3">
|
||||||
<div class="card h-100">
|
<div class="card h-100">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
{% translate "Upcoming Fleets" as widget_title %}
|
{% translate "Upcoming Fleets" as widget_title %}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
<div id="esi-alert" class="col-12 align-self-stretch py-2 collapse">
|
<div id="esi-alert" class="col-12 collapse">
|
||||||
<div class="alert alert-warning">
|
<div class="alert alert-warning">
|
||||||
<p class="text-center ">{% translate 'Your Server received an ESI error response code of ' %}<b id="esi-code">?</b></p>
|
<p class="text-center ">{% translate 'Your Server received an ESI error response code of ' %}<b id="esi-code">?</b></p>
|
||||||
<hr>
|
<hr>
|
||||||
@ -23,7 +23,7 @@
|
|||||||
console.log("ESI Check: ", JSON.stringify(responseJson, null, 2));
|
console.log("ESI Check: ", JSON.stringify(responseJson, null, 2));
|
||||||
|
|
||||||
const status = responseJson.status;
|
const status = responseJson.status;
|
||||||
if (status != 200) {
|
if (status !== 200) {
|
||||||
elemCode.textContent = status
|
elemCode.textContent = status
|
||||||
elemMessage.textContent = responseJson.data.error;
|
elemMessage.textContent = responseJson.data.error;
|
||||||
new bootstrap.Collapse(elemCard, {
|
new bootstrap.Collapse(elemCard, {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
{% load humanize %}
|
{% load humanize %}
|
||||||
|
|
||||||
{% if notifications %}
|
{% if notifications %}
|
||||||
<div id="aa-dashboard-panel-admin-notifications" class="col-12 align-self-stretch pb-2">
|
<div id="aa-dashboard-panel-admin-notifications" class="col-12 mb-3">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
{% translate "Alliance Auth Notifications" as widget_title %}
|
{% translate "Alliance Auth Notifications" as widget_title %}
|
||||||
@ -46,7 +46,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="col-12 align-self-stretch py-2">
|
<div class="col-12 mb-3">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body row">
|
<div class="card-body row">
|
||||||
<div id="aa-dashboard-panel-software-version" class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
|
<div id="aa-dashboard-panel-software-version" class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% load evelinks %}
|
{% load evelinks %}
|
||||||
|
|
||||||
<div class="col-12 align-self-stretch py-2">
|
<div class="col-12 mb-3">
|
||||||
<div class="card h-100">
|
<div class="card h-100">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
{% translate "Upcoming Timers" as widget_title %}
|
{% translate "Upcoming Timers" as widget_title %}
|
||||||
|
@ -35,7 +35,7 @@ To ensure the dashboard widgets have a unified style, we provide a template part
|
|||||||
To use it, you can use the following code in your dashboard widget template:
|
To use it, you can use the following code in your dashboard widget template:
|
||||||
|
|
||||||
```django
|
```django
|
||||||
<div id="my-app-dashboard-widget" class="col-12 align-self-stretch py-2">
|
<div id="my-app-dashboard-widget" class="col-12 mb-3">
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
{% translate "My Widget Title" as widget_title %}
|
{% translate "My Widget Title" as widget_title %}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user