Compare commits

..

No commits in common. "e2be8b3440b6efe9be9c8d38df32060de72d67ca" and "179c26975ccc1749bbee266ac5e3cd500ae1fe05" have entirely different histories.

11 changed files with 27 additions and 28 deletions

View File

@ -7,7 +7,7 @@
{% translate "Dashboard" %}
{% endblock %}
{% block content %}
<div class="row">
<div class="d-flex justify-content-around align-self-center flex-wrap">
{% for dash in views %}
{{ dash | safe }}
{% endfor %}

View File

@ -1,5 +1,5 @@
{% load i18n %}
<div id="aa-dashboard-panel-characters" class="col-12 col-xl-8 mb-3">
<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 class="card h-100">
<div class="card-body">
{% translate "Characters" as widget_title %}

View File

@ -1,5 +1,5 @@
{% load i18n %}
<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 mb-3">
<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 align-self-stretch py-2 ps-xl-2">
<div class="card h-100">
<div class="card-body">
{% translate "Membership" as widget_title %}

View File

@ -1,7 +1,7 @@
{#Usage:#}
{# {% include "framework/dashboard/widget-title.html" with title="Foobar" %}#}
<div class="text-center">
<div class="d-flex align-items-center">
<h4 class="ms-auto me-auto mb-3">
{{ title }}
</h4>

View File

@ -1,7 +1,7 @@
{% load i18n %}
{% load evelinks %}
<div class="col-12 mb-3">
<div class="col-12 align-self-stretch py-2">
<div class="card h-100">
<div class="card-body">
{% translate "Upcoming Fleets" as widget_title %}

View File

@ -1,5 +1,5 @@
{% load i18n %}
<div id="esi-alert" class="col-12 collapse">
<div id="esi-alert" class="col-12 align-self-stretch py-2 collapse">
<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>
<hr>
@ -23,7 +23,7 @@
console.log("ESI Check: ", JSON.stringify(responseJson, null, 2));
const status = responseJson.status;
if (status !== 200) {
if (status != 200) {
elemCode.textContent = status
elemMessage.textContent = responseJson.data.error;
new bootstrap.Collapse(elemCard, {

View File

@ -2,7 +2,7 @@
{% load humanize %}
{% if notifications %}
<div id="aa-dashboard-panel-admin-notifications" class="col-12 mb-3">
<div id="aa-dashboard-panel-admin-notifications" class="col-12 align-self-stretch pb-2">
<div class="card">
<div class="card-body">
{% translate "Alliance Auth Notifications" as widget_title %}
@ -46,7 +46,7 @@
</div>
{% endif %}
<div class="col-12 mb-3">
<div class="col-12 align-self-stretch py-2">
<div class="card">
<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">

View File

@ -1,7 +1,7 @@
{% load i18n %}
{% load evelinks %}
<div class="col-12 mb-3">
<div class="col-12 align-self-stretch py-2">
<div class="card h-100">
<div class="card-body">
{% translate "Upcoming Timers" as widget_title %}

View File

@ -9,21 +9,21 @@ ENV AUTH_HOME=/home/allianceauth
# Setup user and directory permissions
SHELL ["/bin/bash", "-c"]
RUN groupadd -g 61000 ${AUTH_GROUP} && \
useradd -g 61000 -l -m -s /bin/false -u 61000 ${AUTH_USER}
RUN groupadd -g 61000 ${AUTH_GROUP}
RUN useradd -g 61000 -l -M -s /bin/false -u 61000 ${AUTH_USER}
RUN mkdir -p ${STATIC_BASE} \
&& chown ${AUTH_USERGROUP} ${STATIC_BASE} \
&& mkdir -p ${AUTH_HOME} \
&& chown ${AUTH_USERGROUP} ${AUTH_HOME}
RUN mkdir -p ${STATIC_BASE}/myauth/static \
&& chown ${AUTH_USERGROUP} ${STATIC_BASE}/myauth/static
# Install build dependencies
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
libmariadb-dev gcc git pkg-config
# Install Build Dependencies
RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y --no-install-recommends libmariadb-dev gcc git pkg-config \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
# Install AA and Dependencies
RUN pip install --no-cache-dir ${AUTH_PACKAGE} gunicorn
# Install python dependencies
RUN pip install --upgrade pip
RUN pip install wheel gunicorn
RUN pip install ${AUTH_PACKAGE}
# Switch to non-root user
USER ${AUTH_USER}
@ -33,6 +33,7 @@ WORKDIR ${AUTH_HOME}
RUN allianceauth start myauth
COPY /allianceauth/project_template/project_name/settings/local.py ${AUTH_HOME}/myauth/myauth/settings/local.py
RUN allianceauth update myauth
RUN mkdir -p ${STATIC_BASE}/myauth/static
RUN echo 'alias auth="python $AUTH_HOME/myauth/manage.py"' >> ~/.bashrc && \
source ~/.bashrc

View File

@ -1,8 +1,6 @@
ARG AA_DOCKER_TAG
FROM $AA_DOCKER_TAG
WORKDIR ${AUTH_HOME}
RUN cd /home/allianceauth
COPY /conf/requirements.txt requirements.txt
RUN --mount=type=cache,target=~/.cache \
pip install -r requirements.txt
RUN pip install -r requirements.txt

View File

@ -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:
```django
<div id="my-app-dashboard-widget" class="col-12 mb-3">
<div id="my-app-dashboard-widget" class="col-12 align-self-stretch py-2">
<div class="card">
<div class="card-body">
{% translate "My Widget Title" as widget_title %}