Skip to content

Some more validation stuff, and a script to check them :) #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
relrod wants to merge 6 commits into from
Closed

Some more validation stuff, and a script to check them :) #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0a23f0e
Make more pages validate, this should be most of them.
relrod Jul 31, 2013
5a7d21a
Fix tag in license.md, see below.
relrod Jul 31, 2013
571ee46
Make hacker-guide valid.
relrod Aug 1, 2013
bb4dd31
Add a small script to check validation of _site/
relrod Aug 1, 2013
6ea29ae
Add shebang and license info
relrod Aug 1, 2013
339384d
+x it
relrod Aug 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions _layouts/blog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="navbar-wrap">
<div class="container" style="position: relative; height: 100%;">
<div class="scala-logo">
<a href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/img/scala-logo-white-sm.png"/></a>
<a href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/img/scala-logo-white-sm.png" alt="white Scala logo" /></a>
</div>
{% include navbar.html %}
</div>
Expand Down Expand Up @@ -48,6 +48,4 @@ <h1 id="page-title">{{ page.title }}</h1>
</div>
</div>

<div class="lift-footer">
{% include footer.html %}
</div>
{% include footer.html %}
4 changes: 2 additions & 2 deletions _layouts/downloadpage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h3 hidden>Other resources</h3>
{% endunless %}
</tr></thead>

<body>
<tbody>
{% for resource in page.resources %}
<tr>
<td>
Expand All @@ -61,7 +61,7 @@ <h3 hidden>Other resources</h3>
{% unless page.dont_show_sizes %}
<td>{{ resource[4] }}</td>
{% endunless %}
<tr/>
</tr>
{% endfor %}
</tbody>

Expand Down
6 changes: 2 additions & 4 deletions _layouts/page-full-width.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="navbar-wrap">
<div class="container" style="position: relative; height: 100%;">
<div class="scala-logo">
<a href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/img/scala-logo-white-sm.png"/></a>
<a href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/img/scala-logo-white-sm.png" alt="white Scala logo" /></a>
</div>
{% include navbar.html %}
</div>
Expand Down Expand Up @@ -42,6 +42,4 @@ <h1 id="page-title">{{ page.title }}</h1>
</div>
</div>

<div class="lift-footer">
{% include footer.html %}
</div>
{% include footer.html %}
6 changes: 2 additions & 4 deletions _layouts/page-no-toc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="navbar-wrap">
<div class="container" style="position: relative; height: 100%;">
<div class="scala-logo">
<a href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/img/scala-logo-white-sm.png"/></a>
<a href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/img/scala-logo-white-sm.png" alt="white Scala logo" /></a>
</div>
{% include navbar.html %}
</div>
Expand Down Expand Up @@ -46,6 +46,4 @@ <h1 id="page-title">{{ page.title }}</h1>
</div>
</div>

<div class="lift-footer">
{% include footer.html %}
</div>
{% include footer.html %}
6 changes: 2 additions & 4 deletions _layouts/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="navbar-wrap">
<div class="container" style="position: relative; height: 100%;">
<div class="scala-logo">
<a href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/img/scala-logo-white-sm.png"/></a>
<a href="{{ site.baseurl }}/index.html"><img src="{{ site.baseurl }}/resources/img/scala-logo-white-sm.png" alt="white Scala logo" /></a>
</div>
{% include navbar.html %}
</div>
Expand Down Expand Up @@ -48,6 +48,4 @@ <h1 id="page-title">{{ page.title }}</h1>
</div>
</div>

<div class="lift-footer">
{% include footer.html %}
</div>
{% include footer.html %}
5 changes: 5 additions & 0 deletions _tools/validation/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source 'https://rubygems.org'

gem 'httparty'
gem 'json'
gem 'paint'
18 changes: 18 additions & 0 deletions _tools/validation/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
GEM
remote: https://rubygems.org/
specs:
httparty (0.11.0)
multi_json (~> 1.0)
multi_xml (>= 0.5.2)
json (1.8.0)
multi_json (1.7.7)
multi_xml (0.5.4)
paint (0.8.6)

PLATFORMS
ruby

DEPENDENCIES
httparty
json
paint
28 changes: 28 additions & 0 deletions _tools/validation/validation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/usr/bin/env ruby
# by Ricky Elrod (gh: @CodeBlock)
# Licensed under the same license as the same license as
# the scala/scala-lang repository from which this script originates.

require 'httparty'
require 'json'
require 'paint'

