Skip to content

Commit b1ea423

Browse files
author
Kátia Nakamura
authored
Merge pull request #12 from PythonBalkan/katia/base-html
core: create base.html with base page
2 parents 07996b1 + ff2a611 commit b1ea423

4 files changed

Lines changed: 76 additions & 175 deletions

File tree

‎pyconbalkan/conference/templates/home.html‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
{% extends "base.html" %}
2+
3+
{% block main_content %}
4+
5+
<!-- Main Content -->
6+
7+
<div class="col-xl-6 offset-1">
8+
{% if count_down %}
9+
<h1 class="font900 font-blue">{{ count_down.title }}</h1>
10+
<div class="countdown-timer">
11+
<span id="days" class="font900 font-blue"></span>
12+
<span class="font-blue font900" id="days-text"> Days</span>
13+
<ul class="countdown">
14+
<li>
15+
<span id="hours" class="hms font-yellow"></span>
16+
<div class="hms-text">hours</div>
17+
</li>
18+
<li>
19+
<span id="minutes" class="hms font-yellow"></span>
20+
<div class="hms-text">minutes</div>
21+
</li>
22+
<li>
23+
<span id="seconds" class="hms font-yellow"></span>
24+
<div class="hms-text">sec</div>
25+
</li>
26+
</ul>
27+
</div>
28+
29+
{# <div class="moveDown">#}
30+
{# <a class="btn btn-secondary btn-md round" href="#" role="button" id="btnBuyNow"><b>Buy Now</b></a>#}
31+
{# </div>#}
32+
{% endif %}
33+
34+
<div class="moveDown">
35+
<h1 class="font900 font-yellow">Speakers</h1>
36+
</div>
37+
38+
{% if speakers %}
39+
<div class="card-deck moveDown">
40+
<div class="card">
41+
<div class="row">
42+
{% for speaker in speakers %}
43+
<div class="col-sm">
44+
<img src="{{ speaker.images.first.profile_picture }}">
45+
<ul class="card-body h-100 justify-content-center">
46+
<li><b>{{ speaker.name }}</b></li>
47+
<hr>
48+
<li>{{ speaker.job }}</li>
49+
</ul>
50+
</div>
51+
{% endfor %}
52+
</div>
53+
</div>
54+
</div>
55+
{% else %}
56+
<div class="white">
57+
<span class="blue">C</span>OMING <span class="yellow">S</span>OON
58+
</div>
59+
{% endif %}
60+
61+
62+
{# <div class="moveDown">#}
63+
{# <a class="btn btn-secondary btn-md round" href="#" role="button" id="seeMore"><b>See More</b></a>#}
64+
{# <a class="btn btn-primary btn-md round" href="#" role="button" id="attend"><b>Attend</b></a>#}
65+
{# </div>#}
66+
</div>
67+
68+
69+
<!-- END of Main Content -->
70+
71+
{% endblock %}

‎pyconbalkan/conference/templates/index.html‎

Whitespace-only changes.

pyconbalkan/core/templates/home.html renamed to pyconbalkan/core/templates/base.html

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -110,70 +110,9 @@ <h1 class="font900 font-yellow">#{{ conference.number }}</h1>
110110

111111
<!-- END of Left Side -->
112112

113-
114113
<!-- Main Content -->
115114

116-
<div class="col-xl-6 offset-1">
117-
{% if count_down %}
118-
<h1 class="font900 font-blue">{{ count_down.title }}</h1>
119-
<div class="countdown-timer">
120-
<span id="days" class="font900 font-blue"></span>
121-
<span class="font-blue font900" id="days-text"> Days</span>
122-
<ul class="countdown">
123-
<li>
124-
<span id="hours" class="hms font-yellow"></span>
125-
<div class="hms-text">hours</div>
126-
</li>
127-
<li>
128-
<span id="minutes" class="hms font-yellow"></span>
129-
<div class="hms-text">minutes</div>
130-
</li>
131-
<li>
132-
<span id="seconds" class="hms font-yellow"></span>
133-
<div class="hms-text">sec</div>
134-
</li>
135-
</ul>
136-
</div>
137-
138-
{# <div class="moveDown">#}
139-
{# <a class="btn btn-secondary btn-md round" href="#" role="button" id="btnBuyNow"><b>Buy Now</b></a>#}
140-
{# </div>#}
141-
{% endif %}
142-
143-
<div class="moveDown">
144-
<h1 class="font900 font-yellow">Speakers</h1>
145-
</div>
146-
147-
{% if speakers %}
148-
<div class="card-deck moveDown">
149-
<div class="card">
150-
<div class="row">
151-
{% for speaker in speakers %}
152-
<div class="col-sm">
153-
<img src="{{ speaker.images.first.profile_picture }}">
154-
<ul class="card-body h-100 justify-content-center">
155-
<li><b>{{ speaker.name }}</b></li>
156-
<hr>
157-
<li>{{ speaker.job }}</li>
158-
</ul>
159-
</div>
160-
{% endfor %}
161-
</div>
162-
</div>
163-
</div>
164-
{% else %}
165-
<div class="white">
166-
<span class="blue">C</span>OMING <span class="yellow">S</span>OON
167-
</div>
168-
{% endif %}
169-
170-
171-
{# <div class="moveDown">#}
172-
{# <a class="btn btn-secondary btn-md round" href="#" role="button" id="seeMore"><b>See More</b></a>#}
173-
{# <a class="btn btn-primary btn-md round" href="#" role="button" id="attend"><b>Attend</b></a>#}
174-
{# </div>#}
175-
</div>
176-
115+
{% block main_content %}{% endblock %}
177116

178117
<!-- END of Main Content -->
179118

‎pyconbalkan/organizers/templates/organizers.html‎

Lines changed: 4 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,8 @@
1-
{% load static %}
2-
<!DOCTYPE html>
3-
<!--[if IE 8]> <html lang="en" class="ie8"> <![endif]-->
4-
<!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->
5-
<!--[if !IE]><!--> <html lang="en"> <!--<![endif]-->
6-
<head>
7-
<title>{{ conference.event }} {{ conference.name }} {{ conference.year }}</title>
8-
<!-- Meta -->
9-
<meta charset="utf-8">
10-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
11-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
12-
<meta name="description" content="PyCon Balkan description">
13-
<meta name="author" content="Python Balkan community">
14-
<link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon-32x32.png' %}">
15-
<link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon-16x16.png' %}">
16-
<link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet">
17-
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.9/css/all.css" integrity="sha384-5SOiIsAziJl6AWe0HWRKTXlfcSHKmYV4RBF18PPJ173Kzn7jzMyFuTtk8JA7QQG1" crossorigin="anonymous">
18-
<!-- Bootstrap 4 -->
19-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
20-
<link rel="stylesheet" href="{% static 'css/style.css' %}">
21-
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
22-
<!--[if lt IE 9]>
23-
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
24-
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
25-
<![endif]-->
26-
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,900"
27-
rel="stylesheet">
28-
<!-- Global site tag (gtag.js) - Google Analytics -->
29-
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-118269305-1"></script>
30-
<script>
31-
window.dataLayer = window.dataLayer || [];
32-
function gtag(){dataLayer.push(arguments);}
33-
gtag('js', new Date());
1+
{% extends "base.html" %}
342

35-
gtag('config', 'UA-118269305-1');
36-
</script>
37-
</head>
3+
{% block main_content %}
384

39-
<body>
40-
41-
<!-- Navigation Bar -->
42-
43-
<div class="row">
44-
<div class="col-md-11 offset-0">
45-
<nav class="navbar navbar-light navbar-expand-md bg-faded justify-content-center">
46-
<div class="navbar navbar-header mr-auto">
47-
<a class="navbar-brand" href="/#"><img src="{% static 'img/logo.jpg' %}"></a>
48-
</div>
49-
<ul class="nav navbar-nav ml-auto w-100 justify-content-end mb-5 pb-3">
50-
<li><a class="btn btn-light btn-sm round" href="/#" role="button">Home</a></li>
51-
{# <li><a class="btn btn-light btn-sm round" href="#" role="button">News</a></li>#}
52-
{# <li><a class="btn btn-light btn-sm round" href="#" role="button">CFP</a></li>#}
53-
{# <li><a class="btn btn-light btn-sm round" href="#" role="button">Sponsoring</a></li>#}
54-
{# <li><a class="btn btn-light btn-sm round" href="#" role="button">Timetable</a></li>#}
55-
{# <li><a class="btn btn-light btn-sm round" href="#" role="button">Travel</a></li>#}
56-
{# <li><a class="btn btn-light btn-sm round" href="#" role="button">Tickets</a></li>#}
57-
{# <li><a class="btn btn-light btn-sm round" href="#" role="button">Events</a></li>#}
58-
{# <li><a class="btn btn-light btn-sm round" href="#" role="button">FAQ</a></li>#}
59-
{# <li><a class="btn btn-light btn-sm round" href="#" role="button">About</a></li>#}
60-
{# <li><a class="btn btn-light btn-sm round" href="#" role="button">Contact</a></li>#}
61-
<li><a class="btn btn-light btn-sm round" href="/organizers" role="button">Organizers</a></li>
62-
<li><a class="btn btn-light btn-sm round" href="/coc" role="button">CoC</a></li>
63-
</ul>
64-
</nav>
65-
</div>
66-
</div>
67-
68-
<!-- END of Navigation Bar -->
69-
70-
<div class="row">
71-
72-
<!-- Left Side -->
73-
74-
<div class="col-xl-3 offset-1">
75-
<div>
76-
{% if conference %}
77-
<h1 class="font900 one">{{ conference.event }}</h1>
78-
<h2 class="one">{{ conference.name }}</h2>
79-
<h3>{{ conference.city }} {{ conference.year }}</h3>
80-
{% endif %}
81-
</div>
82-
<hr>
83-
{% if conference %}
84-
<div class="details">
85-
<h1 class="font900 font-yellow">#{{ conference.number }}</h1>
86-
<p>{{ conference.address }}</p>
87-
<div>
88-
<p><i class="far fa-calendar-alt"></i> {{ conference.from_date }} - {{ conference.to_date }}</p>
89-
<p><i class="fas fa-users"></i> {{ conference.max_attendees }} attendees</p>
90-
<p><i class="fas fa-globe"></i> {{ conference.get_type_display }}</p>
91-
</div>
92-
{# <div>#}
93-
{# <a class="btn btn-primary btn-md round" href="#" role="button"><b>JOIN US</b></a>#}
94-
{# </div>#}
95-
{# <div>#}
96-
{# <i class="fa-lg fab fa-facebook-f sn-icons"></i>#}
97-
{# <i class="fa-lg fab fa-twitter sn-icons"></i>#}
98-
{# <i class="fa-lg fab fa-linkedin-in sn-icons"></i>#}
99-
{# </div>#}
100-
</div>
101-
{% endif %}
102-
</div>
103-
104-
<!-- END of Left Side -->
105-
106-
<!-- Main Content -->
5+
<!-- Main Content -->
1076

1087
<div class="col-xl-6 offset-1">
1098
<div class="moveDown">
@@ -173,12 +72,4 @@ <h1 class="font900 font-yellow">Volunteers</h1>
17372

17473
<!-- END of Main Content -->
17574

176-
</div>
177-
178-
<!-- Bootstrap 4 scripts -->
179-
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
180-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
181-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
182-
183-
</body>
184-
</html>
75+
{% endblock %}

0 commit comments

Comments
 (0)