Merge branch 'master' into nix-jekyll-auth

Conflicts:
	Gemfile

Author: benbalter

.travis.yml

@@ -0,0 +1,2 @@
+language: ruby
+script: "./script/cibuild"

CNAME

@@ -0,0 +1 @@
+government.github.com

Gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
-#github
 gem "github-pages"
-gem 'html-proofer', :git => 'https://github.com/benbalter/html-proofer', :branch => 'proper-resolves'
+gem 'html-proofer'
 gem 'rake'

Gemfile.lock

@@ -1,35 +1,19 @@
-GIT
-  remote: https://github.com/benbalter/html-proofer
-  revision: 506e40ee2876c16a7653c9bbc7ca88fc6f8a8aab
-  branch: proper-resolves
-  specs:
-    html-proofer (0.0.16)
-      colored (~> 1.2)
-      nokogiri (= 1.6.0)
-      typhoeus (~> 0.6.3)
-
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    addressable (2.3.5)
     classifier (1.3.3)
       fast-stemmer (>= 1.0.0)
     colorator (0.1)
     colored (1.2)
     commander (4.1.5)
       highline (~> 1.6.11)
     directory_watcher (1.4.1)
-    dotenv (0.9.0)
     ethon (0.6.1)
       ffi (>= 1.3.0)
       mime-types (~> 1.18)
-    excon (0.25.3)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
     fast-stemmer (1.0.2)
     ffi (1.9.0)
-    git (1.2.6)
     github-pages (8)
       RedCloth (= 4.2.9)
       jekyll (= 1.2.0)
@@ -38,15 +22,11 @@ GEM
       maruku (= 0.6.1)
       rdiscount (= 1.6.8)
       redcarpet (= 2.2.2)
-    heroku (3.0.0)
-      heroku-api (~> 0.3.7)
-      launchy (>= 0.3.2)
-      netrc (~> 0.7.7)
-      rest-client (~> 1.6.1)
-      rubyzip
-    heroku-api (0.3.15)
-      excon (~> 0.25.1)
     highline (1.6.19)
+    html-proofer (0.1.0)
+      colored (~> 1.2)
+      nokogiri (= 1.6.0)
+      typhoeus (~> 0.6.3)
     jekyll (1.2.0)
       classifier (~> 1.3)
       colorator (~> 0.1)
@@ -57,70 +37,31 @@ GEM
       pygments.rb (~> 0.5.0)
       redcarpet (~> 2.2.2)
       safe_yaml (~> 0.7.0)
-    jekyll-auth (0.1.2)
-      commander
-      dotenv
-      git
-      github-pages
-      heroku
-      rake
-      sinatra-index
-      sinatra_auth_github
     kramdown (1.0.2)
-    launchy (2.3.0)
-      addressable (~> 2.3)
     liquid (2.5.1)
     maruku (0.6.1)
       syntax (>= 1.0.0)
     mime-types (1.25)
     mini_portile (0.5.1)
