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

control stylesheet

Browse Source
This commit is contained in:
Raphael Michel
2018-07-08 18:51:34 +02:00
parent 50aa186197
commit 365d78f63c
6 changed files with 94 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/control/templates/pretixcontrol/event/base.html
View File

@@ -107,7 +107,7 @@
{% if 'can_view_vouchers' in request.eventpermset %} {% if 'can_view_vouchers' in request.eventpermset %}
<li> <li>
<a href="{% url 'control:event.vouchers' organizer=request.event.organizer.slug event=request.event.slug %}" <a href="{% url 'control:event.vouchers' organizer=request.event.organizer.slug event=request.event.slug %}"
{% if url_name == "event.voucher" %}class="active"{% endif %}> {% if "event.voucher" in url_name %}class="active"{% endif %}>
<i class="fa fa-tags fa-fw"></i> <i class="fa fa-tags fa-fw"></i>
{% trans "Vouchers" %} {% trans "Vouchers" %}
</a> </a>

91
src/pretix/control/templates/pretixcontrol/order/index.html
View File

@@ -12,48 +12,6 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% blocktrans asvar s_taxes %}taxes{% endblocktrans %} {% blocktrans asvar s_taxes %}taxes{% endblocktrans %}
<h1>
{% blocktrans trimmed with code=order.code %}
Order details: {{ code }}
{% endblocktrans %}
{% include "pretixcontrol/orders/fragment_order_status.html" with order=order class="pull-right" %}
</h1>
{% if 'can_change_orders' in request.eventpermset %}
<form action="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"
method="post">
{% csrf_token %}
<div class="btn-toolbar" role="toolbar">
<div class="btn-group" role="group">
{% if order.status == 'n' or order.status == 'e' %}
<a href="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}?status=p" class="btn btn-default">
{% trans "Mark as paid" %}
</a>
<a href="{% url "control:event.order.extend" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}" class="btn btn-default">
{% trans "Extend payment term" %}
</a>
{% endif %}
{% if order.cancel_allowed %}
<a href="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}?status=c" class="btn btn-default">
{% trans "Cancel order" %}
</a>
{% elif order.status == 'p' %}
<button name="status" value="n" class="btn btn-default">{% trans "Mark as not paid" %}</button>
<a href="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}?status=r" class="btn btn-default">
{% trans "Refund order" %}
</a>
{% endif %}
<a href="{% eventurl request.event "presale:event.order" order=order.code secret=order.secret %}"
class="btn btn-default" target="_blank">
{% trans "View order as user" %}
</a>
<a href="{% url "control:event.order.mail_history" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}" class="btn btn-default">
{% trans "View email history" %}
</a>
</div>
</div>
</form>
{% endif %}
{% if order.is_expired_by_time %} {% if order.is_expired_by_time %}
<form action="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}" <form action="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"
method="post"> method="post">
@@ -68,13 +26,50 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-lg-10"> <div class="col-xs-12 col-lg-10">
<div class="panel panel-primary items"> <div class="panel items">
<div class="panel-heading">
<h3 class="panel-title">
{% trans "Order details" %}
</h3>
</div>
<div class="panel-body"> <div class="panel-body">
<h1>
{% blocktrans trimmed with code=order.code %}
Order details: {{ code }}
{% endblocktrans %}
{% include "pretixcontrol/orders/fragment_order_status.html" with order=order class="pull-right" %}
</h1>
{% if 'can_change_orders' in request.eventpermset %}
<form action="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}"
method="post">
{% csrf_token %}
<div class="btn-toolbar" role="toolbar">
<div class="btn-group" role="group">
{% if order.status == 'n' or order.status == 'e' %}
<a href="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}?status=p" class="btn btn-default">
{% trans "Mark as paid" %}
</a>
<a href="{% url "control:event.order.extend" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}" class="btn btn-default">
{% trans "Extend payment term" %}
</a>
{% endif %}
{% if order.cancel_allowed %}
<a href="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}?status=c" class="btn btn-default">
{% trans "Cancel order" %}
</a>
{% elif order.status == 'p' %}
<button name="status" value="n" class="btn btn-default">{% trans "Mark as not paid" %}</button>
<a href="{% url "control:event.order.transition" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}?status=r" class="btn btn-default">
{% trans "Refund order" %}
</a>
{% endif %}
<a href="{% eventurl request.event "presale:event.order" order=order.code secret=order.secret %}"
class="btn btn-default" target="_blank">
{% trans "View order as user" %}
</a>
<a href="{% url "control:event.order.mail_history" event=request.event.slug organizer=request.event.organizer.slug code=order.code %}" class="btn btn-default">
{% trans "View email history" %}
</a>
</div>
</div>
</form>
{% endif %}
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>{% trans "Order code" %}</dt> <dt>{% trans "Order code" %}</dt>
<dd>{{ order.code }}</dd> <dd>{{ order.code }}</dd>

28
src/pretix/static/pretixbase/scss/_theme.scss
View File

