Merge pull request #223 from GSA/release-2.1.1

Adding a line returns to list items and making events conditional on homepage

config.yml

@@ -134,11 +134,6 @@ menu:
       Identifier      : "about"
       URL             : "/about/"
       Weight          : 6
-    - Name            : "Contact Us"
-      Parent          : "about"
-      Identifier      : "contact-us"
-      URL             : "/contact-us/"
-      Weight          : 61
 
     - Name            : "Join Digitalgov"
       Identifier      : "join"

config_dev.yml

@@ -137,11 +137,6 @@ menu:
       Identifier      : "about"
       URL             : "/about/"
       Weight          : 6
-    - Name            : "Contact Us"
-      Parent          : "about"
-      Identifier      : "contact-us"
-      URL             : "/contact-us/"
-      Weight          : 61
 
     - Name            : "Join Digitalgov"
       Identifier      : "join"

content/about/about.md

@@ -3,7 +3,8 @@ date: 2017-11-14 12:05:00 -0400
 title: About
 url: /about/
 summary: 'Welcome to DigitalGov. Learn more about what we're working on'
-
+aliases:
+  - /contact-us/
 ---
 
 Welcome to DigitalGov.
@@ -15,6 +16,7 @@ And we do that by providing people in government the tools, methods, practices a
 It is our job to be the experts in the problems people in government face, and support them wherever they may be blocked.
 
 We’ve found that agencies need:
+
 - Guidance on implementing digital policies and initiatives
 - Open access to modern methods, practices, policies, and tools
 - Focused trainings and events that help teams learn and adopt new concepts
@@ -54,3 +56,15 @@ We are a cross-functional team of writers, editors, strategists, technologists,
 **Maya Benari**<br/>
 **John Donmoyer**<br/>
 **Andrea Sigritz**<br/>
