Skip to content

Commit dcb206e

Browse files
vlee489vlee489
committed
Merge pull request #1 from PiNet/master
test
2 parents 8490447 + 93d201f commit dcb206e

File tree

101 files changed

+1567
-230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1567
-230
lines changed

‎Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ gem "jekyll", "~> 2.5.3"
77
# gem install iconv -- --with-iconv-dir=~/.rvm/usr
88
gem "iconv"
99
gem "albino"
10+
gem "jekyll-sitemap"

‎Gemfile.lock

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ GEM
3939
jekyll-paginate (1.1.0)
4040
jekyll-sass-converter (1.3.0)
4141
sass (~> 3.2)
42+
jekyll-sitemap (0.8.1)
4243
jekyll-watch (1.2.0)
4344
listen (~> 2.7)
4445
kramdown (1.5.0)
@@ -73,3 +74,4 @@ DEPENDENCIES
7374
albino
7475
iconv
7576
jekyll (~> 2.5.3)
77+
jekyll-sitemap

‎_config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ source: .
22
destination: ./_site
33
plugins: ./_plugins
44
exclude: [bin, CNAME, Gemfile, Gemfile.lock, README.md]
5-
permalink: /:title
6-
markdown: redcarpet
5+
permalink: /blog/:year/:month/:day/:title.html
6+
markdown: kramdown
77
redcarpet:
88
extensions: ["no_intra_emphasis", "fenced_code_blocks", "autolink", "tables", "with_toc_data"]
99
gems:

‎_layouts/article.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
<li>
6464
<a href='/articles/faq.html'>FAQ</a>
6565
</li>
66+
<li>
67+
<a href='/blog/bloglist.html'>Blog</a>
68+
</li>
6669
</ul>
6770
</div>
6871
</div>
@@ -81,7 +84,7 @@
8184
&nbsp;<a href='http://github.com/PiNet'>PiNet team</a>.</p>
8285
<p>Follow us on Twitter:
8386
&nbsp;<a href='https://twitter.com/pinetdev'>@PiNetDev</a></p>
84-
<p>Website artwork by <a href='http://www.andyhunt.com/'>Andy Hunt</a>, it should not be copied or reproduced without prior consent</p>
87+
<p>Website header artwork by <a href='http://www.andyhunt.com/'>Andy Hunt</a> should not be copied or reproduced without prior consent. The PiNet logo by <a href='https://about.me/minigirlgeek'>Amy Mather</a> is released under <a href='http://creativecommons.org/licenses/by-sa/4.0/'>Creative Commons BY-SA 4.0.</a></p>
8588
</footer>
8689
</div>
8790
</body>

