Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
A
AKPlanning
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
10
Issues
10
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
KIF
AKPlanning
Commits
90fbc780
Commit
90fbc780
authored
Oct 31, 2019
by
Benjamin Hättasch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve AK beamer plan UI
Fix room color Fix clock bar Add links to detail pages
parent
c1ce8bab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
AKPlan/templates/AKPlan/plan_beamer.html
AKPlan/templates/AKPlan/plan_beamer.html
+2
-1
AKPlan/views.py
AKPlan/views.py
+1
-1
No files found.
AKPlan/templates/AKPlan/plan_beamer.html
View file @
90fbc780
...
...
@@ -24,6 +24,7 @@ background: linear-gradient(to right, rgba(100,255,255,0.0) 0%,rgba(100,255,255,
{
%
if
is_white
%
}
div
.event
a
{
color
:
black
;}
body
{
background
:
#ddd
!important
;
color
:
#555
;}
h4
{
color
:
white
;}
.dateheader
h4
{
color
:
white
;}
table
tr
:nth-child
(
even
)
{
background
:
#e7e7e7
;
}
{
%
endif
%
}
...
...
@@ -55,7 +56,7 @@ table tr:nth-child(even) { background:#e7e7e7; }
<div
class=
"event"
style=
"margin-left:{{slot.leftpixels|unlocalize}}px;width:{{slot.widthpixels|unlocalize}}px;
border-top: 5px solid {{slot.ak.color}}; background-color: {{slot.red}};"
>
<a
href=
""
>
{{ slot.ak.short_name }}
</a></div>
<a
href=
"
{% url "
submit:ak_detail
"
event_slug=
"kif475"
pk=
slot.ak.pk
%}
"
>
{{ slot.ak.short_name }}
</a></div>
{% endif %}{% endfor %}
</td>
{% endfor %}
...
...
AKPlan/views.py
View file @
90fbc780
...
...
@@ -65,7 +65,7 @@ def plan_beamer(request, *args, **kwargs):
# TODO Hide instead (and make ak wall wider?)
nowsliderpos
+=
daywidth
elif
now
.
date
()
==
daydate
:
nowsliderpos
+=
max
(
0
,
min
(
daywidth
,
((
timezone
.
localtime
(
now
)
-
daystart
)
.
total_seconds
()
*
pixpersec
)))
nowsliderpos
+=
max
(
0
,
min
(
daywidth
,
((
timezone
.
localtime
(
now
)
+
datetime
.
timedelta
(
hours
=
1
)
-
daystart
)
.
total_seconds
()
*
pixpersec
)))
for
slot
in
slots
:
if
slot
.
start
.
date
()
==
daydate
:
secsfromstart
=
(
slot
.
start
-
daystart
)
.
total_seconds
()
...
...
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