Merge branch 'gh-pages' into mrchrisw/exclude-node_modules

Author: jbjonesjr

.gitignore

@@ -11,4 +11,5 @@ assets/vendor/**/*.txt
 assets/vendor/bootstrap-sass/assets/javascripts/
 .sass-cache
 .env
+.jekyll-metadata
 tmp/

Gemfile

@@ -4,6 +4,8 @@ source 'https://rubygems.org'
 
 gem 'github-pages'
 gem 'jekyll-octicons'
+# need lazy-load support
+gem 'jekyll-avatar', '>= 0.6.0'
 
 group :development, :test do
   gem 'html-proofer'

_data/civic_hackers.yml

@@ -125,7 +125,6 @@ Civic Hackers:
   - smartchicago
   - smcgov
   - spaceadvocates
-  - spendb
   - stadtlandcode
   - statedecoded
   - sunlightlabs

_data/governments.yml

@@ -22,6 +22,7 @@ Australia:
   - data61
   - datagovau
   - dpipwe
+  - dssgovaus
   - envris
   - Fire-and-Rescue-NSW
   - gccgisteam
@@ -51,6 +52,7 @@ Australia:
 
 Belgium:
   - belgianpolice
+  - CIRB
   - Fedict
   - inbo
   - onroerenderfgoed
@@ -87,7 +89,6 @@ Brazil:
   - prodest
   - secom-tocantins
   - secultce
-  - SerraWeb
   - tcers
   - tisorocaba
   - tre-pa
@@ -116,17 +117,19 @@ Canada:
   - ECCC-MSC
   - electionsquebec
   - fgpv-vpgf
+  - gc-proto
   - GCTC-NTGC
   - gctools-outilsgc
   - GeoCanViz
   - GNWT
   - HIFIS
   - infra-geo-ouverte
   - MC-MBO-WebPublishingTeam
+  - MetPX
   - nrc-cnrc
   - NRCan
   - nsgov
-  - OntarioDigital
+  - ongov
   - open-data
   - phac-nml
   - pspc-spac
@@ -144,9 +147,16 @@ Catalonia:
   - AjuntamentdeSabadell
   - AjuntamentdeSantCugat
   - AjuntamentdeTerrassa
+  - AjuntamentDeMataro
+  - AjuntamentdeReus
+  - AjuntamentDeGava
+  - AjuntamentdeCalafell
+  - AjMalgrat
+  - diputacioBCN
   - gencat
   - HospitaletDeLlobregat
   - projectestac
+  - vilanovailageltru
 
 Chile:
   - e-gob
@@ -198,19 +208,32 @@ Finland:
 
 France:
   - afimb
+  - AlsaceDigitale
   - ANSSI-FR
   - ApieFrance
+  - betagouv
   - communaute-cimi
+  - culturecommunication
   - DGFiP
   - diplomatiegouvfr
   - disic
+  - entrepreneur-interet-general
   - erasme
   - etalab
+  - Inist-CNRS
+  - SocieteNumerique
+  - lutece-secteur-public
+  - MINAGRI-INITIAL
+  - MTES-MCT
+  - MinistereSupRecherche
   - nanterre
+  - nantesmetropole
   - polewebmaedi
   - ProgrammeVitam
-  - sgmap
+  - region-bretagne
   - sgmap-agd
+  - SocialGouv
+  - strasbourg
 
 French Polynesia:
   - sipf
@@ -254,7 +277,7 @@ Japan:
   - codefornamie
   - gsi-cyberjapan
   - nhohq
-  - nims-library
+  - nims-dpfc
   - wakayama-pref-org
 
 Jersey:
@@ -340,6 +363,9 @@ Poland:
 Portugal:
   - amagovpt
 
+Republic of Korea:
+  - molit-korea
+
 Romania:
   - gov-ithub
   - govro
@@ -356,25 +382,36 @@ South Africa:
   - eddZA
 
 Spain:
+  - AjuntamentdeCastello
   - AyuntamientoMadrid
+  - castilla-lamancha
   - ctt-gob-es
+  - ErabakiPamplona
   - GobiernoLaRioja
   - icane
   - JuntaDeAndalucia
- 
+
 Sweden:
+  - arbetsformedlingen
   - domstol
   - gbif-sweden
+  - Helsingborg
+  - helsingborg-stad
   - kungbib
+  - Lantmateriet
   - libris
   - lldd
   - malmostad
   - mtmse