‎_layouts/blog.html

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2+
<html lang='en'>
3+
<head>
4+
<title>{{page.title}}</title>
5+
<meta content='width=device-width, initial-scale=1.0' name='viewport' />
6+
<meta content='PiNet, a system for setting up and managing a classroom set of Raspberry Pis. ' name='description' />
7+
<meta content='PiNet team' name='author' />
8+
<link href='/assets/stylesheets/bootstrap.css' media='screen' rel='stylesheet' type='text/css' />
9+
<link href='/assets/stylesheets/bootstrap-responsive.css' media='screen' rel='stylesheet' type='text/css' />
10+
<link href='/assets/stylesheets/sass/styles.css' media='screen' rel='stylesheet' type='text/css' />
11+
<link href='/assets/stylesheets/pygments.css' media='screen' rel='stylesheet' type='text/css' />
12+
<link href='http://fonts.googleapis.com/css?family=Signika+Negative:300,400,600' rel='stylesheet' type='text/css' />
13+
<script src='/assets/javascripts/jquery-1.7.min.js' type='text/javascript'></script>
14+
<script src='/assets/javascripts/toc.js'></script>
15+
<meta content='text/html;charset=utf-8' http-equiv='Content-Type' />
16+
<script type="text/javascript">
17+
if(!(window.location.hostname === "localhost")) {
18+
var _gaq = _gaq || [];
19+
_gaq.push(['_setAccount', 'UA-31267936-1']);
20+
_gaq.push(['_trackPageview']);
21+
22+
(function() {
23+
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
24+
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
25+
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
26+
})();
27+
}
28+
</script>
29+
</head>
30+
<body>
31+
<div class='navbar navbar-fixed-top'>
32+
<div class='navbar-inner'>
33+
<div class='container-fluid'>
34+
<a class='btn btn-navbar' data-target='.nav-collapse' data-toggle='collapse'>
35+
<span class='icon-bar'></span>
36+
<span class='icon-bar'></span>
37+
<span class='icon-bar'></span>
38+
</a>
39+
<a class='brand' href='/'>PiNet, a system for Raspberry Pi classrooms</a>
40+
<div class='nav-collapse'>
41+
<ul class='nav'>
42+
<li>
43+
<a href='/'>Home</a>
44+
</li>
45+
<li>
46+
<a href="/articles/guides.html">All guides</a>
47+
</li>
48+
<li>
49+
<a href="/articles/installation/getting_started.html">Getting started</a>
50+
</li>
51+
<li>
52+
<a href='/articles/manage-users/manage-users.html'>Managing users</a>
53+
</li>
54+
<li>
55+
<a href='/articles/shared-folders/shared-folders.html'>Shared folders</a>
56+
</li>
57+
<li>
58+
<a href='/articles/backups/backups.html'>Backups</a>
59+
</li>
60+
<li>
61+
<a href='/articles/advanced/advanced.html'>Advanced</a>
62+
</li>
63+
<li>
64+
<a href='/articles/faq.html'>FAQ</a>
65+
</li>
66+
<li>
67+
<a href='/blog/bloglist.html'>Blog</a>
68+
</li>
69+
</ul>
70+
</div>
71+
</div>
72+
</div>
73+
</div>
74+
<div class='container-fluid'>
75+
<div class='row-fluid'>
76+
<div class='span3'>
77+
</div>
78+
<div class='span9'>
79+
<a href="/blog/bloglist.html">Return to blog post list</a>
80+
<p></p>
81+
<h1>{{ page.title }} </h1>
82+
<p></p>
83+
{{ page.date | date: '%d %B, %Y' }}
84+
<p></p>
85+
{{ content }}
86+
<hr/>
87+
</div>
88+
89+
<footer class='footer article'>
90+
<HR>
91+
<p>This website was developed by
92+
&nbsp;<a href='http://github.com/PiNet'>PiNet team</a>.</p>
93+
<p>Follow us on Twitter:
94+
&nbsp;<a href='https://twitter.com/pinetdev'>@PiNetDev</a></p>
95+
<p>Website header artwork by <a href='http://www.andyhunt.com/'>Andy Hunt</a> should not be copied or reproduced without prior consent. The PiNet logo by <a href='https://about.me/minigirlgeek'>Amy Mather</a> is released under <a href='http://creativecommons.org/licenses/by-sa/4.0/'>Creative Commons BY-SA 4.0.</a></p>
96+
</footer>
97+
</div>
98+
</body>
99+
</html>

‎_layouts/blogList.html

