Merge pull request #198 from GSA/release-2

Release 2

content/communities/communities.md

@@ -27,7 +27,7 @@ There are more than 10,000 people participating across government in 19 areas. O
 **[Challenges & Prizes]({{< link "challenges-prizes.md" >}})**: We encourage public participation in crowdsourcing competitions to find innovative government solutions.<br/>
 [Learn&nbsp;more&nbsp;»]({{< link "challenges-prizes.md" >}})
 
-**[Community Solutions]({{< link "community-solutions.md" >}})**: A community of government to provide services to local communities in a holistic and collaborative way by developing innovative and crosscutting partnerships. We are experts who help federal, state, local, and regional leaders enhance their relationships with their local communities and create targeted solutions that drive meaningful outcomes.<br/>
+**[Community Solutions]({{< link "community-solutions.md" >}})**: A community of federal staff that provide services to local communities in a holistic and collaborative way by developing innovative and crosscutting partnerships. We are experts who help federal, state, local, and regional leaders enhance their relationships with their local communities and create targeted solutions that drive meaningful outcomes.<br/>
 [Learn&nbsp;more&nbsp;»]({{< link "community-solutions.md" >}})
 
 **[Crowdsourcing and Citizen Science]({{< link "crowdsourcing-and-citizen-science.md" >}})**: Designing, implementing, and evaluating crowdsourcing and citizen science initiatives.<br/>
@@ -42,24 +42,24 @@ There are more than 10,000 people participating across government in 19 areas. O
 **[MobileGov]({{< link "mobilegov.md" >}})**: Creating anytime, anywhere government resources and solutions with collaborations including the Federal Crowdsource Mobile Testing Program, the Structured and Open Content Models Working Group.<br/>
 [Learn&nbsp;more&nbsp;»]({{< link "mobilegov.md" >}})
 
-**[Multilingual Digital Group]({{< link "multilingual.md" >}})**: Expanding and improving access to digital content on different platforms in languages other than English.<br/>
+**[Multilingual Community]({{< link "multilingual.md" >}})**: Expanding and improving access to digital content on different platforms in languages other than English.<br/>
 [Learn&nbsp;more&nbsp;»]({{< link "multilingual.md" >}})
 
-**[Open Data]({{< link "open-data.md" >}}):** Uniting open data leads at federal agencies, data stewards, and all others in government interested in open data, enterprise data inventory, civic tech, and data-driven government issues. Bi-weekly implementation support meetings are held every Tuesday at GSA for Federal employees and contractors.<br/>
+**[Open Data]({{< link "open-data.md" >}}):** Uniting open data leads at federal agencies, data stewards, and all others in government interested in open data, enterprise data inventory, civic tech, and data-driven government issues.<br/>
 [Learn&nbsp;more&nbsp;»]({{< link "open-data.md" >}})
 
