Merge pull request github#318 from github/research

WIP: Pull out research into seperate data file

Author: benbalter

Gemfile.lock

@@ -2,104 +2,128 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.1.1)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     blankslate (2.1.2.4)
-    classifier (1.3.4)
-      fast-stemmer (>= 1.0.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.1)
+      fast-stemmer (~> 1.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.8.0)
     colorator (0.1)
     colored (1.2)
-    commander (4.1.6)
-      highline (~> 1.6.11)
-    ethon (0.7.0)
+    ethon (0.7.1)
       ffi (>= 1.3.0)
+    execjs (2.2.1)
     fast-stemmer (1.0.2)
     ffi (1.9.3)
-    gemoji (1.5.0)
-    github-pages (18)
+    gemoji (2.1.0)
+    github-pages (27)
       RedCloth (= 4.2.9)
-      jekyll (= 1.5.1)
-      jekyll-mentions (= 0.0.6)
-      jekyll-redirect-from (= 0.3.1)
-      jekyll-sitemap (= 0.2.0)
-      jemoji (= 0.1.0)
+      jekyll (= 2.3.0)
+      jekyll-coffeescript (= 1.0.0)
+      jekyll-mentions (= 0.1.3)
+      jekyll-redirect-from (= 0.6.2)
+      jekyll-sass-converter (= 1.2.0)
+      jekyll-sitemap (= 0.6.0)
+      jemoji (= 0.3.0)
       kramdown (= 1.3.1)
-      liquid (= 2.5.5)
+      liquid (= 2.6.1)
       maruku (= 0.7.0)
+      pygments.rb (= 0.6.0)
       rdiscount (= 2.1.7)
-      redcarpet (= 2.3.0)
-    highline (1.6.21)
-    html-pipeline (1.5.0)
+      redcarpet (= 3.1.2)
+    hitimes (1.2.2)
+    html-pipeline (1.9.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
-    html-proofer (0.6.7)
+    html-proofer (1.4.0)
       colored (~> 1.2)
       mercenary (~> 0.3.2)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.5)
+      parallel (~> 1.3)
       typhoeus (~> 0.6.7)
-    i18n (0.6.9)
-    jekyll (1.5.1)
-      classifier (~> 1.3)
+      yell (~> 2.0)
+    i18n (0.6.11)
+    jekyll (2.3.0)
+      classifier-reborn (~> 2.0)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
-      liquid (~> 2.5.5)
-      listen (~> 1.3)
-      maruku (= 0.7.0)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.3.0)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-mentions (0.0.6)
-      html-pipeline (~> 1.5.0)
-      jekyll (~> 1.4)
-    jekyll-redirect-from (0.3.1)
-      jekyll (~> 1.4)
-    jekyll-sitemap (0.2.0)
-      jekyll (~> 1.4)
-    jemoji (0.1.0)
-      gemoji (~> 1.5.0)
-      html-pipeline (~> 1.5.0)
-      jekyll (~> 1.4)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-mentions (0.1.3)
+      html-pipeline (~> 1.9.0)
+      jekyll (~> 2.0)
+    jekyll-paginate (1.0.0)
+    jekyll-redirect-from (0.6.2)
+      jekyll (~> 2.0)
+    jekyll-sass-converter (1.2.0)
+      sass (~> 3.2)
+    jekyll-sitemap (0.6.0)
+    jekyll-watch (1.1.1)
+      listen (~> 2.7)
+    jemoji (0.3.0)
+      gemoji (~> 2.0)
+      html-pipeline (~> 1.9)
+      jekyll (~> 2.0)
     json (1.8.1)
     kramdown (1.3.1)
