From c8d023ca941ee2606212c0f41a2148e3c0dc0289 Mon Sep 17 00:00:00 2001 From: Greg Boone Date: Wed, 30 Dec 2015 08:55:34 -0600 Subject: [PATCH 01/37] Adds a baseurl and updates relevant tempaltes and plugins --- _config.yml | 2 +- _includes/head.html | 8 ++++---- _plugins/author.rb | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_config.yml b/_config.yml index bbf163922..86d34619d 100644 --- a/_config.yml +++ b/_config.yml @@ -40,7 +40,7 @@ tag_dir: tags tag_title_prefix: "#" # use where a full URL is appropriate (e.g. RSS, OG tags) -url: https://18f.gsa.gov +baseurl: / # metadata title: 18F Digital Services Delivery diff --git a/_includes/head.html b/_includes/head.html index 0622651d7..5d2f54e45 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -23,8 +23,8 @@ - - + + {% if page.title %} @@ -48,11 +48,11 @@ {% if page.image %} - + {% else %} - + {% endif %} diff --git a/_plugins/author.rb b/_plugins/author.rb index de2b1fcc4..a95b5c6e5 100755 --- a/_plugins/author.rb +++ b/_plugins/author.rb @@ -3,6 +3,7 @@ class AuthorTag < Liquid::Tag def initialize(tag_name, author, tokens) super @author = author.strip + @baseurl = Jekyll.sites[0].config['baseurl'] end def render(context) @@ -14,7 +15,6 @@ def render(context) if teammate "" + - # "" + "#{teammate['full_name']}" + "" else @@ -39,7 +39,7 @@ def render(context) full_name = context.environments[0]['page']['full_name'] first_name = context.environments[0]['page']['first_name'] posts = context.environments[0]['site']['posts'] - site_url = context.environments[0]['site']['url'] + site_url = context.environments[0]['site']['baseurl'] for p in posts if p.data['authors'] and p.data['authors'].include? author authored.push(p) @@ -62,9 +62,9 @@ def with_pic(input) info = input[1] image = File.join 'assets', 'images', 'team', "#{name}.jpg" if File.exist?(File.join(Jekyll.sites[0].config['source'], image)) - "18F team member #{info[" + "18F team member #{info[" else - "18F logo" + "18F logo" end end # lookup filter @@ -98,7 +98,7 @@ def team_link(input) team = Jekyll.sites[0].collections['team'].docs index = team.find_index {|x| x.data['name'] == input} unless index.nil? - url = "/team/#{team[index].data['name']}" + url = "#{@baseurl}/team/#{team[index].data['name']}" full_name = team[index].data['full_name'] string = "#{full_name}" else From d3919aa2fb1ed8919498b0ee671c6888612752d6 Mon Sep 17 00:00:00 2001 From: Greg Boone Date: Wed, 30 Dec 2015 09:00:36 -0600 Subject: [PATCH 02/37] Reverts changes to head, config --- _config.yml | 2 +- _includes/head.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_config.yml b/_config.yml index 86d34619d..bbf163922 100644 --- a/_config.yml +++ b/_config.yml @@ -40,7 +40,7 @@ tag_dir: tags tag_title_prefix: "#" # use where a full URL is appropriate (e.g. RSS, OG tags) -baseurl: / +url: https://18f.gsa.gov # metadata title: 18F Digital Services Delivery diff --git a/_includes/head.html b/_includes/head.html index 5d2f54e45..0622651d7 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -23,8 +23,8 @@ - - + + {% if page.title %} @@ -48,11 +48,11 @@ {% if page.image %} - + {% else %} - + {% endif %} From e939cfe10253483d8f1e8c3e1722189a04d6929d Mon Sep 17 00:00:00 2001 From: Greg Boone Date: Wed, 30 Dec 2015 09:07:31 -0600 Subject: [PATCH 03/37] Adds baseurl to first md post in the site --- _posts/2014-09-25-design-studio-onrr.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_posts/2014-09-25-design-studio-onrr.md b/_posts/2014-09-25-design-studio-onrr.md index 250425b7c..56c85a602 100644 --- a/_posts/2014-09-25-design-studio-onrr.md +++ b/_posts/2014-09-25-design-studio-onrr.md @@ -60,17 +60,17 @@ Next, following a round of introductions, we dove right into the collaborative d **Creating user personas.** Based on the participants’ previous research on users, the group developed [user personas](http://www.usability.gov/how-to-and-tools/methods/personas.html) to serve as examples of the types of people who would interact with the website. We did this by brainstorming possible user goals, behavior patterns, skills, attitudes and environments, and then condensing these into representative groups through [affinity mapping](https://en.wikipedia.org/wiki/Affinity_diagram). The resulting personas give users actual characteristics — names, faces and narratives. This helps our design studio participants (and our 18F team designers!) shift focus away from meeting specific requirements and deliverables, and onto meeting the needs of the users. -![photo: team creating personas](/assets/blog/eiti/eiti1.jpg) +![photo: team creating personas]({{site.baseurl}}/assets/blog/eiti/eiti1.jpg) _Building user personas_ **Sketching.** Next came rapid rounds of sketching. Participants chose a specific user persona to design for, and each individual was asked to produce 5 sketches in 8 minutes depicting how to meet that user’s needs. After the buzzer told everyone to put their pens down, all participants presented and critiqued each other’s sketches. To do this, we focused on: “Does the design satisfy the goals of the user persona?” and “What assumptions does the design make that we want or need to test?” -![photo: critiquing sketches](/assets/blog/eiti/eiti2.jpg) +![photo: critiquing sketches]({{site.baseurl}}/assets/blog/eiti/eiti2.jpg) _Critiquing the first round of sketches_ We didn’t focus on whether the design was pretty or technically feasible; we simply wanted to generate ideas we knew would delight our user personas. This process — sketching, presenting, and critiquing — was repeated until the group converged on a clear set of winning designs. -![photo: wall of sketches](/assets/blog/eiti/eiti3.jpg) +![photo: wall of sketches]({{site.baseurl}}/assets/blog/eiti/eiti3.jpg) _Second round of sketches producing some clear winners!_ ## What’s next? From d927c6d143b90f0824a9dd1930494c4590479a69 Mon Sep 17 00:00:00 2001 From: Greg Boone Date: Wed, 30 Dec 2015 09:16:50 -0600 Subject: [PATCH 04/37] Should link the stylesheet in Federalist --- _includes/head.html | 14 +++++++------- _posts/2014-10-01-open-source-hack-series-midas.md | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_includes/head.html b/_includes/head.html index 0622651d7..15ec1e94c 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -81,18 +81,18 @@ - - - - - - + + + + + + {% include ascii.html %} diff --git a/_posts/2014-10-01-open-source-hack-series-midas.md b/_posts/2014-10-01-open-source-hack-series-midas.md index 3d56276ab..d1daf77f7 100644 --- a/_posts/2014-10-01-open-source-hack-series-midas.md +++ b/_posts/2014-10-01-open-source-hack-series-midas.md @@ -18,7 +18,7 @@ tags: - midas --- -![Two developers coding together](/assets/blog/midas-oct-hacking/coding.jpg) +![Two developers coding together]({{site.baseurl}}/assets/blog/midas-oct-hacking/coding.jpg) **Do you know JavaScript? Or do you have UX or visual design skills?** **One evening can make an impact!** @@ -28,7 +28,7 @@ tags: Midas is an open source project in active development by 18F, Health & Human Services (HHS) IDEA Lab and the State Department. A small cross-agency team, dedicated to launching this product to empower passionate civil servants and aspiring diplomats all over the world. ## What is Midas? -[Midas is an online marketplace of skill building opportunities](https://18f.gsa.gov/2014/07/16/midas-a-marketplace-for-innovation-in-government) which matches people to projects that they’re passionate about. Our goal is to foster innovation across team boundaries by connecting projects or challenges that need help within federal government agencies to people who want to work collaboratively on the solution. +[Midas is an online marketplace of skill building opportunities]({{site.baseurl}}/2014/07/16/midas-a-marketplace-for-innovation-in-government) which matches people to projects that they’re passionate about. Our goal is to foster innovation across team boundaries by connecting projects or challenges that need help within federal government agencies to people who want to work collaboratively on the solution. "It's like a Kickstarter for people's time." –Joe Polastre at [18F Demo Day](https://speakerdeck.com/18f/innovation-toolkit-18f-demo-day-9-may-2014?slide=3) @@ -57,4 +57,4 @@ We're building the future of government, but we need your help! We have a stabl ![Designing at the -Whiteboard](/assets/blog/midas-oct-hacking/whiteboard_design.jpg) +Whiteboard]({{site.baseurl}}/assets/blog/midas-oct-hacking/whiteboard_design.jpg) From c0df27539b22524cdf1379099cc6c9a6ad32126a Mon Sep 17 00:00:00 2001 From: Greg Boone Date: Wed, 30 Dec 2015 09:26:09 -0600 Subject: [PATCH 05/37] Brings in the other includes with baseurl --- _includes/flag.html | 2 +- _includes/head.html | 14 +++++++------- _includes/logo.html | 2 +- _includes/nav.html | 12 ++++++------ _includes/scripts.html | 10 +++++----- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/_includes/flag.html b/_includes/flag.html index 0603cef6d..8b28e5a48 100644 --- a/_includes/flag.html +++ b/_includes/flag.html @@ -3,7 +3,7 @@

