Skip to content

Commit e201563

Browse files
Anton VanhouckeAnton Vanhoucke
Anton Vanhoucke
authored and
Anton Vanhoucke
committed
Merge branch 'master' of https://github.com/ev3dev/ev3dev.github.io into gh-pages
2 parents 96e20ea + fd94512 commit e201563

69 files changed

Lines changed: 481 additions & 360 deletions

File tree

Some content is hidden

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

‎.travis.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
language: ruby
2+
rvm:
3+
- 2.1
4+
5+
before_script:
6+
- chmod +x ./cibuild.sh # or do this locally and commit
7+
8+
# Assume bundler is being used, therefore
9+
# the `install` step will run `bundle install` by default.
10+
script: ./cibuild.sh
11+
12+
env:
13+
global:
14+
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer

‎Gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ source 'https://rubygems.org'
22
gem 'github-pages'
33

44
require 'rbconfig'
5+
gem "html-proofer", :platforms => :ruby
56
gem 'wdm', '~> 0.1.0' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i

‎README.md‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ev3dev.github.io
1+
Pretty website for ev3dev [![Build Status](https://travis-ci.org/ev3dev/ev3dev.github.io.svg?branch=master)](https://travis-ci.org/ev3dev/ev3dev.github.io)
22
================
33

44
This is the web page at <http://www.ev3dev.org> and also <http://ev3dev.github.io>.
@@ -48,21 +48,10 @@ Now you should be able to visit your page at: [http://localhost:4000](http://loc
4848
Previewing Your Changes Online
4949
---
5050

51-
When forking, you can create a new branch called `gh-pages`, then your
52-
changes can be viewed as `http://<user>.github.io/ev3dev.github.io`. When you do this
53-
though, GitHub will send you lots of email like this, which you should ignore.
54-
55-
The page build completed successfully, but returned the following warning:
56-
57-
CNAME already taken: www.ev3dev.org
58-
59-
For information on troubleshooting Jekyll see:
60-
61-
https://help.github.com/articles/using-jekyll-with-pages#troubleshooting
62-
63-
If you have any questions please contact us at https://github.com/contact.
64-
65-
If it really gets on your nerves, you can rename the `CNAME` file. Just make sure to
66-
change it back before you submit your pull request.
67-
68-
51+
We have a special script to use to publish your changes using the `gh-pages`
52+
branch of your fork of ev3dev.github.io. If you have SSH setup for your GitHub
53+
account, simply run`./publish <gh-user>` where *gh-user* is your actual GitHub
54+
user name. If you don't have SSH setup, you can use https by running
55+
`./publish https://github.com/<gh-user>/ev3dev.github.io.git` instead.
56+
This will copy the contents of `_site`, fix it up a bit and push it to your
57+
fork on GitHub. You can view the results at `http://<gh-user>.github.io/ev3dev.github.io`.

‎_config.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
markdown: kramdown
22
permalink: pretty
3-
exclude: [README.md, Gemfile, Gemfile.lock, repo-metadata.html]
3+
exclude:
4+
- README.md
5+
- Gemfile
6+
- Gemfile.lock
7+
- repo-metadata.html
8+
- publish.rb
9+
- vendor
10+
- cibuild.sh
11+
- .travis.yml
412

513
gems:
614
- jekyll-mentions

‎_data/motors.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"vendor_name": "LEGO",
4242
"vendor_part_name": "Motor 9V Mini-motor, newer lighter weight",
4343
"vendor_part_number": "43362",
44-
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=43362c01"
44+
"vendor_website": "http://rebrickable.com/parts/43362c01"
4545
},
4646
{
4747
"count_per_rot": "360",
@@ -83,7 +83,7 @@
8383
"vendor_name": "LEGO",
8484
"vendor_part_name": "Technic Motor 9V Geared ",
8585
"vendor_part_number": "47154",
86-
"vendor_website": "http://alpha.bricklink.com/pages/clone/catalogitem.page?P=47154c01"
86+
"vendor_website": "http://rebrickable.com/parts/44486c02"
8787
},
8888
{
8989
"id": "LEGO_9V_MICROMOTOR",
@@ -95,7 +95,7 @@
9595
"vendor_name": "LEGO",
9696
"vendor_part_name": "Motor 9V Micromotor",
9797
"vendor_part_number": "70823",
98-
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=2986"
98+
"vendor_website": "https://rebrickable.com/parts/2986"
9999
},
100100
{
101101
"id": "LEGO_9V_MINI_MOTOR_OLDER",
@@ -107,7 +107,7 @@
107107
"vendor_name": "LEGO",
108108
"vendor_part_name": "Motor 9V Mini-motor, older heavier weight",
109109
"vendor_part_number": "71427",
110-
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=71427c01"
110+
"vendor_website": "http://rebrickable.com/parts/71427c01"
111111
},
112112
{
113113
"id": "LEGO_TECHNIC_MOTOR_9V",
@@ -119,7 +119,7 @@
119119
"vendor_name": "LEGO",
120120
"vendor_part_name": "Technic Motor 9V",
121121
"vendor_part_number": "74569",
122-
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=2838c01"
122+
"vendor_website": "http://rebrickable.com/parts/2838c01"
123123
},
124124
{
125125
"id": "LEGO_PF_TRAIN_MOTOR",
@@ -131,7 +131,7 @@
131131
"vendor_name": "LEGO",
132132
"vendor_part_name": "Power Functions Train Motor",
133133
"vendor_part_number": "88002",
134-
"vendor_website": "http://shop.lego.com/en-US/Power-Functions-Train-Motor-88002"
134+
"vendor_website": "http://shop.lego.com/en-US/LEGO-Power-Functions-Train-Motor-88002"
135135
},
136136
{
137137
"id": "LEGO_PF_L_MOTOR",

‎_data/ports.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,21 +184,21 @@
184184
"id": "EV3_OUTPUT_PORT_MODE_TACHO_MOTOR",
185185
"name": "tacho-motor",
186186
"name_footnote": "[^tacho-motor-mode]",
187-
"notes": "\n[^tacho-motor-mode]: Configures the port to use the\n [tacho-motor] driver module. The default driver is the\n EV3 Large Motor (`lego-ev3-l-motor`). You can change\n the driver using the `set_device` attribute.\n ^\n [tacho-motor]: /docs/drivers/tacho-motor\n \n "
187+
"notes": "\n[^tacho-motor-mode]: Configures the port to use the\n [tacho-motor] driver module. The default driver is the\n EV3 Large Motor (`lego-ev3-l-motor`). You can change\n the driver using the `set_device` attribute.\n ^\n [tacho-motor]: /docs/drivers/tacho-motor-class\n \n "
188188
},
189189
{
190190
"description": "Load the [dc-motor] device.",
191191
"id": "EV3_OUTPUT_PORT_MODE_DC_MOTOR",
192192
"name": "dc-motor",
193193
"name_footnote": "[^dc-motor-mode]",
194-
"notes": "\n[^dc-motor-mode]: This can be use with MINDSTORMS RCX\n motors, Power Functions motors and any other 'plain' DC\n motor. By 'plain', we mean the motor is just a motor without\n any feedback.\n ^\n [dc-motor]: /docs/drivers/dc-motor\n \n "
194+
"notes": "\n[^dc-motor-mode]: This can be use with MINDSTORMS RCX\n motors, Power Functions motors and any other 'plain' DC\n motor. By 'plain', we mean the motor is just a motor without\n any feedback.\n ^\n [dc-motor]: /docs/drivers/dc-motor-class\n \n "
195195
},
196196
{
197197
"description": "Load the [led] device.",
198198
"id": "EV3_OUTPUT_PORT_MODE_LED",
199199
"name": "led",
200200
"name_footnote": "[^led-mode]",
201-
"notes": "\n[^led-mode]: This can be used with MINDSTORMS RCX LEDs,\n Power Functions LEDs or any other LED connected to pins 1\n and 2 of the output port.\n ^\n [led]: /docs/drivers/led\n \n "
201+
"notes": "\n[^led-mode]: This can be used with MINDSTORMS RCX LEDs,\n Power Functions LEDs or any other LED connected to pins 1\n and 2 of the output port.\n ^\n [led]: /docs/drivers/rcx-led\n \n "
202202
},
203203
{
204204
"description": "Provide access to low level drivers.",

‎_data/sensors.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2008,7 +2008,7 @@
20082008
"vendor_name": "LEGO",
20092009
"vendor_part_name": "NXT Touch Sensor",
20102010
"vendor_part_number": "9843",
2011-
"vendor_website": "http://www.lego.com/en-us/mindstorms/downloads/software/nxt-hdk/"
2011+
"vendor_website": "http://shop.lego.com/en-US/Ultrasonic-Sensor-9846"
20122012
},
20132013
{
20142014
"analog_mode_info": [
@@ -2063,7 +2063,7 @@
20632063
"vendor_name": "LEGO",
20642064
"vendor_part_name": "NXT Light Sensor",
20652065
"vendor_part_number": "9844",
2066-
"vendor_website": "http://www.lego.com/en-us/mindstorms/downloads/software/nxt-hdk/"
2066+
"vendor_website": "http://shop.lego.com/en-US/Light-Sensor-9844"
20672067
},
20682068
{
20692069
"analog_mode_info": [
@@ -2116,7 +2116,7 @@
21162116
"vendor_name": "LEGO",
21172117
"vendor_part_name": "NXT Sound Sensor",
21182118
"vendor_part_number": "9845",
2119-
"vendor_website": "http://www.lego.com/en-us/mindstorms/downloads/software/nxt-hdk/"
2119+
"vendor_website": "http://shop.lego.com/en-US/Sound-Sensor-9845"
21202120
},
21212121
{
21222122
"default_address": "0x01",
@@ -2218,7 +2218,7 @@
22182218
"vendor_name": "LEGO",
22192219
"vendor_part_name": "NXT Ultrasonic Sensor",
22202220
"vendor_part_number": "9846",
2221-
"vendor_website": "http://www.lego.com/en-us/mindstorms/downloads/software/nxt-hdk/"
2221+
"vendor_website": "http://shop.lego.com/en-US/Ultrasonic-Sensor-9846"
22222222
},
22232223
{
22242224
"cmd_info": [

‎_includes/head.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,35 @@
33
<meta name="viewport" content="width=device-width, initial-scale=1">
44
<meta http-equiv="X-UA-Compatible" content="IE=edge">
55

6-
<title>{{ page.title }}</title>
7-
<link rel="alternate" type="application/atom+xml" href="{{ site.github.url }}/news/atom.xml" title="Atom feed">
8-
<link rel="icon" href="favicon.ico" />
6+
<title>{{ page.title | xml_escape }}</title>
7+
<link rel="alternate" type="application/atom+xml" href="/news/atom.xml" title="Atom feed">
8+
<link rel="icon" href="/favicon.ico" />
99

1010
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
11-
<link rel="stylesheet" href="{{ site.github.url }}/stylesheets/bootstrap.css">
12-
<link rel="stylesheet" href="{{ site.github.url }}/stylesheets/bootstrap-extensions.css">
11+
<link rel="stylesheet" href="/stylesheets/bootstrap.css">
12+
<link rel="stylesheet" href="/stylesheets/bootstrap-extensions.css">
1313
<!-- Nav infrastructure and misc utils (search, user cards, embeds, CC license) -->
14-
<link rel="stylesheet" href="{{ site.github.url }}/stylesheets/infrastructure-utils.css" />
14+
<link rel="stylesheet" href="/stylesheets/infrastructure-utils.css" />
1515

1616
<!-- Python code highlighting -->
1717
<link rel="stylesheet" href="{{ site.github.url }}/stylesheets/pygments/monokai.css" />
1818

1919
<!-- 3rd-party libraries -->
2020
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
2121
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
22-
<script src="{{ site.github.url }}/javascripts/jquery.getUrlParam.js"></script>
23-
<script src="{{ site.github.url }}/javascripts/jquery.loadTemplate-1.4.4.min.js"></script>
24-
<script src="{{ site.github.url }}/javascripts/respond.js"></script>
25-
<script src="{{ site.github.url }}/javascripts/ua-parser.min.js"></script>
22+
<script src="/javascripts/jquery.getUrlParam.js"></script>
23+
<script src="/javascripts/jquery.loadTemplate-1.4.4.min.js"></script>
24+
<script src="/javascripts/respond.js"></script>
25+
<script src="/javascripts/ua-parser.min.js"></script>
2626

2727
<!-- Loads user-cards from GH API -->
28-
<script src="{{ site.github.url }}/javascripts/cards.js"></script>
28+
<script src="/javascripts/cards.js"></script>
2929
<!-- Responds to queries typed into the "Quick nav" box -->
30-
<script src="{{ site.github.url }}/javascripts/search.js"></script>
30+
<script src="/javascripts/search.js"></script>
3131
<!-- Converts static descriptors of tab target content into live text and links -->
32-
<script src="{{ site.github.url }}/javascripts/tabs.js"></script>
32+
<script src="/javascripts/tabs.js"></script>
3333
<!-- Adds classes and other styles to pages where hard-coded css can't be used -->
34-
<script src="{{ site.github.url }}/javascripts/style-helpers.js"></script>
34+
<script src="/javascripts/style-helpers.js"></script>
3535

3636
<!--[if lt IE 9]>
3737
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>

‎_includes/header.html‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,60 +7,60 @@
77
<span class="icon-bar"></span>
88
<span class="icon-bar"></span>
99
</button>
10-
<a class="navbar-brand" href="{{ site.github.url }}/">
11-
<img id="brand-logo" src="{{ site.github.url }}/images/ev3dev_logo_white.png" />
10+
<a class="navbar-brand" href="/">
11+
<img id="brand-logo" src="/images/ev3dev_logo_white.png" alt="ev3dev logo" />
1212
</a>
1313
</div>
1414
<div class="collapse navbar-collapse">
15-
<ul class="nav navbar-nav">
15+
<ul class="nav navbar-nav" id="main-nav">
1616
<li>
17-
<a href="{{ site.github.url }}/" title="There's no place like Home...">Home</a>
17+
<a href="/" title="There's no place like Home...">Home</a>
1818
</li>
1919
<li class="dropdown">
20-
<a class="dropdown-toggle" data-toggle="dropdown" title="Documentation on how to use ev3dev">
20+
<a class="dropdown-toggle" href="#" data-toggle="dropdown" title="Documentation on using ev3dev">
2121
Docs
2222
<span class="caret"></span>
2323
</a>
2424
<ul class="dropdown-menu">
2525
<li>
26-
<a href="{{ site.github.url }}/docs/getting-started">Getting Started</a>
26+
<a href="/docs/getting-started">Getting Started</a>
2727
</li>
2828
<li>
29-
<a href="{{ site.github.url }}/docs/tutorials">Tutorials</a>
29+
<a href="/docs/tutorials">Tutorials</a>
3030
</li>
3131
<li role="separator" class="divider"></li>
3232
<li>
33-
<a href="{{ site.github.url }}/docs/motors">Motors</a>
33+
<a href="/docs/motors">Motors</a>
3434
</li>
3535
<li>
36-
<a href="{{ site.github.url }}/docs/sensors">Sensors</a>
36+
<a href="/docs/sensors">Sensors</a>
3737
</li>
3838
<li role="separator" class="divider"></li>
3939
<li>
40-
<a href="{{ site.github.url }}/docs">More...</a>
40+
<a href="/docs">More...</a>
4141
</li>
4242
</ul>
4343
</li>
4444
<li>
45-
<a href="{{ site.github.url }}/news" title="News about ev3dev">News</a>
45+
<a href="/news" title="News about ev3dev">News</a>
4646
</li>
4747
<li class="dropdown">
48-
<a class="dropdown-toggle" data-toggle="dropdown">
48+
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
4949
Community
5050
<span class="caret"></span>
5151
</a>
5252
<ul class="dropdown-menu">
5353
<li>
54-
<a href="{{ site.github.url }}/projects" title="Discover projects that use ev3dev">Projects</a>
54+
<a href="/projects" title="Discover projects that use ev3dev">Projects</a>
5555
</li>
5656
<li>
57-
<a href="{{ site.github.url }}/share" title="Share projects that use ev3dev">Share</a>
57+
<a href="/share" title="Share projects that use ev3dev">Share</a>
5858
</li>
5959
<li>
60-
<a href="{{ site.github.url }}/contribute" title="How to contribute to ev3dev">Contribute</a>
60+
<a href="/contribute" title="How to contribute to ev3dev">Contribute</a>
6161
</li>
6262
<li>
63-
<a href="{{ site.github.url }}/support" title="Found a bug? Have a question?">Get Help</a>
63+
<a href="/support" title="Found a bug? Have a question?">Get Help</a>
6464
</li>
6565
</ul>
6666
</li>

‎_includes/inline-screenshot.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="screenshot inline-screenshot pull-right">
2-
<a href="{{ site.github.url }}{{ include.source }}">
3-
<img src="{{ site.github.url }}{{ include.source }}" />
2+
<a href="{{ include.source }}">
3+
<img src="{{ include.source }}" alt="screenshot"/>
44
</a>
55
<p>
66
<small>

0 commit comments

Comments
 (0)