files = Dir.glob("#{File.dirname(__FILE__)}/../../_site/**/*.html")
files.each do |page|
begin
options = {
:body => File.open(page).read.to_s,
:headers => {'Content-Type' => 'text/html'}
}
r = HTTParty.post('http://validator.nu?out=json&parser=html5&laxtype=yes&level=error', options)
j = JSON.parse(r.response.body)

if j['messages'].length > 0
puts Paint["INVALID: #{page}", :red]
else
puts Paint["VALID: #{page}", :green]
end
rescue Exception => e
puts e
end
end
11 changes: 5 additions & 6 deletions contribute/hacker-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ Since Martin is the person who submitted the string interpolation Scala Improvem
As alluded to earlier, one must also choose an appropriate mailing list. Typically, one would use the scala-internals mailing list, as it is devoted to discussions about the core internal design and implementation of the Scala system. However, since this issue has been discussed previously on the scala-user mailing list,
in this example, we post to the [the scala-user mailing list](http://groups.google.com/group/scala-user) about our issue.

<center><img src="{{ site.baseurl }}/resources/img/01-post.png" alt="Posting to scala-user" /></center>
<br/>
<center><img src="{{ site.baseurl }}/resources/img/02-post.png" alt="Response from Martin" /></center>
<img src="{{ site.baseurl }}/resources/img/01-post.png" alt="Posting to scala-user" class="centerclear" />
<img src="{{ site.baseurl }}/resources/img/02-post.png" alt="Response from Martin" class="centerclear" />

Now that we have the approval of the feature's author, we can get to work!

Expand All @@ -59,7 +58,7 @@ button in the top right corner of the page. This will create your own copy of ou

If you're new to Git, don't be afraid of messing up-- there is no way you can corrupt our repository.

<center><img src="{{ site.baseurl }}/resources/img/03-fork.png" alt="Fork scala/scala" /></center>
<img src="{{ site.baseurl }}/resources/img/03-fork.png" alt="Fork scala/scala" class="centerclear" />

### Clone

Expand Down Expand Up @@ -335,14 +334,14 @@ Now, we must simply submit our proposed patch. Navigate to your branch in GitHub
and click the pull request button to submit your patch as a pull request to Scala. If you've never submitted patches to Scala, you will
need to sign the contributor license agreement, which [can be done online](http://typesafe.com/contribute/cla/scala) within a few minutes.

<center><img src="{{ site.baseurl }}/resources/img/04-submit.png" alt="Submit a pull request" /></center>
<img src="{{ site.baseurl }}/resources/img/04-submit.png" alt="Submit a pull request" class="centerclear" />

### Review

After the pull request has been submitted, you need to pick a reviewer (usually the person you've contacted in the beginning of your
workflow) and be ready to elaborate and adjust your patch if necessary. In this example, we picked Martin, because we had such a nice chat on the mailing list:

<center><img src="{{ site.baseurl }}/resources/img/05-review.png" alt="SAssign the reviewer" /></center>
<img src="{{ site.baseurl }}/resources/img/05-review.png" alt="SAssign the reviewer" class="centerclear" />

## Merge

Expand Down
2 changes: 1 addition & 1 deletion license.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ layout: page-no-toc
title: Scala License
---

Copyright (c) 2002-<span class="current-year"></span> EPFL, Lausanne, unless otherwise specified.
Copyright (c) 2002-<span class="current-year">&nbsp;</span> EPFL, Lausanne, unless otherwise specified.
All rights reserved.

This software was developed by the Programming Methods Laboratory of the
Expand Down
10 changes: 6 additions & 4 deletions resources/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,7 @@ h2.twitterhdr > span {
/*text-align: center;*/
color: #fff;
padding-top: 20px;
margin-top: -50px;
}

.copyright {
Expand Down Expand Up @@ -2393,10 +2394,6 @@ code {
height: 0;
}

.lift-footer {
margin-top: -50px;
}

#page-title { /*font-weight: 100;*/ margin-top: 20px; font-family:
'proxima-nova', sans-serif; font-size: 32px; line-height: 20px; color:
#fff; /*color: #2797b7;*/ /*color: #50B8E1;*/ /*color: rgba(7, 54, 66,
Expand Down Expand Up @@ -2523,3 +2520,8 @@ div#toc ul > li + ul > li { margin-top: 12px; }
color: #DC322F;
}

.centerclear {
display: block;
margin: 0 auto;
clear: both;
}