From d54068272c756c8e62f4561bbe5f216de0e58189 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Sat, 25 Oct 2014 11:36:11 +0200
Subject: [PATCH] CSS: Unified submit control

---
 .../static/tixlcontrol/less/forms.less         | 14 ++++++++++++++
 .../templates/tixlcontrol/event/settings.html  | 10 ++++------
 .../templates/tixlcontrol/item/index.html      | 10 ++++------
 .../tixlcontrol/item/restrictions.html         | 10 ++++------
 .../tixlcontrol/item/variations_1d.html        | 10 ++++------
 .../tixlcontrol/item/variations_2d.html        | 10 ++++------
 .../tixlcontrol/item/variations_nd.html        | 10 ++++------
 .../templates/tixlcontrol/items/category.html  | 10 ++++------
 .../tixlcontrol/items/category_delete.html     | 16 +++++++---------
 .../templates/tixlcontrol/items/property.html  | 10 ++++------
 .../tixlcontrol/items/property_delete.html     | 18 ++++++++----------
 .../templates/tixlcontrol/items/question.html  | 10 ++++------
 .../tixlcontrol/items/question_delete.html     | 16 +++++++---------
 .../templates/tixlcontrol/items/quota.html     | 10 ++++------
 .../tixlcontrol/items/quota_delete.html        | 16 +++++++---------
 15 files changed, 83 insertions(+), 97 deletions(-)

