Skip to content

Commit 025677d

Browse files
mattmakaimattmakai
committed
add windows page. update banners
1 parent 21f91fa commit 025677d

10 files changed

Lines changed: 59 additions & 11 deletions

File tree

‎content/pages/03-data/14-neo4j.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ graph database that can be used to persist data in
1717
[a commercial version and a community version](https://neo4j.com/editions/)
1818
of the database.
1919

20-
<a href="https://neo4j.com/product/" style="border: none;"><img src="/img/logos/neo4j.png" width="100%" alt="Neo4j logo." class="technical-diagram" /></a>
20+
<a href="https://neo4j.com/product/" style="border: none;"><img src="/img/logos/neo4j.png" width="100%" alt="Neo4j logo." class="shot"></a>
2121

2222
<div class="well see-also">Neo4j is an implementation of the <a href="/no-sql-datastore.html">NoSQL graph database</a> concept. Learn more in the <a href="/data.html">data</a> chapter or view the <a href="/table-of-contents.html">table of contents</a> for all topics.</div>
2323

‎content/pages/05-deployment/15-macos.markdown‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ macOS is an [operating system](/operating-system.html)
1212
within the Unix family tree that is developed by Apple and is often
1313
used for [developing Python applications](/learning-programming.html).
1414

15+
<div class="well see-also">macOS is an implementation of the <a href="/operating-systems.html">operating systems</a> concept. Learn more in the <a href="/deployment.html">deployment</a> chapter or view the <a href="/table-of-contents.html">table of contents</a> for all topics.</div>
16+
1517

1618
### macOS Python resources
1719
* [Using Python on a Macintosh](https://docs.python.org/3/using/mac.html)

‎content/pages/05-deployment/16-windows.markdown‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
title: Windows
2+
category: page
3+
slug: microsoft-windows
4+
sortorder: 0516
5+
toc: False
6+
sidebartitle: Windows
7+
meta: Windows is an operating system built by Microsoft that is often used for developing Python applications.
8+
9+
10+
# Windows
11+
[Windows](https://www.microsoft.com/windows) is a closed-source, proprietary
12+
[operating system](/operating-system.html) created by Microsoft that
13+
is often used to [develop Python applications](/learning-programming.html).
14+
15+
<a href="https://www.microsoft.com/windows" style="border: none"><img src="/img/logos/windows.png" width="100%" alt="Microsoft Windows 10 logo." class="shot" style="margin: 8px 0 8px 0"></a>
16+
17+
<div class="well see-also">Windows is an implementation of the <a href="/operating-systems.html">operating systems</a> concept. Learn more in the <a href="/deployment.html">deployment</a> chapter or view the <a href="/table-of-contents.html">table of contents</a> for all topics.</div>
18+
19+
20+
### Useful resources for Python on Windows
21+
* [PyInstaller](https://www.pyinstaller.org/) packages a Python application with
22+
its associated dependencies into a Windows executable file so it can be
23+
more easily distributed and run on other computers.
24+
25+
* [Cmder](http://cmder.net/) is a beautiful console emulator designed for
26+
Windows that can be useful for when you need to get work done on the
27+
commandline.
28+
29+

‎content/pages/06-devops/01-monitoring.markdown‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ Incident Management
151151
"[10 Things They Forgot to Monitor](http://word.bitly.com/post/74839060954/ten-things-to-monitor)"
152152
beyond the standard metrics such as disk & memory usage.
153153

154+
* The videos from [Monitorama](https://vimeo.com/monitorama), a conference
155+
that's all about monitoring and observability, are recordings of fantastic
156+
technical talks from their events.
157+
154158
* [Four Linux server monitoring tools](http://aarvik.dk/four-linux-server-monitoring-and-management-tools/)
155159

156160
* [How to design useful monitoring and graphing visualizations](https://blog.serverdensity.com/how-to-design-useful-monitoring-graphs-and-visualizations/)

‎static/img/logos/windows.png‎

22.1 KB
Loading

‎theme/templates/banner.html‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
<div style="margin: 0 0 12px;background-color: #22B24C;">
2-
<div class="cn">
3-
<p class="banner sns">
4-
<a href="https://training.talkpython.fm/courses/explore_ansible/introduction-to-ansible-with-python" style="color: #fff">Learn to deploy and configure servers with Ansible in my latest video course</a>!
5-
</p>
6-
</div>
7-
</div>
8-
91
{% if false %}
102
{% if page and (page.slug == 'development-environments' or page.slug == 'best-python-videos' or page.slug == 'learning-programming' or page.slug == 'web-development' or page.slug == 'why-use-python' or page.slug == 'javascript' or page.slug == 'cascading-style-sheets' or page.slug == 'python-2-or-3' or page.slug == 'introduction' or page.slug == 'best-python-podcasts') %}
113
<div style="margin: 0 0 12px;background-color: #22B24C;">

theme/templates/choices/windows.html renamed to theme/templates/choices/microsoft-windows.html

File renamed without changes.

‎theme/templates/lower-banner.html‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
{% if page and (page.slug == 'development-environments' or page.slug == 'best-python-videos' or page.slug == 'learning-programming' or page.slug == 'web-development' or page.slug == 'why-use-python' or page.slug == 'javascript' or page.slug == 'cascading-style-sheets' or page.slug == 'python-2-or-3' or page.slug == 'introduction' or page.slug == 'best-python-podcasts') %}
2+
<div style="margin: 0 0 12px;background-color: #22B24C;">
3+
<div class="cn">
4+
<p class="banner sns">
5+
<a href="https://training.talkpython.fm/courses/explore_entrepreneurs/python-for-entrepreneurs-build-and-launch-your-online-business" style="color: #fff">Python for Entrepreneurs: learn Python while building your own business</a>!
6+
</p>
7+
</div>
8+
</div>
29
{% else %}
10+
<div style="margin: 0 0 12px;background-color: #22B24C;">
11+
<div class="cn">
12+
<p class="banner sns">
13+
<a href="https://training.talkpython.fm/courses/explore_ansible/introduction-to-ansible-with-python" style="color: #fff">Learn to deploy and configure servers with Ansible in my latest video course</a>!
14+
</p>
15+
</div>
16+
</div>
17+
{% endif %}
18+
19+
{% if false %}
320
<div style="margin: 0 0 12px;background-color: #22B24C;">
421
<div class="cn">
522
<p class="banner sns">

‎theme/templates/page.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,7 @@
5151
</div>
5252
</div>
5353
{% endblock %}
54+
55+
{% block lower_banner %}
56+
{% include "lower-banner.html" %}
57+
{% endblock %}

‎theme/templates/table-of-contents.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ <h4>5.3 <a href="/platform-as-a-service.html">Platform-as-a-Service</a></h4>
161161
<div class="tc sn">AWS Codestar</div>
162162
<h4>5.4 <a href="/operating-systems.html">Operating systems</a></h4>
163163
<div class="tc"><a href="/ubuntu.html">Ubuntu Linux</a></div>
164-
<div class="tc sn">macOS</div>
165-
<div class="tc sn">Windows</div>
164+
<div class="tc"><a href="/macos.html">macOS</a></div>
165+
<div class="tc"><a href="/microsoft-windows.html">Windows</a></div>
166166
<h4>5.5 <a href="/web-servers.html">Web servers</a></h4>
167167
<div class="tc"><a href="/apache-http-server.html">Apache HTTP Server</a></div>
168168
<div class="tc"><a href="/nginx.html">Nginx</a></div>

0 commit comments

Comments
 (0)