-    multipart-post (1.2.0)
-    netrc (0.7.7)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
-    octokit (2.4.0)
-      sawyer (~> 0.5.1)
     posix-spawn (0.3.6)
     pygments.rb (0.5.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rack (1.5.2)
-    rack-protection (1.5.0)
-      rack
     rake (10.1.0)
     rdiscount (1.6.8)
     redcarpet (2.2.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rubyzip (1.0.0)
     safe_yaml (0.7.1)
-    sawyer (0.5.1)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    sinatra (1.4.3)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra-index (0.0.2)
-      sinatra
-    sinatra_auth_github (1.0.0)
-      sinatra (~> 1.0)
-      warden-github (~> 1.0)
     syntax (1.0.0)
-    tilt (1.4.1)
     typhoeus (0.6.5)
       ethon (~> 0.6.1)
-    warden (1.2.3)
-      rack (>= 1.0)
-    warden-github (1.0.0)
-      octokit (> 2.1.0)
-      warden (> 1.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  html-proofer!
-  jekyll-auth
+  github-pages
+  html-proofer
   rake

Rakefile

@@ -1,8 +1,16 @@
 require 'html/proofer'
-require 'find'
 
 task :test do
-  Rake::Task["assets:precompile"].execute
-  tester = HTML::Proofer.new "./_site"
+  sh "bundle exec jekyll build"
+  tester = HTML::Proofer.new "./_site/", :href_ignore => [
+    "https://github.com/github/government.github.com",
+    "http://prose.io#/github/government.github/com/blob/gh-pages/_posts/2013-09-17-design-a-street-with-streetmix.md",
+    "http://prose.io#/github/government.github/com/blob/gh-pages/_posts/2013-10-06-forking-your-city.md",
+    "http://prose.io#/github/government.github/com/blob/gh-pages/_posts/2013-09-26-philadelphia-gets-going-and-gets-open.md",
+    "http://prose.io#/github/government.github/com/blob/gh-pages/_posts/2013-09-03-project-open-data.md",
+    "http://prose.io#/github/government.github/com/blob/gh-pages/_posts/2013-10-01-sunlight.md",
+    "http://prose.io#/github/government.github/com/blob/gh-pages/_posts/2013-10-14-canadian-web-experience-toolkit.md",
+    "http://prose.io#github/government.github.com/new/master/_posts"
+  ]
   tester.run
 end

_config.yml

@@ -99,13 +99,13 @@ organizations:
     - localdata
 
 #global settings
-title: "Government is on GitHub"
+title: "Make government better, together."
 description: "Stories of open data, open source, and open collaboration"
 permalink: "/stories/:title"
 url: http://government.github.com
 relative_permalinks: false
-prose_server: "http://edit.benbalter.com"
-tagline: 'They <a href="/categories/#open-data" class="open data" title="Data made easily accessible and fee to the public.">open data</a>, find <a href="/categories/#open-source"class="open source" title="Code or creation materials made easily accessible and free to the public.">open source</a> projects and be a more <a href="/categories/#open-government" class="open government" title="An acessible, transparent and forthcoming with data government agency.">open government</a>.'
+prose_server: "http://prose.io"
+tagline: 'Whether it&#39;s <a href="/categories/#open-source"class="open source" title="Code or creation materials made easily accessible and free to the public.">open source</a>, <a href="/categories/#open-data" class="open data" title="Data made easily accessible and fee to the public.">open data</a>, or <a href="/categories/#open-government" class="open government" title="An acessible, transparent and forthcoming with data government agency.">open government</a> &ndash;'
 
 #build settings
 exclude: ["script", "vendor", "Gemfile", "Gemfile.lock", "config.ru", "Procfile", "Rakefile", "readme.md", "node_modules"]

_includes/footer.html

@@ -1,10 +1,10 @@
         <footer class="container">
           <div class="site-footer">
             <ul class="site-footer-links right">
-              <li><a href="/submit/">Submit a Story</a></li>
-              <li><a href="/faq/">FAQ</a></li>
-              <li><a href="https://help.github.com/articles/github-glossary" target="_blank">Glossary</a></li>
-              <li><a href="https://help.github.com/security">Security</a></li>
+              <li class="no-mobile"><a href="/submit/">Submit a Story</a></li>
+              <li class="no-mobile"><a href="/faq/">FAQ</a></li>
+              <li class="no-mobile"><a href="https://help.github.com/articles/github-glossary" target="_blank">Glossary</a></li>
+              <li class="no-mobile"><a href="https://help.github.com/security">Security</a></li>
               <li><a href="mailto:[email protected]">Contact Us</a></li>
             </ul>
 
@@ -13,17 +13,15 @@
             </a>
 
             <ul class="site-footer-links">
-                <li>© 2013 GitHub Inc. All rights reserved</li>
+                <li class="no-mobile">&copy; 2013 GitHub Inc. All rights reserved</li>
                 <li><a href="https://status.github.com/">GitHub.com</a></li>
-                <li><a href="/about/">About</a></li>
-                <li><a href="/features/">Features</a></li>
+                <li class="no-mobile"><a href="/about/">About</a></li>
+                <li class="no-mobile"><a href="/features/">Features</a></li>
 
             </ul>
           </div>
         </footer>
 
-        <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
-        <script>window.jQuery || document.write('<script src="{{ site.root }}assets/js/jquery.min.js"><\/script>')</script>
-
     </body>
 </html>
+<!-- Proudly powered by GitHub Pages -- Generated {{ site.time }} -->

_layouts/home.html

@@ -3,10 +3,10 @@
 <div class="full-width">
 	<div class="splash container">
   	<div class="row">
-    	<div class="span10">
-    		<h1>{{ site.title }}</h1>
-        <h3>{{ site.tagline }}</h3>
-    	</div>
+    	<div class="span12">
+				<h3>{{ site.tagline }}</h3>
+				<h1>{{ site.title }}</h1>
+ 		 </div>
     </div>
   </div>
 </div>

_layouts/story.html

@@ -6,7 +6,7 @@
       <img class="storypage-image post-image {{ page.category }}" src="{{ page.image }}" alt="{{ page.title }}" />
       <div class="meta {{ page.category }}" style="padding: 4px 0px;"><a class="{{ page.category }}" href="/categories/#{{ page.category | replace: " ","-" }}">{{ page.category }}</a></div>
       <h1>{{ page.title }}</h1>
-      <div class="meta">Published {{ page.date | date: "%B %d, %Y"}} in {{ page.category }}{% if page.author %} by {{ page.author }}{% endif %}</div>
+      <div class="meta">Published {{ page.date | date: "%B %d, %Y"}} {% if page.author %} by {{ page.author }}{% endif %}</div>
     </div>
   </div>
 

_posts/2013-07-01-using-github-to-make-things.md

@@ -1,5 +1,6 @@
 ---
 layout: story
+author: Ben Balter, GitHub
 title: Project Open Data Opens More than Data
 description: To offset the risk of becoming outdated, the White House Open Data Policy was published as a living, collaborative document.
 image: /images/whitehouse.png

_posts/2013-07-02-cities-on-github.md

@@ -1,5 +1,6 @@
 ---
 layout: story
+author: Jessica Lord, GitHub
 title: Design Street Sections with Streetmix
 description: "Streetmix is an open source civic web application with its code on GitHub. It was created by a handful of 2013 Code for America fellows, each on different teams, who came together to solve a problem."
 image: /images/streetmix.png

_posts/2013-08-28-project-open-data.md _posts/2013-09-03-project-open-data.md

@@ -1,10 +1,10 @@
 ---
 layout: story
+author: Jessica Lord, GitHub
 title: Philadelphia Gets Going and Gets Open
 description: The Chief Data Office for the City of Philadelphia hit the ground running using GitHub to help "support some of our core objectives - specifically, collaboration and engagement to provide improved delivery of government services and information".
 image: /images/philadelphia.png
 category: open government
-author: Jessica Lord
 ---
 
 A little over a year ago Mark Headd was named the Chief Data Office for the City of Philadelphia and he hit the ground running using GitHub to help "support some of our core objectives - specifically, collaboration and engagement to provide improved delivery of government services and information." Theirs is a great story for a city went from step one to awesome.

_posts/2013-09-07-design-a-street-with-streetmix.md _posts/2013-09-17-design-a-street-with-streetmix.md

@@ -1,5 +1,6 @@
 ---
 layout: story
+author: Ben Balter, GitHub
 title: The Sunlight Foundation's Modern Approach to Open Data
 description: "Developers from the nonprofit Sunlight Foundation decided to stop each building the same basic tools over and over, and start building an open data platform they could share."
 image: /images/unitedstates.png

_posts/2013-09-05-philadelphia-gets-going-and-gets-open.md _posts/2013-09-26-philadelphia-gets-going-and-gets-open.md

@@ -0,0 +1,16 @@
+---
+layout: story
+title: Canadian web experience toolkit
+description: ""
+image: /images/wet.png
+category: open source
+author: Ben Balter, GitHub
+---
+
+Government websites often share many of the same basic requirements such as usability, accessibility, and interoperability. Rather than reinvent the wheel each time, the Treasury Board of Canada developed the [Web Experience Toolkit](http://github.com/wet-boew/wet-boew) to create a shared boilerplate for all government websites.
+
+After extensive user testing, this mobile-first, multilingual framework can be completely customized for any government use case. As project lead Paul Jackson remarked during [a recent webinar](http://www.howto.gov/training/classes/canada-web-experience-toolkit), "It actually became much easier for everyone to meet their requirements and a lot less costly by everyone pooling their resources into a common solution that everyone could repurpose." Even [the documentation itself](http://wet-boew.github.io/wet-boew/index-en.html) is open source and collaborative using GitHub Pages.
+
+Today, with nearly 300 forks, and almost 100 members, [the award-winning Web Experience Toolkit](https://github.com/wet-boew/wet-boew) has been translated to more than 30 languages and is one of, if not the most active government open source projects. Members of the public and government employees from any agency are encouraged to provide feedback or submit contributions at any time. As Jackson noted, "It's all free. It's a community resources... there's no request for any funds to do any work.
+
+Interested in using the Web Experience Toolkit for your next government site? Simply [download the latest release](https://github.com/wet-boew/wet-boew/wiki/Downloads). The toolkit is both W3C and WCAG standards-compliant and has been adapted for use with Joomla, .Net, Drupal, Sharepoint, Jekyll, and Wordpress. You can see it featured, for example, on the [Canadian Open Data portal](http://www.data.gc.ca/eng), and with [over 3,000 issues under its belt](https://github.com/wet-boew/wet-boew/issues?state=open), it's showing no signs of slowing down.