CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-14 16:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI consistency

Browse Source
This commit is contained in:
Raphael Michel
2014-10-25 11:42:26 +02:00
parent d54068272c
commit d25cc20031
9 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tixlcontrol/static/tixlcontrol/less/forms.less
View File

@@ -34,8 +34,7 @@ td > .form-group > .checkbox {
}
.submit-group {
margin: 0 !important;
margin-top: 15px;
margin: 15px 0 0 0 !important;
padding: 15px;
background: #eeeeee;
text-align: right;
@@ -46,4 +45,8 @@ td > .form-group > .checkbox {
.pull-left;
.btn-lg;
}
}
.container ul.nav-pills {
margin: 20px 0;
}

2
src/tixlcontrol/templates/tixlcontrol/event/base.html
View File

@@ -16,6 +16,6 @@
</ul>
</li>
<li {% if url_name == "event.index" %}class="active"{% endif %}><a href="{% url 'control:event.index' organizer=request.event.organizer.slug event=request.event.slug %}">{% trans "Dashboard" %}</a></li>
<li {% if url_name == "event.settings" %}class="active"{% endif %}><a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}">{% trans "Settings" %}</a></li>
<li {% if "event.settings" in url_name %}class="active"{% endif %}><a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}">{% trans "Settings" %}</a></li>
<li {% if "event.item" in url_name %}class="active"{% endif %}><a href="{% url 'control:event.items' organizer=request.event.organizer.slug event=request.event.slug %}">{% trans "Items" %}</a></li>
{% endblock %}

2
src/tixlcontrol/templates/tixlcontrol/item/index.html
View File

@@ -2,8 +2,6 @@
{% load i18n %}
{% load bootstrap3 %}
{% block inside %}
<h2>{% trans "General information" %}</h2>
{% if "success" in request.GET %}
<div class="alert alert-success">
{% trans "Your changes have been saved." %}

1
src/tixlcontrol/templates/tixlcontrol/item/restrictions.html
View File

@@ -3,7 +3,6 @@
{% load bootstrap3 %}
{% load formset_tags %}
{% block inside %}
<h2>{% trans "Restrictions" %}</h2>
<form action="" method="post">
{% csrf_token %}
{% for set in formsets %}

1
src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html
View File

@@ -2,7 +2,6 @@
{% load i18n %}
{% load bootstrap3 %}
{% block inside %}
<h2>{% trans "Variations" %}</h2>
<em>{% trans "You have to define and select propreties to be able to configure variations." %}
{% endblock %}

1
src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html
View File

@@ -2,7 +2,6 @@
{% load i18n %}
{% load bootstrap3 %}
{% block inside %}
<h2>{% trans "Variations" %}</h2>
<form action="" method="post">
{% csrf_token %}
<table class="table">

1
src/tixlcontrol/templates/tixlcontrol/item/variations_2d.html
View File

@@ -2,7 +2,6 @@
{% load i18n %}
{% load bootstrap3 %}
{% block inside %}
<h2>{% trans "Variations" %}</h2>
<form action="" method="post">
{% csrf_token %}
<table class="table">

1
src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html
View File

@@ -2,7 +2,6 @@
{% load i18n %}
{% load bootstrap3 %}
{% block inside %}
<h2>{% trans "Variations" %}</h2>
<form action="" method="post">
{% csrf_token %}
{% for major in forms %}

8
src/tixlcontrol/templates/tixlcontrol/items/property.html
View File

@@ -24,14 +24,14 @@
{% for f in formset %}
<div class="form-group" data-formset-form>
{{ f.id }}
<div class="col-sm-10">
<div class="col-sm-9">
{% bootstrap_field f.value form_group_class="" layout="inline" %}
</div>
<div class="sr-only">
{% bootstrap_field f.ORDER form_group_class="" layout="inline" %}
{% bootstrap_field f.DELETE form_group_class="" layout="inline" %}
</div>
<div class="col-sm-2 text-right">
<div class="col-sm-3 text-right">
<button type="button" class="btn btn-default" data-formset-move-up-button><i class="fa fa-arrow-up"></i></button>
<button type="button" class="btn btn-default" data-formset-move-down-button><i class="fa fa-arrow-down"></i></button>
<button type="button" class="btn btn-danger" data-formset-delete-button><i class="fa fa-trash"></i></button>
@@ -43,14 +43,14 @@
{% escapescript %}
<div class="form-group" data-formset-form>
{{ formset.empty_form.id }}
<div class="col-sm-10">
<div class="col-sm-9">
{% bootstrap_field formset.empty_form.value form_group_class="" layout="inline" %}
</div>
<div class="sr-only">
{% bootstrap_field formset.empty_form.ORDER form_group_class="" layout="inline" %}
{% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
</div>
<div class="col-sm-2 text-right">
<div class="col-sm-3 text-right">
<button type="button" class="btn btn-default" data-formset-move-up-button><i class="fa fa-arrow-up"></i></button>
<button type="button" class="btn btn-default" data-formset-move-down-button><i class="fa fa-arrow-down"></i></button>
<button type="button" class="btn btn-danger" data-formset-delete-button><i class="fa fa-trash"></i></button>