-    liquid (2.5.5)
-    listen (1.3.1)
+    liquid (2.6.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     maruku (0.7.0)
-    mercenary (0.3.3)
-    mini_portile (0.5.3)
-    minitest (5.3.3)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    mercenary (0.3.4)
+    mini_portile (0.6.0)
+    minitest (5.4.1)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    parallel (1.3.2)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    posix-spawn (0.3.8)
-    pygments.rb (0.5.4)
+    posix-spawn (0.3.9)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdiscount (2.1.7)
-    redcarpet (2.3.0)
+    redcarpet (3.1.2)
     safe_yaml (1.0.3)
-    thread_safe (0.3.3)
+    sass (3.4.4)
+    thread_safe (0.3.4)
+    timers (4.0.1)
+      hitimes
     toml (0.1.1)
       parslet (~> 1.5.0)
-    typhoeus (0.6.8)
-      ethon (>= 0.7.0)
-    tzinfo (1.1.0)
+    typhoeus (0.6.9)
+      ethon (>= 0.7.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     yajl-ruby (1.1.0)
+    yell (2.0.4)
 
 PLATFORMS
   ruby

_data/governments.yml

@@ -365,64 +365,6 @@ U.S. Federal:
   - WFMRDA
   - whitehouse
 
-U.S. Research Labs:
-  - ACME-Climate
-  - ARM-DOE
-  - BrookhavenNationalLaboratory
-  - CASL
-  - CBIIT
-  - EarthSystemCoG
-  - EMSL-MSC
-  - epicsdeb
-  - exmatex
-  - globus
-  - HipGISAXS
-  - hpde
-  - idaholab
-  - JGI-Bioinformatics
-  - LANL
-  - LANL-Bioinformatics
-  - lbl-anp
-  - lblpbd
-  - libmesh
-  - losalamos
-  - materialsproject
-  - MCSclimate
-  - mdhim
-  - MG-RAST
-  - NASA-Tensegrity-Robotics-Toolkit
-  - ncgmp09
-  - NIAID-RTB
-  - NIFA
-  - nih-fmrif
-  - Nikea
-  - nimh-nif
-  - nist-ionstorage
-  - NSLS-II
-  - NSLS-II-CSX
-  - nsls2ap
-  - olcf
-  - OpsLabJPL
-  - ORNL
-  - ORNL-BTRIC
-  - ORNL-CEES
-  - ornl-sava
-  - ORNL-TechInt
-  - ornlcda
-  - PCMDI
-  - plfs
-  - PNNL-Comp-Mass-Spec
-  - pyepics
-  - reflectometry
-  - sandialabs
-  - scalability-llnl
-  - scattering
-  - simx
-  - SNEWS-Collaboration
-  - TinyTitan
-  - UV-CDAT
-  - zfsonlinux
-
 U.S. Special District:
   - atlregional
   - AZMAG

_data/research.yml

@@ -0,0 +1,70 @@
+# Government funded research - must have a government email/domain to be listed
+
+U.S. Research Labs:
+  - ACME-Climate
+  - ARM-DOE
+  - BrookhavenNationalLaboratory
+  - CASL
+  - CBIIT
+  - ControlSystemStudio
+  - EarthSystemCoG
+  - EMSL-MSC
+  - epicsdeb
+  - exmatex
+  - GENIEMC
+  - globus
+  - HipGISAXS
+  - hpde
+  - idaholab
+  - JGI-Bioinformatics
+  - kbaseIncubator
+  - LANL
+  - LANL-Bioinformatics
+  - lbl-anp
+  - lbl-cal
+  - lblpbd
+  - libmesh
+  - losalamos
+  - magellancloud
+  - materialsproject
+  - MCSclimate
+  - mdhim
+  - MG-RAST
+  - NASA-Tensegrity-Robotics-Toolkit
+  - ncgmp09
+  - NIAID-RTB
+  - NIFA
+  - nih-fmrif
+  - Nikea
+  - nimh-nif
+  - nist-ionstorage
+  - NSLS-II
+  - NSLS-II-CSX
+  - nsls2ap
+  - olcf
+  - OpsLabJPL
+  - ORNL
+  - ORNL-BTRIC
+  - ORNL-CEES
+  - ornl-sava
+  - ORNL-TechInt
+  - ornlcda
+  - ORNLSMRModeling
+  - PCMDI
+  - plfs
+  - PNNL-Comp-Mass-Spec
+  - pyepics
+  - reflectometry
+  - sandialabs
+  - scalability-llnl
+  - scattering
+  - sim-x
+  - simx
+  - SNEWS-Collaboration
+  - SNL-WaterPower
+  - swift-lang
+  - TinyTitan
+  - TriBITSPub
+  - UV-CDAT
+  - WISDEM
+  - zfsonlinux

_includes/org-table.html

@@ -0,0 +1,31 @@
+<div class="mini-section">
+  {% unless include.id == "governments" %}
+    <h3 id="{{ include.id }}" class="search-section">Return to <a href="#to-top">top</a>.</h3>
+  {% endunless %}
+  <h2>{{ include.name }}</h2>
+  <h6 class="no-matches" style="display: none;">No matches.</h6>
+  <table class="table">
+    <tbody class="searchable">
+      <tr class="table-header"><th>Avatar</th><th>Account</th><th>Affiliation</th></tr>
+      {% for type_hash in include.orgs %}
+      <tr class="type-block" id="{{ type_hash[0] | downcase | replace: ' ','_' }}">
+        <td><h3>{{ type_hash[0] }} ({{ type_hash[1] | size }})</h3></td><td></td><td></td>
+        </tr>
+        {% for org in type_hash[1] %}
+        <tr>
+          <td>
+            <a href="https://github.com/{{ org }}" title="{{ org }}">
+            <img src="https://github.com/{{ org }}.png" width="40" height="40" alt="{{ org }}"></a>
+          </td>
+          <td>
+            <p><a href="https://github.com/{{ org }}" title="{{ org }}">{{ org }}</a></p>
+          </td>
+          <td>
+            <p class="dim-affiliation">{{ type_hash[0] }}</p>
+          </td>
+        </tr>
+        {% endfor %}
+      {% endfor %}
+    </tbody>
+  </table>
+</div>