Skip to content

Commit

Permalink
add spacing to bottom form and padding to nav, fix nlds components fo…
Browse files Browse the repository at this point in the history 
…r projectpage
  • Loading branch information
@rubenrouwhof
rubenrouwhof committed Sep 3, 2024
1 parent fefd125 commit 03b8c9c
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 2,620 deletions.
14 changes: 2 additions & 12 deletions amt/site/templates/header.html.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</div>
</div>
</div>
<div class="rvo-layout-column rvo-layout-gap--md">
<div class="rvo-topnav__background rvo-topnav__background--horizontal-rule">
<div class="rvo-topnav__background rvo-topnav__background--horizontal-rule">
<div class="rvo-max-width-layout rvo-max-width-layout--md rvo-max-width-layout-inline-padding--none">
<nav class="rvo-topnav rvo-topnav--md">
<ul class="rvo-topnav__list">
<li class="rvo-topnav__item">
Expand Down Expand Up @@ -43,16 +43,6 @@
{% trans %}New project{% endtrans %}
</a>
</li>
<li class="rvo-topnav__item rvo-topnav__item--align-right">
<a class="rvo-link rvo-topnav__link rvo-link--logoblauw" href="#">
<span
class="utrecht-icon rvo-icon rvo-icon-versleutelen rvo-icon--md rvo-icon--wit"
role="img"
aria-label="Versleutelen"
></span>
Uitloggen
</a>
</li>
</ul>
</nav>
</div>
Expand Down
4 changes: 2 additions & 2 deletions amt/site/templates/projects/_list.html.j2
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% for project in projects %}
{% if loop.last and projects|length == limit %}
<li class="rvo-item-list" data-marker="last-element" hx-get="/projects/?skip={{ next }}&search={{ search }}" hx-swap="afterend" hx-trigger="revealed"><a href="/project/{{ project.id }}">{{ project.name }}</a></li>
<li class="rvo-item-list__item" data-marker="last-element" hx-get="/projects/?skip={{ next }}&search={{ search }}" hx-swap="afterend" hx-trigger="revealed"><a class="rvo-link rvo-link--no-underline rvo-link--zwart" href="/project/{{ project.id }}">{{ project.name }}</a></li>
{% else %}
<li><a href="/project/{{ project.id }}">{{ project.name }}</a></li>
<li class="rvo-item-list__item"><a class="rvo-link rvo-link--no-underline rvo-link--zwart" href="/project/{{ project.id }}">{{ project.name }}</a></li>
{% endif %}
{% endfor %}
73 changes: 35 additions & 38 deletions amt/site/templates/projects/index.html.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,41 @@

{% block content %}

<main class="rvo-max-width-layout rvo-max-width-layout--sm">
<div class="rvo-content">

<h1 class="utrecht-heading-1">{% trans %}Projects{% endtrans %}</h1>

<form>
<label>
<input
size="100"
type="search"
placeholder="{% trans %}Find project...{% endtrans %}"
name="search"
hx-get="/projects/?skip=0"
hx-trigger="input changed delay:500ms, search"
hx-target="#project-search-results"
hx-indicator=".htmx-indicator"
hx-swap="innerHTML"
autocomplete="false"
id="project-search-input"
/>
</label>
<input type="reset"
value="X"
style="position: relative; margin-left: -30px"
hx-trigger="click"
hx-get="/projects/?skip=0"
hx-target="#project-search-results"
hx-indicator=".htmx-indicator"
hx-swap="innerHTML"
/>
</form>

<ul class="rvo-item-list" id="project-search-results">
{% include 'projects/_list.html.j2' %}
</ul>

<main class="rvo-max-width-layout rvo-max-width-layout--sm">
<div class="rvo-content">
<h1 class="utrecht-heading-1">{% trans %}Projects{% endtrans %}</h1>
</div>
<fieldset class="utrecht-form-fieldset__fieldset utrecht-form-fieldset--html-fieldset">
<div class="rvo-form-layout">
<div class="rvo-max-width-layout rvo-max-width-layout--lg rvo-max-width-layout-inline-padding--none">
<div class="rvo-inline-form">
<div role="group" aria-labelledby="fieldId-label" class="utrecht-form-field utrecht-form-field--text rvo-form-field">
<input
id="project-search-input"
type="text"
class="utrecht-textbox utrecht-textbox--html-input"
dir="auto"
value=""
placeholder="{% trans %}Find project...{% endtrans %}"
name="search"
hx-get="/projects/?skip=0"
hx-trigger="input changed delay:500ms, focus"
hx-target="#project-search-results"
hx-indicator=".htmx-indicator"
hx-swap="innerHTML"
autocomplete="off"
onfocus="this.value=''"
/>
</div>
</div>
</div>
</div>
</main>
</fieldset>
<ul class="rvo-item-list" id="project-search-results">
{% include 'projects/_list.html.j2' %}
</ul>
</main>

<div id="errorContainer"></div>

<div id="errorContainer"></div>
{% endblock %}
22 changes: 12 additions & 10 deletions amt/site/templates/projects/new.html.j2
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{% extends 'layouts/base.html.j2' %}

{% block content %}
<div class="rvo-layout-column rvo-layout-gap--lg">
<div class="rvo-max-width-layout rvo-max-width-layout--md">
<main>
<div class="rvo-form">
<div class="rvo-layout-column rvo-layout-gap--sm">
<div class="rvo-form-intro">
<h1 class="utrecht-heading-1"> {% trans %}Create new project{% endtrans %}</h1>
<h1 class="utrecht-heading-1">{% trans %}Create new project{% endtrans %}</h1>
</div>
<form class="rvo-layout-spacer rvo-layout-spacer--2xl" hx-ext="json-enc" hx-post="/projects/new"
<form class="rvo-layout-column rvo-layout-gap--2xl" hx-ext="json-enc" hx-post="/projects/new"
hx-headers='{"X-CSRF-Token": "{{ csrftoken }}"}' hx-target-error="#errorContainer"
hx-swap="innerHTML" method="post">
<div class="utrecht-form-fieldset rvo-form-fieldset">
Expand Down Expand Up @@ -49,20 +50,20 @@
</div>
{% for instrument in instruments %}
<div class="rvo-checkbox__group">
<label
class="rvo-checkbox rvo-checkbox--not-checked"
for="{{ instrument.urn }}"
>
<input id="{{ instrument.urn }}" name="instruments" class="rvo-checkbox__input" type="checkbox" value="{{ instrument.urn }}" />{{ instrument.name }}
</label>
<label
class="rvo-checkbox rvo-checkbox--not-checked"
for="{{ instrument.urn }}"
>
<input id="{{ instrument.urn }}" name="instruments" class="rvo-checkbox__input" type="checkbox" value="{{ instrument.urn }}" />{{ instrument.name }}
</label>
</div>
{% endfor %}
</div>
</div>
</fieldset>
</div>
<p class="utrecht-button-group">
<button
class="utrecht-button utrecht-button--primary-action rvo-layout-row rvo-layout-gap--md utrecht-button--rvo-md"
class="utrecht-button utrecht-button--primary-action utrecht-button--rvo-md"
type="submit"
>
{% trans %}Create Project{% endtrans %}
Expand All @@ -74,4 +75,5 @@
</div>
</main>
</div>
</div>
{% endblock %}
Loading

0 comments on commit 03b8c9c

Please sign in to comment.