Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 62cb44d

Browse files
jungmirjungmir
committed
program 시간표 정보 수정
1 parent a2539bb commit 62cb44d

File tree

3 files changed

+9
-282
lines changed

3 files changed

+9
-282
lines changed

‎_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ conference:
8181

8282
program:
8383
url: "/program"
84-
time_steps: 15
84+
time_steps: 60
8585
show_alltimes: true
8686

8787
talks:

‎_layouts/program.html

Lines changed: 6 additions & 279 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% include partials/header.html %}
22
{% assign nbr_days = site.data.program.days | size -%}
33

4-
<h1 class="display-5 {% if nbr_days > 1 -%} mb-2 {%- else -%} mb-4 {%- endif %}">
4+
<h1 class="display-5 {% if nbr_days > 1 -%} mb-2 {%- else -%} mb-4 {%- endif %} text-break">
55
{%- if page.title -%}
66
{{- page.title -}}
77
{%- else -%}
@@ -16,7 +16,7 @@ <h1 class="display-5 {% if nbr_days > 1 -%} mb-2 {%- else -%} mb-4 {%- endif %}"
1616
{%- for d in site.data.program.days -%}
1717
{%- include partials/get_day_hash.html %}
1818
<li class="nav-item" role="presentation">
19-
<a class="nav-link btn btn-outline-secondary {%- if forloop.index == 1 %} active{% endif %}" id="tab-{{ day_hash }}" data-toggle="tab" {%- if d.date %} data-date="{{ d.date }}" {%- endif %} href="#{{ day_hash }}" role="tab" aria-controls="{{ day_hash }}" aria-selected="{% if forloop.index == 1 %}true{% else %}false{% endif %}">{{ day_name }}</a>
19+
<a class="nav-link btn btn-outline-secondary {%- if forloop.index == 1 %} active{% endif %}" id="tab-{{ day_hash }}" data-toggle="tab" {%- if d.date -%}{%- include partials/get_talk_timestamp.html %} data-ts="{{ timestamp_start }}" {%- endif %} href="#{{ day_hash }}" role="tab" aria-controls="{{ day_hash }}" aria-selected="{% if forloop.index == 1 %}true{% else %}false{% endif %}">{{ day_name }}</a>
2020
</li>
2121
{%- endfor %}
2222
</ul>
@@ -59,287 +59,14 @@ <h1 class="display-5 {% if nbr_days > 1 -%} mb-2 {%- else -%} mb-4 {%- endif %}"
5959
<div class="syncscroll overflow-y-hidden" name="sync-table">
6060
<table class="table mx-auto">
6161
<tbody>
62-
<tr>
63-
<th scope="row" class="col-title text-center vertical-middle">
64-
10:00<br>~<br>10:40
65-
</th>
66-
<td class="col-space p-0"></td>
67-
{%- for r in d.rooms -%}
68-
{%- assign room = site.rooms | where: 'name', r.name | first -%}
69-
70-
{%- for t in r.talks -%}
71-
{%- if t.time_start == '10:00' %}
72-
{%- assign talk = site.talks | where: 'name', t.name | first -%}
73-
74-
{%- include partials/get_main_category.html -%}
75-
<td class="alert alert-{{ main_cat_color }} shadow-sm overflow-hidden">
76-
<p class="mb-2">
77-
{%- include partials/show_talk.html %}
78-
</p>
79-
<p class="font-weight-light mb-2">
80-
{%- include partials/list_speakers.html %}
81-
</p>
82-
<p class="mb-1">
83-
{%- include partials/list_sub_categories.html %}
84-
</p>
85-
</td>
86-
{%- endif -%}
87-
88-
{%- endfor %}
89-
90-
{%- if forloop.last != true %}
91-
<td class="col-space p-0"></td>
92-
{%- endif -%}
93-
94-
{%- endfor %}
95-
</tr>
96-
<tr>
97-
<th scope="row" class="col-title text-center"></th>
98-
<td colspan="6" class="text-center">쉬는 시간</td>
99-
</tr>
100-
<tr>
101-
<th scope="row" class="col-title text-center vertical-middle">
102-
10:50<br>~<br>11:30
103-
</th>
104-
<td class="col-space p-0"></td>
105-
{%- for r in d.rooms -%}
106-
{%- assign room = site.rooms | where: 'name', r.name | first -%}
107-
108-
{%- for t in r.talks -%}
109-
{%- if t.time_start == '10:50' %}
110-
{%- assign talk = site.talks | where: 'name', t.name | first -%}
111-
112-
{%- include partials/get_main_category.html -%}
113-
<td class="alert alert-{{ main_cat_color }} shadow-sm overflow-hidden">
114-
<p class="mb-2">
115-
{%- include partials/show_talk.html %}
116-
</p>
117-
<p class="font-weight-light mb-2">
118-
{%- include partials/list_speakers.html %}
119-
</p>
120-
<p class="mb-1">
121-
{%- include partials/list_sub_categories.html %}
122-
</p>
123-
</td>
124-
{%- endif -%}
125-
126-
{%- endfor %}
127-
128-
{%- if forloop.last != true %}
129-
<td class="col-space p-0"></td>
130-
{%- endif -%}
131-
132-
{%- endfor %}
133-
</tr>
134-
<tr>
135-
<th scope="row" class="col-title text-center"></th>
136-
<td colspan="6" class="text-center">쉬는 시간</td>
137-
</tr>
138-
<tr>
139-
<th scope="row" class="col-title text-center vertical-middle">
140-
11:50<br>~<br>12:10
141-
</th>
142-
<td class="col-space p-0"></td>
143-
{%- for r in d.rooms -%}
144-
{%- assign room = site.rooms | where: 'name', r.name | first -%}
145-
146-
{%- for t in r.talks -%}
147-
{%- if t.time_start == '11:50' %}
148-
{%- assign talk = site.talks | where: 'name', t.name | first -%}
149-
150-
{%- include partials/get_main_category.html -%}
151-
<td class="alert alert-{{ main_cat_color }} shadow-sm overflow-hidden">
152-
<p class="mb-2">
153-
{%- include partials/show_talk.html %}
154-
</p>
155-
<p class="font-weight-light mb-2">
156-
{%- include partials/list_speakers.html %}
157-
</p>
158-
<p class="mb-1">
159-
{%- include partials/list_sub_categories.html %}
160-
</p>
161-
</td>
162-
{%- endif -%}
163-
164-
{%- endfor %}
165-
166-
{%- if forloop.last != true %}
167-
<td class="col-space p-0"></td>
168-
{%- endif -%}
169-
170-
{%- endfor %}
171-
</tr>
172-
<tr>
173-
<th scope="row" class="col-title text-center"></th>
174-
<td colspan="6" class="text-center">점심시간</td>
175-
</tr>
176-
<tr>
177-
<th scope="row" class="col-title text-center vertical-middle">
178-
14:00<br>~<br>14:20
179-
</th>
180-
<td class="col-space p-0"></td>
181-
{%- for r in d.rooms -%}
182-
{%- assign room = site.rooms | where: 'name', r.name | first -%}
183-
184-
{%- for t in r.talks -%}
185-
{%- if t.time_start == '14:00' %}
186-
{%- assign talk = site.talks | where: 'name', t.name | first -%}
187-
188-
{%- include partials/get_main_category.html -%}
189-
<td class="alert alert-{{ main_cat_color }} shadow-sm overflow-hidden">
190-
<p class="mb-2">
191-
{%- include partials/show_talk.html %}
192-
</p>
193-
<p class="font-weight-light mb-2">
194-
{%- include partials/list_speakers.html %}
195-
</p>
196-
<p class="mb-1">
197-
{%- include partials/list_sub_categories.html %}
198-
</p>
199-
</td>
200-
{%- endif -%}
201-
202-
{%- endfor %}
203-
204-
{%- if forloop.last != true %}
205-
<td class="col-space p-0"></td>
206-
{%- endif -%}
207-
208-
{%- endfor %}
209-
</tr>
210-
<tr>
211-
<th scope="row" class="col-title text-center"></th>
212-
<td colspan="6" class="text-center">쉬는 시간</td>
213-
</tr>
214-
<tr>
215-
<th scope="row" class="col-title text-center vertical-middle">
216-
15:00<br>~<br>15:40
217-
</th>
218-
<td class="col-space p-0"></td>
219-
{%- for r in d.rooms -%}
220-
{%- assign room = site.rooms | where: 'name', r.name | first -%}
221-
222-
{%- for t in r.talks -%}
223-
{%- if t.time_start == '15:00' %}
224-
{%- assign talk = site.talks | where: 'name', t.name | first -%}
225-
226-
{%- include partials/get_main_category.html -%}
227-
<td class="alert alert-{{ main_cat_color }} shadow-sm overflow-hidden">
228-
<p class="mb-2">
229-
{%- include partials/show_talk.html %}
230-
</p>
231-
<p class="font-weight-light mb-2">
232-
{%- include partials/list_speakers.html %}
233-
</p>
234-
<p class="mb-1">
235-
{%- include partials/list_sub_categories.html %}
236-
</p>
237-
</td>
238-
{%- endif -%}
239-
240-
{%- endfor %}
241-
242-
{%- if forloop.last != true %}
243-
<td class="col-space p-0"></td>
244-
{%- endif -%}
245-
246-
{%- endfor %}
247-
</tr>
248-
<tr>
249-
<th scope="row" class="col-title text-center"></th>
250-
<td colspan="6" class="text-center">쉬는 시간</td>
251-
</tr>
252-
<tr>
253-
<th scope="row" class="col-title text-center vertical-middle">
254-
15:50<br>~<br>16:10
255-
</th>
256-
<td class="col-space p-0"></td>
257-
{%- for r in d.rooms -%}
258-
{%- assign room = site.rooms | where: 'name', r.name | first -%}
259-
260-
{%- for t in r.talks -%}
261-
{%- if t.time_start == '15:50' %}
262-
{%- assign talk = site.talks | where: 'name', t.name | first -%}
263-
264-
{%- include partials/get_main_category.html -%}
265-
<td class="alert alert-{{ main_cat_color }} shadow-sm overflow-hidden">
266-
<p class="mb-2">
267-
{%- include partials/show_talk.html %}
268-
</p>
269-
<p class="font-weight-light mb-2">
270-
{%- include partials/list_speakers.html %}
271-
</p>
272-
<p class="mb-1">
273-
{%- include partials/list_sub_categories.html %}
274-
</p>
275-
</td>
276-
{%- endif -%}
277-
278-
{%- endfor %}
279-
280-
{%- if forloop.last != true %}
281-
<td class="col-space p-0"></td>
282-
{%- endif -%}
283-
284-
{%- endfor %}
285-
</tr>
286-
<tr>
287-
<th scope="row" class="col-title text-center"></th>
288-
<td colspan="6" class="text-center">쉬는 시간</td>
289-
</tr>
290-
<tr>
291-
<th scope="row" class="col-title text-center vertical-middle">
292-
16:20<br>~<br>17:00
293-
</th>
294-
<td class="col-space p-0"></td>
295-
{%- for r in d.rooms -%}
296-
{%- if r.name == '독도' %}
297-
{%- assign room = site.rooms | where: 'name', r.name | first -%}
298-
299-
{%- for t in r.talks -%}
300-
{%- if t.time_start == '16:20' %}
301-
{%- assign talk = site.talks | where: 'name', t.name | first -%}
302-
303-
{%- include partials/get_main_category.html -%}
304-
<td class="alert alert-{{ main_cat_color }} shadow-sm overflow-hidden" colspan="6">
305-
<p class="mb-2">
306-
{%- include partials/show_talk.html %}
307-
</p>
308-
<p class="font-weight-light mb-2">
309-
{%- include partials/list_speakers.html %}
310-
</p>
311-
<p class="mb-1">
312-
{%- include partials/list_sub_categories.html %}
313-
</p>
314-
</td>
315-
{%- endif -%}
316-
317-
{%- endfor %}
318-
319-
{%- if forloop.last != true %}
320-
<td class="col-space p-0"></td>
321-
{%- endif -%}
322-
{%- endif -%}
323-
{%- endfor %}
324-
</tr>
325-
<tr>
326-
<th scope="row" class="col-title text-center vertical-middle">
327-
17:00<br>~<br>18:00
328-
</th>
329-
<td colspan="6" class="text-center vertical-middle">패널 토크 - 파이썬 웹 개발자의 과거/현재/미래</td>
330-
</tr>
331-
332-
333-
334-
335-
<!-- {%- include partials/get_day_time.html -%}
62+
{%- include partials/get_day_time.html -%}
33663