+
+_[https://standards.usa.gov/](https://standards.usa.gov/)_
+
+---
+
+#### Contact Us
+
+**Have a question or comment?**
+
+- Send us an e-mail [[email protected]](mailto:[email protected])
+- Create [an issue on GitHub](https://github.com/GSA/digitalgov.gov/issues)
+- Or make an edit to our pages and submit a pull request

content/communities/user-experience.md

@@ -3,7 +3,7 @@ url: /communities/user-experience/
 uid: user-experience
 date: 2014-01-13 2:35:36 -0400
 title: 'User Experience Community of Practice'
-summary: "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."
+summary: "Join other federal user experience practitioners and learn how to make better user-centered products."
 aliases:
   - /federal-user-experience-community-of-practice/
 ---
@@ -13,27 +13,29 @@ Join other federal user experience practitioners and learn how to make better us
 ### Join
 Send an e-mail from your official government email to [[email protected]](mailto:[email protected]?subject=Join%20U%20Community), with “Join UX Community” in the subject line.
 
-## Community Managers: Jean Fox (BLS) and Silvia Salazar (NIH)
+### Community Managers:
+Jean Fox (BLS) and Silvia Salazar (NIH)
 
-### Overview 
+### 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!
+
+- 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
 
 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.
 
 ### 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
-  * Connect people to useful UX resources 
+* Create case studies of why UX works!
+* Training for government Web managers, usability specialists, project managers, etc…
+* User Experience (UX) networking events
+* Connect people to useful UX resources
 
 ### Key Resources
 
-  * https://www.usability.gov/
+* https://www.usability.gov/

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

@@ -8,7 +8,7 @@ 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:
+youtube_id: qeFNf2EPzpE
 venue:
   venue_name: U.S. General Services Administration
   room: 4150
@@ -27,16 +27,19 @@ This workshop will provide you and your team with an overview of using two new g
 
 The second part of the workshop will be 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.
 
+:sparkles: _We will live-stream the first 45mins of the workshop. Video will be available after._ :sparkles:
+
 ### Schedule
 * 9 - 9:15am — Arrivals
-* 9:15 - 10am — Federalist overview
+* 9:15 - 10am — Federalist overview _(+ online)_
 * 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:
+**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?

content/posts/2013/10/2013-10-30-content-management-systems-toolkit.md

@@ -378,7 +378,7 @@ Before you shut down the old site, run the old and new sites in parallel to test
 If you’ve done your research and followed your plan, you should have a smooth migration. Once it’s all done, and the site is live in the new CMS:
 
   * Evaluate what worked well, and where you ran into problems. Document as lessons learned for future migration projects, and share with your colleagues.
-  * Consider writing a case study, and [send to us]({{< link "contact-us.md" >}} "Contact Us") so we can post on DigitalGov, so others can benefit from your experiences.
+  * Consider writing a case study, and [send to us]({{< link "about.md" >}} "Contact Us") so we can post on DigitalGov, so others can benefit from your experiences.
   * Perform a “before and after comparison” to document improved efficiencies and help you measure success. Identify how the new CMS improves your ability to manage information assets, speed up content publication, or other improvements.
   * Communicate results to your management team and stakeholders, so they understand that all the hard work was worth it.
 

content/posts/2014/02/2014-02-26-open-for-innovation-in-digitalgov.md

@@ -31,6 +31,6 @@ Here’s where you come in.
 
 [Join in]({{< link "join-digitalgov.md" >}} "Join DigitalGov") and help shape this platform into the creative engine that will drive digital government and advance your agency’s mission. We&#8217;ll help steer you to projects, [communities]({{< link "communities.md" >}} "Communities"), [services]({{< link "services.md" >}} "Services"), [resources]({{< link "resources.md" >}} "Resources") and [events]({{< link "events" >}}) that will help you build out the government of the 21st century.
 
-Take a look around and kick the tires on this new platform. Let us know what’s working and what we could do better in the comments or [contact us]({{< link "contact-us.md" >}} "Contact Us").
+Take a look around and kick the tires on this new platform. Let us know what’s working and what we could do better in the comments or [contact us]({{< link "about.md" >}} "Contact Us").
 
 We&#8217;re glad you&#8217;re here.

content/posts/2014/09/2014-09-12-digitalgov-gov-six-months-later.md

@@ -73,4 +73,4 @@ So far, the data is showing that we are doing what we set out to do. But, we kno
 
 In the next few weeks we’ll be publishing our first roadmap with priorities for the next FY. We plan to be very transparent. Look also for a follow up on some decisions and pivots we’ve made since launch in February—not everything went as expected.
 
-Oh, and regarding doing MORE and doing it better? Keep an eye out for _more_ posts featuring more agencies doing _more_ innovative work to make a _more_ responsive 21st century government. And last, [keep in touch]({{< link "contact-us.md" >}} "Contact Us"). Comments and suggestions are always welcome.
+Oh, and regarding doing MORE and doing it better? Keep an eye out for _more_ posts featuring more agencies doing _more_ innovative work to make a _more_ responsive 21st century government. And last, [keep in touch]({{< link "about.md" >}} "Contact Us"). Comments and suggestions are always welcome.

content/posts/2014/11/2014-11-07-digitalgov-university-is-making-changes-thanks-to-you.md

@@ -45,6 +45,6 @@ DGU has morphed over the years into a program by feds for feds. We listen and he
 
 [tell us, and we will put it on the calendar](https://www.surveymonkey.com/s/friend-event).
 
-Are you using social in an innovative way to meet your agency goals? Are you working in an agile environment? Are you more focused on creating mobile apps? Has using an open sourced tool allow you to work smarter? We want to know. [Submit your event ideas to us]({{< link "contact-us.md" >}} "Contact Us"). Chances are other agencies can benefit from the awesome work you&#8217;re doing and the lessons you learned along the way. Feel free to also submit ideas on what you want to hear about or who you want to hear from.
+Are you using social in an innovative way to meet your agency goals? Are you working in an agile environment? Are you more focused on creating mobile apps? Has using an open sourced tool allow you to work smarter? We want to know. [Submit your event ideas to us]({{< link "about.md" >}} "Contact Us"). Chances are other agencies can benefit from the awesome work you&#8217;re doing and the lessons you learned along the way. Feel free to also submit ideas on what you want to hear about or who you want to hear from.
 
 One last thing continue to check out the [events calendar]({{< link "events" >}}) to see what&#8217;s cookin&#8217;, and keep those cards and letters coming.

content/posts/2014/11/2014-11-26-usability-events-round-up-2014.md

@@ -45,4 +45,4 @@ You might want to know what&#8217;s involved in [mobile user testing]({{< link "
 
 Join us on November 19th for our [Hands-On Usability Testing Workshop]({{< tmp "events/november-usability-testing-workshop.md" >}} "November Usability Testing Workshop") or our November 25th [Around the Horn Call]({{< tmp "events/november-mobile-gov-around-the-horn-call.md" >}} "Mobile Terms of Service: November Around the Horn Call").
 
-[Tell us what other Usability events you&#8217;d like to see]({{< link "contact-us.md" >}} "Contact Us") this coming year or [tell us]({{< link "contact-us.md" >}} "Contact Us") about ways in which you&#8217;ve made strides by implementing a UX program at your agency.
+[Tell us what other Usability events you&#8217;d like to see]({{< link "about.md" >}} "Contact Us") this coming year or [tell us]({{< link "about.md" >}} "Contact Us") about ways in which you&#8217;ve made strides by implementing a UX program at your agency.

content/posts/2014/12/2014-12-31-countdown-to-2015-with-our-most-popular-articles-this-year.md

@@ -124,4 +124,4 @@ We look forward to bringing you more great content in 2015, but first we wanted
   </div>
 </blockquote>
 
-We welcome your contributions; in fact, only half of the articles on this list were written by DigitalGov staff. Add your voice to the mix and help us promote your agency&#8217;s efforts by [contacting us]({{< link "contact-us.md" >}}).
+We welcome your contributions; in fact, only half of the articles on this list were written by DigitalGov staff. Add your voice to the mix and help us promote your agency&#8217;s efforts by [contacting us]({{< link "about.md" >}}).

content/posts/2015/01/2015-01-09-trend-watch-2015-whats-in-the-forecast-for-digital-government.md

@@ -31,4 +31,4 @@ In January on DigitalGov, we’ll highlight pieces looking at trends we see comi
 
 Check back Monday, when we kick-off the month with [15 Government Customer Service Trends]({{< link "2015-01-12-15-government-customer-service-trends-for-2015.md" >}} "15 Government Customer Service Trends for 2015"). And you can look at some of our most recent [monthly theme articles]({{< link "categories/monthly-theme" >}}) in: [crowdsourcing]({{< link "2014-12-08-crowdsourcing-month-an-overview.md" >}} "Crowdsourcing Month: An Overview"), [user experience]({{< link "2014-11-07-welcome-to-user-experience-month.md" >}} "Welcome to User Experience Month!"), and [mobile]({{< link "2014-10-20-welcome-to-mobilegov-month-on-digitalgov.md" >}} "Welcome to Mobile Gov Month on DigitalGov").
 
-Where do you see digital government going in 2015? Where should agencies focus their efforts? [Let us know]({{< link "contact-us.md" >}} "Contact Us")!
+Where do you see digital government going in 2015? Where should agencies focus their efforts? [Let us know]({{< link "about.md" >}} "Contact Us")!

content/posts/2015/01/2015-01-23-training-trends-in-2014.md

@@ -16,7 +16,7 @@ tag:
   - SocialGov
 ---
 
-In recent years, DigitalGov University (DGU) has evolved from a prescriptive training program to a more agile program looking to federal government leaders like you to [share the innovations, tools, resources, hurdles and case studies of how you work to meet the digital expectations]({{< link "contact-us.md" >}} "Contact Us") of the 21st century citizen customer better. Whew. That’s a mouthful.
+In recent years, DigitalGov University (DGU) has evolved from a prescriptive training program to a more agile program looking to federal government leaders like you to [share the innovations, tools, resources, hurdles and case studies of how you work to meet the digital expectations]({{< link "about.md" >}} "Contact Us") of the 21st century citizen customer better. Whew. That’s a mouthful.
 
 Thanks to all the participation from you, across many agencies, we’ve hosted over 100 events this past year with over 8,000 attendees. So, we thought we’d take took a look at the most popular (by attendance) in-person, on-line and recorded events throughout 2014.
 

content/posts/2015/02/2015-02-19-top-10-things-we-think-you-dont-know-about-digitalgov.md

@@ -39,4 +39,4 @@ Things you don’t know about this website, DigitalGov.gov, that is. It’s
 
 1.  While we owe everyone who has written for DigitalGov.gov a piece of birthday cake, since we don’t bake, we are going to wish that someone brings them all cake. Instead we will thank our authors for their fabulous contributions. Each and every one! Thank you!! **Aaron** Snow, Alan DeLevie, Alan Greilsamer, Alberto Navas, Alison Lemon, Alison Rowland, Allison Alexander, Alycia Piazza, Ammie Farraj Feijoo, Amos Stone, Andrea Sigritz, Angela Hooker, Anthony Calabrese, ¡Muchas gracias! Arianne Miller, Arlene Hernandez, Ashley Braun, Ashley Wichman, **Barbara** Walton, BEA Team, Ben Rosset, Beth Cobert, Beth Martin, Betsy Steele, _Merci beaucoup!_ Bill Brantley, Blogger Bob, Brandon Barr, Brandon Kopp, Brenda Wensil, Brian Dunbar, Brian Forde, Byrhonda Lyons, **Candace** Maynard, Carolyn Cihelka, Carolyn Kaleel, Thanks! Carrie Hessler-Radelet, Cheryl Hackley, Christen Geiler, Christine Kundrat, Clair Koroma, Colleen Bayus, Communications Community Office–Government of Canada, Corinna Zarek, Crystal Peeler, _Merci beaucoup!_ Curt Tilmes, **Dan** Wendling, Danita Stenberg, Dannielle Blumenthal, Darlene Gamble, Darlene Meskell, David A. Kennedy, David Fern, David Hale, David Hebert, David Hebert, David Herring, David Kaufmann, Deb LeBel, Debra Harris, Dominic McDevitt-Parks, Donavan Albert, Donna Canestraro, _Merci beaucoup!_ Dorothy Amatucci, Dr. Taha Kass-Hout, Dustin Renwick, **Eden** Savino, Elizabeth Hochberg, Ellen Arnold Losey, Ellen Langhans, Emily Canis, Eric Mill, Erika Brown, Erin Twamley, **Federal** Citizen Information Center Marketing Team, **Gary** Morin, ¡Muchas gracias! Genevieve Contey, Georgia Gallavin, Glaceria Mason, Gray Brooks, Gwynne Kostin, **Hannah** Gladfelter Rubin, Hyon Kim, **Jackie** Kazil, Jacob Parcell, Jacqueline Snee, Jamal Mazrui, Janelle Thalls, Jason Kelly, Jay Benforado, Jean Fox, Thanks! Jeanne Holm, Jed Sundwall, Jeffrey Levy, Jenn Gustetic, Jennifer Dorsey, Jennifer Reeves, Jessica Milcetich, Jessica Orquina, Jill James, Jim Costello, Thanks! Jim Wilson, Jini Ryan, Joanna Widzer, Joël Virothaisakun, Jon Booth, Jonathan Rubin, Jordan Higgins, Judith Snyderman, Justin Goldberger, Justin Herman, **Kanika** Tolver, Karen Trebon, Katherine Spivey, _Merci beaucoup!_ Kathryn Hambleton, Katie Chan, Katie Gorscak, Katie Gresham, Katie Messner, Katie Steffy, Katina Stapleton, Kendrick Daniel, Kevin Downey, Kin Lane, Kristen O’Nell, **Lakshmi** Grama, Laura Godfrey, Lauren Caldwell, Lauren Lipovic, Lawton King, Lea Shanley, Leah Bannon, Leilani Martinez, Linda V. Priebe, Lisa Nelson, Lisa Wilcox, Lisa Wolfisch, Logan Powell, Loren Siebert, **Margot** Lawton Kern, Thanks! Marietta Jelks, Marina Fox, Mario Damiani, Marion Royal, Mark Anthony, Martha Dorris, Mary Ann Monroe, Mary Krakowiak, Matt Goodrich, Michael Bloom, Michael Niedzwiecki, ¡Muchas gracias! Michael Pulsifer, Michelle Chronister, Miguel Gomez, Mike Bland, Mike Kruger, Minette Wilson, Mobile Gov Team, Monte Desai, Myehsha Boone, **Nancy** Merritt, Nicholas Garlow, Nick Sinai, Nicole Wong, Noah Kunin, Noah Manger, **Ori** Hoffer, **Phaedra** Chrousos, Pooja Sawant, **Rachel** Flagg, Rachel Hurley, Rachel Mundstock, _Merci beaucoup!_ Randy Abramson, Raphael Majma, Ray Bryson, Rebecca Williams, Richard Easterbrook, Robert L. Read, PhD, Robin L. Kaplan, Rosetta Carrington Lue, Ryan Leisinger, Ryan Leisinger, ¡Muchas gracias! Ryan Xue, **Sally** Bourrie, Sam Bronson, Sara Harris Smith, Sarah Crane, Sarah Kaczmarek, Scott Horvath, Sean Herron, Shashank Khandelwal, Simchah Suveyke-Bogin, Stephanie Santoso, Stephanie Sharpe, Stephanie Stover, Stephanie Thum, Stephen Buckner, Steven VanRoekel, Structured and Open Content Models Working Group, Thanks! Susan Bell, **Tammi** Marcoullier, Tim Brice, Tim Hudak, Tim Lowden, Todd Park, Tonya Beres, Treci Johnson, Troy Kitch, ¡Muchas gracias! Tyrus Manuel, **USAJOBS** Team, **Victor** Diaz Zapanta, Victoria Wales, **Wendy** Littman, Wendy Wagner-Smith, **Zeshan** Khan, and 18F Team.
 
-Want your name on this list? [Let us know]({{< link "contact-us.md" >}} "Contact Us")! And feel free to wish us &#8220;Happy Birthday&#8221; in the comments.
+Want your name on this list? [Let us know]({{< link "about.md" >}} "Contact Us")! And feel free to wish us &#8220;Happy Birthday&#8221; in the comments.