Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
tools.ethertoff
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
27
Issues
27
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
osp
tools.ethertoff
Commits
df59d3da
Commit
df59d3da
authored
Apr 10, 2019
by
gijs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make dates clickable, border of continuous events on mobile
parent
28c35744
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
13 deletions
+27
-13
contour/static/contour/css/styles.css
contour/static/contour/css/styles.css
+7
-4
contour/templates/contour/event.html
contour/templates/contour/event.html
+1
-1
contour/templates/contour/partials/home__interbellum.html
contour/templates/contour/partials/home__interbellum.html
+18
-7
contour/views.py
contour/views.py
+1
-1
No files found.
contour/static/contour/css/styles.css
View file @
df59d3da
...
...
@@ -835,7 +835,10 @@ p, h4 {
height
:
initial
;
min-height
:
8em
;
padding-top
:
0
;
border-bottom
:
2px
solid
black
;
}
.loop
{
border-top
:
2px
solid
black
;
}
.interbellum
{
...
...
@@ -985,7 +988,7 @@ p, h4 {
.loop-days
.continuous-inline
.hour
{
font-family
:
'Syne'
;
font-weight
:
900
;
margin
:
-1.75em
.5em
1em
.5em
;
margin
:
calc
(
-2.25em
-
2px
)
.5em
1em
.5em
;
display
:
block
;
text-align
:
right
;
position
:
-webkit-sticky
;
...
...
@@ -1004,10 +1007,10 @@ p, h4 {
}
.loop-days
.continuous-inline
{
padding
-bottom
:
1
em
;
padding
:
.5
em
;
margin-bottom
:
1em
;
margin
:
0
.5em
1em
.5em
;
border
-bottom
:
2px
solid
black
;
border
:
2px
solid
black
;
}
}
...
...
contour/templates/contour/event.html
View file @
df59d3da
...
...
@@ -75,7 +75,7 @@
{% endfor %}
</span> -->
{% if event.show_ticket_link and event.ticket_link %}
<a
href=
"{{ event.ticket_link }}"
class=
"ticket-link"
>
{% trans "Buy tickets" %}
</a>
<a
href=
"{{ event.ticket_link }}"
class=
"ticket-link"
target=
"_blank"
>
{% trans "Buy tickets" %}
</a>
{% endif %}
</div>
<div
class=
"header-buttons"
>
...
...
contour/templates/contour/partials/home__interbellum.html
View file @
df59d3da
{% load static contour thumbnail i18n %}
{% for day in interbellum.days %}
<section
class=
"interbellum"
data-label=
"{
{ day.date|date:'D j M' }}{% if day.multiday %} - {{ day.end_date|date:"
D
j
M
"
}}{%
endif
%}"
data-type=
"interbellum"
data-t=
"{{ interbellum.t|stringformat:'0.2f' }}"
data-date=
"{{ day.date|date:"
c
"
}}"
>
<section
class=
"interbellum"
data-label=
"{
% if day.multiday %}{{ day.date|date:'j M' }} - {{ day.end_date|date:"
j
M
"
}}{%
else
%}{{
day.date
|
date:
'
D
j
M
'
}}{%
endif
%}"
data-type=
"interbellum"
data-t=
"{{ interbellum.t|stringformat:'0.2f' }}"
data-date=
"{{ day.date|date:"
c
"
}}"
>
<div
class=
"overlay"
></div>
<section
class=
"interbellum-spacer-before"
></section>
<section
class=
"day"
data-main
>
...
...
@@ -32,12 +32,23 @@
{% endfor %}
{% endif %}
<section
class=
"event-data--event"
>
{% if day.multiday %}
<time
class=
"date"
datetime=
"{{ event.start|date:'c' }}"
>
{{ event.start|date:"j M" }}{% if event.end %} - {{ event.end|date:"j M" }}{% endif %}
</time>
{% endif %}
{% if event.show_hours %}
<time
class=
"hour"
datetime=
"{{ event.start|date:'c' }}"
>
{{ event.start|date:"H:i" }}{% if event.end %} - {{ event.end|date:"H:i" }}{% endif %}
</time>
{% endif %}
<time
class=
"hour"
datetime=
"{{ event.start|date:'c' }}"
>
<a
href=
"{% url 'contour:event' event.pk %}"
>
{% if day.multiday %}
{% if event.show_hours %}
{{ event.start|date:"j M H:i" }}{% if event.end %} - {{ event.end|date:"j M H:i" }}{% endif %}
{% else %}
{{ event.start|date:"j M" }}{% if event.end %} - {{ event.end|date:"j M" }}{% endif %}
{% endif %}
{% else %}
{% if event.show_hours %}
{{ event.start|date:"H:i" }}{% if event.end %} - {{ event.end|date:"H:i" }}{% endif %}
{% else %}
{{ event.start|date:"j M" }}
{% endif %}
{% endif %}
</a>
</time>
<span
class=
"type"
>
{{ event.event_type }}
</span>
<span
class=
"venue"
>
{% trans "at" %}
{% if event.venue.published %}
<a
href=
"{% url 'contour:venue' event.venue.pk %}"
>
{{ event.venue }}
</a>
{% else %}{{ event.venue }}{% endif %}
</span>
</section>
...
...
contour/views.py
View file @
df59d3da
...
...
@@ -176,7 +176,7 @@ def home(request):
else
:
continuous
,
days
=
structureInterbellumEvents
(
end
=
loop
.
start
)
interbellum
=
Interbellum
(
continuous
=
continuous
,
days
=
days
,
t
=
max
(
0
,
index
-
.
5
))
interbellum
=
Interbellum
(
continuous
=
continuous
,
days
=
days
,
t
=
max
(
-
.
5
,
index
-
.
5
))
timelineEntries
.
append
(
interbellum
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment