Skip to content

Commit

Permalink
changed button positions
Browse files Browse the repository at this point in the history
  • Loading branch information
@silvioheinze
silvioheinze committed Jan 5, 2025
1 parent 8616873 commit 76ec07a
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 19 deletions.
8 changes: 4 additions & 4 deletions app/templates/campaigns/detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h3 class="mb-0">{% trans "Rooms" %}</h3>
<tbody>
{% for room in campaign.rooms.all %}
<tr>
<td>{{ room.name }}</td>
<td><a href="{% url 'room-detail' room.pk %}">{{ room.name }}</a></td>
<td>
<span class="badge badge-custom-green">Temp 21,3°C</span>
<span class="badge badge-custom-green">PM2.5 3.70 µg/m³</span>
Expand All @@ -47,7 +47,7 @@ <h3 class="mb-0">{% trans "Rooms" %}</h3>
</td>
<td class="text-end">
<div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
<a href="{% url 'room-detail' room.pk %}" class="btn btn-info btn-sm">{% trans "Details" %}</a>
<a href="{% url 'room-detail' room.pk %}" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
<a href="" class="btn btn-secondary btn-sm">{% trans "Edit" %}</a>
<a href="{% url 'room-delete' room.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>
</div>
Expand Down Expand Up @@ -82,11 +82,11 @@ <h3 class="mb-0">{% trans "Participants" %}</h3>
<tbody>
{% for user in campaign.users.all %}
<tr>
<td>{{ user.username }}</td>
<td><a href="">{{ user.username }}</a></td>
<td>{{ user.email }}</td>
<td class="text-end">
<div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
<a href="" class="btn btn-info btn-sm">{% trans "Details" %}</a>
<a href="" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
<a href="" class="btn btn-danger btn-sm">{% trans "Remove" %}</a>
</div>
</td>
Expand Down
10 changes: 6 additions & 4 deletions app/templates/campaigns/my.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,24 @@

{% block content %}
<div class="container mt-5">
<h2 class="mb-4">{% trans "My Campaigns" %}</h2>
<div class="d-flex justify-content-between align-items-center mb-4">
<h2>{% trans "My Campaigns" %}</h2>
<a href="{% url 'campaigns-create' %}" class="btn btn-outline-primary">{% trans "Create Campaign" %}</a>
</div>
{% if campaigns %}
<div class="list-group">
{% for campaign in campaigns %}
<div class="list-group-item list-group-item-action d-flex flex-column flex-md-row justify-content-between align-items-start">
<div class="mb-2 mb-md-0">
<h5 class="mb-1">{{ campaign.name }}</h5>
<h5 class="mb-1"><a href="{% url 'campaigns-detail' campaign.pk %}">{{ campaign.name }}</a></h5>
<p class="mb-1">
<strong>{% trans "Date:" %}</strong> {{ campaign.start_date|date:"d.m.Y H:i" }} – {{ campaign.end_date|date:"d.m.Y H:i" }}<br>
<strong>{% trans "Public:" %}</strong> {{ campaign.public|yesno:"Ja,Nein" }}
</p>
</div>
<div>
<div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
<a href="{% url 'campaigns-detail' campaign.pk %}" class="btn btn-info btn-sm">{% trans "Details" %}</a>
<a href="{% url 'campaigns-detail' campaign.pk %}" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
<a href="{% url 'campaigns-update' campaign.pk %}" class="btn btn-secondary btn-sm">{% trans "Edit" %}</a>
<a href="{% url 'campaigns-delete' campaign.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>
</div>
Expand All @@ -32,6 +35,5 @@ <h5 class="mb-1">{{ campaign.name }}</h5>
{% trans "No campaigns found." %}
</div>
{% endif %}
<a href="{% url 'campaigns-create' %}" class="btn btn-primary mt-3">{% trans "Create Campaign" %}</a>
</div>
{% endblock %}
10 changes: 6 additions & 4 deletions app/templates/campaigns/my_organizations.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,23 @@

