diff --git a/.gitignore b/.gitignore index 45899c8b..a8ddc42b 100644 --- a/.gitignore +++ b/.gitignore @@ -113,6 +113,5 @@ screenshots/ nginx/certs/ nginx/certbot/ nginx/*.conf -!nginx/default.dev.conf *.pem *.key diff --git a/Dockerfile b/Dockerfile index 87811728..03d9dabf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,67 +1,101 @@ -# Stage 1: build frontend assets (multi-arch: official node image) +# syntax=docker/dockerfile:1 +# +# Targets: +# prod (default, last stage) gunicorn image with assets and static files baked in +# dev dependencies only; the source is bind-mounted by compose.override.yml +# +# Stages are ordered so that editing application code only invalidates the cheap final layers: +# apt packages, Python dependencies and node modules are all cached separately. + +# ---- Frontend assets (multi-arch: official node image) ---- FROM node:24-slim AS assets WORKDIR /app COPY package.json package-lock.json ./ -RUN npm ci +RUN --mount=type=cache,target=/root/.npm \ + npm ci COPY gulpfile.js ./ COPY pipeline/source_assets ./pipeline/source_assets RUN npm run build -# Stage 2: build the Python environment (multi-arch: official python image) -FROM python:3.14-slim-trixie AS builder + +# ---- Shared Python base: runtime system libraries only ---- +FROM python:3.14-slim-trixie AS python-base + +# Keep downloaded packages between builds (the default Docker config for Debian images deletes them) +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ + apt-get update \ + && apt-get install -y --no-install-recommends libcairo2 + +ENV PYTHONDONTWRITEBYTECODE=1 \ + PYTHONUNBUFFERED=1 \ + UV_PROJECT_ENVIRONMENT=/opt/venv \ + UV_LINK_MODE=copy \ + PATH="/opt/venv/bin:$PATH" + + +# ---- Python dependencies (only rebuilt when pyproject.toml / uv.lock change) ---- +FROM python-base AS deps-base COPY --from=ghcr.io/astral-sh/uv:0.12.21 /uv /uvx /bin/ # pycairo (via z3c.rml) has no wheels and is compiled against cairo -RUN apt-get update \ - && apt-get install -y --no-install-recommends build-essential pkg-config libcairo2-dev \ - && rm -rf /var/lib/apt/lists/* +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ + apt-get update \ + && apt-get install -y --no-install-recommends build-essential pkg-config libcairo2-dev WORKDIR /app -# Set up py environment -# DEBUG must never be on in a built image; enable it explicitly via the environment if needed -ENV DEBUG=false \ - PYTHONDONTWRITEBYTECODE=1 \ - PYTHONUNBUFFERED=1 \ - UV_COMPILE_BYTECODE=1 \ - UV_LINK_MODE=copy - -# Copy uv project files first (for better caching) -COPY pyproject.toml uv.lock ./ - -# Install the project's dependencies using the lockfile and settings +FROM deps-base AS deps-prod +ENV UV_COMPILE_BYTECODE=1 RUN --mount=type=cache,target=/root/.cache/uv \ --mount=type=bind,source=uv.lock,target=uv.lock \ --mount=type=bind,source=pyproject.toml,target=pyproject.toml \ uv sync --frozen --no-install-project --no-dev -# Then, add the rest of the project source code and install it -# Installing separately from its dependencies allows optimal layer caching +FROM deps-base AS deps-dev +RUN --mount=type=cache,target=/root/.cache/uv \ + --mount=type=bind,source=uv.lock,target=uv.lock \ + --mount=type=bind,source=pyproject.toml,target=pyproject.toml \ + uv sync --frozen --no-install-project + + +# ---- Development: dependencies only, source and static assets are mounted at runtime ---- +FROM python-base AS dev +COPY --from=deps-dev /opt/venv /opt/venv +WORKDIR /app +EXPOSE 8000 +CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"] + + +# ---- Static files: depends on the source, so this is the first stage that reruns on a code change ---- +FROM python-base AS static +COPY --from=deps-prod /opt/venv /opt/venv +WORKDIR /app COPY . /app COPY --from=assets /app/pipeline/built_assets /app/pipeline/built_assets -RUN --mount=type=cache,target=/root/.cache/uv \ - uv sync --frozen --no-dev - # Placeholder values only satisfy settings that are mandatory when DEBUG is off; they are not kept in the image -RUN EMAIL_HOST=build EMAIL_HOST_USER=build EMAIL_HOST_PASSWORD=build EMAIL_FROM=build@example.com \ - uv run python manage.py collectstatic --noinput +RUN DEBUG=false EMAIL_HOST=build EMAIL_HOST_USER=build EMAIL_HOST_PASSWORD=build EMAIL_FROM=build@example.com \ + python manage.py collectstatic --noinput -FROM python:3.14-slim-trixie -RUN apt-get update \ - && apt-get install -y --no-install-recommends libcairo2 \ - && rm -rf /var/lib/apt/lists/* + +# ---- Production image ---- +FROM python-base AS prod RUN addgroup --system app \ - && adduser --system --group --home /home/app app \ - && mkdir -p /home/app \ - && chown app:app /home/app -COPY --from=builder --chown=app:app /app /app + && adduser --system --group --home /home/app app + +COPY --from=deps-prod /opt/venv /opt/venv WORKDIR /app -ENV DEBUG=false \ - PYTHONDONTWRITEBYTECODE=1 \ - PYTHONUNBUFFERED=1 -ENV PATH="/app/.venv/bin:$PATH" +COPY --chown=app:app . /app +COPY --from=static --chown=app:app /app/static /app/static +COPY --from=assets --chown=app:app /app/pipeline/built_assets /app/pipeline/built_assets + +# DEBUG must never be on in a built image; enable it explicitly via the environment if needed +ENV DEBUG=false USER app EXPOSE 8000 diff --git a/PyRIGS/urls.py b/PyRIGS/urls.py index 93b6a513..0577b777 100644 --- a/PyRIGS/urls.py +++ b/PyRIGS/urls.py @@ -27,7 +27,3 @@ urlpatterns = [ if settings.DEBUG: urlpatterns += staticfiles_urlpatterns() - - urlpatterns += [ - path("bootstrap/", TemplateView.as_view(template_name="bootstrap.html")), - ] diff --git a/README.md b/README.md index ca91749d..0f14d458 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,23 @@ For setup information and other such helpful stuff check the [Wiki](https://gith - users: Our custom logic for registration and profiles. Semi-modular. # Running locally -The compose stack runs the app behind a plain-HTTP nginx (`nginx/default.dev.conf`) on port 80. +> [!WARNING] +> `compose.yml` is for **development only** and must not be run in production. It mounts the source into the container, runs Django's development server with `DEBUG` on by default, and uses placeholder captcha keys. Production is deployed from the image built by the `prod` target of the `Dockerfile`. + +The compose stack runs Postgres, the Django development server and a gulp watcher that rebuilds the CSS/JS. Changes to Python code and templates reload the app automatically, and changes to `pipeline/source_assets` are rebuilt into `pipeline/built_assets` (refresh the browser to pick them up). 1. Copy `.env.example` to `.env` and fill it in. For local use set at least: + ``` + DEBUG=true + DJANGO_ALLOWED_HOSTS=localhost + ``` + The sample data commands refuse to run unless `DEBUG` (or `STAGING`) is true. 2. Start the stack (migrations run automatically on start): ``` docker compose up -d --build ``` -3. Open . + The first start installs the node modules, so give the assets a minute to appear. After changing `pyproject.toml`, `uv.lock` or the `Dockerfile`, rebuild with `docker compose up -d --build` (or run `docker compose watch`). +3. Open . ## Creating a user ``` diff --git a/RIGS/forms.py b/RIGS/forms.py index a9780c8c..862e8f77 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -201,7 +201,7 @@ class EventRiskAssessmentForm(forms.ModelForm): field.widget = forms.CheckboxInput() elif field.__class__ == forms.BooleanField: field.widget = forms.RadioSelect( - choices=[(True, "Yes"), (False, "No")], attrs={"class": "custom-control-input", "required": "true"} + choices=[(True, "Yes"), (False, "No")], attrs={"class": "form-check-input", "required": "true"} ) def clean(self): diff --git a/RIGS/templates/base_rigs.html b/RIGS/templates/base_rigs.html index d7556a4e..98df83c8 100644 --- a/RIGS/templates/base_rigs.html +++ b/RIGS/templates/base_rigs.html @@ -14,7 +14,7 @@ {% if user.is_authenticated %}
  • Home
  • -
    @@ -42,15 +42,15 @@ {% total_invoices_todo as todo %} {% invoices_waiting as waiting %} {% invoices_outstanding as outstanding %} -
    Dashboard {% if perms.RIGS.add_invoice %} - Waiting {{ waiting }} + Waiting {{ waiting }} {% endif %} - Outstanding {{ outstanding }} + Outstanding {{ outstanding }} Archive
    • @@ -74,11 +74,4 @@ {% block js %} {{ block.super }} - - - {% endblock %} diff --git a/RIGS/templates/calendar.html b/RIGS/templates/calendar.html index e0a8116f..d35a40ac 100644 --- a/RIGS/templates/calendar.html +++ b/RIGS/templates/calendar.html @@ -27,7 +27,7 @@ calendar = new FullCalendar.Calendar(calendarEl, { firstDay: 1, - themeSystem: 'bootstrap', + themeSystem: 'standard', aspectRatio: 1.5, eventTimeFormat: { 'hour': '2-digit', @@ -38,14 +38,13 @@ editable: false, dayMaxEventRows: true, // allow "more" link when too many events events: function(fetchInfo, successCallback, failureCallback) { - $.ajax({ - url: '/api/event', - dataType: 'json', - data: { - start: moment(fetchInfo.startStr).format("YYYY-MM-DD[T]HH:mm:ss"), - end: moment(fetchInfo.endStr).format("YYYY-MM-DD[T]HH:mm:ss") - }, - success: function(doc) { + var params = new URLSearchParams({ + start: moment(fetchInfo.startStr).format("YYYY-MM-DD[T]HH:mm:ss"), + end: moment(fetchInfo.endStr).format("YYYY-MM-DD[T]HH:mm:ss") + }); + fetch('/api/event?' + params, {credentials: 'same-origin'}) + .then(function (response) { return response.json(); }) + .then(function (doc) { var events = []; colours = { 'Provisional': '#FFE89B', @@ -54,8 +53,8 @@ 'Cancelled': 'grey' , 'non-rig': '#25AAE2' }; - $(doc).each(function() { - end = $(this).attr('latest') + doc.forEach(function (item) { + end = item.latest allDay = false if(end.indexOf("T") < 0){ //If latest does not contain a time end = moment(end + " 23:59").format("YYYY-MM-DD[T]HH:mm:ss") @@ -63,84 +62,64 @@ } thisEvent = { - 'start': $(this).attr('earliest'), + 'start': item.earliest, 'end': end, 'className': 'modal-href', - 'title': $(this).attr('title'), - 'url': $(this).attr('url'), + 'title': item.title, + 'url': item.url, 'allDay': allDay } - if($(this).attr('is_rig')===true || $(this).attr('status') === "Cancelled"){ - thisEvent['color'] = colours[$(this).attr('status')]; + if(item.is_rig===true || item.status === "Cancelled"){ + thisEvent['color'] = colours[item.status]; }else{ thisEvent['color'] = colours['non-rig']; } events.push(thisEvent); }); successCallback(events); - } - }); + }) + .catch(failureCallback); }, datesSet: function(info) { var view = info.view; // Set the title of the view - $('#calendar-header').text(view.title); + document.getElementById('calendar-header').textContent = view.title; // Enable/Disable "Today" button as required - let $today = $('#today-button'); - if(moment().isBetween(view.currentStart, view.currentEnd)){ - //Today is within the current view - $today.prop('disabled', true); - }else{ - $today.prop('disabled', false); - } + //Today is within the current view + document.getElementById('today-button').disabled = moment().isBetween(view.currentStart, view.currentEnd); // Set active view select button - let $month = $('#month-button'); - let $week = $('#week-button'); - let $day = $('#day-button'); - switch(view.type){ - case 'dayGridMonth': - $month.addClass('active'); - $week.removeClass('active'); - $day.removeClass('active'); - break; - - case 'timeGridWeek': - $month.removeClass('active'); - $week.addClass('active'); - $day.removeClass('active'); - break; - - case 'timeGridDay': - $month.removeClass('active'); - $week.removeClass('active'); - $day.addClass('active'); - break; - } + var buttons = { + dayGridMonth: document.getElementById('month-button'), + timeGridWeek: document.getElementById('week-button'), + timeGridDay: document.getElementById('day-button') + }; + Object.keys(buttons).forEach(function (type) { + buttons[type].classList.toggle('active', type === view.type); + }); history.replaceState(null,null,"{% url 'web_calendar' %}"+viewToUrl[view.type]+'/'+moment(view.currentStart).format('YYYY-MM-DD')+'/'); } }); calendar.render(); }); - $(document).ready(function() { + ready(function() { // set some button listeners - $('#next-button').click(function(){ calendar.next(); }); - $('#prev-button').click(function(){ calendar.prev(); }); - $('#today-button').click(function(){ calendar.today(); }); - $('#month-button').click(function(){ calendar.changeView('dayGridMonth'); }); - $('#week-button').click(function(){ calendar.changeView('timeGridWeek'); }); - $('#day-button').click(function(){ calendar.changeView('timeGridDay'); }); - $('#go-to-date-input').change(function(){ - if(moment($('#go-to-date-input').val()).isValid()){ - $('#go-to-date-button').prop('disabled', false); - } else{ - $('#go-to-date-button').prop('disabled', true); - } + var click = function (id, fn) { document.getElementById(id).addEventListener('click', fn); }; + click('next-button', function(){ calendar.next(); }); + click('prev-button', function(){ calendar.prev(); }); + click('today-button', function(){ calendar.today(); }); + click('month-button', function(){ calendar.changeView('dayGridMonth'); }); + click('week-button', function(){ calendar.changeView('timeGridWeek'); }); + click('day-button', function(){ calendar.changeView('timeGridDay'); }); + var dateInput = document.getElementById('go-to-date-input'); + var dateButton = document.getElementById('go-to-date-button'); + dateInput.addEventListener('change', function(){ + dateButton.disabled = !moment(dateInput.value).isValid(); }); - $('#go-to-date-button').click(function(){ - day = moment($('#go-to-date-input').val()); + dateButton.addEventListener('click', function(){ + day = moment(dateInput.value); if(day.isValid()){ calendar.gotoDate(day.format("YYYY-MM-DD")); } else{ @@ -164,25 +143,23 @@ {% block content %}
    -
    -
    +
    +
    -
    -
    +
    +
    - - - +
    -
    +
    -
    +
    -
    +
    diff --git a/RIGS/templates/event_archive.html b/RIGS/templates/event_archive.html index 41e2f27a..170bd9a2 100644 --- a/RIGS/templates/event_archive.html +++ b/RIGS/templates/event_archive.html @@ -17,26 +17,20 @@ {% block content %}
    -
    +
    -
    - Start -
    + Start
    -
    - End -
    + End
    -
    - Keyword -
    + Keyword
    - {% for status in statuses %} {% endfor %} diff --git a/RIGS/templates/event_detail.html b/RIGS/templates/event_detail.html index 4013df65..a0749e12 100644 --- a/RIGS/templates/event_detail.html +++ b/RIGS/templates/event_detail.html @@ -7,10 +7,10 @@ {{ block.super }} @@ -20,7 +20,7 @@
    {% if not is_ajax %} {% if perms.RIGS.view_event %} -
    +
    {% include 'partials/event_detail_buttons.html' %}
    {% endif %} @@ -50,7 +50,7 @@ {% endif %} {% endif %} {% if not is_ajax and perms.RIGS.view_event %} -
    +
    {% include 'partials/event_detail_buttons.html' %}
    {% endif %} @@ -73,13 +73,13 @@ {% include 'partials/crew_list.html' %} {% if not is_ajax and perms.RIGS.view_event %} -
    +
    {% include 'partials/event_detail_buttons.html' %}
    {% endif %} {% endif %} {% if not is_ajax and perms.RIGS.view_event %} -
    +
    {% include 'partials/last_edited.html' with target="event_history" %}
    {% endif %} diff --git a/RIGS/templates/event_embed.html b/RIGS/templates/event_embed.html index df2a69b2..df42800c 100644 --- a/RIGS/templates/event_embed.html +++ b/RIGS/templates/event_embed.html @@ -7,7 +7,7 @@ {% endblock %} {% block content %} - + {% if object.mic %}
    @@ -39,8 +39,8 @@ {% include 'partials/event_status.html' %} -
    -
    +
    +

    {% if object.is_rig %} Client: {{ object.person.name }} @@ -61,7 +61,7 @@ {% endif %}

    -
    +
    {% if object.meet_at %}

    Crew meet: diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html index 69d28455..2838c39b 100644 --- a/RIGS/templates/event_form.html +++ b/RIGS/templates/event_form.html @@ -19,64 +19,64 @@ {% block js %} {{ block.super }} - - {% endblock %} @@ -98,11 +98,11 @@

    - - @@ -116,13 +116,13 @@
    Contact Details
    -
    +
    - {% if person %} {% endif %} @@ -131,10 +131,10 @@
    + data-select-target="#{{ form.person.id_for_label }}"> - +
    @@ -142,14 +142,14 @@
    -
    +
    - {% if organisation %} {% endif %} @@ -158,10 +158,10 @@
    + data-select-target="#{{ form.organisation.id_for_label }}"> - +
    @@ -174,7 +174,7 @@
    Event Description
    -
    +
    @@ -192,7 +192,7 @@
    Event Details
    -
    +
    @@ -200,14 +200,14 @@ {% render_field form.name class+="form-control" %}
    -
    +
    - {% if venue %} {% endif %} @@ -216,10 +216,10 @@
    + data-select-target="#{{ form.venue.id_for_label }}"> - +
    @@ -227,31 +227,31 @@
    -
    +
    -
    +
    {% render_field form.start_date class+="form-control" %}
    -
    +
    {% render_field form.start_time class+="form-control" step="60" %}
    -
    +
    -
    +
    {% render_field form.end_date class+="form-control" %}
    -
    +
    {% render_field form.end_time class+="form-control" step="60" %}
    @@ -260,14 +260,14 @@ {# Rig only information #}
    -
    +
    {% render_field form.access_at class+="form-control" step="60" %}
    -
    +
    @@ -275,15 +275,15 @@ {% render_field form.meet_at class+="form-control" step="60" %}
    -
    +
    -
    -
    +
    -
    @@ -292,7 +292,7 @@
    {# Status is needed on all events types and it looks good here in the form #} -
    +
    @@ -302,12 +302,12 @@
    -
    +
    - {% if mic %} {% endif %} @@ -316,12 +316,12 @@
    {% if object.dry_hire %} -
    +
    - {% if checked_in_by %} {% endif %} @@ -330,7 +330,7 @@
    {% endif %} -
    +
    @@ -339,7 +339,7 @@
    -
    +
    @@ -348,7 +348,7 @@
    -
    +
    @@ -357,7 +357,7 @@ {% if object.pk %}

    or

    - + Create Forum Thread {% endif %}
    @@ -372,7 +372,7 @@
    -
    +
    {% render_field form.notes class+="form-control md-enabled" %}
    @@ -381,7 +381,7 @@
    -
    +
    {% button 'submit' %}
    diff --git a/RIGS/templates/eventauthorisation.html b/RIGS/templates/eventauthorisation.html index f464f72d..e9a6d0b5 100644 --- a/RIGS/templates/eventauthorisation.html +++ b/RIGS/templates/eventauthorisation.html @@ -3,15 +3,13 @@ {% load static %} {% block js %} - diff --git a/RIGS/templates/eventauthorisation_form.html b/RIGS/templates/eventauthorisation_form.html index 771ddeaa..0390653d 100644 --- a/RIGS/templates/eventauthorisation_form.html +++ b/RIGS/templates/eventauthorisation_form.html @@ -23,7 +23,7 @@
    -
    @@ -33,7 +33,7 @@
    -
    @@ -44,7 +44,7 @@
    -
    @@ -53,15 +53,13 @@
    -
    -
    - £ -
    + £ {% render_field form.amount class+="form-control" %}
    @@ -69,8 +67,8 @@
    -
    -
    +
    -
    +
    - +
    diff --git a/RIGS/templates/eventauthorisation_request.html b/RIGS/templates/eventauthorisation_request.html index a8adc86f..5c883f07 100644 --- a/RIGS/templates/eventauthorisation_request.html +++ b/RIGS/templates/eventauthorisation_request.html @@ -18,11 +18,11 @@
    {% if object.person.email %}
    Person Email
    -
    {{ object.person.email }} {% button 'copy' id='#person-email' %}
    +
    {{ object.person.email }} {% button 'copy' id='#person-email' %}
    {% endif %} {% if object.organisation.email %}
    Organisation Email
    -
    {{ object.organisation.email }} {% button 'copy' id='#org-email' %}
    +
    {{ object.organisation.email }} {% button 'copy' id='#org-email' %}
    {% endif %}
    {% else %} @@ -32,7 +32,7 @@ {% csrf_token %} {% include 'form_errors.html' %} -
    +
    @@ -42,25 +42,24 @@
    - - {% endblock %} {% block footer %} -
    +
    Preview @@ -67,9 +65,9 @@
    -
    +
    -
    +
    @@ -80,7 +78,7 @@
    {% if edit or manual %} -
    +
    @@ -90,7 +88,7 @@ {% endif %} {% if not is_ajax %}
    -
    +
    {% button 'submit' %}
    @@ -100,7 +98,7 @@ {% endblock %} {% block footer %} -
    +
    diff --git a/RIGS/templates/hs/hs_list.html b/RIGS/templates/hs/hs_list.html index f57f6e29..3d573432 100644 --- a/RIGS/templates/hs/hs_list.html +++ b/RIGS/templates/hs/hs_list.html @@ -42,7 +42,7 @@
    {% endfor %} + class="d-none d-sm-inline">Create {% empty %} diff --git a/RIGS/templates/hs/power_detail.html b/RIGS/templates/hs/power_detail.html index 2fd123f6..5a5a3e39 100644 --- a/RIGS/templates/hs/power_detail.html +++ b/RIGS/templates/hs/power_detail.html @@ -6,7 +6,7 @@ {% block content %}
    -
    +
    {% button 'edit' url='pt_edit' pk=object.pk %} {% button 'view' url='event_detail' pk=object.event.pk text="Event" %} {% include 'partials/review_status.html' with perm=perms.RIGS.review_power review='pt_review' %} @@ -164,13 +164,13 @@ {% endif %}
    -
    +
    {% button 'print' 'pt_print' object.pk %} {% button 'edit' url='pt_edit' pk=object.pk %} {% button 'view' url='event_detail' pk=object.event.pk text="Event" %} {% include 'partials/review_status.html' with perm=perms.RIGS.review_power review='pt_review' %}
    -
    +
    {% include 'partials/last_edited.html' with target="powertestrecord_history" %}
    {% endblock %} diff --git a/RIGS/templates/hs/power_form.html b/RIGS/templates/hs/power_form.html index e07877e0..f9bcc1b5 100644 --- a/RIGS/templates/hs/power_form.html +++ b/RIGS/templates/hs/power_form.html @@ -17,8 +17,6 @@ {% block js %} {{ block.super }} - - {% endblock %} {% block content %} @@ -48,19 +46,19 @@
    {% include 'partials/event_size.html' with object=event.riskassessment %}
    -
    +
    - {% if power_mic %} {% endif %}
    -
    +
    - {% if venue %} {% endif %} @@ -190,7 +188,7 @@
    {% endif %}
    -
    +
    {% button 'submit' %}
    diff --git a/RIGS/templates/hs/risk_assessment_detail.html b/RIGS/templates/hs/risk_assessment_detail.html index 146d2ddc..1e84ab69 100644 --- a/RIGS/templates/hs/risk_assessment_detail.html +++ b/RIGS/templates/hs/risk_assessment_detail.html @@ -165,7 +165,7 @@
    -
    +
    {% button 'print' 'ra_print' object.pk %} Edit diff --git a/RIGS/templates/hs/risk_assessment_form.html b/RIGS/templates/hs/risk_assessment_form.html index cccef9bd..0d677e3c 100644 --- a/RIGS/templates/hs/risk_assessment_form.html +++ b/RIGS/templates/hs/risk_assessment_form.html @@ -13,27 +13,35 @@ {% endblock %} {% block js %} - - {% endblock %} @@ -42,13 +50,13 @@
    {% if form.errors %}
    - +
    {% with form|nice_errors as qq %} {% for error_name,desc in qq.items %} {% if error_name == 'General form errors' %} {{ form.non_field_errors.0|safe }} -
    +
    {% render_field form.supervisor_consulted class+="form-check-input" form="form" %}
    @@ -98,7 +106,7 @@
    - {% if power_mic %} {% endif %} @@ -174,7 +182,7 @@
    -
    +
    @@ -65,11 +64,11 @@ £ {% if edit %} - +
    -
    +
    {% include 'partials/form_field.html' with field=form.date_sold col="col-6" %}
    -
    +
    {% include 'partials/form_field.html' with field=form.replacement_cost col="col-6" prepend="£" %}
    -
    +
    {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %}
    -
    +
    {% include 'partials/form_field.html' with field=form.cable_type col="col-6" %}
    -
    +
    {% include 'partials/form_field.html' with field=form.length append=form.length.help_text col="col-6" %}
    @@ -71,7 +71,7 @@
    -
    +
    {% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text title='CSA' col="col-6" %}
    @@ -80,7 +80,7 @@
    {% if not is_ajax %} -
    +
    {% endif %} @@ -88,7 +88,7 @@ {% endblock %} {% block footer %} -
    - +
    +
    {% endblock %} diff --git a/assets/templates/asset_audit_list.html b/assets/templates/asset_audit_list.html index 73711dbb..1c9f67b0 100644 --- a/assets/templates/asset_audit_list.html +++ b/assets/templates/asset_audit_list.html @@ -5,59 +5,53 @@ {% block js %} {% endblock %} {% block content %} -
    +

    Audit Asset:

    {% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID' autofocus="true" %} -
    - + Search -
    diff --git a/assets/templates/asset_form.html b/assets/templates/asset_form.html index b7c96e7b..0229a464 100644 --- a/assets/templates/asset_form.html +++ b/assets/templates/asset_form.html @@ -16,30 +16,18 @@ {% block js %} {{ block.super }} - - - - {% endblock %} {% block content %} diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html index e00dcd04..31191d46 100644 --- a/assets/templates/asset_list.html +++ b/assets/templates/asset_list.html @@ -62,26 +62,26 @@
    -
    +
    {% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID/Desc/Serial' %} - - {% button 'search' id="id_search" %} + + {% button 'search' id="id_search" %}
    -
    +
    -
    - - {% render_field form.category|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %} +
    + + {% render_field form.category|attr:'multiple'|add_class:'ts-select col-sm' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
    -
    - - {% render_field form.status|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %} +
    + + {% render_field form.status|attr:'multiple'|add_class:'ts-select col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
    @@ -91,12 +91,12 @@
    -
    +
    {% render_field form.date_acquired|add_class:'form-control mx-2' %}
    -
    +
    @@ -104,7 +104,7 @@
    -
    +
    {% button 'new' 'asset_create' style="width: 6em" %} {% if object_list %} Generate Labels @@ -114,9 +114,9 @@
    {# TODO Gotta be a cleaner way to do this... #} -

    Active Filters: {% for filter in category_filters %}{{filter}}{%endfor%}{% for filter in status_filters %}{{filter}}{%endfor%}{% for filter in status_filters %}{{filter}}{%endfor%}

    diff --git a/assets/templates/asset_update_search_results.html b/assets/templates/asset_update_search_results.html index 46fcc57c..3175253b 100644 --- a/assets/templates/asset_update_search_results.html +++ b/assets/templates/asset_update_search_results.html @@ -9,8 +9,7 @@ diff --git a/assets/templates/base_assets.html b/assets/templates/base_assets.html index 9d0a491d..6fc46d2c 100644 --- a/assets/templates/base_assets.html +++ b/assets/templates/base_assets.html @@ -11,7 +11,7 @@ {% block titleelements %}
  • Home
  • - +
    List Assets {% if perms.assets.add_asset %} @@ -25,7 +25,7 @@
    • - +
      List Suppliers {% if perms.assets.add_supplier %} diff --git a/assets/templates/cable_list.html b/assets/templates/cable_list.html index b94be4a5..031805a5 100644 --- a/assets/templates/cable_list.html +++ b/assets/templates/cable_list.html @@ -62,41 +62,41 @@
      -
      +
      {% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID/Desc/Serial' %} - - {% button 'search' id="id_search" %} + + {% button 'search' id="id_search" %}
      -
      +
      -
      - - {% render_field form.category|attr:'multiple'|add_class:'selectpicker col-sm pl-0' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %} +
      + + {% render_field form.category|attr:'multiple'|add_class:'ts-select col-sm ps-0' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
      -
      - - {% render_field form.status|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %} +
      + + {% render_field form.status|attr:'multiple'|add_class:'ts-select col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
      -
      - - {% render_field form.cable_type|attr:'multiple'|add_class:'selectpicker col-sm' data-none-selected-text="Cable Type" data-header="Cable Type" data-actions-box="true" %} +
      + + {% render_field form.cable_type|attr:'multiple'|add_class:'ts-select col-sm' data-none-selected-text="Cable Type" data-header="Cable Type" data-actions-box="true" %}
      -
      +
      {% render_field form.date_acquired|add_class:'form-control mx-2' %}
      -
      +
      @@ -104,7 +104,7 @@
      -
      +
      {% button 'new' 'asset_create' style="width: 6em" %} {% if object_list %} Generate Labels @@ -114,9 +114,9 @@
      {# TODO Gotta be a cleaner way to do this... #} -

      Active Filters: {% for filter in category_filters %}{{filter}}{%endfor%}{% for filter in status_filters %}{{filter}}{%endfor%}{% for filter in status_filters %}{{filter}}{%endfor%}

      @@ -125,7 +125,7 @@
      - + diff --git a/assets/templates/cable_type_detail.html b/assets/templates/cable_type_detail.html index 4023d546..d089a81a 100644 --- a/assets/templates/cable_type_detail.html +++ b/assets/templates/cable_type_detail.html @@ -22,7 +22,7 @@ -
      +
      {% button 'edit' url='cable_type_update' pk=object.id %}
      {% cache None cable_type_assets object %} diff --git a/assets/templates/cable_type_form.html b/assets/templates/cable_type_form.html index 0589582e..e6cc9faf 100644 --- a/assets/templates/cable_type_form.html +++ b/assets/templates/cable_type_form.html @@ -15,11 +15,11 @@
      {% for field in form %} -
      +
      {% include 'partials/form_field.html' with field=field %}
      {% endfor %} -
      +
      {% button 'submit' %}
      diff --git a/assets/templates/cable_type_list.html b/assets/templates/cable_type_list.html index f9f49ade..57108ad7 100644 --- a/assets/templates/cable_type_list.html +++ b/assets/templates/cable_type_list.html @@ -5,7 +5,7 @@ {% block content %}
      -
      +
      {% button 'new' 'cable_type_create' %}
      diff --git a/assets/templates/partials/asset_buttons.html b/assets/templates/partials/asset_buttons.html index 71f2a11b..77e2ca48 100644 --- a/assets/templates/partials/asset_buttons.html +++ b/assets/templates/partials/asset_buttons.html @@ -1,5 +1,5 @@ {% load button from filters %} -
      +
      {% if create or edit and object %} {% button 'submit' %} diff --git a/assets/templates/partials/asset_detail_form.html b/assets/templates/partials/asset_detail_form.html index 8b382d34..70bc96ab 100644 --- a/assets/templates/partials/asset_detail_form.html +++ b/assets/templates/partials/asset_detail_form.html @@ -7,7 +7,7 @@
      {% if create or edit or duplicate %} -
      +
      {% if duplicate %} {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %} @@ -17,32 +17,32 @@ {% render_field form.asset_id|add_class:'form-control' %} {% endif %}
      -
      +
      {% render_field form.description|add_class:'form-control' value=object.description %}
      -
      +
      {% render_field form.nickname|add_class:'form-control' value=object.nickname %}
      -
      +
      {% render_field form.category|add_class:'form-control'%}
      -
      +
      {% render_field form.status|add_class:'form-control'%}
      -
      +
      {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
      -
      +
      {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %}
      -
      +
      {% render_field form.comments|add_class:'form-control md-enabled' %}
      diff --git a/assets/templates/partials/asset_list_table.html b/assets/templates/partials/asset_list_table.html index e5136eb4..e711a2ca 100644 --- a/assets/templates/partials/asset_list_table.html +++ b/assets/templates/partials/asset_list_table.html @@ -1,7 +1,7 @@ {% load button from filters %}
      Asset ID Description
      - + diff --git a/assets/templates/partials/audit_details.html b/assets/templates/partials/audit_details.html index 93623fed..e62d35cc 100644 --- a/assets/templates/partials/audit_details.html +++ b/assets/templates/partials/audit_details.html @@ -3,6 +3,6 @@ Audit Details
      -

      Audited at {{ object.last_audited_at|default_if_none:'-' }} by {{ object.last_audited_by|default_if_none:'-' }}

      +

      Audited at {{ object.last_audited_at|default_if_none:'-' }} by {{ object.last_audited_by|default_if_none:'-' }}

      diff --git a/assets/templates/partials/cable_form.html b/assets/templates/partials/cable_form.html index 5799bc35..6dfc9a50 100644 --- a/assets/templates/partials/cable_form.html +++ b/assets/templates/partials/cable_form.html @@ -5,13 +5,13 @@
      {% if create or edit or duplicate %} -
      +
      {% include 'partials/form_field.html' with field=form.cable_type %}
      -
      +
      {% include 'partials/form_field.html' with field=form.length append=form.length.help_text %}
      -
      +
      {% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text %}
      {% else %} diff --git a/assets/templates/partials/parent_form.html b/assets/templates/partials/parent_form.html index c5fcbe85..7df6a242 100644 --- a/assets/templates/partials/parent_form.html +++ b/assets/templates/partials/parent_form.html @@ -5,9 +5,9 @@
      {% if create or edit or duplicate %} -
      - - {% if object.parent %} {% endif %} diff --git a/assets/templates/partials/purchasedetails_form.html b/assets/templates/partials/purchasedetails_form.html index dc627fc9..b52bc7d3 100644 --- a/assets/templates/partials/purchasedetails_form.html +++ b/assets/templates/partials/purchasedetails_form.html @@ -6,11 +6,11 @@
      {% if create or edit or duplicate %} -
      +
      - {% if object.purchased_from %} {% endif %} @@ -19,10 +19,10 @@
      + data-select-target="#{{ form.purchased_from.id_for_label }}"> - +
      @@ -30,23 +30,23 @@
      -
      +
      -
      £
      + £ {% render_field form.purchase_price|add_class:'form-control'|set_data:"toggle:tooltip" value=object.purchase_price title="Ex. VAT" %}
      -
      +
      -
      £
      + £ {% render_field form.replacement_cost|add_class:'form-control'|set_data:"toggle:tooltip" value=object.replacement_cost title="Ex. VAT" %}
      -
      +
      {% if object.date_acquired%} {% with date_acq=object.date_acquired|date:"Y-m-d" %} @@ -58,7 +58,7 @@ {% endif %}
      -
      +
      {% with date_sol=object.form.date_sold|date:"Y-m-d" %} {% render_field form.date_sold|add_class:'form-control'|attr:'type="date"' value=date_sol %} diff --git a/compose.yml b/compose.yml index 50769eb8..852f2c75 100644 --- a/compose.yml +++ b/compose.yml @@ -1,3 +1,4 @@ +# Local development only. Production is not deployed with this file. services: db: image: postgres:18.6 @@ -19,13 +20,15 @@ services: retries: 5 pyrigs: - build: . + build: + context: . + target: dev restart: unless-stopped environment: SECRET_KEY: ${SECRET_KEY} DJANGO_ALLOWED_HOSTS: ${DJANGO_ALLOWED_HOSTS} DOMAIN: ${DOMAIN:-example.com} - DEBUG: ${DEBUG:-false} + DEBUG: ${DEBUG:-true} STAGING: ${STAGING:-false} SESSION_COOKIE_SECURE_ENABLED: ${SESSION_COOKIE_SECURE_ENABLED:-true} CSRF_COOKIE_SECURE_ENABLED: ${CSRF_COOKIE_SECURE_ENABLED:-true} @@ -46,21 +49,21 @@ services: HCAPTCHA_SITEKEY: ${HCAPTCHA_SITEKEY:-10000000-ffff-ffff-ffff-000000000001} HCAPTCHA_SECRET: ${HCAPTCHA_SECRET:-0x0000000000000000000000000000000000000000} SENTRY_DSN: ${SENTRY_DSN:-} - expose: - - "8000" + ports: + - "8000:8000" + + volumes: + # The source is mounted rather than copied: the Django dev server reloads on every change + - .:/app healthcheck: - # gunicorn only starts listening once migrations and collectstatic have finished + # the dev server only starts listening once migrations have finished test: [ "CMD", "python", "-c", "import socket; socket.create_connection(('127.0.0.1', 8000), 2).close()" ] interval: 10s timeout: 5s retries: 5 start_period: 60s - volumes: - # shared with nginx, which serves /static/ directly - - static_files:/app/static - depends_on: db: condition: service_healthy @@ -70,41 +73,34 @@ services: - -c - | python manage.py migrate --noinput && - python manage.py collectstatic --noinput && - gunicorn \ - --bind 0.0.0.0:8000 \ - --workers 2 \ - PyRIGS.wsgi + exec python manage.py runserver 0.0.0.0:8000 develop: - # Create a `watch` configuration to update the app watch: - # Sync the working directory with the `/app` directory in the container - - action: sync - path: . - target: /app - # Exclude the project virtual environment - ignore: - - .venv/ - - # Rebuild the image on changes to the `pyproject.toml` + # `docker compose watch` rebuilds the image when the dependencies change - action: rebuild path: ./pyproject.toml + - action: rebuild + path: ./uv.lock - nginx: - image: nginx:stable-alpine - restart: unless-stopped - ports: - - "80:80" - + # Rebuilds the CSS/JS bundles into pipeline/built_assets whenever the sources change + assets: + image: node:24-slim + working_dir: /app volumes: - - ./nginx/default.dev.conf:/etc/nginx/conf.d/default.conf:ro - - static_files:/var/www/static:ro - - depends_on: - pyrigs: - condition: service_healthy + - .:/app + - node_modules:/app/node_modules + - npm_cache:/root/.npm + command: + - sh + - -c + - | + if [ ! -d node_modules/.bin ] || [ package-lock.json -nt node_modules/.package-lock.json ]; then + npm ci + fi + exec npx gulp watchAssets volumes: postgres_data: - static_files: + node_modules: + npm_cache: diff --git a/gulpfile.js b/gulpfile.js index 3233846b..196a958e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -22,11 +22,10 @@ function fonts(done) { } function styles(done) { - const bs_select = ["bootstrap-select.css", "ajax-bootstrap-select.css"] + const bs_select = ["tom-select.bootstrap5.css"] return gulp.src(['pipeline/source_assets/scss/**/*.scss', 'node_modules/fullcalendar/main.css', - 'node_modules/bootstrap-select/dist/css/bootstrap-select.css', - 'node_modules/ajax-bootstrap-select/dist/css/ajax-bootstrap-select.css', + 'node_modules/tom-select/dist/css/tom-select.bootstrap5.css', 'node_modules/easymde/dist/easymde.min.css' ]) .pipe(sourcemaps.init()) @@ -47,35 +46,24 @@ function styles(done) { function scripts() { const dest = 'pipeline/built_assets/js'; - const base_scripts = ["src.js", "util.js", "alert.js", "collapse.js", "dropdown.js", "modal.js", "konami.js"]; - const bs_select = ["bootstrap-select.js", "ajax-bootstrap-select.js"] + const base_scripts = ["src.js", "konami.js"]; + const bs_select = ["tom-select.complete.js", "autocompleter.js"] const interaction = ["html5sortable.min.js", "interaction.js"] - const jpop = ["jquery.min.js", "popper.min.js"] - return gulp.src(['node_modules/jquery/dist/jquery.min.js', - /* JQuery Plugins */ - 'node_modules/popper.js/dist/umd/popper.min.js', - /* Bootstrap Plugins */ - 'node_modules/bootstrap/js/dist/util.js', - 'node_modules/bootstrap/js/dist/tooltip.js', - 'node_modules/bootstrap/js/dist/popover.js', - 'node_modules/bootstrap/js/dist/dropdown.js', - 'node_modules/bootstrap/js/dist/collapse.js', - 'node_modules/bootstrap/js/dist/modal.js', - 'node_modules/bootstrap/js/dist/alert.js', + return gulp.src([/* Bootstrap bundle includes Popper */ + 'node_modules/bootstrap/dist/js/bootstrap.bundle.js', 'node_modules/html5sortable/dist/html5sortable.min.js', 'node_modules/clipboard/dist/clipboard.min.js', 'node_modules/moment/moment.js', 'node_modules/fullcalendar/main.js', - 'node_modules/bootstrap-select/dist/js/bootstrap-select.js', - 'node_modules/ajax-bootstrap-select/dist/js/ajax-bootstrap-select.js', + 'node_modules/tom-select/dist/js/tom-select.complete.js', 'node_modules/easymde/dist/easymde.min.js', 'node_modules/konami/konami.js', 'pipeline/source_assets/js/**/*.js',]) .pipe(gulpif(function(file) { return base_scripts.includes(file.relative);}, con('base.js'))) .pipe(gulpif(function(file) { return bs_select.includes(file.relative);}, con('selects.js'))) .pipe(gulpif(function(file) { return interaction.includes(file.relative);}, con('interaction.js'))) - .pipe(gulpif(function(file) { return jpop.includes(file.relative);}, con('jpop.js'))) + .pipe(gulpif(function(file) { return ["bootstrap.bundle.js", "helpers.js"].includes(file.relative);}, con('jpop.js'))) .pipe(flatten()) // Only minify if filename does not already denote it as minified .pipe(gulpif(function(file) { return file.path.indexOf("min") === -1;},terser())) @@ -105,5 +93,12 @@ function watchFiles() { gulp.watch("**/templates/*.html", browserSyncReload); } +// Rebuild the bundles when the sources change (used by the `assets` service in compose.override.yml) +function watchSources() { + gulp.watch("pipeline/source_assets/scss/**/*.scss", styles); + gulp.watch("pipeline/source_assets/js/**/*.js", scripts); +} + exports.build = gulp.parallel(styles, scripts, fonts); exports.watch = gulp.parallel(watchFiles, browserSync); +exports.watchAssets = gulp.series(exports.build, watchSources); diff --git a/nginx/default.dev.conf b/nginx/default.dev.conf deleted file mode 100644 index 8455d2d7..00000000 --- a/nginx/default.dev.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Local development: plain HTTP, no certificates. Use default.conf.example for production. -upstream pyrigs { - server pyrigs:8000; -} - -server { - listen 80; - server_name _; - - client_max_body_size 20m; - - location /static/ { - alias /var/www/static/; - access_log off; - } - - location / { - proxy_pass http://pyrigs; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_redirect off; - } -} diff --git a/package-lock.json b/package-lock.json index 538ee157..e564ddea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,13 +9,11 @@ "version": "1.0.0", "license": "Custom", "dependencies": { - "@forevolve/bootstrap-dark": "^2.1.0", "@fortawesome/fontawesome-free": "^5.15.4", - "ajax-bootstrap-select": "^1.4.5", + "@popperjs/core": "^2.11.8", "autocompleter": "^6.1.2", "autoprefixer": "^10.4.0", - "bootstrap": "^4.6.1", - "bootstrap-select": "^1.13.18", + "bootstrap": "^5.3.8", "clipboard": "^2.0.8", "cssnano": "^5.0.13", "easymde": "^2.21.0", @@ -28,12 +26,11 @@ "gulp-sourcemaps": "^3.0.0", "gulp-uglify": "^3.0.2", "html5sortable": "^0.13.3", - "jquery": "^3.6.0", "konami": "^1.7.0", "moment": "^2.29.4", - "popper.js": "^1.16.1", "postcss": "^8.5.26", "sass": "^1.103.1", + "tom-select": "^2.6.2", "uglify-js": "^3.14.5" }, "devDependencies": { @@ -44,16 +41,6 @@ "node": "24.x" } }, - "node_modules/@forevolve/bootstrap-dark": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@forevolve/bootstrap-dark/-/bootstrap-dark-2.1.1.tgz", - "integrity": "sha512-1QYwjzkq1IX57uvOR2ptRasQGG8PhcIDtnzZj+/z8fusS5eK4RUufcfvOSSamAzUsQjpqMBd8zBFIq3fLTO+6Q==", - "dependencies": { - "bootstrap": "^4.6.2", - "jquery": "^3.5.1", - "popper.js": "^1.16.1" - } - }, "node_modules/@fortawesome/fontawesome-free": { "version": "5.15.4", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz", @@ -131,6 +118,21 @@ "node": ">=10.13.0" } }, + "node_modules/@orchidjs/sifter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@orchidjs/sifter/-/sifter-1.1.0.tgz", + "integrity": "sha512-mYwHCfr736cIWWdhhSZvDbf90AKt2xyrJspKFC3qyIJG1LtrJeJunYEqCGG4Aq2ijENbc4WkOjszcvNaIAS/pQ==", + "license": "Apache-2.0", + "dependencies": { + "@orchidjs/unicode-variants": "^1.1.2" + } + }, + "node_modules/@orchidjs/unicode-variants": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@orchidjs/unicode-variants/-/unicode-variants-1.1.2.tgz", + "integrity": "sha512-5DobW1CHgnBROOEpFlEXytED5OosEWESFvg/VYmH0143oXcijYTprRYJTs+55HzGM4IqxiLFSuqEzu9mPNwVsA==", + "license": "Apache-2.0" + }, "node_modules/@parcel/watcher": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.6.0.tgz", @@ -419,6 +421,16 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@socket.io/component-emitter": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz", @@ -503,14 +515,6 @@ "node": ">=0.4.0" } }, - "node_modules/ajax-bootstrap-select": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/ajax-bootstrap-select/-/ajax-bootstrap-select-1.4.5.tgz", - "integrity": "sha512-xDnoD1xq3bekqEVJsye1LcsxQ4jpdnyMJrTdsZqZySA7hc6R02D/23uVaE3P/2POyam1eRkC+c+ph59m9IJLgg==", - "engines": { - "node": ">=6" - } - }, "node_modules/ansi-colors": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", @@ -864,9 +868,9 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" }, "node_modules/bootstrap": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", - "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", + "version": "5.3.8", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz", + "integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==", "funding": [ { "type": "github", @@ -877,18 +881,9 @@ "url": "https://opencollective.com/bootstrap" } ], + "license": "MIT", "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" - } - }, - "node_modules/bootstrap-select": { - "version": "1.13.18", - "resolved": "https://registry.npmjs.org/bootstrap-select/-/bootstrap-select-1.13.18.tgz", - "integrity": "sha512-V1IzK4rxBq5FrJtkzSH6RmFLFBsjx50byFbfAf8jYyXROWs7ZpprGjdHeoyq2HSsHyjJhMMwjsQhRoYAfxCGow==", - "peerDependencies": { - "bootstrap": ">=3.0.0", - "jquery": "1.9.1 - 3" + "@popperjs/core": "^2.11.8" } }, "node_modules/brace-expansion": { @@ -3025,11 +3020,6 @@ "node": ">=0.10.0" } }, - "node_modules/jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" - }, "node_modules/jsonfile": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", @@ -3565,16 +3555,6 @@ "node": ">=0.10.0" } }, - "node_modules/popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/portscanner": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz", @@ -5072,6 +5052,23 @@ "node": ">=0.6" } }, + "node_modules/tom-select": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tom-select/-/tom-select-2.6.2.tgz", + "integrity": "sha512-eiXIkk82XzzUTOVQDFpy+ZGejuqdTvMukyUyeZBQaKnqW42UoTiTZnrod/eX0rkqJEc4rZY9DZ3zdjV07i29wQ==", + "license": "Apache-2.0", + "dependencies": { + "@orchidjs/sifter": "^1.1.0", + "@orchidjs/unicode-variants": "^1.1.2" + }, + "engines": { + "node": "*" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/tom-select" + } + }, "node_modules/type": { "version": "2.7.3", "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz", @@ -5510,16 +5507,6 @@ } }, "dependencies": { - "@forevolve/bootstrap-dark": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@forevolve/bootstrap-dark/-/bootstrap-dark-2.1.1.tgz", - "integrity": "sha512-1QYwjzkq1IX57uvOR2ptRasQGG8PhcIDtnzZj+/z8fusS5eK4RUufcfvOSSamAzUsQjpqMBd8zBFIq3fLTO+6Q==", - "requires": { - "bootstrap": "^4.6.2", - "jquery": "^3.5.1", - "popper.js": "^1.16.1" - } - }, "@fortawesome/fontawesome-free": { "version": "5.15.4", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz", @@ -5582,6 +5569,19 @@ "is-negated-glob": "^1.0.0" } }, + "@orchidjs/sifter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@orchidjs/sifter/-/sifter-1.1.0.tgz", + "integrity": "sha512-mYwHCfr736cIWWdhhSZvDbf90AKt2xyrJspKFC3qyIJG1LtrJeJunYEqCGG4Aq2ijENbc4WkOjszcvNaIAS/pQ==", + "requires": { + "@orchidjs/unicode-variants": "^1.1.2" + } + }, + "@orchidjs/unicode-variants": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@orchidjs/unicode-variants/-/unicode-variants-1.1.2.tgz", + "integrity": "sha512-5DobW1CHgnBROOEpFlEXytED5OosEWESFvg/VYmH0143oXcijYTprRYJTs+55HzGM4IqxiLFSuqEzu9mPNwVsA==" + }, "@parcel/watcher": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.6.0.tgz", @@ -5686,6 +5686,11 @@ "integrity": "sha512-cA+/pXV2YkfxlIcXOQ5fSWqAzzPyD78/x5qbK/I0vUkrlYHA8TIz+MXjAbGouguKVSI4bOmkTSJ1/poVSsgt+A==", "optional": true }, + "@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==" + }, "@socket.io/component-emitter": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz", @@ -5760,11 +5765,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==" }, - "ajax-bootstrap-select": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/ajax-bootstrap-select/-/ajax-bootstrap-select-1.4.5.tgz", - "integrity": "sha512-xDnoD1xq3bekqEVJsye1LcsxQ4jpdnyMJrTdsZqZySA7hc6R02D/23uVaE3P/2POyam1eRkC+c+ph59m9IJLgg==" - }, "ansi-colors": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", @@ -6001,15 +6001,9 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" }, "bootstrap": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", - "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", - "requires": {} - }, - "bootstrap-select": { - "version": "1.13.18", - "resolved": "https://registry.npmjs.org/bootstrap-select/-/bootstrap-select-1.13.18.tgz", - "integrity": "sha512-V1IzK4rxBq5FrJtkzSH6RmFLFBsjx50byFbfAf8jYyXROWs7ZpprGjdHeoyq2HSsHyjJhMMwjsQhRoYAfxCGow==", + "version": "5.3.8", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz", + "integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==", "requires": {} }, "brace-expansion": { @@ -7646,11 +7640,6 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" }, - "jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" - }, "jsonfile": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", @@ -8047,11 +8036,6 @@ } } }, - "popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" - }, "portscanner": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz", @@ -9121,6 +9105,15 @@ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true }, + "tom-select": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tom-select/-/tom-select-2.6.2.tgz", + "integrity": "sha512-eiXIkk82XzzUTOVQDFpy+ZGejuqdTvMukyUyeZBQaKnqW42UoTiTZnrod/eX0rkqJEc4rZY9DZ3zdjV07i29wQ==", + "requires": { + "@orchidjs/sifter": "^1.1.0", + "@orchidjs/unicode-variants": "^1.1.2" + } + }, "type": { "version": "2.7.3", "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz", diff --git a/package.json b/package.json index 77ea718c..7a078dfd 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,11 @@ "node": "24.x" }, "dependencies": { - "@forevolve/bootstrap-dark": "^2.1.0", "@fortawesome/fontawesome-free": "^5.15.4", - "ajax-bootstrap-select": "^1.4.5", + "@popperjs/core": "^2.11.8", "autocompleter": "^6.1.2", "autoprefixer": "^10.4.0", - "bootstrap": "^4.6.1", - "bootstrap-select": "^1.13.18", + "bootstrap": "^5.3.8", "clipboard": "^2.0.8", "cssnano": "^5.0.13", "easymde": "^2.21.0", @@ -27,12 +25,11 @@ "gulp-sourcemaps": "^3.0.0", "gulp-uglify": "^3.0.2", "html5sortable": "^0.13.3", - "jquery": "^3.6.0", "konami": "^1.7.0", "moment": "^2.29.4", - "popper.js": "^1.16.1", "postcss": "^8.5.26", "sass": "^1.103.1", + "tom-select": "^2.6.2", "uglify-js": "^3.14.5" }, "devDependencies": { diff --git a/pipeline/source_assets/js/autocompleter.js b/pipeline/source_assets/js/autocompleter.js index 97696774..eb0870f9 100644 --- a/pipeline/source_assets/js/autocompleter.js +++ b/pipeline/source_assets/js/autocompleter.js @@ -1,101 +1,138 @@ -function changeSelectedValue(obj,pk,text,update_url) { //Pass in JQuery object and new parameters - //console.log('Changing selected value'); - obj.find('option').remove(); //Remove all the available options - obj[0].add(new Option(text, pk, true, true)); // Add new option - //obj.selectpicker('val', pk); //Set the new value to be selected - obj.selectpicker('refresh'); - obj.change(); //Trigger the change function manually - //console.log(obj); +// Select widgets, built on Tom Select. +// * without a source URL is a plain (optionally multiple) select + +var clearSelectionLabel = '(no selection)'; + +function changeSelectedValue(select, pk, text, update_url) { // Pass in the - -
      -
      -
      - -
      -
      -
      -
      -

      - - Typography -

      -

      - - - - - - - - - - -

      -
      - -
      -
      -
      -
      -
      -

      Headings

      -

      h1. Bootstrap heading

      -

      h2. Bootstrap heading

      -

      h3. Bootstrap heading

      -

      h4. Bootstrap heading

      -
      h5. Bootstrap heading
      -
      h6. Bootstrap heading
      - -

      Lead

      -

      Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.

      - -

      Styles

      -

      You can use the mark tag to - highlight text.

      -

      - This line of text is meant to be treated as deleted text. -

      -

      - This line of text is meant to be treated as no longer accurate. -

      -

      - This line of text is meant to be treated as an addition to the document. -

      -

      - This line of text will render as underlined -

      -

      This line of text is meant to be treated as fine print.

      -

      This line rendered as bold text.

      -

      This line rendered as italicized text.

      -

      And this is a muted text.

      -

      abbr abbr+init

      - -

      Colors

      -

      - - .text-primary - - .text-secondary - - .text-success - - .text-danger - - .text-warning - - .text-info - - .text-light - - .text-dark - - .text-white - -

      -

      - - Primary link - - Secondary link - - Success link - - Danger link - - Warning link - - Info link - - Light link - - Dark link - - White link - -

      - -

      Inline code

      -

      For example, <section> should be wrapped as inline.

      -

      y = mx + b

      -

      To switch directories, type cd followed by the name of the directory.
      To edit settings, press ctrl + , -

      -

      This text is meant to be treated as sample output from a computer program.

      -
      -
      -

      Displays

      -

      Display 1

      -

      Display 2

      -

      Display 3

      -

      Display 4

      - -

      Sample body

      -

      - Lórum ipse - mint senyért - nyált ságos iség, ahol beles metás, csaprozás, vermény, csaprát - és más meni zsorlóca kuncáskodik. Mosztag, férzet napé, fuvódás 11, törnyélés ; valamint szuvegés vitancs: a dozmus drikója, - jultsás kelés magyarul. A szuvegés és gyarány pasztákban buggyos mendernyékről, filingéjükről és pucájukról húzódik a - fabampa. Hűtő benne a legújabban belég mendernyék mártja is, részletesen sáskodik a kétenc fríg lepkonyaival. Csétletésről - cigál le egy kéző lengelész csapárába rimulnia, ahol három másik szivény együtt érleti spotráit. Ha a bénulás summája - kalkodik, úgy púdulhat, mintha az volna a sülső csoltása, hogy a szedhentes és egyes tengyelét lécetse ki a pávágyokból. - Ez vajon vertető ölyök vagy vegítő dosna? Szalalizál bunya a felegesben olyan szellőző kedő, amely farisban kevetteti - a nyagondos hizmusok „énemlő” lárias mizmusait? -

      - -

      Code block

      - - 
      /**
- * @author John Smith <john.smith@example.com>
- */
-package l2f.gameserver.model;
-
-public abstract class L2Char extends L2Object {
-	public static final Short ERROR = 0x0001;
-
-	public void moveTo(int x, int y, int z) {
-		_ai = null;
-		log("Should not be called");
-		if (1 > 5) { // wtf!?
-			return;
-		}
-	}
-}
      -
      -
      -
      -
      -

      Blockquote

      -
      -

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      -
      Someone famous in Source Title
      -
      -
      -
      -
      -
      -

      ...centered

      -
      -

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      -
      Someone famous in Source Title
      -
      -
      -
      -
      -
      -

      ...on right

      -
      -

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      -
      Someone famous in Source Title
      -
      -
      -
      -
      -
      -

      List

      -
        -
      • Lorem ipsum dolor sit amet
        • -
      • Consectetur adipiscing elit
        • -
      • Integer molestie lorem at massa
        • -
      • Facilisis in pretium nisl aliquet
        • -
      • Nulla volutpat aliquam velit -
          -
        • Phasellus iaculis neque
          • -
        • Purus sodales ultricies
          • -
        • Vestibulum laoreet porttitor sem
          • -
        • Ac tristique libero volutpat at
          • -
        -
        • -
      • Faucibus porta lacus fringilla vel
        • -
      • Aenean sit amet erat nunc
        • -
      • Eget porttitor lorem
        • -
      -
      -
      -

      ...unstyled

      -
        -
      • Lorem ipsum dolor sit amet
        • -
      • Consectetur adipiscing elit
        • -
      • Integer molestie lorem at massa
        • -
      • Facilisis in pretium nisl aliquet
        • -
      • Nulla volutpat aliquam velit -
          -
        • Phasellus iaculis neque
          • -
        • Purus sodales ultricies
          • -
        • Vestibulum laoreet porttitor sem
          • -
        • Ac tristique libero volutpat at
          • -
        -
        • -
      • Faucibus porta lacus fringilla vel
        • -
      • Aenean sit amet erat nunc
        • -
      • Eget porttitor lorem
        • -
      -
      -
      -

      ...inline

      -
        -
      • Lorem ipsum
        • -
      • Phasellus iaculis
        • -
      • Nulla volutpat
        • -
      -
      -
      -
      -
      -

      Definition list

      -
      -
      -
      -
      Description lists
      -
      A description list is perfect for defining terms.
      - -
      Euismod
      -
      -

      Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.

      -

      Donec id elit non mi porta gravida at eget metus.

      -
      - -
      Malesuada porta
      -
      Etiam porta sem malesuada magna mollis euismod.
      - -
      Truncated term is truncated
      -
      Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
      - -
      Nesting
      -
      -
      -
      Nested definition list
      -
      Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc.
      -
      -
      -
      - -
      -
      -

      Background colors

      -
      - - -
      -
      .bg-primary
      -
      - - -
      -
      .bg-secondary
      -
      - - -
      -
      .bg-success
      -
      - - -
      -
      .bg-danger
      -
      - - -
      -
      .bg-warning
      -
      - - -
      -
      .bg-info
      -
      - - -
      -
      .bg-light
      -
      - - -
      -
      .bg-dark
      -
      - - -
      -
      .bg-white
      -
      - -
      -
      -
      - -
      -
      -
      -
      -

      - - Images -

      -

      - - - - - - - - -

      -
      - -
      -
      -
      -
      -
      -

      Responsive image

      - responsive image -
      -
      -

      Thumbnail

      - thumbnail image -
      -
      -

      Figure

      -
      - Figure -
      A caption for the above image.
      -
      -
      -
      -

      Media

      -
      - Generic placeholder image -
      -
      Media heading
      - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in - vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in - faucibus. - -
      - - Generic placeholder image - -
      -
      Media heading
      - Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in - vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis - in faucibus. -
      -
      -
      -
      -
      -
      -
      -
      - -
      -
      -
      -
      -

      - - Tables -

      -

      - - - - -

      -
      - -
      -
      -
      -
      -
      -

      Table

      -
      Asset ID Description
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      #First NameLast NameUsername
      1MarkOtto@mdo
      2JacobThornton@fat
      3Larrythe Bird@twitter
      -
      -
      -

      Inversed table

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      #First NameLast NameUsername
      1MarkOtto@mdo
      2JacobThornton@fat
      3Larrythe Bird@twitter
      -
      -
      -
      -
      -

      Table with colors

      -

      Note: Use table-* classes.

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      TypeColumn headingColumn heading
      DefaultColumn contentColumn content
      ActiveColumn contentColumn content
      PrimaryColumn contentColumn content
      SecondaryColumn contentColumn content
      SuccessColumn contentColumn content
      DangerColumn contentColumn content
      WarningColumn contentColumn content
      InfoColumn contentColumn content
      LightColumn contentColumn content
      DarkColumn contentColumn content
      -
      -
      -

      Inversed table with colors

      -

      Note: Use bg-* and text-* classes.

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      TypeColumn headingColumn heading
      DefaultColumn contentColumn content
      PrimaryColumn contentColumn content
      SecondaryColumn contentColumn content
      SuccessColumn contentColumn content
      DangerColumn contentColumn content
      WarningColumn contentColumn content
      InfoColumn contentColumn content
      LightColumn contentColumn content
      DarkColumn contentColumn content
      -
      -
      -
      -
      -

      Default header

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      #First NameLast NameUsername
      1MarkOtto@mdo
      2JacobThornton@fat
      3Larrythe Bird@twitter
      -
      -
      -

      Inversed header

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      #First NameLast NameUsername
      1MarkOtto@mdo
      2JacobThornton@fat
      3Larrythe Bird@twitter
      -
      -
      -
      -
      -

      Small table

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      #First NameLast NameUsername
      1MarkOtto@mdo
      2JacobThornton@fat
      3Larrythe Bird@twitter
      -
      -
      -
      - - -
      -
      -
      -
      -

      - - List groups -

      -

      - - - - -

      -
      - -
      -
      -
      -
      -
      - -
      -
      -

      ...with actions and colors

      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      -
      -

      ...with custom content

      -
      - -
      -
      List group item heading
      - 3 days ago -
      -

      Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

      - Donec id elit non mi porta. -       - -
      -
      List group item heading
      - 3 days ago -
      -

      Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

      - Donec id elit non mi porta. -       - -
      -
      List group item heading
      - 3 days ago -
      -

      Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

      - Donec id elit non mi porta. -       -
      -
      -
      -
      -
      - -
      -
      -
      -
      -

      - - Buttons -

      -

      - - - - - - - - - - -

      -
      - -
      -
      -
      - - -
      -
      -

      General buttons

      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      - -

      Outline buttons

      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      -
      -

      Sizes

      -
      - - - -
      -
      -
      -

      Groups and dropdown

      - -
      - -
      -

      Pagination

      - -
      -
      -
      -
      - -
      -
      -
      -
      -

      - - Jumbotrons -

      -

      - - - - -

      -
      - -
      -
      -
      -
      -
      -

      Default jumbotron

      -
      -

      Hello, world!

      -

      This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

      -
      -

      It uses utility classes for typography and spacing to space content out within the larger container.

      -

      - Learn more -

      -
      - -

      Fluid jumbotron

      -
      -
      -

      Fluid jumbotron

      -

      This is a modified jumbotron that occupies the entire horizontal space of its parent.

      -
      -
      -
      -
      -
      -
      - -
      -
      -
      -
      -

      - - Cards -

      -

      - - - - -

      -
      - -
      -
      -
      -
      -
      -

      Various types of cards

      -
      -
      -
      - This is some text within a card block. -
      -
      -
      -
        -
      • Cras justo odio
        • -
      • Dapibus ac facilisis in
        • -
      • Vestibulum at eros
        • -
      -
      -
      -
      -

      Card title

      -
      Card subtitle
      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      - Card link - Another link -
      -
      -
      -
      -

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      -
      - - Someone famous in Source Title - -
      -
      -
      -
      -
      - Featured -
      -
      -

      Special title treatment

      -

      With supporting text below as a natural lead-in to additional content.

      - Go somewhere -
      -
      -
      -
      - Featured -
      -
      -

      Special title treatment

      -

      With supporting text below as a natural lead-in to additional content.

      - Go somewhere -
      -
      - 2 days ago -
      -
      -
      - Card image -
      -
      - Card image cap -
      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      -
      -

      Card title

      -

      This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little - bit longer.

      -

      Last updated 3 mins ago

      -
      - Card image cap -
      -
      - Card image cap -
      -

      Card title

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
        -
      • Cras justo odio
        • -
      • Dapibus ac facilisis in
        • -
      • Vestibulum at eros
        • -
      -
      - Card link - Another link -
      -
      -
      -
      - -
      -
      -

      Special title treatment

      -

      With supporting text below as a natural lead-in to additional content.

      - Go somewhere -
      -
      -
      -
      - -
      -
      -

      Special title treatment

      -

      With supporting text below as a natural lead-in to additional content.

      - Go somewhere -
      -
      -
      -
      -
      -
      -
      -

      Colored cards

      -
      - - - -
      -
      -
      Header
      -
      -

      Primary card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - - -
      -
      -
      Header
      -
      -

      Secondary card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - - -
      -
      -
      Header
      -
      -

      Success card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - - -
      -
      -
      Header
      -
      -

      Danger card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - - -
      -
      -
      Header
      -
      -

      Warning card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - - -
      -
      -
      Header
      -
      -

      Info card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - - -
      -
      -
      Header
      -
      -

      Light card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - - -
      -
      -
      Header
      -
      -

      Dark card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - -
      -
      -
      -

      Cards with colored borders

      -
      - - -
      -
      -
      Header
      -
      -

      Primary card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - -
      -
      -
      Header
      -
      -

      Secondary card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - -
      -
      -
      Header
      -
      -

      Success card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - -
      -
      -
      Header
      -
      -

      Danger card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - -
      -
      -
      Header
      -
      -

      Warning card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - -
      -
      -
      Header
      -
      -

      Info card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - -
      -
      -
      Header
      -
      -

      Light card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - -
      -
      -
      Header
      -
      -

      Dark card

      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      -
      -
      -
      - - -
      -
      -
      - -
      -
      -
      -
      -

      - - Forms -

      -

      - - - - - - -

      -
      - -
      -
      -
      - -
      -
      -

      Text fields

      -
      - - - We'll never share your email with anyone else. -
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      -
      - - -
      -
      - - -
      Please provide a valid value.
      -
      -
      - -
      -
      - -
      -
      - -
      -
      -
      -
      - $ -
      - -
      - .00 -
      -
      -
      -
      -
      -
      - $ -
      - -
      - .00 -
      -
      -
      -
      -
      -
      - -
      - -
      - -
      -
      -
      -
      -
      - -
      - -
      - Action - Another action - Something else here - - Separated link -
      -
      -
      -
      -
      - - -
      - -

      Layouts

      -
      -
      -
      - -
      -
      - -
      -
      -
      -
      -
      -
      - -
      -
      - -
      -
      -
      -
      - -
      - -
      -
      -
      -
      - -
      -
      - @ -
      - -
      -
      -
      -
      -
      -
      - - - Must be 8-20 characters long. -
      -
      -
      -
      -
      -

      Selects

      -
      - - -
      -
      - - -
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      - -

      Checkboxes

      -
      - -
      -
      - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - -
      -
      - -
      -
      - -
      - -

      Radio buttons

      -
      - -
      -
      - -
      -
      - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - - -
      -
      - -
      -
      - -
      -
      - -
      -
      -
      - - -
      -
      - - - -
      -
      -
      -
      -

      - - Badges -

      -

      - - - - -

      -
      - -
      -
      -
      -
      -
      -

      Contextual badges

      -

      - - - Primary - - - Secondary - - - Success - - - Danger - - - Warning - - - Info - - - Light - - - Dark - - -

      - -

      Pill badges

      -

      - - - Primary - - - Secondary - - - Success - - - Danger - - - Warning - - - Info - - - Light - - - Dark - - -

      - -

      Links

      -

      - - - Primary - - - Secondary - - - Success - - - Danger - - - Warning - - - Info - - - Light - - - Dark - - -

      -
      -
      -

      Badges in headings

      -

      Example heading New

      -

      Example heading New

      -

      Example heading New

      -

      Example heading New

      -
      Example heading New
      -
      Example heading New
      -
      -
      -
      -
      - -
      -
      -
      -
      -

      - - Alerts -

      -

      - - - - -

      -
      - -
      -
      -
      -
      -
      -

      Simple alerts

      -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      -
      -
      -

      Alerts with additional content

      -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      - -
      - - -
      -
      -
      - -
      -
      -
      -
      -

      - - Popovers -

      -

      - - - - - - -

      -
      - -
      -
      -
      -
      -
      -

      Popovers

      - -
      -
      -

      Tooltips

      - -
      -
      -
      -
      - -
      -
      -
      -
      -

      - - Progress bars -

      -

      - - - - -

      -
      - -
      -
      -
      -
      -
      -

      Colored progress bars

      -
      -
      Label
      -
      - - -
      -
      Label
      -
      - -
      -
      Label
      -
      - -
      -
      Label
      -
      - -
      -
      Label
      -
      - -
      -
      -

      Striped progress bars

      -
      -
      Label
      -
      - - -
      -
      Label
      -
      - -
      -
      Label
      -
      - -
      -
      Label
      -
      - -
      -
      Label
      -
      - -
      -
      -
      -
      - -
      -
      -
      -
      -

      - - Modals -

      -

      - - - - -

      -
      - -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      Modal title
      - -
      -
      -

      Modal body text goes here.

      -
      -
      - - -
      -
      -
      -
      -
      -
      -
      -
      - -{% endblock %} diff --git a/templates/closemodal.html b/templates/closemodal.html index 5cd52641..0026376a 100644 --- a/templates/closemodal.html +++ b/templates/closemodal.html @@ -4,5 +4,5 @@ {% endfor %} {% endif %} diff --git a/templates/generic_detail.html b/templates/generic_detail.html index b146e085..27913cdf 100644 --- a/templates/generic_detail.html +++ b/templates/generic_detail.html @@ -48,7 +48,7 @@ {% if not is_ajax %}
      -
      +
      {% if can_edit %}
      {% button 'edit' update_link object.pk %} @@ -62,7 +62,7 @@ {% if is_ajax %} {% block footer %}
      -
      +
      Open Page diff --git a/templates/generic_form.html b/templates/generic_form.html index 7082e2b9..1625ee6a 100644 --- a/templates/generic_form.html +++ b/templates/generic_form.html @@ -17,7 +17,7 @@ {% block js %} {{ block.super }} @@ -29,21 +29,21 @@
      {% include 'form_errors.html' %} -
      +
      {% render_field form.name class+="form-control" placeholder=form.name.label %}
      -
      +
      {% render_field form.phone class+="form-control" type="tel" placeholder=form.phone.label %}
      -
      +
      @@ -51,7 +51,7 @@
      -
      +
      @@ -60,7 +60,7 @@
      -
      +
      @@ -68,7 +68,7 @@
      {% if form.three_phase_available is not None %} -
      +
      {% endif %} {% if form.union_account is not None %} -
      +
      -
      +
      {% button 'submit' %}
      diff --git a/templates/generic_list.html b/templates/generic_list.html index 4104cd94..d5e69120 100644 --- a/templates/generic_list.html +++ b/templates/generic_list.html @@ -8,7 +8,7 @@ {% block content %} {% include 'partials/list_search.html' %}
      -
      +
      {% button 'new' url=create %}
      diff --git a/templates/partials/associated_organisations.html b/templates/partials/associated_organisations.html index eab97b27..0ba5deb0 100644 --- a/templates/partials/associated_organisations.html +++ b/templates/partials/associated_organisations.html @@ -3,7 +3,7 @@
      Associated Organisations
      diff --git a/templates/partials/button.html b/templates/partials/button.html index c89e1516..27fab721 100644 --- a/templates/partials/button.html +++ b/templates/partials/button.html @@ -3,9 +3,9 @@ {% elif pk %} {{ text }} {% elif copy %} - + {% elif today %} - + {% else %} {{ text }} {% endif %} diff --git a/templates/partials/dark_theme.html b/templates/partials/dark_theme.html index 1f5a0335..035dd462 100644 --- a/templates/partials/dark_theme.html +++ b/templates/partials/dark_theme.html @@ -1,7 +1,5 @@ -{% load static %} diff --git a/templates/partials/form_field.html b/templates/partials/form_field.html index b7b75418..69a32538 100644 --- a/templates/partials/form_field.html +++ b/templates/partials/form_field.html @@ -5,15 +5,11 @@ {% if append or prepend %}
      {% if prepend %} -
      - {{ prepend }} -
      + {{ prepend }} {% endif %} {% render_field field|add_class:'form-control' style=style %} {% if append %} -
      - {{ append }} -
      + {{ append }} {% endif %}
      {% else %} diff --git a/templates/partials/list_search.html b/templates/partials/list_search.html index 92d1c2fa..fb9f9d21 100644 --- a/templates/partials/list_search.html +++ b/templates/partials/list_search.html @@ -1,12 +1,12 @@ {% load button from filters %}
      -
      + {% csrf_token %}
      - {% button 'search' id="id_search" %} + {% button 'search' id="id_search" %}
      diff --git a/templates/partials/search.html b/templates/partials/search.html index d83bf71e..008f7c14 100644 --- a/templates/partials/search.html +++ b/templates/partials/search.html @@ -1,11 +1,9 @@ {% if user.is_authenticated %} -
      +
      -
      - -
      +
      - +
      {% endif %} diff --git a/templates/registration/login_embed.html b/templates/registration/login_embed.html index bddb7333..d135d589 100644 --- a/templates/registration/login_embed.html +++ b/templates/registration/login_embed.html @@ -15,15 +15,15 @@
      {% csrf_token %} -
      +
      {% render_field form.username class+="form-control" placeholder=form.username.label %}
      -
      +
      {% render_field form.password class+="form-control" placeholder=form.password.label %}
      -
      +
      diff --git a/templates/registration/loginform.html b/templates/registration/loginform.html index 8a6c44c8..4821712f 100644 --- a/templates/registration/loginform.html +++ b/templates/registration/loginform.html @@ -7,15 +7,15 @@ {% endif %}
      {% csrf_token %} -
      +
      {% render_field form.username class+="form-control" placeholder=form.username.label autofocus="" %}
      -
      +
      {% render_field form.password class+="form-control" placeholder=form.password.label %}
      -
      +
      Register Forgotten Password diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html index 20fb909e..63962880 100644 --- a/templates/registration/password_change_form.html +++ b/templates/registration/password_change_form.html @@ -18,14 +18,14 @@
      {% csrf_token %} {% for field in form %} -
      +
      {% render_field field class+="form-control" placeholder=field.label %}
      {% endfor %} -

      +

      diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html index 3c3e1664..0e0d7ed6 100644 --- a/templates/registration/password_reset_confirm.html +++ b/templates/registration/password_reset_confirm.html @@ -26,21 +26,21 @@ {% if form.errors %} {% include 'form_errors.html' %} {% endif %} -
      +
      {% render_field form.new_password1 class+="form-control" %}
      -
      +
      {% render_field form.new_password2 class+="form-control" %}
      -
      -
      +
      +
      diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html index 36386212..c6f9c3a1 100644 --- a/templates/registration/password_reset_form.html +++ b/templates/registration/password_reset_form.html @@ -15,17 +15,17 @@ {% if form.errors %} {% include 'form_errors.html' %} {% endif %} -
      +
      {% render_field form.email type="email" class+="form-control" %}
      -
      +
      {{ form.captcha }}
      -
      +
      diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index ec5829eb..cd33d7f5 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -18,14 +18,14 @@
      {% csrf_token %} {% for field in form %} -
      +
      {% render_field field class+="form-control" placeholder=field.label %}
      {% endfor %} -

      +

      diff --git a/templates/search_help.html b/templates/search_help.html index 2a11bf60..7ac0ddbb 100644 --- a/templates/search_help.html +++ b/templates/search_help.html @@ -17,13 +17,13 @@

      Searches for entire query in: - name - description and - notes + name + description and + notes

      -

      You can search for an event by event_id by entering an integer, or using the format N01234

      -

      On the search results page you can also specify the date range for the start_date of the event

      -

      Events are sorted in reverse start_date order (most recent events at the top)

      +

      You can search for an event by event_id by entering an integer, or using the format N01234

      +

      On the search results page you can also specify the date range for the start_date of the event

      +

      Events are sorted in reverse start_date order (most recent events at the top)

      Searching People/Organisations/Venues/Suppliers

      @@ -31,14 +31,14 @@

      Searches for entire search phrase in: - name - email - address - notes and - phone + name + email + address + notes and + phone

      -

      You can search for an entry by id by entering an integer

      -

      Entries are sorted in alphabetical order by name

      +

      You can search for an entry by id by entering an integer

      +

      Entries are sorted in alphabetical order by name

      {% if perms.RIGS.view_invoice %}
      @@ -47,12 +47,12 @@

      Searches for entire search phrase in: - event__name + event__name

      -

      You can search for an event's invoice by entering the event_id using the format N01234

      -

      You can search for an invoice by invoice_id using the format #01234

      -

      Entering a raw integer will search by both invoice_id and event_id

      -

      Entries are sorted in reverse invoice_date order

      +

      You can search for an event's invoice by entering the event_id using the format N01234

      +

      You can search for an invoice by invoice_id using the format #01234

      +

      Entering a raw integer will search by both invoice_id and event_id

      +

      Entries are sorted in reverse invoice_date order

      {% endif %}
      @@ -61,13 +61,13 @@

      Searches for entire search phrase in: - description and - serial number + description and + serial number

      - Will also attempt to exact match asset ID + Will also attempt to exact match asset ID

      -

      Entries are sorted in alphanumerical order by asset ID

      +

      Entries are sorted in alphanumerical order by asset ID

      diff --git a/training/models.py b/training/models.py index cc5a0d42..a7ec3f0f 100644 --- a/training/models.py +++ b/training/models.py @@ -361,7 +361,7 @@ class TrainingLevel(models.Model, RevisionMixin): else: icon = "".join([w[0] for w in str(self).split()]) return mark_safe( - f"{icon}" + f"{icon}" ) diff --git a/training/templates/add_level_requirement.html b/training/templates/add_level_requirement.html index 58883d42..b02b0655 100644 --- a/training/templates/add_level_requirement.html +++ b/training/templates/add_level_requirement.html @@ -15,25 +15,16 @@ {% block js %} {{ block.super }} - - {% endblock %} {% block content %} {% if form.errors %} {% include 'form_errors.html' %} - - {% endif %}
      {% csrf_token %} {% render_field form.level|attr:'hidden' value=form.level.initial %} {% include 'partials/item_field.html' %} -
      +
      {% render_field form.depth|add_class:'form-control col-sm'|attr:'required' %}
      @@ -44,7 +35,7 @@ {% endblock %} {% block footer %} -
      +
      {% endblock %} diff --git a/training/templates/base_training.html b/training/templates/base_training.html index f60de7f1..6a19ca85 100644 --- a/training/templates/base_training.html +++ b/training/templates/base_training.html @@ -10,7 +10,7 @@ {% if user.is_authenticated %}
    • Home
    • -
      @@ -21,7 +21,7 @@
    • -
      diff --git a/training/templates/edit_training_record.html b/training/templates/edit_training_record.html index 42f895ea..7d164d14 100644 --- a/training/templates/edit_training_record.html +++ b/training/templates/edit_training_record.html @@ -13,30 +13,22 @@ {% endblock %} {% block js %} - {% endblock %} {% block content %} - - {% include 'form_errors.html' %} {% csrf_token %} {% render_field form.trainee|attr:'hidden' value=form.trainee.initial %} {% include 'partials/item_field.html' %} -
      +
      - {% render_field form.depth|add_class:'form-control custom-select col-sm-8' %} + {% render_field form.depth|add_class:'form-control form-select col-sm-8' %}
      -
      +
      {% include 'partials/supervisor_field.html' %}
      -
      +
      {% with training_date=object.date|date:"Y-m-d" %} @@ -45,14 +37,14 @@
      {% button 'today' id='id_date' %}
      -
      +
      {% render_field form.notes|add_class:'form-control' rows=3 %}
      {% if not is_ajax %} -
      +
      {% button 'submit' %}
      {% endif %} @@ -60,7 +52,7 @@ {% endblock %} {% block footer %} -
      +
      {% endblock %} diff --git a/training/templates/item_list.html b/training/templates/item_list.html index 245625c8..2fd6754a 100644 --- a/training/templates/item_list.html +++ b/training/templates/item_list.html @@ -3,25 +3,25 @@ {% load button from filters %} {% block content %} -
      +
      {% button 'print' 'item_list_export' %}
      {% for category in categories %}
      -
      -
      +
      {% for item in category.items.all %} -
    • {{ item }} Qualified Users +
    • {{ item }} Qualified Users
      {{ item.description }} {% if item.prerequisites.exists %} -
      +

      Competency Assessment Prerequisites:

        {% for p in item.prerequisites.all %} diff --git a/training/templates/item_qualification_list.html b/training/templates/item_qualification_list.html index d0e68049..b70f5294 100644 --- a/training/templates/item_qualification_list.html +++ b/training/templates/item_qualification_list.html @@ -6,12 +6,6 @@ {% load static %} {% block js %} - - {% endblock %} {% block content %} diff --git a/training/templates/level_detail.html b/training/templates/level_detail.html index 9586ca6c..59eaf025 100644 --- a/training/templates/level_detail.html +++ b/training/templates/level_detail.html @@ -16,28 +16,15 @@ {% endblock %} {% block js %} - - @@ -45,7 +32,7 @@ {% block content %} {% if request.user.is_supervisor %} -
        +
        Add New Requirement @@ -58,7 +45,7 @@
        -

        Level Requirements

        {% if u.pk != request.user.pk %}
        for {{ u }}
        {% endif %}
        +

        Level Requirements

        {% if u.pk != request.user.pk %}
        for {{ u }}
        {% endif %}
        @@ -70,7 +57,7 @@ {% for level in object.prerequisite_levels.all %} - + @@ -135,7 +122,7 @@
        -
        +
        {% include 'partials/last_edited.html' with target="traininglevel_history" %}
        diff --git a/training/templates/partials/item_field.html b/training/templates/partials/item_field.html index 618f8524..6e298454 100644 --- a/training/templates/partials/item_field.html +++ b/training/templates/partials/item_field.html @@ -1,6 +1,6 @@ -
        +
        - {% if item %} {% endif %} diff --git a/training/templates/partials/supervisor_field.html b/training/templates/partials/supervisor_field.html index a2e7e2f9..e92810c3 100644 --- a/training/templates/partials/supervisor_field.html +++ b/training/templates/partials/supervisor_field.html @@ -1,5 +1,5 @@ - +

        Training Items

        {% for depth in depths %} -
        - -
        {% endfor %}

        Session Information

        -
        +
        {% include 'partials/form_field.html' with field=form.date col='col-sm-6' %} {% button 'today' id='id_date' %}
        -
        +
        {% include 'partials/form_field.html' with field=form.notes %}
        -
        +
        {% button 'submit' %}
        diff --git a/training/templates/trainee_detail.html b/training/templates/trainee_detail.html index 8b34c802..59335a1c 100644 --- a/training/templates/trainee_detail.html +++ b/training/templates/trainee_detail.html @@ -14,35 +14,23 @@ {% endblock %} {% block js %} - {% endblock %} {% block content %}
        -
        +
        {% include 'partials/add_qualification.html' %} View Detailed Record @@ -72,16 +60,17 @@ {{ level.description|markdown }}
        -
        -
        {{completion}}% complete
        +
        +
        {% if completion >= 30 %}{{completion}}% complete{% endif %}
        + {% if completion < 30 %}{{completion}}% complete{% endif %} {% if completion == 100 %}
        {% confirm_button request.user object level as cb %} {% if cb %}
        {{ cb }}
        {% else %} -

        Missing prerequisite level(s)

        +

        Missing prerequisite level(s)

        {% endif %} {% endif %}
        @@ -90,7 +79,7 @@
        -
        +
        {% include 'partials/last_edited.html' with target="trainee_history" %}
        diff --git a/training/templates/trainee_item_list.html b/training/templates/trainee_item_list.html index 91e2cc9d..dca99154 100644 --- a/training/templates/trainee_item_list.html +++ b/training/templates/trainee_item_list.html @@ -16,33 +16,22 @@ {% endblock %} {% block js %} - {% endblock %} {% block content %} -

        Search by supervisor name, item name or item ID

        {% include 'partials/list_search.html' %} +

        Search by supervisor name, item name or item ID

        {% include 'partials/list_search.html' %}
        @@ -82,7 +71,7 @@
        -
        +
        {% include 'partials/last_edited.html' with target="trainee_history" object=trainee %}
        diff --git a/training/templates/trainee_list.html b/training/templates/trainee_list.html index 9b9ed881..25c2d14f 100644 --- a/training/templates/trainee_list.html +++ b/training/templates/trainee_list.html @@ -10,23 +10,17 @@ {% load static %} {% block js %} - - {% endblock %} {% block content %} -
        + {% csrf_token %}
        - {% button 'search' id="id_search" %} + {% button 'search' id="id_search" %}
        - diff --git a/training/templates/traininglevelrequirement_confirm_delete.html b/training/templates/traininglevelrequirement_confirm_delete.html index 5bd77bdd..b4e9ffd3 100644 --- a/training/templates/traininglevelrequirement_confirm_delete.html +++ b/training/templates/traininglevelrequirement_confirm_delete.html @@ -4,7 +4,7 @@
        {{level}} (prerequisite)
        {{level}} (prerequisite)
          {% for req in level.started_requirements %}
        • {{ req.item }} {% user_has_qualification u req.item 0 %}
          • {% endfor %}
          {% for req in level.complete_requirements %}
        • {{ req.item }} {% user_has_qualification u req.item 1 %}
          • {% endfor %}