Compare commits

..

No commits in common. "cbcfda3726ea9d42c149ba656b87ae6482cff8eb" and "aff5babb2023cf22f979edcc62d4fc791c72394d" have entirely different histories.

4 changed files with 15 additions and 52 deletions

View File

@ -106,10 +106,6 @@ body {
background-color: #76323F; background-color: #76323F;
color: #f9f9f9; } color: #f9f9f9; }
.LP-Button--cancel { .LP-Button--cancel {
background-color: #565656;
color: #f9f9f9; }
.LP-Button--cancel:active {
color: #565656;
background-color: #f9f9f9; } background-color: #f9f9f9; }
.LP-Form .LP-Form__Checkbox { .LP-Form .LP-Form__Checkbox {
@ -138,17 +134,6 @@ body {
background-color: #f9f9f9; background-color: #f9f9f9;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
box-shadow: none; } box-shadow: none; }
.LP-Input .LP-Input__Field[type=submit] {
background-color: #C09F80;
color: #565656;
border: none;
padding: 8px 14px;
border-radius: 2px;
font-weight: bold;
cursor: pointer; }
.LP-Input .LP-Input__Field[type=submit]:active {
background-color: #76323F;
color: #f9f9f9; }
.LP-Input .LP-Input__Label { .LP-Input .LP-Input__Label {
font-family: Montserrat, Helvetica, sans-serif; font-family: Montserrat, Helvetica, sans-serif;
font-size: 16px; } font-size: 16px; }
@ -498,17 +483,6 @@ body {
flex: 2 0; } flex: 2 0; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrower { .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrower {
flex: 1 0; } flex: 1 0; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition--buttons {
justify-content: flex-end; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Button {
flex-grow: 0;
padding-left: 0;
min-width: 130px; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Button .LP-Link {
display: contents; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__InfoText .LP-Paragraph {
font-family: Montserrat, Helvetica, sans-serif;
color: #565656; }
@media (max-width: 650px) { @media (max-width: 650px) {
.LP-Form .LP-Form__Fieldset .LP-Form__Composition--breakable { .LP-Form .LP-Form__Fieldset .LP-Form__Composition--breakable {
@ -521,13 +495,9 @@ body {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; } justify-content: space-between; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field:not(.LP-Form__Button) { .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field {
flex: 3 1 100px; flex: 3 1 100px;
padding: 12px 15px; } padding: 12px 15px; } }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Button {
padding: 0 15px; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition--buttons {
justify-content: flex-end; } }
.LP-ImageGrid .LP-ImageGrid__List { .LP-ImageGrid .LP-ImageGrid__List {
list-style-type: none; list-style-type: none;

View File

@ -6,7 +6,7 @@
{% block maincontent %} {% block maincontent %}
<form class="LP-Form" method="POST" enctype="multipart/form-data"> <form class="LP-Form" method="POST" enctype="multipart/form-data">
<fieldset class="LP-Form__Fieldset"> <fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">Create Place</legend> <legend class="LP-Form__Legend">Place erstellen</legend>
{% csrf_token %} {% csrf_token %}
<div class="LP-Form__Composition LP-Form__Composition--breakable"> <div class="LP-Form__Composition LP-Form__Composition--breakable">
<div class="LP-Form__Field"> <div class="LP-Form__Field">

View File

@ -7,22 +7,15 @@
<form class="LP-Form" method="POST"> <form class="LP-Form" method="POST">
<fieldset class="LP-Form__Fieldset"> <fieldset class="LP-Form__Fieldset">
<legend class="LP-Form__Legend">Delete place</legend> <legend class="LP-Form__Legend">Place löschen</legend>
{% csrf_token %} {% csrf_token %}
<div class="LP-Form__Composition LP-Form__Composition--breakable">
<p class="LP-Paragraph">Are you sure you want to delete "{{place.name}}"?</p>
<div class="LP-Form__Composition"> <div class="LP-Form__Composition">
<div class="LP-Form__Field LP-Form__InfoText"> <a href="{% url 'place_detail' pk=place.pk %}">
<p class="LP-Paragraph">Are you sure you want to delete "{{place.name}}"? </p>
</div>
</div>
<div class="LP-Form__Composition LP-Form__Composition--buttons">
<div class="LP-Form__Field LP-Form__Button LP-Input">
<button class="LP-Button">Delete</button>
</div>
<div class="LP-Form__Field LP-Form__Button LP-Input">
<a class="LP-Link" href="{% url 'place_detail' pk=place.pk %}">
<button type="button" class="LP-Button LP-Button--cancel">Cancel</button> <button type="button" class="LP-Button LP-Button--cancel">Cancel</button>
</a> </a>
<input type="submit" class="LP-Button" value="Delete"/>
</div> </div>
</div> </div>
</fieldset> </fieldset>

View File

@ -107,9 +107,9 @@ class PlaceDeleteView(UserPassesTestMixin, DeleteView):
if self.request.user.is_superuser: if self.request.user.is_superuser:
return True return True
# Check if currently logged in user was the submitter
place_obj = self.get_object() place_obj = self.get_object()
# Check if currently logged in user was the submitter
if self.request.user == place_obj.submitted_by: if self.request.user == place_obj.submitted_by:
return True return True