Skip to content

Commit 2da92bd

Browse files
authored
Merge pull request #16 from xenophenes/master
fixes
2 parents b3f838f + 1cb0c74 commit 2da92bd

File tree

2 files changed

+32
-35
lines changed

2 files changed

+32
-35
lines changed

template/confreg/sessionlist.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@
99
<header class="major">
1010
<span class="header"><img src="/ext/{{conference.urlname}}/shared/images/policy.svg" alt="" /></span>
1111
<h2>Conference Sessions - {{conference}}</h2><br>
12-
<p> The following list contains all the talks that have been confirmed so far
13-
for {{conference}}. Note that they may not yet have been scheduled! You
14-
can find the full conference information <a href="{{conference.confurl}}">here</a>.
15-
</p>
1612
</header>
1713
<!-- <p>The schedule is also available for <a href="/m/{{conference.urlname}}/#schedule">mobile users</a>
1814
and is available in <a href="ical/">iCalendar</a> format.</p> -->
1915

20-
21-
</section>
2216
<!-- Secondary Header -->
17+
<section class="section">
18+
<hr>
19+
<p> The following list contains all the talks that have been confirmed so far
20+
for {{conference}}. Note that they may not yet have been scheduled! You
21+
can find the full conference information <a href="{{conference.confurl}}">here</a>.
22+
</p>
23+
</section>
24+
2325
<section class="section">
2426
<hr>
2527
{%for session in sessions%}

template/confreg/speaker.html

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,36 @@
33
{%block content%}
44
<!-- Content
55
================================================== -->
6-
<main class="main-content">
7-
6+
<section id="main" class="wrapper">
87
<div class="container">
98

10-
<!-- ConfReg -->
11-
<section class="section">
12-
<div class="title-bordered" data-animation="fadeInUp" data-animation-delay="0">
13-
<h2>{{speaker.name}}</h2>
14-
<a href="../../">Back</a><br/>
15-
</div>
16-
</section>
9+
<!-- Call for Papers -->
10+
<header class="major">
11+
<span class="header"><img src="/ext/{{conference.urlname}}/shared/images/policy.svg" alt="" /></span>
12+
<h2>{{speaker.name}}</h2><br>
13+
</header>
14+
1715
<!-- Secondary Header -->
1816
<section class="section">
19-
<div class="clearfix">
20-
<div class="title title__lg pull-left">
21-
{%if speaker.photofile %}
22-
<img src="../../../../speaker/{{speaker.id}}/photo/" align="right" />
23-
{%endif%}
24-
{%if speaker.company%}<div>Company: {{speaker.company}}</div>{%endif%}
25-
{%if speaker.twittername%}<div>Twitter: <a href="http://twitter.com/{{speaker.twittername}}">{{speaker.twittername}}</a></div>{%endif%}
26-
<p>
27-
{{speaker.abstract|markdown}}
28-
</p>
17+
<hr>
18+
<a href="../../">Back</a><br/>
19+
{%if speaker.photofile %}
20+
<img src="../../../../speaker/{{speaker.id}}/photo/" align="right" />
21+
{%endif%}
22+
{%if speaker.company%}<div>Company: {{speaker.company}}</div>{%endif%}
23+
{%if speaker.twittername%}<div>Twitter: <a href="http://twitter.com/{{speaker.twittername}}">{{speaker.twittername}}</a></div>{%endif%}
24+
<p>
25+
{{speaker.abstract|markdown}}
26+
</p>
2927

30-
<p><b>Sessions</b></p>
31-
<ul>
32-
{%for session in sessions%}
33-
<li><a href="../../session/{{session.id}}-{{session.title|slugify}}/">{{session.title}}</a></li>
34-
{%endfor%}
35-
</ul>
36-
</div>
37-
</div>
28+
<p><b>Sessions</b></p>
29+
<ul>
30+
{%for session in sessions%}
31+
<li><a href="../../session/{{session.id}}-{{session.title|slugify}}/">{{session.title}}</a></li>
32+
{%endfor%}
33+
</ul>
3834
</section>
3935
<!-- Secondary Header -->
4036
</div>
41-
</main>
37+
</section>
4238
{%endblock%}
43-

0 commit comments

Comments
 (0)