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

Show date in event picker

Browse Source
This commit is contained in:
Raphael Michel
2018-11-05 22:45:33 +01:00
parent 994ff23719
commit 18cb29b425
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pretix/control/templates/pretixcontrol/base.html
View File

@@ -109,8 +109,11 @@
</div> </div>
<ul class="nav navbar-nav navbar-top-links navbar-left hidden-xs"> <ul class="nav navbar-nav navbar-top-links navbar-left hidden-xs">
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-calendar"></i> <a href="#" class="dropdown-toggle event-dropdown-toggle" data-toggle="dropdown"><i class="fa fa-calendar"></i>
<span class="event-name">{{ request.event }}</span> <div class="event-indicator">
<span class="event-name">{{ request.event }}</span>
<span class="event-daterange">{{ request.event.get_date_range_display }}</span>
</div>
<span class="caret"></span></a> <span class="caret"></span></a>
<ul class="dropdown-menu event-dropdown" role="menu" data-event-typeahead <ul class="dropdown-menu event-dropdown" role="menu" data-event-typeahead
data-source="{% url "control:events.typeahead" %}"> data-source="{% url "control:events.typeahead" %}">

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

@@ -309,19 +309,55 @@ body.loading #wrapper {
height: 30px; height: 30px;
} }
.event-name { .event-name, .event-indicator .event-daterange {
display: inline-block; display: inline-block;
max-width: 150px; max-width: 200px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
vertical-align: bottom; vertical-align: bottom;
} }
@media (max-width: $screen-sm-max) {
.event-name, .event-indicator .event-daterange {
max-width: 150px;
}
}
.dropdown-menu .form-box { .dropdown-menu .form-box {
padding: 3px 10px; padding: 3px 10px;
} }
.navbar-nav > li > a.event-dropdown-toggle {
padding-top: 10px;
padding-bottom: 10px;
vertical-align: middle;
min-height: 0;
line-height: 0;
height: 50px;
i.fa {
position: relative;
line-height: 30px;
vertical-align: top;
}
.caret {
position: relative;
vertical-align: top;
top: 13px;
}
.event-indicator {
display: inline-block;
padding-left: 5px;
padding-right: 2px;
line-height: 15px;
span {
display: block;
}
span.event-daterange {
opacity: 0.7;
font-size: 11px;
}
}
}
.event-dropdown { .event-dropdown {
width: 300px; width: 300px;
} }