33764
{%- if day_end_day > day_start_day -%}
33865
{%- assign day_end_hour = day_end_day | minus: day_start_day | times: 24 | plus: day_end_hour -%}
33966
{%- endif -%}
34067

34168
{%- assign day_duration_min = day_end_hour | minus: day_start_hour | times: 60 | minus: day_start_min | plus: day_end_min -%}
342-
{%- assign nbr_steps = day_duration_min | divided_by: site.conference.program.time_steps -%} -->
69+
{%- assign nbr_steps = day_duration_min | divided_by: site.conference.program.time_steps -%}
34370

34471
<!--
34572
The shadow of a previous program block should be above a later program block, thus
@@ -348,7 +75,7 @@ <h1 class="display-5 {% if nbr_days > 1 -%} mb-2 {%- else -%} mb-4 {%- endif %}"
34875
Bootstrap uses as lowest z-index for its overlapping elements a z-index of 1000 (for
34976
$zindex-dropdown).
35077
-->
351-
<!-- {%- assign z-index-max = 999 -%}
78+
{%- assign z-index-max = 999 -%}
35279

35380
{%- for i in (1..nbr_steps) -%}
35481
{%- assign current_day = 0 -%}
@@ -449,7 +176,7 @@ <h1 class="display-5 {% if nbr_days > 1 -%} mb-2 {%- else -%} mb-4 {%- endif %}"
449176
{%- endfor %}
450177

451178
</tr>
452-
{%- endfor %} -->
179+
{%- endfor %}
453180
</tbody>
454181
</table>
455182
</div>

‎_talks/talk1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ speakers:
44
- 황정식
55
categories:
66
- 웹 프레임워크 (Web Framework)
7-
- 20min
7+
- 5 hours
88
- 초급
99
---
1010

11-
- 발표 길이: 20분
11+
- 발표 길이: 5시간
1212

1313
- 발표 자료: [Link](https://drive.google.com/file/d/1NitCsSD-AcLj7v9wMiztY8bd98IZZjYR/view)
1414

0 commit comments

Comments
 (0)