+111
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2+
<html lang='en'>
3+
<head>
4+
<title>{{page.title}}</title>
5+
<meta content='width=device-width, initial-scale=1.0' name='viewport' />
6+
<meta content='PiNet, a system for setting up and managing a classroom set of Raspberry Pis. ' name='description' />
7+
<meta content='PiNet team' name='author' />
8+
<link href='/assets/stylesheets/bootstrap.css' media='screen' rel='stylesheet' type='text/css' />
9+
<link href='/assets/stylesheets/bootstrap-responsive.css' media='screen' rel='stylesheet' type='text/css' />
10+
<link href='/assets/stylesheets/sass/styles.css' media='screen' rel='stylesheet' type='text/css' />
11+
<link href='/assets/stylesheets/pygments.css' media='screen' rel='stylesheet' type='text/css' />
12+
<link href='http://fonts.googleapis.com/css?family=Signika+Negative:300,400,600' rel='stylesheet' type='text/css' />
13+
<script src='/assets/javascripts/jquery-1.7.min.js' type='text/javascript'></script>
14+
<script src='/assets/javascripts/toc.js'></script>
15+
<meta content='text/html;charset=utf-8' http-equiv='Content-Type' />
16+
<script type="text/javascript">
17+
if(!(window.location.hostname === "localhost")) {
18+
var _gaq = _gaq || [];
19+
_gaq.push(['_setAccount', 'UA-31267936-1']);
20+
_gaq.push(['_trackPageview']);
21+
22+
(function() {
23+
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
24+
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
25+
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
26+
})();
27+
}
28+
</script>
29+
</head>
30+
<body>
31+
<div class='navbar navbar-fixed-top'>
32+
<div class='navbar-inner'>
33+
<div class='container-fluid'>
34+
<a class='btn btn-navbar' data-target='.nav-collapse' data-toggle='collapse'>
35+
<span class='icon-bar'></span>
36+
<span class='icon-bar'></span>
37+
<span class='icon-bar'></span>
38+
</a>
39+
<a class='brand' href='/'>PiNet, a system for Raspberry Pi classrooms</a>
40+
<div class='nav-collapse'>
41+
<ul class='nav'>
42+
<li>
43+
<a href='/'>Home</a>
44+
</li>
45+
<li>
46+
<a href="/articles/guides.html">All guides</a>
47+
</li>
48+
<li>
49+
<a href="/articles/installation/getting_started.html">Getting started</a>
50+
</li>
51+
<li>
52+
<a href='/articles/manage-users/manage-users.html'>Managing users</a>
53+
</li>
54+
<li>
55+
<a href='/articles/shared-folders/shared-folders.html'>Shared folders</a>
56+
</li>
57+
<li>
58+
<a href='/articles/backups/backups.html'>Backups</a>
59+
</li>
60+
<li>
61+
<a href='/articles/advanced/advanced.html'>Advanced</a>
62+
</li>
63+
<li>
64+
<a href='/articles/faq.html'>FAQ</a>
65+
</li>
66+
<li>
67+
<a href='/blog/bloglist.html'>Blog</a>
68+
</li>
69+
</ul>
70+
</div>
71+
</div>
72+
</div>
73+
</div>
74+
<div class='container-fluid'>
75+
<div class='row-fluid'>
76+
<div class='span3'>
77+
</div>
78+
<div class='span9'>
79+
<h1>{{ page.title }}</h1>
80+
<p></p>
81+
<img src="../assets/images/PiNet-Jam-1-small.jpg" alt="PiNet";">
82+
<p></p>
83+
84+
<h1>Posts</h1>
85+
86+
<ul id="archive">
87+
{% for post in site.posts %}
88+
<li class="post-{{ post.category }}">
89+
{% if post.external_url == nil %}
90+
<h3><a href="{{ post.url }}">{{ post.title }}</a></h3><abbr>{{ post.date | date_to_string }}</abbr>
91+
{% else %}
92+
<a href="{{ post.external_url }}">{{ post.title }}</a><abbr>{{ post.date | date_to_string }}</abbr>
93+
{% endif %}
94+
</li>
95+
{% endfor %}
96+
97+
</ul>
98+
<hr/>
99+
</div>
100+
101+
<footer class='footer article'>
102+
<HR>
103+
<p>This website was developed by
104+
&nbsp;<a href='http://github.com/PiNet'>PiNet team</a>.</p>
105+
<p>Follow us on Twitter:
106+
&nbsp;<a href='https://twitter.com/pinetdev'>@PiNetDev</a></p>
107+
<p>Website header artwork by <a href='http://www.andyhunt.com/'>Andy Hunt</a> should not be copied or reproduced without prior consent. The PiNet logo by <a href='https://about.me/minigirlgeek'>Amy Mather</a> is released under <a href='http://creativecommons.org/licenses/by-sa/4.0/'>Creative Commons BY-SA 4.0.</a></p>
108+
</footer>
109+
</div>
110+
</body>
111+
</html>

‎_layouts/default.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
<li>
6464
<a href='/articles/faq.html'>FAQ</a>
6565
</li>
66+
<li>
67+
<a href='/blog/bloglist.html'>Blog</a>
68+
</li>
6669
</ul>
6770
</div>
6871
</div>
@@ -75,7 +78,7 @@
7578
&nbsp;<a href='http://github.com/PiNet'>PiNet team</a>.</p>
7679
<p>Follow us on Twitter:
7780
&nbsp;<a href='https://twitter.com/pinetdev'>@PiNetDev</a></p>
78-
<p>Website artwork by <a href='http://www.andyhunt.com/'>Andy Hunt</a>, it should not be copied or reproduced without prior consent</p>
81+
<p>Website header artwork by <a href='http://www.andyhunt.com/'>Andy Hunt</a> should not be copied or reproduced without prior consent. The PiNet logo by <a href='https://about.me/minigirlgeek'>Amy Mather</a> is released under <a href='http://creativecommons.org/licenses/by-sa/4.0/'>Creative Commons BY-SA 4.0.</a></p>
7982
</footer>
8083
</div>
8184
</body>

‎_posts/2015-10-12-helloworld.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
title: "PiNet has a blog!"
3+
layout: blog
4+
---
5+
6+
![](/assets/images/PiNet-Jam-1-small.jpg)
7+
8+
## Why a blog?
9+
10+
Over the past 2 years of development, many users have asked for a blog for PiNet so they can keep an eye on what is going on, without having to follow the Twitter feed. We have listened to those users and we now have a simple blog for PiNet!
11+
The Twitter account will still be the main place to hear about in realtime all the awesome new changes coming to PiNet, but the blog will serve to act as a more permanent log.
12+
## What type of content will be added to the blog?
13+
14+
The blog will also be mainly used to document most major stable PiNet releases including a full changelog.
15+
It will also though be used to document extra less known features in PiNet.