diff --git a/src/tixlcontrol/static/tixlcontrol/less/forms.less b/src/tixlcontrol/static/tixlcontrol/less/forms.less
index decf6fa8ef..b8a3906b91 100644
--- a/src/tixlcontrol/static/tixlcontrol/less/forms.less
+++ b/src/tixlcontrol/static/tixlcontrol/less/forms.less
@@ -31,5 +31,19 @@ td > .form-group > .checkbox {
 
 .restriction-formset .variations label {
     margin: 0;
+}
 
+.submit-group {
+    margin: 0 !important;
+    margin-top: 15px;
+    padding: 15px;
+    background: #eeeeee;
+    text-align: right;
+    .btn-save {
+        .btn-lg;
+    }
+    .btn-cancel {
+        .pull-left;
+        .btn-lg;
+    }
 }
\ No newline at end of file
diff --git a/src/tixlcontrol/templates/tixlcontrol/event/settings.html b/src/tixlcontrol/templates/tixlcontrol/event/settings.html
index abce92f029..7049c51b98 100644
--- a/src/tixlcontrol/templates/tixlcontrol/event/settings.html
+++ b/src/tixlcontrol/templates/tixlcontrol/event/settings.html
@@ -34,12 +34,10 @@
 			{% bootstrap_field form.payment_term_days layout="horizontal" %}
 			{% bootstrap_field form.payment_term_last layout="horizontal" %}
 		</fieldset>
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Save" %}
-				</button>
-			</div>
+		<div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
 		</div>
 	</form>
 {% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/item/index.html b/src/tixlcontrol/templates/tixlcontrol/item/index.html
index 88c31ded48..56ab5d95db 100644
--- a/src/tixlcontrol/templates/tixlcontrol/item/index.html
+++ b/src/tixlcontrol/templates/tixlcontrol/item/index.html
@@ -29,12 +29,10 @@
 			{% bootstrap_field form.properties layout="horizontal" %}
 			{% bootstrap_field form.questions layout="horizontal" %}
 		</fieldset>
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Save" %}
-				</button>
-			</div>
+		<div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
 		</div>
 	</form>
 {% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/item/restrictions.html b/src/tixlcontrol/templates/tixlcontrol/item/restrictions.html
index bb7f8353c5..a4d5c3ec73 100644
--- a/src/tixlcontrol/templates/tixlcontrol/item/restrictions.html
+++ b/src/tixlcontrol/templates/tixlcontrol/item/restrictions.html
@@ -29,12 +29,10 @@
 				</div>
 			</fieldset>
 		{% endfor %}
-		<div class="form-group">
-			<div class="col-sm-12">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Save" %}
-				</button>
-			</div>
+		<div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
 		</div>
 	</form>
 	
diff --git a/src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html b/src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html
index a8321e696a..8694e8855d 100644
--- a/src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html
+++ b/src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html
@@ -24,12 +24,10 @@
 				{% endfor %}
 			</tbody>
 		</table>
-		<div class="form-group">
-			<div class="col-sm-12">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Save" %}
-				</button>
-			</div>
+		<div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
 		</div>
 	</form>
 	
diff --git a/src/tixlcontrol/templates/tixlcontrol/item/variations_2d.html b/src/tixlcontrol/templates/tixlcontrol/item/variations_2d.html
index da81646322..63b200f7a3 100644
--- a/src/tixlcontrol/templates/tixlcontrol/item/variations_2d.html
+++ b/src/tixlcontrol/templates/tixlcontrol/item/variations_2d.html
@@ -29,12 +29,10 @@
 				{% endfor %}
 			</tbody>
 		</table>
-		<div class="form-group">
-			<div class="col-sm-12">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Save" %}
-				</button>
-			</div>
+		<div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
 		</div>
 	</form>
 	
diff --git a/src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html b/src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html
index 6682d550d6..c960e701ab 100644
--- a/src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html
+++ b/src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html
@@ -32,12 +32,10 @@
 				</tbody>
 			</table>
 		{% endfor %}
-		<div class="form-group">
-			<div class="col-sm-12">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Save" %}
-				</button>
-			</div>
+		<div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
 		</div>
 	</form>
 	
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/category.html b/src/tixlcontrol/templates/tixlcontrol/items/category.html
index 95c49466c0..3e2a8d5951 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/category.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/category.html
@@ -15,12 +15,10 @@
 			<legend>{% trans "General information" %}</legend>
 			{% bootstrap_field form.name layout="horizontal" %}
 		</fieldset>
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Save" %}
-				</button>
-			</div>
+		<div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
 		</div>
 	</form>
 {% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/category_delete.html b/src/tixlcontrol/templates/tixlcontrol/items/category_delete.html
index 8dcef68d19..7cb6db8cd9 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/category_delete.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/category_delete.html
@@ -7,15 +7,13 @@
 	<form action="" method="post" class="form-horizontal">
 		{% csrf_token %}
 		<p>{% blocktrans %}Are you sure you want to the category <strong>{{ category.name }}</strong>?{% endblocktrans %}</p>
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Confirm" %}
-				</button>
-				<a href="{% url "control:event.items.categories" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default">
-					{% trans "Cancel" %}
-				</a>
-			</div>
+		<div class="form-group submit-group">
+            <a href="{% url "control:event.items.categories" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
+                {% trans "Cancel" %}
+            </a>
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Delete" %}
+            </button>
 		</div>
 	</form>
 {% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/property.html b/src/tixlcontrol/templates/tixlcontrol/items/property.html
index 4a17a3420c..35a69d7737 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/property.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/property.html
@@ -61,12 +61,10 @@
 				<button type="button" class="btn btn-default" data-formset-add><i class="fa fa-plus"></i> {% trans "Add a new value" %}</button>
 			</div>
 		</fieldset>
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Save" %}
-				</button>
-			</div>
+		<div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
 		</div>
 	</form>
 {% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/property_delete.html b/src/tixlcontrol/templates/tixlcontrol/items/property_delete.html
index 3973942e67..d2b4b4ca99 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/property_delete.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/property_delete.html
@@ -15,16 +15,14 @@
 		<form action="" method="post" class="form-horizontal">
 			{% csrf_token %}
 			<p>{% blocktrans %}Are you sure you want to the property <strong>{{ property }}</strong>?{% endblocktrans %}</p>
-			<div class="form-group">
-				<div class="col-sm-offset-2 col-sm-10">
-					<button type="submit" class="btn btn-primary">
-						{% trans "Confirm" %}
-					</button>
-					<a href="{% url "control:event.items.properties" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default">
-						{% trans "Cancel" %}
-					</a>
-				</div>
-			</div>
+            <div class="form-group submit-group">
+                <a href="{% url "control:event.items.properties" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
+                    {% trans "Cancel" %}
+                </a>
+                <button type="submit" class="btn btn-primary btn-save">
+                    {% trans "Delete" %}
+                </button>
+            </div>
 		</form>
 	{% endif %}
 {% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/question.html b/src/tixlcontrol/templates/tixlcontrol/items/question.html
index a7877527b2..d7bb84f753 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/question.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/question.html
@@ -17,12 +17,10 @@
 			{% bootstrap_field form.type layout="horizontal" %}
 			{% bootstrap_field form.required layout="horizontal" %}
 		</fieldset>
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Save" %}
-				</button>
-			</div>
+		<div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
 		</div>
 	</form>
 {% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/question_delete.html b/src/tixlcontrol/templates/tixlcontrol/items/question_delete.html
index 98763ceacc..16b2370bfe 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/question_delete.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/question_delete.html
@@ -13,15 +13,13 @@
 				<li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item.name }}</a></li>
 			{% endfor %}
 		{% endif %}
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Confirm" %}
-				</button>
-				<a href="{% url "control:event.items.questions" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default">
-					{% trans "Cancel" %}
-				</a>
-			</div>
+		<div class="form-group submit-group">
+            <a href="{% url "control:event.items.questions" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
+                {% trans "Cancel" %}
+            </a>
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Delete" %}
+            </button>
 		</div>
 	</form>
 {% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/quota.html b/src/tixlcontrol/templates/tixlcontrol/items/quota.html
index a7d14bd81e..9599952eac 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/quota.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/quota.html
@@ -16,12 +16,10 @@
 			{% bootstrap_field form.name layout="horizontal" %}
 			{% bootstrap_field form.size layout="horizontal" %}
 		</fieldset>
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Save" %}
-				</button>
-			</div>
+		<div class="form-group submit-group">
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Save" %}
+            </button>
 		</div>
 	</form>
 {% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/quota_delete.html b/src/tixlcontrol/templates/tixlcontrol/items/quota_delete.html
index 85e997cda6..118bbec058 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/quota_delete.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/quota_delete.html
@@ -13,15 +13,13 @@
 				<li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item.name }}</a></li>
 			{% endfor %}
 		{% endif %}
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				<button type="submit" class="btn btn-primary">
-					{% trans "Confirm" %}
-				</button>
-				<a href="{% url "control:event.items.quotas" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default">
-					{% trans "Cancel" %}
-				</a>
-			</div>
+		<div class="form-group submit-group">
+            <a href="{% url "control:event.items.quotas" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
+                {% trans "Cancel" %}
+            </a>
+            <button type="submit" class="btn btn-primary btn-save">
+                {% trans "Delete" %}
+            </button>
 		</div>
 	</form>
 {% endblock %}