CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix small UI glitches

Browse Source
This commit is contained in:
Raphael Michel
2017-03-31 11:11:40 +02:00
parent 9dacea11dd
commit 7267496367
6 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/control/forms/event.py
View File

@@ -197,7 +197,8 @@ class EventSettingsForm(SettingsForm):
) )
locales = forms.MultipleChoiceField( locales = forms.MultipleChoiceField(
choices=settings.LANGUAGES, choices=settings.LANGUAGES,
label=_("Available langauges"), widget=forms.CheckboxSelectMultiple,
label=_("Available languages"),
) )
locale = forms.ChoiceField( locale = forms.ChoiceField(
choices=settings.LANGUAGES, choices=settings.LANGUAGES,

5
src/pretix/control/templates/pretixcontrol/items/categories.html
View File

@@ -29,8 +29,8 @@
<thead> <thead>
<tr> <tr>
<th>{% trans "Product categories" %}</th> <th>{% trans "Product categories" %}</th>
<th></th> <th class="action-col-2"></th>
<th></th> <th class="action-col-2"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -44,6 +44,7 @@
<a href="{% url "control:event.items.categories.down" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}" class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-down"></i></a> <a href="{% url "control:event.items.categories.down" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}" class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-down"></i></a>
</td> </td>
<td class="text-right"> <td class="text-right">
<a href="{% url "control:event.items.categories.edit" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
<a href="{% url "control:event.items.categories.delete" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a> <a href="{% url "control:event.items.categories.delete" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
</td> </td>
</tr> </tr>

5
src/pretix/control/templates/pretixcontrol/items/index.html
View File

@@ -32,8 +32,8 @@
<tr> <tr>
<th>{% trans "Product name" %}</th> <th>{% trans "Product name" %}</th>
<th>{% trans "Category" %}</th> <th>{% trans "Category" %}</th>
<th></th> <th class="action-col-2"></th>
<th></th> <th class="action-col-2"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -53,6 +53,7 @@
<a href="{% url "control:event.items.down" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-down"></i></a> <a href="{% url "control:event.items.down" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-down"></i></a>
</td> </td>
<td class="text-right"> <td class="text-right">
<a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
<a href="{% url "control:event.items.delete" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a> <a href="{% url "control:event.items.delete" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
</td> </td>
</tr> </tr>

3
src/pretix/control/templates/pretixcontrol/items/questions.html
View File

@@ -31,7 +31,8 @@
<tr> <tr>
<th>{% trans "Question" %}</th> <th>{% trans "Question" %}</th>
<th>{% trans "Type" %}</th> <th>{% trans "Type" %}</th>
<th></th> <th class="action-col-2"></th>
<th class="action-col-2"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

2
src/pretix/control/templates/pretixcontrol/items/quotas.html
View File

@@ -36,7 +36,7 @@
<th>{% trans "Products" %}</th> <th>{% trans "Products" %}</th>
<th>{% trans "Total capacity" %}</th> <th>{% trans "Total capacity" %}</th>
<th>{% trans "Capacity left" %}</th> <th>{% trans "Capacity left" %}</th>
<th></th> <th class="action-col-2"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

11
src/pretix/static/pretixcontrol/scss/main.scss
View File

@@ -207,4 +207,13 @@ body.loading #wrapper {
width: 12px; width: 12px;
height: 12px; height: 12px;
margin-top: -2px; margin-top: -2px;
} }
.btn .fa {
@extend .fa-fw;
}
.action-col-2 {
min-width: 95px;
}