@@ -1,6 +1,26 @@
.sidebar-nav li > a > .fa { .sidebar-nav li > a > .fa {
color: $navbar-inverse-bg; color: $navbar-inverse-bg;
} }
.sidebar-nav {
padding-top: 10px;
}
.sidebar-nav li > a {
padding: 7px 15px;
}
.sidebar-nav li li a {
padding-top: 2px;
padding-bottom: 2px;
}
.sidebar-nav li ul {
margin-bottom: 5px;
}
.sidebar-nav li.active > a, .sidebar-nav li a.active {
font-weight: bold;
}
.panel h1, .panel h2 {
margin-top: 0;
}
.btn { .btn {
border-width: 0px; border-width: 0px;
@@ -69,6 +89,14 @@
.alert-primary, .alert-warning, .alert-info, .alert-success, .alert-danger { .alert-primary, .alert-warning, .alert-info, .alert-success, .alert-danger {
color: #3b3b3b; color: #3b3b3b;
} }
.panel {
box-shadow: 0 7px 14px 0 rgba(78, 50, 92, 0.1),0 3px 6px 0 rgba(0,0,0,.07);
}
.panel-default > .panel-heading, .panel-default > .panel-footer {
background: white;
}
.panel-danger > .panel-heading, .panel-success > .panel-heading, .panel-default > .panel-heading, .panel-info > .panel-heading, .panel-warning > .panel-heading { .panel-danger > .panel-heading, .panel-success > .panel-heading, .panel-default > .panel-heading, .panel-info > .panel-heading, .panel-warning > .panel-heading {
color: #000000; color: #000000;
} }

11
src/pretix/static/pretixbase/scss/_variables.scss
View File

@@ -13,6 +13,8 @@ $gray-light: lighten(#000, 60%);
$gray-lighter: lighten(#000, 93.5%); $gray-lighter: lighten(#000, 93.5%);
$gray-lightest: lighten(#000, 97.25%); $gray-lightest: lighten(#000, 97.25%);
$page-background: #fbf7fc;
$font-family-sans-serif: "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif !default; $font-family-sans-serif: "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$text-color: #222222; $text-color: #222222;
$text-muted: #999999; $text-muted: #999999;
@@ -23,6 +25,10 @@ $brand-info: #5f9cd4;
$brand-warning: #ffb419; $brand-warning: #ffb419;
$brand-danger: #d36060; $brand-danger: #d36060;
$font-size-base: 14px;
$font-size-h1: floor(($font-size-base * 2.15));
$font-size-h2: floor(($font-size-base * 2.0));
$btn-default-border: #CCCCCC; $btn-default-border: #CCCCCC;
$border-radius-base: 3px !default; $border-radius-base: 3px !default;
@@ -39,6 +45,11 @@ $navbar-inverse-link-color: white;
$navbar-inverse-link-hover-color: $gray-lighter; $navbar-inverse-link-hover-color: $gray-lighter;
$navbar-inverse-brand-hover-color: $gray-lighter; $navbar-inverse-brand-hover-color: $gray-lighter;
$navbar-inverse-color: white; $navbar-inverse-color: white;
$navbar-default-bg: $page-background;
$nav-link-hover-bg: $page-background;
$navbar-default-link-active-bg: $page-background;
$navbar-default-link-hover-bg: $page-background;
$state-success-bg: white; $state-success-bg: white;
$state-success-border: $brand-success; $state-success-border: $brand-success;

8
src/pretix/static/pretixcontrol/scss/_dashboard.scss
View File

@@ -10,9 +10,12 @@
flex: 1 0 auto; flex: 1 0 auto;
align-self: stretch; align-self: stretch;
padding: 15px 5px; padding: 15px 5px;
border: 5px solid white;
min-height: 160px; min-height: 160px;
background: #F8F8F8; margin: 5px;
background: white;
box-shadow: 0 7px 14px 0 rgba(78, 50, 92, 0.1),0 3px 6px 0 rgba(0,0,0,.07);
border-radius: $panel-border-radius;
} }
.dashboard .widget-container.widget-full { .dashboard .widget-container.widget-full {
@@ -110,6 +113,7 @@
} }
a.status-warning { a.status-warning {
background: $brand-warning; background: $brand-warning;
color: black;
} }
a.status-default { a.status-default {
background: $gray-light; background: $gray-light;

18
src/pretix/static/pretixcontrol/scss/_sb-admin-2.scss
View File

@@ -7,7 +7,7 @@ Modified by Raphael Michel
// Global Styles // Global Styles
body { body {
background-color: $gray-lightest; background-color: $page-background;
} }
// Wrappers // Wrappers
@@ -17,17 +17,15 @@ body {
} }
#page-wrapper { #page-wrapper {
padding: 0 15px; padding: 20px 15px 0;
min-height: 568px; min-height: 568px;
background-color: white;
} }
@media(min-width:768px) { @media(min-width:768px) {
#page-wrapper { #page-wrapper {
position: inherit; position: inherit;
margin: 0 0 0 250px; margin: 0 0 0 220px;
padding: 0 30px; padding: 20px 30px 0;
border-left: 1px solid darken($gray-lightest, 6.5%);
} }
} }
@@ -95,7 +93,7 @@ body {
// --Sidebar // --Sidebar
.sidebar { .sidebar { li
.sidebar-nav.navbar-collapse { .sidebar-nav.navbar-collapse {
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
@@ -107,13 +105,7 @@ body {
} }
.sidebar ul li { .sidebar ul li {
border-bottom: 1px solid darken($gray-lightest, 6.5%);
position: relative; position: relative;
a {
&.active {
background-color: $gray-lighter;
}
}
a.arrow { a.arrow {
position: absolute; position: absolute;
right: 0; right: 0;