Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update organization_list and settings page, remove unused stuff, add tags + direct settings link #4039

Merged
merged 8 commits into from
Jan 30, 2025
Merged

Update organization_list and settings page, remove unused stuff, add tags + direct settings link #4039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f68eff6
Update organization_list.html
underdarknl Jan 21, 2025
75b15b3
Update organization_settings.html
underdarknl Jan 21, 2025
6189433
Update organization_list.html
underdarknl Jan 21, 2025
3cac001
Update organization_settings.html
underdarknl Jan 21, 2025
037a398
Merge branch 'main' into ux/small-changes-to-orgalist
underdarknl Jan 23, 2025
daa7760
Merge branch 'main' into ux/small-changes-to-orgalist
underdarknl Jan 27, 2025
5bc96c7
Merge branch 'main' into ux/small-changes-to-orgalist
underdarknl Jan 29, 2025
3698c3c
Merge branch 'main' into ux/small-changes-to-orgalist
dekkers Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions rocky/rocky/templates/organizations/organization_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

{% load i18n %}
{% load static %}
{% load compress %}

{% block content %}
{% include "header.html" %}
Expand All @@ -25,7 +24,7 @@ <h1>{% translate "Organizations" %}</h1>
<th>{% translate "Name" %}</th>
<th>{% translate "Code" %}</th>
<th>{% translate "Tags" %}</th>
<th>{% translate "Members" %}</th>
<th>{% translate "Settings" %}</th>
</tr>
</thead>
<tbody>
Expand All @@ -41,7 +40,11 @@ <h1>{% translate "Organizations" %}</h1>
{% include "organizations/organization_tags.html" %}

</td>
<td>{{ organization.member_count }}</td>
<td>
<a href="{% url 'organization_settings' organization_code=organization.code %}">
<button class="icon ti-edit action-button">Settings</button>
</a>
</td>
</tr>
{% endfor %}
</tbody>
Expand All @@ -67,9 +70,3 @@ <h2>{% translate "Actions" %}</h2>
</section>
</main>
{% endblock content %}
{% block html_at_end_body %}
{{ block.super }}
{% compress js %}
<script src="{% static "js/checkboxToggler.js" %}" nonce="{{ request.csp_nonce }}"></script>
{% endcompress %}
{% endblock html_at_end_body %}
5 changes: 5 additions & 0 deletions rocky/rocky/templates/organizations/organization_settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ <h2>{% translate "Organization details" %}</h2>
<tr>
<th>{% translate "Name" %}</th>
<th>{% translate "Code" %}</th>
<th>{% translate "Tags" %}</th>
{% if perms.tools.change_organization %}
<th>{% translate "Edit" %}</th>
{% endif %}
Expand All @@ -44,6 +45,10 @@ <h2>{% translate "Organization details" %}</h2>
<tr>
<td>{{ organization.name }}</td>
<td>{{ organization.code }}</td>
<td>
{% include "organizations/organization_tags.html" %}

</td>
{% if perms.tools.change_organization %}
<td>
{% spaceless %}
Expand Down
Loading