Skip to content

Commit 76ecb1a

Browse files
jh0kerjh0ker
committed
create real template, add sponsors page
1 parent 07f3c7f commit 76ecb1a

File tree

9 files changed

+158
-104
lines changed

9 files changed

+158
-104
lines changed

‎ptb_website/urls.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919

2020
urlpatterns = [
2121
url(r'^admin/', include(admin.site.urls)),
22-
url(r'^$', include('website.urls'))
22+
url(r'^', include('website.urls'))
2323
]

‎requirements.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
django
22
cherrypy
33
paste
4+
git+https://github.com/natevw/django-sameas.git@master#egg=django-sameas

‎website/static/website/jetbrains.png‎

164 KB
Loading

‎website/static/website/style.css‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,31 @@ div.content {
2828
overflow: auto;
2929
}
3030

31+
h1 {
32+
font-size: 30px;
33+
font-family: 'Roboto Slab', sans-serif;
34+
text-transform: uppercase;
35+
margin: 0 0 5px 0;
36+
}
37+
3138
h2 {
3239
font-size: 26px;
3340
font-family: 'Convergence', sans-serif;
3441
text-transform: uppercase;
3542
margin: 0 0 5px 0;
3643
}
3744

45+
h2.nocaps {
46+
text-transform: none;
47+
}
48+
3849
h1.title {
3950
font-size: 72px;
4051
text-align: right;
4152
line-height: 1.25;
4253
color: #646464;
54+
text-transform: none;
55+
margin: 0;
4356
}
4457