{% block content %}
<div class="container mt-5">
<h2 class="mb-4">{% trans "My Organisations" %}</h2>
<div class="d-flex justify-content-between align-items-center mb-4">
<h2>{% trans "My Organisations" %}</h2>
<a href="{% url 'organization-create' %}" class="btn btn-outline-primary">{%trans "Create Organization" %}</a>
</div>
{% if member_organizations %}
<div class="list-group">
{% for organization in member_organizations %}
<div class="list-group-item list-group-item-action d-flex flex-column flex-md-row justify-content-between align-items-start">
<div class="mb-2 mb-md-0">
<h5 class="mb-1">{{ organization.name }}</h5>
<h5 class="mb-1"><a href="{% url 'organization-detail' organization.pk %}">{{ organization.name }}</a></h5>
<p class="mb-1">
{{ organization.description|truncatewords:20 }}
</p>
</div>
<div class="d-flex flex-column flex-md-row">
<div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
<a href="{% url 'organization-detail' organization.pk %}" class="btn btn-info btn-sm">
<a href="{% url 'organization-detail' organization.pk %}" class="btn btn-primary btn-sm">
<i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
<a href="" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
</i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
Expand All @@ -38,7 +41,6 @@ <h5 class="mb-1">{{ organization.name }}</h5>
{% trans "You are not a member of any organizations." %}
</div>
{% endif %}
<a href="{% url 'organization-create' %}" class="btn btn-primary mt-3">{%trans "Create Organization" %}</a>
</div>
{% endblock content %}

Expand Down
2 changes: 1 addition & 1 deletion app/templates/campaigns/room/detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ <h3 class="mb-0">{% trans "Devices" %}</h3>
<td>{{ device.id }}</td>
<td>{{ device.device_name }}</td>
<td>{{ device.last_update }}</td>
<td><a href="" class="btn btn-danger btn-sm">{% trans "Remove" %}</a></td>
<td class="text-end"><a href="" class="btn btn-danger btn-sm">{% trans "Remove" %}</a></td>
</tr>
{% empty %}
<tr>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/devices/list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h2>{% trans "Devices" %}</h2>
<td>{{ device.current_organization.name|default:_("N/A") }}</td>
<td class="text-end">
<div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
<a href="{% url 'device-detail' device.pk %}" class="btn btn-info btn-sm" title="{% trans 'View Details' %}">
<a href="{% url 'device-detail' device.pk %}" class="btn btn-primary btn-sm" title="{% trans 'View Details' %}">
<i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Detail" %}</span>
</a>
<a href="{% url 'device-edit' device.pk %}" class="btn btn-secondary btn-sm" title="{% trans 'Edit Device' %}">
Expand Down
11 changes: 6 additions & 5 deletions app/templates/workshops/my.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,24 @@

{% block content %}
<div class="container mt-5">
<h2 class="mb-4">{% trans "My Workshops" %}</h2>
<div class="d-flex justify-content-between align-items-center mb-4">
<h2>{% trans "My Workshops" %}</h2>
<a href="{% url 'workshop-create' %}" class="btn btn-outline-primary mt-3">{% trans "Create workshop" %}</a>
</div>
{% if workshops %}
<div class="list-group">
{% for workshop in workshops %}
<div class="list-group-item list-group-item-action d-flex flex-column flex-md-row justify-content-between align-items-start">
<div class="mb-2 mb-md-0">
<h5 class="mb-1">{{ workshop.title }}</h5>
<h5 class="mb-1"><a href="{% url 'workshop-detail' workshop.pk %}">{{ workshop.title }}</a></h5>
<p class="mb-1">
<strong>{% trans "Date:" %}</strong> {{ workshop.start_date|date:"d.m.Y H:i" }} – {{ workshop.end_date|date:"d.m.Y H:i" }}<br>
<strong>{% trans "Public:" %}</strong> {{ workshop.public|yesno:"Ja,Nein" }}
</p>
</div>
<div>
<div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
<a href="{% url 'workshop-detail' workshop.pk %}" class="btn btn-info btn-sm">{% trans "Details" %}</a>
<a href="{% url 'workshop-detail' workshop.pk %}" class="btn btn-primary btn-sm">{% trans "Details" %}</a>
<a href="{% url 'workshop-update' workshop.pk %}" class="btn btn-secondary btn-sm">{% trans "Edit" %}</a>
<a href="{% url 'workshop-delete' workshop.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>
</div>
Expand All @@ -32,7 +35,5 @@ <h5 class="mb-1">{{ workshop.title }}</h5>
{% trans "No workshops found." %}
</div>
{% endif %}

<a href="{% url 'workshop-create' %}" class="btn btn-primary mt-3">{% trans "Create workshop" %}</a>
</div>
{% endblock %}

0 comments on commit 76ec07a

Please sign in to comment.