A bundle of updates, including:

- remove (but don't delete) steering since it's out of date
- add MTC logo and favicon
- update schedule page to be easier to read (table formatting)
- test local with jekyll

.gitignore

@@ -1,26 +1,4 @@
-<<<<<<< HEAD
 .bak
-=======
-# History files
-.Rhistory
-
-# Example code in package build process
-*-Ex.R
-
-# R data files from past sessions
-.Rdata
-
-# RStudio files
-.Rproj.user/
-
-# TextPad back ups
-.bak
-.Rproj.user
-
-# IPython Notebook checkpoints
-.ipynb_checkpoints/
-
-# Cache
-summaries/Summaries_cache/*
-
->>>>>>> origin/gh-pages
+_site/*
+Gemfile.lock
+.DS_Store

Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
 gem 'github-pages'
+
+gem "webrick", "~> 1.8"

README.md

@@ -1,6 +1,7 @@
-Regional On-board Transit Survey
+Regional Transit Passenger Survey
 
 Starting point borrowed from the personal website of [Joshua Lande](https://github.com/joshualande/joshualande.github.io).
 
 The sitemap.xml file was inspired by [this post](http://jethrokuan.github.io/2013/12/20/SEO-with-Jekyll.html).
 
+This is a Jekyll site, so to test locally, follow the [Jekyll installation instructions](https://jekyllrb.com/docs/installation/).

_config.yml

@@ -9,7 +9,7 @@ rouge:         true
 permalink:        pretty
 
 # Setup
-title:            Home 
+title:            Transit Passenger Survey 
 tagline:          'Metropolitan Transportation Commission'
 url:              http://bayareametro.github.io/transit-passenger-surveys
 shorturl:         bayareametro.github.io/transit-passenger-surveys
@@ -28,13 +28,13 @@ github:
 
 # This is the list of pages to include in the header of the website.
 pages_list:
-  Steering: 'steering/'
-  Schedule: 'schedule/'  
-  SOP: 'SOP/'
-  Data/Reports: 'data/'
-  Policy/Papers: 'papers/'
+  # Steering: '/steering/'
+  Schedule: '/schedule/'  
+  Standard Operating Procedures: '/SOP/'
+  Data/Reports: '/data/'
+  Policy/Papers: '/papers/'
 
 # Allow URL Redirects: 
 #  * https://help.github.com/articles/redirects-on-github-pages
-gems:
+plugins:
   - jekyll-redirect-from

_includes/head.html

@@ -14,12 +14,12 @@
   </title>
 
   <!-- CSS -->
-  <link rel="stylesheet" href="/transit-passenger-surveys/css/poole.css">
-  <link rel="stylesheet" href="/transit-passenger-surveys/css/syntax.css">
-  <link rel="stylesheet" href="/transit-passenger-surveys/css/font-awesome.css">
+  <link rel="stylesheet" href="{{ '/css/poole.css' | absolute_url }}">
+  <link rel="stylesheet" href="{{ '/css/syntax.css' | absolute_url }}">
+  <link rel="stylesheet" href="{{ '/css/font-awesome.css' | absolute_url }}">
 
   <!-- Icons -->
-  <link rel="icon" href="/transit-passenger-surveys/assets/favicon.ico">
+  <link rel="icon" href="{{ '/assets/favicon.ico' | absolute_url }}">
 
 
   <!-- RSS -->

_layouts/default.html

@@ -8,11 +8,12 @@
 
     <div class="container content">
       <div class="masthead">
+        <img src="{{ '/assets/MTC_logo_head.png' | absolute_url }}">
         <h3 class="masthead-title">
-          <a href="/transit-passenger-surveys/" title="Home">{{ site.title }}</a>
+          <a href="/#home" title="Transit Passenger Survey Program">{{ site.title }}</a>
 
           {% for page in site.pages_list %}
-              &nbsp;&nbsp;&nbsp;<small><a href="/transit-passenger-surveys/{{ page[1]  }}">{{ page[0] }}</a></small>
+              &nbsp;&nbsp;&nbsp;<small><a href="{{ page[1]  }}">{{ page[0] }}</a></small>
           {% endfor %}
 
         </h3>

atom.xml

@@ -1,5 +1,5 @@
 ---
-layout: nil
+layout: null
 ---
 
 <?xml version="1.0" encoding="utf-8"?>

css/poole.css

@@ -229,11 +229,12 @@ th {
   padding: .25rem .5rem;
   border: 1px solid #e5e5e5;
 }
+/*
 tbody tr:nth-child(odd) td,
 tbody tr:nth-child(odd) th {
   background-color: #f9f9f9;
 }
-
+*/
 
 /*
  * Custom type

data.md

@@ -3,15 +3,10 @@ layout: page
 title: Data
 ---
 
-# Data and Reports
+# Survey Data and Reports
 
-Below you'll find some links to access aggregate summaries of survey data and also consultant reports for completed survey efforts. 
+Reports are available on [Box](https://mtcdrive.box.com/v/onboard-survey-reports):
 
-## Available Data
-
-*	To gain access to the data summaries or the raw data, please contact Shimon Israel at SIsrael@bayareametro.gov or 415-778-5239. 
-
-## Available Reports
-
-You can find a repository of downloadable operator-specific reports with detailed methodology and findings [here](https://mtcdrive.box.com/v/onboard-survey-reports)
+<iframe src="https://mtcdrive.app.box.com/embed/s/7a4ro4z4ngpk8ywlj395agydol5evuuu?sortColumn=date&showParentPath=false" width="800" height="550" frameborder="0" allowfullscreen webkitallowfullscreen msallowfullscreen></iframe>
 
+To request access to the data summaries or the raw data, please contact Shimon Israel at <a href="mailto:SIsrael@bayareametro.gov">SIsrael@bayareametro.gov</a> or 415-778-5239. 

index.html

@@ -3,18 +3,16 @@
 title: Home
 ---
 
-<h1>MTC Transit Passenger Survey</h1>
-
 <p>
-Welcome to the web presence for the MTC Transit Passenger Survey (TPS). In 2010, MTC began the TPS program, collecting data from transit operators on a rolling basis, surveying a few operators every year, with the goal of completing all operators within five to seven years.  The first data collection survey cycle was completed in 2017, with a new cycle initiating thereafter.
+In 2010, MTC began the Transit Passenger Survey program, collecting data from transit operators on a rolling basis, surveying a few operators every year, with the goal of completing all operators within five to seven years.  The first data collection survey cycle was completed in 2017, with a new cycle initiating thereafter.
 </p>
 
 <p>
 The purpose of the survey is twofold: (1) to collect demographic and trip origin/destination data used to support future local and regional transportation planning efforts; and (2) to fulfill data collection requirements stipulated by <a href="https://www.transit.dot.gov/sites/fta.dot.gov/files/docs/FTA_Title_VI_FINAL.pdf">Circular 4702.1B of the Title VI Requirements and Guidelines for Federal Transit Administration Recipients</a>.  MTC and operators coordinate to develop survey instruments that meet these two goals. To further these efforts, coordination requirements applicable to Bay Area transit rider surveys were adopted in July 2015 in <a href="https://mtc.ca.gov/sites/default/files/A-10_RES-3866_Transit_Coord.pdf">MTC Resolution 3866, Revised</a>.
 </p>
 
 <p>
-Navigating through the tabs above, you should be able to find answers to many of your questions about this program, including those about survey scheduling, contracting, funding, types of questions asked of passengers, data releases for planning and research purposes, and related documentation and publications. Please report any questions and comments about this program or about these pages to Shimon Israel at SIsrael@bayareametro.gov or 415-778-5239.
+Navigating through the tabs above, you should be able to find answers to many of your questions about this program, including those about survey scheduling, contracting, funding, types of questions asked of passengers, data releases for planning and research purposes, and related documentation and publications. Please report any questions and comments about this program or about these pages to Shimon Israel at <a href="mailto:SIsrael@bayareametro.gov">SIsrael@bayareametro.gov</a> or 415-778-5239.
 </p>
 
 <br>