4558
h2.subtitle {
@@ -89,10 +102,23 @@ footer {
89102
margin-top: 20px;
90103
}
91104

92-
footer p.right {
105+
.right {
93106
float: right;
94107
}
95108

96-
footer p.left {
109+
.left {
110+
float: left;
111+
}
112+
113+
.spon-logo {
114+
display: block;
115+
float: left;
116+
width: 250px;
117+
}
118+
119+
.spon-text {
120+
display: block;
97121
float: left;
122+
padding-left: 12px;
123+
width: 460px;
98124
}

‎website/templates/website/base.html‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{% load sameastags %}
2+
<!DOCTYPE html>
3+
<!-- {% block title %}{% endblock %} -->
4+
<html>
5+
<head>
6+
<meta charset="UTF-8">
7+
<title>python-telegram-bot{% block dashtitle %} - {% sameas title %}{% endblock %}</title>
8+
<link rel="apple-touch-icon" sizes="57x57" href="/static/website/favicons/apple-touch-icon-57x57.png">
9+
<link rel="apple-touch-icon" sizes="60x60" href="/static/website/favicons/apple-touch-icon-60x60.png">
10+
<link rel="apple-touch-icon" sizes="72x72" href="/static/website/favicons/apple-touch-icon-72x72.png">
11+
<link rel="apple-touch-icon" sizes="76x76" href="/static/website/favicons/apple-touch-icon-76x76.png">
12+
<link rel="apple-touch-icon" sizes="114x114" href="/static/website/favicons/apple-touch-icon-114x114.png">
13+
<link rel="apple-touch-icon" sizes="120x120" href="/static/website/favicons/apple-touch-icon-120x120.png">
14+
<link rel="apple-touch-icon" sizes="144x144" href="/static/website/favicons/apple-touch-icon-144x144.png">
15+
<link rel="apple-touch-icon" sizes="152x152" href="/static/website/favicons/apple-touch-icon-152x152.png">
16+
<link rel="apple-touch-icon" sizes="180x180" href="/static/website/favicons/apple-touch-icon-180x180.png">
17+
<link rel="icon" type="image/png" href="/static/website/favicons/favicon-32x32.png" sizes="32x32">
18+
<link rel="icon" type="image/png" href="/static/website/favicons/android-chrome-192x192.png" sizes="192x192">
19+
<link rel="icon" type="image/png" href="/static/website/favicons/favicon-96x96.png" sizes="96x96">
20+
<link rel="icon" type="image/png" href="/static/website/favicons/favicon-16x16.png" sizes="16x16">
21+
<link rel="manifest" href="/static/website/favicons/manifest.json">
22+
<link rel="mask-icon" href="/static/website/favicons/safari-pinned-tab.svg" color="#5bbad5">
23+
<link rel="shortcut icon" href="/static/website/favicons/favicon.ico">
24+
<link rel="stylesheet" type="text/css" href="/static/website/reset.css" />
25+
<link rel="stylesheet" type="text/css" href="/static/website/style.css" />
26+
<link rel="stylesheet" type="text/css" href="/static/website/code.css" />
27+
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto+Slab">
28+
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Convergence">
29+
<meta name="msapplication-TileColor" content="#2b5797">
30+
<meta name="msapplication-TileImage" content="/static/website/favicons/mstile-144x144.png">
31+
<meta name="msapplication-config" content="/static/website/favicons/browserconfig.xml">
32+
<meta name="theme-color" content="#4f7096">
33+
34+
<meta property="og:title" content="python-telegram-bot{% sameas dashtitle %}" />
35+
<meta property="og:type" content="article" />
36+
<meta property="og:url" content="https://python-telegram-bot.org/" />
37+
<meta property="og:image" content="https://github.com/python-telegram-bot/logos/raw/master/logo/png/ptb-logo_2048.png" />
38+
<meta property="og:description" content="A Python framework for the Telegram Bot API" />
39+
<meta property="og:determiner" content="" />
40+
</head>
41+
<body>
42+
<a href="/"><img class="logo" width="128" src="https://github.com/python-telegram-bot/logos/blob/master/logo/png/ptb-logo_240.png?raw=true" /></a>
43+
44+
<div class="content">
45+
<section>
46+
<header>
47+
48+
<hgroup>
49+
<h1 class="title">python-telegram-bot</h1>
50+
<h2 class="subtitle">We have made you a wrapper you can't refuse</h2>
51+
</hgroup>
52+
<nav>
53+
<ul>
54+
<li><a href="https://telegram.me/pythontelegrambotchannel">News</a></li>
55+
<li><a href="https://telegram.me/pythontelegrambotgroup">Community</a></li>
56+
<li><a href="https://github.com/python-telegram-bot/python-telegram-bot">Development</a></li>
57+
<li><a href="https://python-telegram-bot.readthedocs.io/">Documentation</a></li>
58+
<li><a href="https://github.com/python-telegram-bot/python-telegram-bot/wiki">Wiki</a></li>
59+
<li><a href="https://pypi.python.org/pypi/python-telegram-bot">Download</a></li>
60+
</ul>
61+
</nav>
62+
</header>
63+
64+
<p class="buttons">
65+
<a class="github-button" href="https://github.com/python-telegram-bot/python-telegram-bot" data-icon="octicon-star" data-count-href="/python-telegram-bot/python-telegram-bot/stargazers" data-count-api="/repos/python-telegram-bot/python-telegram-bot#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star python-telegram-bot/python-telegram-bot on GitHub">Star</a>
66+
<a class="github-button" href="https://github.com/python-telegram-bot/python-telegram-bot/fork" data-icon="octicon-repo-forked" data-count-href="/python-telegram-bot/python-telegram-bot/network" data-count-api="/repos/python-telegram-bot/python-telegram-bot#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork python-telegram-bot/python-telegram-bot on GitHub">Fork</a>
67+
</p>
68+
</section>
69+
70+
<section>
71+
<br />
72+
{% block content %}{% endblock %}
73+
</section>
74+
</div>
75+
76+
<section>
77+
<footer>
78+
<p class="left"><a href="https://www.jetbrains.com/pycharm/"><img src="/static/website/pycharm.png" height="43" width="43" alt="PyCharm Logo"/></a> &nbsp;</p>
79+
<p class="left"><a href="/sponsors/#jetbrains">Made with<br>PyCharm</a></p>
80+
<p class="right">© Copyright 2015-2017. Licensed by <a href="https://creativecommons.org/licenses/by/3.0/" rel="license" target="_blank">Creative Commons</a>.</p>
81+
</footer>
82+
</section>
83+
84+
<script async defer id="github-bjs" src="https://buttons.github.io/buttons.js"></script>
85+
</body>
86+
</html>

‎website/templates/website/index.html‎

Lines changed: 25 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,24 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="UTF-8">
5-
<title>python-telegram-bot</title>
6-
<link rel="apple-touch-icon" sizes="57x57" href="/static/website/favicons/apple-touch-icon-57x57.png">
7-
<link rel="apple-touch-icon" sizes="60x60" href="/static/website/favicons/apple-touch-icon-60x60.png">
8-
<link rel="apple-touch-icon" sizes="72x72" href="/static/website/favicons/apple-touch-icon-72x72.png">
9-
<link rel="apple-touch-icon" sizes="76x76" href="/static/website/favicons/apple-touch-icon-76x76.png">
10-
<link rel="apple-touch-icon" sizes="114x114" href="/static/website/favicons/apple-touch-icon-114x114.png">
11-
<link rel="apple-touch-icon" sizes="120x120" href="/static/website/favicons/apple-touch-icon-120x120.png">
12-
<link rel="apple-touch-icon" sizes="144x144" href="/static/website/favicons/apple-touch-icon-144x144.png">
13-
<link rel="apple-touch-icon" sizes="152x152" href="/static/website/favicons/apple-touch-icon-152x152.png">
14-
<link rel="apple-touch-icon" sizes="180x180" href="/static/website/favicons/apple-touch-icon-180x180.png">
15-
<link rel="icon" type="image/png" href="/static/website/favicons/favicon-32x32.png" sizes="32x32">
16-
<link rel="icon" type="image/png" href="/static/website/favicons/android-chrome-192x192.png" sizes="192x192">
17-
<link rel="icon" type="image/png" href="/static/website/favicons/favicon-96x96.png" sizes="96x96">
18-
<link rel="icon" type="image/png" href="/static/website/favicons/favicon-16x16.png" sizes="16x16">
19-
<link rel="manifest" href="/static/website/favicons/manifest.json">
20-
<link rel="mask-icon" href="/static/website/favicons/safari-pinned-tab.svg" color="#5bbad5">
21-
<link rel="shortcut icon" href="/static/website/favicons/favicon.ico">
22-
<link rel="stylesheet" type="text/css" href="/static/website/reset.css" />
23-
<link rel="stylesheet" type="text/css" href="/static/website/style.css" />
24-
<link rel="stylesheet" type="text/css" href="/static/website/code.css" />
25-
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto+Slab">
26-
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Convergence">
27-
<meta name="msapplication-TileColor" content="#2b5797">
28-
<meta name="msapplication-TileImage" content="/static/website/favicons/mstile-144x144.png">
29-
<meta name="msapplication-config" content="/static/website/favicons/browserconfig.xml">
30-
<meta name="theme-color" content="#4f7096">
31-
32-
<meta property="og:title" content="python-telegram-bot" />
33-
<meta property="og:type" content="article" />
34-
<meta property="og:url" content="https://python-telegram-bot.org/" />
35-
<meta property="og:image" content="https://github.com/python-telegram-bot/logos/raw/master/logo/png/ptb-logo_2048.png" />
36-
<meta property="og:description" content="A Python framework for the Telegram Bot API" />
37-
<meta property="og:determiner" content="" />
38-
</head>
39-
<body>
40-
<img class="logo" width="128" src="https://github.com/python-telegram-bot/logos/blob/master/logo/png/ptb-logo_240.png?raw=true" />
41-
42-
<div class="content">
43-
<section>
44-
<header>
45-
46-
<hgroup>
47-
<h1 class="title">python-telegram-bot</h1>
48-
<h2 class="subtitle">We have made you a wrapper you can't refuse</h2>
49-
</hgroup>
50-
<nav>
51-
<ul>
52-
<li><a href="https://telegram.me/pythontelegrambotchannel">News</a></li>
53-
<li><a href="https://telegram.me/pythontelegrambotgroup">Community</a></li>
54-
<li><a href="https://github.com/python-telegram-bot/python-telegram-bot">Development</a></li>
55-
<li><a href="https://python-telegram-bot.readthedocs.io/">Documentation</a></li>
56-
<li><a href="https://github.com/python-telegram-bot/python-telegram-bot/wiki">Wiki</a></li>
57-
<li><a href="https://pypi.python.org/pypi/python-telegram-bot">Download</a></li>
58-
</ul>
59-
</nav>
60-
</header>
61-
62-
<p class="buttons">
63-
<a class="github-button" href="https://github.com/python-telegram-bot/python-telegram-bot" data-icon="octicon-star" data-count-href="/python-telegram-bot/python-telegram-bot/stargazers" data-count-api="/repos/python-telegram-bot/python-telegram-bot#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star python-telegram-bot/python-telegram-bot on GitHub">Star</a>
64-
<a class="github-button" href="https://github.com/python-telegram-bot/python-telegram-bot/fork" data-icon="octicon-repo-forked" data-count-href="/python-telegram-bot/python-telegram-bot/network" data-count-api="/repos/python-telegram-bot/python-telegram-bot#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork python-telegram-bot/python-telegram-bot on GitHub">Fork</a>
65-
</p>
66-
</section>
67-
68-
<section>
69-
<br />
70-
<h2>It's fun</h2>
71-
{% comment %}
72-
The style sheet is generated with
73-
pygmentize -f html -S tango > code.css
74-
and the highlighted code underneath with
75-
pygmentize -f html example.py
76-
{% endcomment %}
1+
{% extends "website/base.html" %}
2+
3+
{% block dashtitle %}{% endblock %}
4+
5+
{% block content %}
6+
<br />
7+
<h2>It's fun</h2>
8+
{% comment %}
9+
The style sheet is generated with
10+
pygmentize -f html -S tango > code.css
11+
and the highlighted code underneath with
12+
pygmentize -f html example.py
13+
{% endcomment %}
7714
<div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">telegram.ext</span> <span class="kn">import</span> <span class="n">Updater</span><span class="p">,</span> <span class="n">CommandHandler</span>
7815

7916
<span class="k">def</span> <span class="nf">start</span><span class="p">(</span><span class="n">bot</span><span class="p">,</span> <span class="n">update</span><span class="p">):</span>
80-
<span class="n">update</span><span class="o">.</span><span class="n">message</span><span class="o">.</span><span class="n">reply_text</span><span class="p">(</span><span class="s1">&#39;Hello World!&#39;</span><span class="p">)</span>
17+
<span class="n">update</span><span class="o">.</span><span class="n">message</span><span class="o">.</span><span class="n">reply_text</span><span class="p">(</span><span class="s1">&#39;Hello World!&#39;</span><span class="p">)</span>
8118

8219
<span class="k">def</span> <span class="nf">hello</span><span class="p">(</span><span class="n">bot</span><span class="p">,</span> <span class="n">update</span><span class="p">):</span>
83-
<span class="n">update</span><span class="o">.</span><span class="n">message</span><span class="o">.</span><span class="n">reply_text</span><span class="p">(</span>
84-
<span class="s1">&#39;Hello {}&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">update</span><span class="o">.</span><span class="n">message</span><span class="o">.</span><span class="n">from_user</span><span class="o">.</span><span class="n">first_name</span><span class="p">))</span>
20+
<span class="n">update</span><span class="o">.</span><span class="n">message</span><span class="o">.</span><span class="n">reply_text</span><span class="p">(</span>
21+
<span class="s1">&#39;Hello {}&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">update</span><span class="o">.</span><span class="n">message</span><span class="o">.</span><span class="n">from_user</span><span class="o">.</span><span class="n">first_name</span><span class="p">))</span>
8522

8623
<span class="n">updater</span> <span class="o">=</span> <span class="n">Updater</span><span class="p">(</span><span class="s1">&#39;YOUR TOKEN HERE&#39;</span><span class="p">)</span>
8724

@@ -91,26 +28,13 @@ <h2>It's fun</h2>
9128
<span class="n">updater</span><span class="o">.</span><span class="n">start_polling</span><span class="p">()</span>
9229
<span class="n">updater</span><span class="o">.</span><span class="n">idle</span><span class="p">()</span>
9330
</pre></div>
94-
<br />
95-
<h2>Easy to setup</h2>
96-
<div class="highlight"><pre><span class="gi">$</span> pip install python-telegram-bot
31+
<br />
32+
<h2>Easy to setup</h2>
33+
<div class="highlight"><pre><span class="gi">$</span> pip install python-telegram-bot
9734
<span class="gi">$</span> python bot.py</pre></div>
98-
<br />
99-
<h2>And it is free</h2>
100-
<p>python-telegram-bot is distributed under a
101-
<a href="https://www.gnu.org/licenses/lgpl-3.0.html">LGPLv3
102-
license.</a></p>
103-
</section>
104-
</div>
105-
106-
<section>
107-
<footer>
108-
<p class="left"><a href="https://www.jetbrains.com/"><img src="/static/website/pycharm.png" height="43" width="43" /></a> &nbsp;</p>
109-
<p class="left"><a href="https://www.jetbrains.com/">Made with<br>PyCharm</a></p>
110-
<p class="right">© Copyright 2015-2017. Licensed by <a href="https://creativecommons.org/licenses/by/3.0/" rel="license" target="_blank">Creative Commons</a>.</p>
111-
</footer>
112-
</section>
113-
114-
<script async defer id="github-bjs" src="https://buttons.github.io/buttons.js"></script>
115-
</body>
116-
</html>
35+
<br />
36+
<h2>And it is free</h2>
37+
<p>python-telegram-bot is distributed under a
38+
<a href="https://www.gnu.org/licenses/lgpl-3.0.html">LGPLv3
39+
license.</a></p>
40+
{% endblock %}

‎website/templates/website/sponsors.html‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{% extends "website/base.html" %}
2+
{% load sameastags %}
3+
4+
{% block title %}Sponsors{% endblock %}
5+
6+
{% block content %}
7+
<h1>{% sameas title %}</h1>
8+
9+
<a name="jetbrains"></a><h2 class="nocaps">JetBrains</h2>
10+
<div class="spon-logo"><a href="https://www.jetbrains.com/"><img src="/static/website/jetbrains.png" alt="JetBrains Logo" width="250" height="271" /></a></div>
11+
<div class="spon-text">JetBrains supports this project by providing PyCharm Professional licenses to the core developers under their <a href="https://www.jetbrains.com/buy/opensource/">support program for Open Source projects</a>.</div>
12+
13+
{% endblock %}

‎website/urls.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44

55
urlpatterns = [
66
url(r'^$', views.index, name='index'),
7+
url(r'^(?P<page>[^/]*)/$', views.page, name='page'),
78
]

‎website/views.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44

55
def index(request):
66
return render(request, 'website/index.html', {})
7+
8+
def page(request, page):
9+
return render(request, 'website/%s.html' % page, {})

0 commit comments

Comments
 (0)