+  - regionhalland
+  - regionostergotland
   - riksarkivet
   - rinfo
   - statens-maritima-museer
+  - Sundsvallskommun
   - swedishpensionsagency
   - The-Municipality-of-Staffanstorp
+  - Vastra-Gotalandsregionen
 
 Switzerland:
   - alv-ch
@@ -395,6 +432,7 @@ The Netherlands:
   - Geonovum
   - Haarlem
   - IenS-Velsen
+  - MinBZK
   - MinELenI
   - Pleio
   - provinciegroningen
@@ -422,12 +460,12 @@ U.K. Central:
   - dvla
   - dvsa
   - GCHQ
-  - gds-attic
   - gds-dead
   - gds-operations
   - guidance-guarantee-programme
   - hmcts
   - hmrc
+  - informatics-lab
   - insolvencyservice
   - intellectual-property-office
   - IQuOD
@@ -438,13 +476,13 @@ U.K. Central:
   - landregistry-ops
   - lgss
   - LocalGovDigital
-  - met-office-lab
   - MetOffice
   - MetOfficeSpaceApps
   - metomi
   - ministryofjustice
   - naouk
   - nationalarchives
+  - NationalCrimeAgency
   - OfqualGovUK
   - ONSdigital
   - openglasgow
@@ -588,6 +626,7 @@ U.S. Federal:
   - CA-CST-Library
   - CA-CST-SII
   - ccmc
+  - CDCgov
   - cfpb
   - cmsgov
   - commercedataservice
@@ -606,6 +645,7 @@ U.S. Federal:
   - eregs
   - fcc
   - fda
+  - fecgov
   - Federal-Aviation-Administration
   - federaltradecommission
   - fedspendingtransparency
@@ -668,6 +708,7 @@ U.S. Federal:
   - sbstusa
   - SelectUSA
   - SERVIR
+  - SSAgov
   - state-hiu
   - sunpy
   - us-bea
@@ -710,6 +751,7 @@ U.S. Federal:
   - USPTO
   - USSBA
   - usstatedept
+  - ustaxcourt
   - VHAINNOVATIONS
   - virtual-world-framework
   - visionworkbench
@@ -723,6 +765,7 @@ U.S. Military and Intelligence:
   - info-sharing-environment
   - NationalSecurityAgency
   - ngageoint
+  - nsacyber
   - project-interoperability
   - screamlab
   - shareandprotect
@@ -794,13 +837,13 @@ U.S. States:
 U.S. Tribal Nations:
   - coquille-indian-tribe
   - osage-nation
-  
+
 U.S. Local Law Enforcement:
   - SanDiegoCountySheriff
-  
+
 Ukraine:
   - openprocurement
-  
+
 Uruguay:
   - gubuy
 

_data/research.yml

@@ -1,5 +1,8 @@
 # Government funded research - must have a government email/domain to be listed
 
+Kenya:
+  - Multimedia-University-of-Kenya
+
 New Zealand Crown Research Institutes:
   - AgResearch
   - niwa
@@ -99,7 +102,6 @@ U.S. Research Labs:
   - reflectometry
   - rose-compiler
   - sandialabs
-  - scalability-llnl
   - scattering
   - seed-platform
   - sim-x

_includes/footer.html

@@ -25,13 +25,13 @@
     </footer>
 
 
-    <script src="/assets/vendor/anchor-js/anchor.min.js"></script>
-    <script src="/assets/vendor/jquery/dist/jquery.min.js"></script>
+    <script src="{{ "/assets/vendor/anchor-js/anchor.min.js" | relative_url}}"></script>
+    <script src="{{ "/assets/vendor/jquery/dist/jquery.min.js" | relative_url}}"></script>
     <script>anchors.add('.org-type h4');</script>
     {% if page.url == "/community/" %}
-      <script src="/assets/js/community.js"></script>
+      <script src="{{ "/assets/js/community.js" | relative_url}}"></script>
     {% elsif page.url == "/" %}
-      <script src="/assets/js/home.js"></script>
+      <script src="{{ "/assets/js/home.js" | relative_url}}"></script>
     {% endif %}
   </body>
 </html>

_includes/form.html