An official website of the United States Government US flag signifying that this is a United States Federal Government website +src="{{site.baseurl}}/assets/images/us_flag_small.png">

diff --git a/_includes/head.html b/_includes/head.html index 15ec1e94c..9261a2c43 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -59,22 +59,22 @@ - - + + - + - + - + - + - + diff --git a/_includes/logo.html b/_includes/logo.html index e6288bc72..b724ddad3 100644 --- a/_includes/logo.html +++ b/_includes/logo.html @@ -3,6 +3,6 @@ {% if page.layout == "profile" %} - + {% endif %} diff --git a/_includes/nav.html b/_includes/nav.html index 6c824799d..d91418ac6 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -3,15 +3,15 @@ Menu | diff --git a/_includes/scripts.html b/_includes/scripts.html index 87796f47b..f7f12c22e 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -1,13 +1,13 @@ - - + + - + \ No newline at end of file + From afad3a3afffeb3c1c91f5446fc213740fea8f925 Mon Sep 17 00:00:00 2001 From: Greg Boone Date: Wed, 30 Dec 2015 11:25:25 -0600 Subject: [PATCH 11/37] Fixes a liquid syntax error. --- pages/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/index.html b/pages/index.html index ee2541ca5..89a1f2c4a 100644 --- a/pages/index.html +++ b/pages/index.html @@ -8,19 +8,19 @@

Building the 21st century digital government.