‎_posts/2015-10-23-pinet-1.1.0.md

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
title: "PiNet stable release 1.1.0 - The Addon Board Update"
3+
layout: blog
4+
---
5+
6+
![](/assets/images/PiNet-addon-update-1.jpg)
7+
Since the last stable release of PiNet (1.0.13) back in July 2015, there has been 6 dev channel releases with just under 1000 line changes!
8+
There has also been [17 PiNet site updates](https://github.com/PiNet/PiNet.github.io/commits/master), ranging from minor typo fixing to quite a few new pages and screenshots.
9+
10+
## What has changed?
11+
There has been a whole stack of new features, improvements of current features and of course, plenty of bugfixes.
12+
To confirm **this release of PiNet is still based off Raspbian Wheezy**, not Raspbian Jessie (see below for more info).
13+
14+
The biggest changes in this release are
15+
- Newly rewritten additional software installer now based on Python instead of Bash - [(1.0.14)](https://github.com/PiNet/PiNet/commit/151c4a9a6be8b46fbb7f8988e7472134c5d05eda)
16+
- The awesome new logo created by [Amy Mather](https://about.me/minigirlgeek) has been added for new installs of PiNet (more details below) - [(1.0.15)](https://github.com/PiNet/PiNet/commit/f50c9c7d96716ef90c11f4f52d5e4011ada16bad)
17+
- Full support for the Raspberry Pi Foundation Sense HAT and Raspberry Pi Foundation 7 inch display - [(1.0.16)](https://github.com/PiNet/PiNet/commit/92e3be8499e8dc8fb9eda6a60ba1aaa85a4e823e)
18+
- Added full support for a number of I2C addon boards including Pimoroni Piano HAT, Explorer HAT etc - [(1.0.16)](https://github.com/PiNet/PiNet/commit/92e3be8499e8dc8fb9eda6a60ba1aaa85a4e823e)
19+
- Added SD card image generator as an alternative to copying files to the SD card - [(1.0.18)](https://github.com/PiNet/PiNet/commit/f1aa7198a68228a5c352fb3736a884bbdb76b5a6)
20+
- Added Pygame Zero and gpiozero to be defaultly installed - [(1.0.18)](https://github.com/PiNet/PiNet/commit/f1aa7198a68228a5c352fb3736a884bbdb76b5a6)
21+
- Added new [PiNet metrics system](/articles/advanced/metrics.html) - [(1.0.18)](https://github.com/PiNet/PiNet/commit/f1aa7198a68228a5c352fb3736a884bbdb76b5a6)
22+
23+
Under the hood, there is also new stuff including updated kernels (now using the 4.1.x branch instead of 3.18.x), a new boot files repository and a new internet connection checker.
24+
25+
## The new logo
26+
Back in June I was on the hunt for a new logo for PiNet. The old one used the Raspberry Pi Foundation logo which meant it wasn't suitable for use in many places.
27+
I happened to be chatting to [Amy Mather](https://about.me/minigirlgeek) one evening about the logo and my utter lack of artistic skills.
28+
She very kindly offered to give it a go and within a few hours, we settled on the awesome new logo below.
29+
![](/assets/images/PiNet-icon.png)
30+
I am sure everyone will agree it is a pretty awesome logo, huge thanks to Amy for taking the time to put it together.
31+
32+
## Addon boards
33+
This stable release of PiNet brings with it support for many I2C based addon boards. The full list of supported boards can be found [here](/articles/advanced/supported-addon-boards.html).
34+
35+
## Where is Raspbian Jessie?
36+
Jessie for PiNet is currently being worked on. PiNet builds a full Raspbian OS package by package each time it is installed. This is due to the fact it is a requirement for LTSP.
37+
This means we don't use the Raspberry Pi Foundation provided SD card images so after each major Raspbian update, we have to go through the update logs and add any changes to PiNet.
38+
Jessie is a huge update... There is a lot of changes with many many new package updates and features. Each of these needs to be thoroughly tested before reaching the stable channel.
39+
This process can take a few weeks and unfortunately we heard at the same time as everyone else on the Jessie release, it came as a surprise. Given this update was already nearly finished and mainly in testing, we have pushed back the Jessie update to PiNet for the next release.
40+
You can of course be trying the dev channel builds by switching over inside the "Other" menu by selecting "Release Channel".
41+
42+
## How can I update?
43+
Make sure your PiNet server is connected to the internet, then launch the PiNet application from the desktop. It will check for updates on startup and notify you there is an update available. When it asks if you would like to update, hit yes and it will automatically install the update.

0 commit comments

Comments
 (0)