@@ -0,0 +1,47 @@
+<form id="eloquaForm" name="fedramp_form" method="post" action="https://s{{ page.form-id }}.t.eloqua.com/e/f2" novalidate>
+  <input value="fedramp_form" type="hidden" name="elqFormName">
+  <input value="{{ page.form-id }}" type="hidden" name="elqSiteId">
+  <input name="elqCampaignId" type="hidden">
+
+  <div class="mb-3">
+    <label for="field0" class="d-inline-block mb-1">
+      Full name
+    </label>
+    <input id="field0" name="fullName1" type="text" class="form-control form-control-lg input-block" placeholder="First and last name" required>
+    <span class="form-control-invalid-text">Your full name is required.</span>
+  </div>
+
+  <div class="mb-3">
+    <label for="field1" class="d-inline-block mb-1">
+      Email address
+    </label>
+    <input id="field1" name="emailAddress" type="email" class="form-control form-control-lg input-block" placeholder="you@example.com" required>
+    <span class="form-control-invalid-text">A valid email address is required.</span>
+  </div>
+
+  <div class="mb-3">
+    <label for="field2" class="d-inline-block mb-1">
+      Company/Agency
+    </label>
+    <input id="field2" name="company" type="text" class="form-control form-control-lg input-block" placeholder="Acme, Inc" required>
+    <span class="form-control-invalid-text">A valid company name is required.</span>
+  </div>
+
+  <div class="mb-3">
+    <label for="field5" class="d-inline-block mb-1">
+      What can we help you with?
+    </label>
+    <textarea id="field5" name="contactComments" type="text" class="form-control form-control-lg input-block" rows="4" placeholder="Tell us how we can help. For support questions, head to github.com/contact" maxlength="1000" required></textarea>
+    <span class="form-control-invalid-text">A valid comment is required.</span>
+  </div>
+
+  <input id="country" type="hidden" name="country" value="">
+  <input id="subdivision" type="hidden" name="subdivision" value="">
+  <input id="city" type="hidden" name="city" value="">
+  <input type="hidden" name="elqCustomerGUID" value="">
+  <input type="hidden" name="elqCookieWrite" value="0">
+  <input id="sfcampaignid" type="hidden" name="sfcampaignid" value="{{ page.sf-campaign-id }}">
+  <input id="source" type="hidden" name="source" value="{{ page.campaign }}">
+
+  <button type="submit" class="btn btn-primary btn-large f4">Submit</button>
+</form>

_includes/header.html

@@ -4,8 +4,8 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="shortcut icon" href="/assets/img/favicon.ico" type="image/x-icon">
-  <link rel="stylesheet" href="/assets/css/style.css">
+  <link rel="shortcut icon" href="{{ "/assets/img/favicon.ico" | relative_url }}" type="image/x-icon">
+  <link rel="stylesheet" type="text/css" href="{{ "/assets/css/style.css" | relative_url }}">
   <link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,700,700i" rel="stylesheet">
   {% include analytics.html %}
   {% seo %}
@@ -16,12 +16,12 @@
   <div class="page-header pt-4 pb-5">
     <div class="container-lg">
       <div class="text-center">
-        <a href="/"><img class="logo py-3" src="/assets/img/logomark.svg" alt="GitHub and Government"></a>
+        <a href="{{ "/" | relative_url}}"><img class="logo py-3" src="{{ "/assets/img/logomark.svg" | relative_url}}" alt="GitHub and Government"></a>
         <ul>
-          <li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="/community/" class="text-white">Who's using GitHub</a></li>
+          <li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="{{ "/community/" | relative_url}}" class="text-white">Who's using GitHub</a></li>
           <li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="https://github.com/government/welcome#readme" class="text-white">Peer Group</a></li>
-          <li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="/accessibility" class="text-white">Accessibility</a></li>
-          <li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="/#contact-a-human" class="text-white">Contact</a></li>
+          <li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="{{ "/accessibility" | relative_url}}" class="text-white">Accessibility</a></li>
+          <li class="text-center d-block d-sm-inline-block px-1 px-md-3"><a href="{{ "/#contact-a-human" | relative_url}}" class="text-white">Contact</a></li>
         </ul>
       </div>
     </div>

_includes/org-table.html

@@ -20,7 +20,7 @@ <h3 class="alt-h3 mb-3" id="{{ slug }}">{{ type_hash[0] }} ({{ type_hash[1] | si
 
             <div class="col-sm-3 float-left org">
               <a href="https://github.com/{{ org }}" title="{{ org }}" class="border d-block text-center px-2 py-4 mb-4">
-                {% avatar user=org size=60 %}
+                {% avatar user=org size=60 lazy=true %}
                 <div class="org-name text-small">
                   @{{ org }}
                 </div>