-**[OpenGov]({{< link "open-gov.md" >}}):** A place where we talk about transparency, open-participation, and collaboration across agencies. <br/>[Learn&nbsp;more&nbsp;»]({{< link "open-gov.md" >}})
+**[OpenGov]({{< link "open-gov.md" >}}):** A place where we talk about transparency, open-participation, and collaboration across agencies.<br/>[Learn&nbsp;more&nbsp;»]({{< link "open-gov.md" >}})
 
 **[Plain Language Action and Information Network]({{< link "plain-language-community-of-practice.md" >}})**: Supporting the use of clear communication in government writing and helping federal agencies comply with the Plain Writing Act of 2010.<br/>
 [Learn&nbsp;more&nbsp;»]({{< link "plain-language-community-of-practice.md" >}})
 
 **[SocialGov](https://www.gsa.gov/technology/government-it-initiatives/emerging-citizen-technology/social-technology-socialgov)**: Analyzing, testing and developing shared resources for digital engagement, participation and collaboration programs for citizens.<br/>
 [Learn&nbsp;more&nbsp;»](https://www.gsa.gov/technology/government-it-initiatives/emerging-citizen-technology/social-technology-socialgov)
 
-**[User Experience]({{< link "user-experience.md" >}})**: User Experience: Developing successful government products and services through the practice of user-centered design, casting a broad tent in the user experience, customer experience, service design, innovation, behavioral design and other fields.<br/>
+**[User Experience]({{< link "user-experience.md" >}})**: Developing successful government products and services through the practice of user-centered design, casting a broad tent in the user experience, customer experience, service design, innovation, behavioral design and other fields.<br/>
 [Learn&nbsp;more&nbsp;»]({{< link "user-experience.md" >}})
 
-**[Video Production Pros]({{< link "video.md" >}})** Creating the best video content possible by staying on the top of our game. We love what we do. We’re a group of storytellers, artists, directors, DPs, producers, gaffers, editors, animators, motion graphics artists, editors, technologists, visionaries, strategists and editorial teams and more.<br/>
+**[Video Production Pros]({{< link "video.md" >}})** Sharing leading trends, best practices, latest projects, feedback, techniques, and strategies that help our respective agencies connect with people through the power of video.<br/>
 [Learn&nbsp;more&nbsp;»]({{< link "video.md" >}})
 
 **[Virtual/Augmented Reality](https://www.gsa.gov/technology/government-it-initiatives/emerging-citizen-technology/virtual-and-augmented-reality)**: Analyzing, testing and developing shared resources for Virtual and Augmented Reality programs to improve the citizen experience of public services and resources.<br/>

content/communities/open-gov.md

@@ -8,6 +8,8 @@ aliases:
   - /communities/open-government-opengov-community-of-practice/
 ---
 
+The Interagency Open Government Community of Practice is where we talk about transparency, open-participation, and collaboration across agencies.
+
 ### Join
 We host two listservs. One is open to the public/civil society for the purposes of collaboration and discussion as well as coordination the quarterly government & civil society gatherings. The other is a government-only listserv and is primarily to disseminate government specific information on timelines and deadlines for the NAP and offer support as agencies work to achieve their commitments.
 

content/communities/user-experience.md

@@ -8,27 +8,32 @@ aliases:
   - /federal-user-experience-community-of-practice/
 ---
 
-Join our community of more than 1,000 federal User Experience practitioners, and learn how to make better, User-Centered products.
+Join other federal user experience practitioners and learn how to make better user-centered products.
 
 ### Join
-Send an e-mail to the group Co-Chairs Jean Fox and Silvia Salazar at [ux-cop-request@listserv.gsa.gov](mailto:ux-cop-request@listserv.gsa.gov?subject=Join%20U%20Community). Please include "Join UX Community" in the subject line.
+Send an e-mail from your official government email to [ux-cop-request@listserv.gsa.gov](mailto:ux-cop-request@listserv.gsa.gov?subject=Join%20U%20Community), with “Join UX Community” in the subject line.
 
-  * Learn how other agencies are creating great User Experiences!
-  * Find how how to conduct valuable user research with little (or no) budget!
+## Community Managers: Jean Fox (BLS) and Silvia Salazar (NIH)
+
+### Overview 
+
+Members of the User Experience Community of Practice can:
+  * Ask questions and learn how other agencies are creating great user experiences!
+  * Find out how to conduct valuable user research with little (or no) budget!
   * Meet other government usability practitioners!
   * Share your own successes and tips!
 
-### Who We Are
+### Who we are
 
-Our members include more than 900 federal, state, and local U.S. government employees and contractors with a valid **.gov** or **.mil** email address. We welcome program managers, subject matter experts, designers, developers, writers and others interested in creating efficient, effective and useful technologies.
+Our members include more than 1,100 federal, state, and local U.S. government employees and contractors with a valid **.gov** or **.mil** email address. We welcome program managers, subject matter experts, designers, developers, writers and others interested in creating efficient, effective and useful technologies.
 
-### We Offer
+### What we do
 
+  * Create case studies of why UX works!
+  * Training for government Web managers, usability specialists, project managers, etc…
   * User Experience (UX) networking events
-  * Training for government Web managers, usability specialists, and project managers through [DigitalGov University]({{< link "digitalgov-university.md" >}}) and other programs
-  * Volunteer opportunities
-  * Useful UX resources such as the [DigitalGov User Experience Resources]({{< link "digitalgov-user-experience-resources.md" >}} "DigitalGov User Experience Program"), the Usability.gov&#8217;s [Guidelines](http://guidelines.usability.gov/), [DigitalGov]({{< link "index.html" >}}), and [DigitalGov University]({{< link "digitalgov-university.md" >}}). [
-  ](http://www.usability.gov/)
-  * Case studies of why UX works!
+  * Connect people to useful UX resources 
+
+### Key Resources
 
-We bring together federal employees who want to make digital services—websites, mobile Apps, intranets, APIs—work better for their customers.
+  * https://www.usability.gov/

content/events/2017/2017-11-15-fedramp-tailored-overview-finalized-new-baseline.md

@@ -0,0 +1,14 @@
+---
+slug: fedramp-tailored-overview-finalized-new-baseline
+title: 'FedRAMP Tailored: Overview of the Finalized New Baseline'
+summary: 'This online event will cover the overview of the FedRAMP Tailored Baseline for Cloud Service Providers (CSPs) with Low-Impact Software-as-a-Service (LI-SaaS) Systems.'
+event_type: online
+date: 2017-11-15 13:00:00 -0400
+end_date: 2017-11-15 14:00:00 -0400
+event_organizer: DigitalGov University
+host: FedRAMP
+registration_url: https://www.eventbrite.com/e/online-fedramp-tailored-overview-of-the-finalized-new-baseline-registration-39406911132
+youtube_id: MC6GfzTnaNY
+---
+
+An introduction to the newly released security baseline, FedRAMP Tailored, which is designed for Cloud Service Providers (CSPs) with Low-Impact Software- as-a-Service (LI-SaaS) Systems. The webinar will address what FedRAMP Tailored is, how it was developed, how the finalized version differs from draft versions released for public comment, and other useful information geared toward CSPs, agencies, and 3PAOs. Discussion also address how to begin a FedRAMP Tailored authorization.

content/events/2017/2017-12-12-workshop-making-government-websites-with-github-federalist-us-web-design-standards.md

@@ -0,0 +1,45 @@
+---
+slug: workshop-making-government-websites-with-github-federalist-us-web-design-standards
+title: 'Workshop: Making Government Websites with GitHub, Federalist, & U.S. Web Design Standards'
+summary: 'Come learn how to create a simple, compliant government website, using Federalist, GitHub and the U.S. Web Design Standards.'
+event_type: in-person
+date: 2017-12-12 09:00:00 -0400
+end_date: 2017-12-12 12:00:00 -0400
+event_organizer: Federalist
+host: Will Slack
+registration_url: https://www.eventbrite.com/e/workshop-making-government-websites-with-federalist-github-basics-registration-39457265744
+youtube_id:
+venue:
+  venue_name: The General Services Administration
+  room: 4150
+  address: 1800 F St.
+  city: Washington
+  state: D.C.
+  zip: 20006
+  country: USA
+  map: https://goo.gl/maps/bFWBD6QfDLA2
+
+---
+
+Come learn how to create a simple, compliant government website, using Federalist, GitHub and the U.S. Web Design Standards.
+
+This workshop will provide you and your team with an overview of using TTS’s new government-specific tools in combination with GitHub. Then we’ll show you how, together, they make it easier than ever to create and launch compliant, government websites.
+
+The second part of the workshop is your chance to get hands-on experience with these tools. We are designing three breakout sessions aimed at helping those on your team publish on Federalist by the end of the day.
+
+### Schedule
+* 9 - 9:15am — Arrivals
+* 9:15 - 10am — Federalist overview
+* 10 - 10:45am — Breakout working groups
+* 10:45am — Take temperature of the room
+* 10:45 — 11am - Break
+* 11 - 12:00pm — Further learning and discussion
+
+
+When you register for the event, we’d like to know:
+- Are you interested in a GitHub-for-beginners training? What specific questions about GitHub would you want the training to cover?
+- Do you have a website you think Federalist might be a good candidate for hosting?
+- If so, tell us about the website
+- Are you interested in learning how to design, code, and build Federalist websites?
+- Are you interested in more details on managing a Federalist site in your agency? (non technical discussion)
+- Any other areas/questions you’d like us to cover at this event?

data/social.yml

@@ -22,9 +22,3 @@ sources:
     link          : "http://www.youtube.com/digitalgov"
     shortcode     : "youtube"
     action        : "Connect on YouTube"
-
-  - name          : "Google Plus"
-    username      : nil
-    link          : "https://plus.google.com/109077476228639396954?rel=author"
-    shortcode     : "gplus"
-    action        : "Connect on Google+"

gulpfile.js

@@ -1,4 +1,6 @@
 var gulp          = require("gulp"),
+    path          = require('path'),
+    gutil         = require('gulp-util'),
     watch         = require('gulp-watch'),
     vinylPaths    = require('vinyl-paths'),
     replace       = require("gulp-replace-name"),
@@ -8,6 +10,8 @@ var gulp          = require("gulp"),
     del           = require("del"),
     concat        = require('gulp-concat'),
     cleanCSS      = require('gulp-clean-css'),
+    cssnano       = require('gulp-cssnano'),
+    sourcemaps    = require('gulp-sourcemaps'),
     combineMq     = require('gulp-combine-mq'),
     strip         = require('gulp-strip-css-comments'),
     bless         = require('gulp-bless'),
@@ -27,6 +31,9 @@ var gulp          = require("gulp"),
     s3            = require('gulp-s3-upload')(s3config),
     cp            = require('child_process');
 
+const USWDS_DIST = 'node_modules/uswds/dist';
+const USWDS_DIST_DIR = path.join(__dirname, ...USWDS_DIST.split('/'));
+
 
 gulp.task("file-tidy", function (done) {
   return gulp.src("content/images/_inbox/*.{png,jpg,jpeg}")
@@ -401,12 +408,52 @@ gulp.task("cleanup", ["done"], function (done) {
 gulp.task("process-img", ["cleanup"], function () {});
 
 
+// - - - - - - - - - - - - - - - - -
+// Build USWDS styles
+
+gulp.task('copy-uswds-assets', () => {
+  return gulp.src(`${USWDS_DIST}/@(js|fonts|img)/**/**`)
+  .pipe(gulp.dest('./themes/digital.gov/static/lib/uswds'));
+});
+
+gulp.task('sass', function (done) {
+  return gulp.src('./themes/digital.gov/src/sass/**/*.scss')
+    .pipe(sourcemaps.init())
+    .pipe(sass({
+      includePaths: [
+        path.join(USWDS_DIST_DIR, 'scss'),
+      ]
+    }).on('error', sass.logError))
+    .pipe(
+      autoprefixer({
+        browsers: [
+          '> 1%',
+          'Last 2 versions',
+          'IE 11',
+          'IE 10',
+          'IE 9',
+        ],
+        cascade: false,
+      }))
+    .pipe(cssnano({
+      safe: true,
+      // XXX see https://github.com/ben-eb/cssnano/issues/340
+      mergeRules: false,
+    }))
+    .pipe(rename({
+      suffix: '.min',
+    }))
+    .pipe(sourcemaps.write())
+    .pipe(gulp.dest('./themes/digital.gov/static/lib/uswds/css'));
+});
+
+
 // - - - - - - - - - - - - - - - - -
 gulp.task("watch", function () {
-  gulp.watch("content/images/_inbox/*.{png,jpg,jpeg}", ["process-img"])
+  gulp.watch('./themes/digital.gov/src/sass/**/*.scss', ['sass']);
 })
 
 
 // - - - - - - - - - - - - - - - - -
 // Set watch as default task
-gulp.task("default", ["watch", "process-img"])
+gulp.task('default', ['watch', 'sass', 'copy-uswds-assets']);

package.json

@@ -47,6 +47,11 @@
   },
   "dependencies": {
     "change-case": "^3.0.1",
-    "node-notifier": "^5.1.2"
+    "gulp-cssnano": "^2.1.2",
+    "gulp-sourcemaps": "^2.6.1",
+    "gutil": "^1.6.4",
+    "node-notifier": "^5.1.2",
+    "path": "^0.12.7",
+    "uswds": "^1.4.2"
   }
 }

themes/digital.gov/layouts/partials/body-top.html

@@ -15,7 +15,7 @@
     {{ partial "notice-bar.html" . }}
   {{ end }}
 
-
+  {{ partial "usa-banner.html" . }}
   {{ partial "nav-fixed-navbar.html" . }}
 
   <a class="screen-reader-popup" href="#content" title="Skip to page content">Skip to page content</a>

themes/digital.gov/layouts/partials/footer-end-scripts.html

@@ -191,6 +191,8 @@
 
 <script src="https://www.google.com/recaptcha/api.js?onload=bwpRecaptchaCallback&#038;render=explicit" async defer></script>
 
+<script src='{{ "lib/uswds/js/uswds.min.js" | absURL }}'></script>
+
 {{ if eq .Section "posts" }}
 <!-- Go to www.addthis.com/dashboard to customize your tools -->
 <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-533093ab734d6d4c"></script>

themes/digital.gov/layouts/partials/head.html

@@ -101,6 +101,7 @@
   <link rel='stylesheet' href='{{ "css/notice-bar.css" | absURL }}' type='text/css' media='all' />
   <link rel='stylesheet' href='{{ "css/tribe-events-full.min.css?ver=4.4.1.1" | absURL }}' type='text/css' media='all' />
   <link rel='stylesheet' href='{{ "css/tribe-events-theme.min.css?ver=4.4.1.1" | absURL }}' type='text/css' media='all' />
+  <link rel='stylesheet' href='{{ "lib/uswds/css/dg-uswds.min.css" | absURL }}' type='text/css' media='all' />
   <link rel="stylesheet" media="all" href="{{ "css/override.css" | absURL }}" type="text/css" />
   <link rel='stylesheet' href='{{ "css/federalist-additions.css" | absURL }}' type='text/css' media='all' />
 

themes/digital.gov/layouts/partials/notice-bar.html

@@ -6,9 +6,10 @@
 {{ $cleanurl := replaceRE "^(.)" "/$1" $cleanurl }}
 {{ $cleanurl := replaceRE "//" "/" $cleanurl }}
 {{ $siteslink := printf "https://%s" (printf "www.digitalgov.gov%s" $cleanurl) }}
+{{ $cleanurl := printf "digitalgov.gov%s" $cleanurl }}
 
-<div div class="notice">
+<div class="notice">
   <div class="notice-content">
-    <p class="notice-text"><span class="notice-text--primary">This is the Federalist version of DigitalGov.</span> Visit the Sites page <a href="{{ $siteslink }}" target="_blank">{{ $cleanurl }}</a></p>
+    <p class="notice-text"><span class="notice-text--primary">This is the prerelease preview of DigitalGov.</span> Visit the live page <a href="{{ $siteslink }}" target="_blank">{{ $cleanurl }}</a></p>
   </div>
 </div>

themes/digital.gov/layouts/partials/usa-banner.html

@@ -0,0 +1,47 @@
+{{ $uswds_img_path := "lib/uswds/img"}}
+
+<div class="usa-banner normalize">
+  <div class="usa-accordion">
+    <header class="usa-banner-header">
+      <div class="usa-grid usa-banner-inner">
+      {{ $uswds_asset := "favicons/favicon-57.png" }}
+      {{ $path := printf "%s/%s" $uswds_img_path $uswds_asset }}
+      {{ $path := (replace $path "//" "/") | relURL }}
+      <img src="{{ $path }}" alt="U.S. flag">
+      <p>An official website of the United States government</p>
+      <button class="usa-accordion-button usa-banner-button"
+        aria-expanded="false" aria-controls="gov-banner">
+        <span class="usa-banner-button-text">Here's how you know</span>
+      </button>
+      </div>
+    </header>
+    <div class="usa-banner-content usa-grid usa-accordion-content" id="gov-banner">
+      <div class="usa-banner-guidance-gov usa-width-one-half">
+        {{ $uswds_asset := "icon-dot-gov.svg" }}
+        {{ $path := printf "%s/%s" $uswds_img_path $uswds_asset }}
+        {{ $path := (replace $path "//" "/") | relURL }}
+        <img class="usa-banner-icon usa-media_block-img" src="{{ $path }}" alt="Dot gov">
+        <div class="usa-media_block-body">
+          <p>
+            <strong>The .gov means it’s official.</strong>
+            <br>
+            Federal government websites often end in .gov or .mil. Before sharing sensitive information, make sure you're on a federal government site.
+          </p>
+        </div>
+      </div>
+      <div class="usa-banner-guidance-ssl usa-width-one-half">
+        {{ $uswds_asset := "icon-https.svg" }}
+        {{ $path := printf "%s/%s" $uswds_img_path $uswds_asset }}
+        {{ $path := (replace $path "//" "/") | relURL }}
+        <img class="usa-banner-icon usa-media_block-img" src="{{ $path }}" alt="Https">
+        <div class="usa-media_block-body">
+          <p>
+            <strong>The site is secure.</strong>
+            <br>
+            The <strong>https://</strong> ensures that you are connecting to the official website and that any information you provide is encrypted and transmitted securely.
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>