Move travel-and-leave to top level (#2750)

* Move travel-and-leave to top level * Fix broken travel 101 links * Fixing a few more pages * Two more pages * Try one file * Three more files * A few more! * Fixing templates * Fixing even more * This will fix a bunch of stuff * Last ones? * Last one * For real
18F · Aug 2, 2021 · d37b7c4 · d37b7c4
1 parent b664f8e
commit d37b7c4
Show file tree

Hide file tree

Showing 24 changed files with 172 additions and 128 deletions.
diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -89,25 +89,25 @@ primary:
       Going somewhere? Here's what you need to know.
     children:
       - text: Updated Travel Guidance for GSA Employees (07/13/2021)
-        url: july-13-travel-guidance/
+        url: travel-and-leave/july-13-travel-guidance/
         internal: true
       - text: Leave (HR Links)
-        url: leave/
+        url: travel-and-leave/leave/
         internal: true
       - text: Covid leave guidance
         url: https://docs.google.com/document/d/1kiIowld8JIY-ORa1Udaj8EosoHjJXF64IekusOsGtdw/edit?usp=sharing
         internal: false
       - text: Out of office expectations
-        url: leave/#leave-checklist
+        url: travel-and-leave/leave/#leave-checklist
         internal: true
       - text: Paid Parental Leave
-        url: leave/#federal-employee-paid-leave-act-paid-parental-leave
+        url: travel-and-leave/leave/#federal-employee-paid-leave-act-paid-parental-leave
         internal: true
       - text: Travel guide (table of contents)
-        url: travel-guide-table-of-contents/
+        url: travel-and-leave/travel-guide-table-of-contents/
         internal: true
       - text: Voluntary Leave Transfer Program (VLTP)
-        url: voluntary-leave-transfer-program/
+        url: travel-and-leave/voluntary-leave-transfer-program/
         internal: true
   - text: Performance management
     href: /#performance-management

diff --git a/_pages/general-information-and-resources/business-and-ops-policies/top-secret.md b/_pages/general-information-and-resources/business-and-ops-policies/top-secret.md
@@ -22,7 +22,7 @@ There are [three national security clearance levels](https://en.wikipedia.org/wi
 
 ## Your clearance status
 
-Find out your clearance status in [HRLinks]({{site.baseurl}}/leave/#logging-into-hr-links)
+Find out your clearance status in [HRLinks]({{site.baseurl}}/travel-and-leave/leave/#logging-into-hr-links)
 
 1. Click on the **Navigator** icon in the top right hand corner
 2. Click on "Click View/Update My Personal Info" icon

diff --git a/_pages/software-and-tools/tock.md b/_pages/software-and-tools/tock.md
@@ -89,7 +89,7 @@ You **must** bill for the below activities because these are direct costs. This
 
 You must not bill for the following activities because these are indirect costs and are not inherently valuable to any one single partner. As a result, we distribute the costs for these amongst all our partners via our hourly rate. Recording these as billable would mean we're billing for them twice.
 
-- [Out of office (Award leave, sick leave, PTO)](../leave/#time-tracking)
+- [Out of office (Award leave, sick leave, PTO)]({{site.baseurl}}/travel-and-leave/leave/#time-tracking)
 - Conferences, trainings and meetings that are not in service of project work
 - OLU trainings that are not in service of project work
 - Internal organization meetings (Team Coffees, TTS Town Hall)

diff --git a/_pages/travel-and-leave/travel-guide-table-of-contents.md b/_pages/travel-and-leave/travel-guide-table-of-contents.md
diff --git a/admin/config.yml b/admin/config.yml
@@ -130,4 +130,14 @@ collections:
         - {label: "Title", name: "title", widget: "string"}
         - {label: "Questions", name: "questions", widget: "list"}
         - {label: "Body", name: "body", widget: "markdown"}
-
+    - name: "travel-and-leave"
+      label: "Travel and leave"
+      label_singular: "Travel and leave page"
+      folder: "travel-and-leave/"
+      nested: { depth: 4 }
+      meta: { path: { widget: string, label: 'Path', index_file: 'index' } }
+      create: true
+      fields: 
+        - {label: "Title", name: "title", widget: "string"}
+        - {label: "Questions", name: "questions", widget: "list"}
+        - {label: "Body", name: "body", widget: "markdown"}
diff --git a/getting-started/classes/benefits.md b/getting-started/classes/benefits.md
@@ -180,7 +180,7 @@ Employees at TTS are eligible to participate in the [Thrift Savings Plan](https:
 
 To start, change, or stop your contributions, you'll need to fill out [Form TSP-1](https://www.tsp.gov/PDF/formspubs/tsp-1.pdf).
 
-You can also update TSP directly in [HR Links]({{site.baseurl}}/leave/#logging-into-hr-links) by following this [visual guide](https://corporateapps.gsa.gov/corporateapps/files/Updating-TSP-Traditional-or-Roth.pdf) or these steps:
+You can also update TSP directly in [HR Links]({{site.baseurl}}/travel-and-leave/leave/#logging-into-hr-links) by following this [visual guide](https://corporateapps.gsa.gov/corporateapps/files/Updating-TSP-Traditional-or-Roth.pdf) or these steps:
 
 1. After you sign into HR Links, click "Benefits Summary"
 1. Click on the **TSP** tile/row to view and edit your contribution amounts

diff --git a/getting-started/classes/travel-101.md b/getting-started/classes/travel-101.md
@@ -17,21 +17,21 @@ You'll also want to [apply for a GSA travel card]({{site.baseurl}}/first-time-tr
 
 Once you are [set up in Concur]({{site.baseurl}}/first-time-travel-get-in-concur/) and your [travel card]({{site.baseurl}}/first-time-travel-travel-card/) is on its way, there are three main parts of the travel process to be aware of:
 
-1. [Booking flights/rail, hotels, and rental cars]({{site.baseurl}}/travel-guide-1-book-travel/) in [Concur](https://travel.gsa.gov) or via AdTrav at (877) 472-6716, [completing trip information]({{site.baseurl}}/travel-guide-faq/#completing-trip-information) and [stamping and submitting]({{site.baseurl}}/travel-guide-faq/#how-to-stamp-and-submit-for-travel-team-approval) in [Concur](https://travel.gsa.gov), and [securing approval either via email]({{site.baseurl}}/travel-guide-faq/#how-to-secure-authorizing-official-approval) from your [authorizing official]({{site.baseurl}}/travel-guide-faq/#who-is-my-authorizing-official-and-what-is-my-budget), or through the [event request process]({{site.baseurl}}/travel-guide-faq/#how-can-i-get-my-travel-approved-to-attend-a-training-conference-speaking-event-or-other-irl-or-large-team-gathering)
+1. [Booking flights/rail, hotels, and rental cars]({{site.baseurl}}/travel-guide-1-book-travel/) in [Concur](https://travel.gsa.gov) or via AdTrav at (877) 472-6716, [completing trip information]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#completing-trip-information) and [stamping and submitting]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#how-to-stamp-and-submit-for-travel-team-approval) in [Concur](https://travel.gsa.gov), and [securing approval either via email]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#how-to-secure-authorizing-official-approval) from your [authorizing official]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#who-is-my-authorizing-official-and-what-is-my-budget), or through the [event request process]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#how-can-i-get-my-travel-approved-to-attend-a-training-conference-speaking-event-or-other-irl-or-large-team-gathering)
 2. [What to keep in mind while on official travel]({{site.baseurl}}/travel-guide-2-travel/), including which receipts to keep, and when to use the GSA travel card
-3. [Getting reimbursed for official travel]({{site.baseurl}}/travel-guide-3-reimbursement/) (plus [local travel]({{site.baseurl}}/travel-guide-faq/#how-do-i-create-a-local-or-miscellaneous-voucher) or [non-travel related reimbursements]({{site.baseurl}}/travel-guide-faq/#how-do-i-create-a-local-or-miscellaneous-voucher) such as [professional liability insurance]({{site.baseurl}}/travel-guide-faq/#how-can-i-get-reimbursed-for-professional-liability-insurance) for supervisors)
+3. [Getting reimbursed for official travel]({{site.baseurl}}/travel-guide-3-reimbursement/) (plus [local travel]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#how-do-i-create-a-local-or-miscellaneous-voucher) or [non-travel related reimbursements]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#how-do-i-create-a-local-or-miscellaneous-voucher) such as [professional liability insurance]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#how-can-i-get-reimbursed-for-professional-liability-insurance) for supervisors)
 
 There are also a few specialized guides to be aware of for the following situations:
 
 - [Rebooking and changing official travel plans]({{site.baseurl}}/travel-guide-a-amended-authorizations/)
 - [After hours and emergency travel]({{site.baseurl}}/travel-guide-b-after-hours-emergency-travel-authorizations)
-- Combining official and personal travel, including [extensions at personal expense]({{site.baseurl}}/travel-guide-faq/#what-if-i-am-extending-travel-for-personal-reasons), and [travel to and from cities other than one's home location and worksite]({{site.baseurl}}/travel-guide-faq/#what-if-i-am-returning-to-or-traveling-from-a-location-other-than-home).
-- [Traveling for multiple projects]({{site.baseurl}}/travel-guide-faq/#what-if-i-am-traveling-for-multiple-projects)
-- [Issues with reimbursement]({{site.baseurl}}/travel-guide-faq/#issues-with-reimbursement)
+- Combining official and personal travel, including [extensions at personal expense]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#what-if-i-am-extending-travel-for-personal-reasons), and [travel to and from cities other than one's home location and worksite]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#what-if-i-am-returning-to-or-traveling-from-a-location-other-than-home).
+- [Traveling for multiple projects]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#what-if-i-am-traveling-for-multiple-projects)
+- [Issues with reimbursement]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#issues-with-reimbursement)
 
 ### Getting help
 
-**You** are responsible for securing your [authorizing official's approval to travel]({{site.baseurl}}/travel-guide-faq/#how-to-secure-authorizing-official-approval), properly submitting your [applications for Concur]({{site.baseurl}}/first-time-travel-get-in-concur/) and the [GSA travel card]({{site.baseurl}}/first-time-travel-travel-card/), booking your travel through [Concur](https://travel.gsa.gov) or AdTrav at (877) 472-6716, and ensuring your travel request is properly [stamped and submitted]({{site.baseurl}}/travel-guide-faq/#how-to-stamp-and-submit-for-travel-team-approval) in Concur.
+**You** are responsible for securing your [authorizing official's approval to travel]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#how-to-secure-authorizing-official-approval), properly submitting your [applications for Concur]({{site.baseurl}}/first-time-travel-get-in-concur/) and the [GSA travel card]({{site.baseurl}}/first-time-travel-travel-card/), booking your travel through [Concur](https://travel.gsa.gov) or AdTrav at (877) 472-6716, and ensuring your travel request is properly [stamped and submitted]({{site.baseurl}}/travel-and-leave/travel-and-leave-policies/travel-guide-faq/#how-to-stamp-and-submit-for-travel-team-approval) in Concur.
 
 **The TTS Travel Team** is responsible for approving properly submitted travel in Concur, and answering most\* of the questions you might have along the way. You can reach them either via email at [email protected], in Slack in the #travel channel, or by booking [travel/purchase office hours](https://sites.google.com/a/gsa.gov/tts-office-hours/). Note that the travel team won't be available to immediately assist with your inquiry, though the team endeavors to answer all questions that come through by their next office hours which are twice daily. Properly submitted authorizations for upcoming travel are reviewed by the team daily, and vouchers are reviewed within 5 business days. Close of business for the travel team is at **4:30 PM ET**. Should you need support after-hours, read the guide [here]({{site.baseurl}}/travel-guide-b-after-hours-emergency-travel-authorizations).
 

diff --git a/...avel-and-leave/july-13-travel-guidance.md → travel-and-leave/july-13-travel-guidance.md b/...avel-and-leave/july-13-travel-guidance.md → travel-and-leave/july-13-travel-guidance.md
@@ -1,5 +1,7 @@
 ---
 title: Updated Travel Guidance for GSA Employees (07/13/2021)
+redirect_from:
+  - /july-13-travel-guidance/
 ---
 
 GSA continues to adjust to the changing COVID-19 pandemic status. Effective immediately as of July 13, any requests for travel must be mission critical, time sensitive and required to perform essential duties. The employee’s authorizing official (AO) is responsible for making the determination if travel requests meet that threshold. Of note:

diff --git a/_pages/travel-and-leave/leave.md → travel-and-leave/leave.md b/_pages/travel-and-leave/leave.md → travel-and-leave/leave.md
@@ -21,6 +21,8 @@ tags:
   - parental
   - parent
   - parental leave
+redirect_from:
+  - /leave/
 ---
 
 This page provides instructions for entering leave requests (also known as absence requests) in <a href="https://corporateapps.gsa.gov/hr-links/">HR Links</a> and information on the various types of leave.

diff --git a/...st-time-travel-complete-concur-profile.md → ...st-time-travel-complete-concur-profile.md b/...st-time-travel-complete-concur-profile.md → ...st-time-travel-complete-concur-profile.md
@@ -5,6 +5,8 @@ questions:
   - [email protected]
   - text: Book office hours
     url: https://sites.google.com/a/gsa.gov/tts-office-hours/
+redirect_from:
+  - /first-time-travel-complete-concur-profile/
 ---
 
 [TTS Travel Guide Table of Contents]({{site.baseurl}}/travel-guide-table-of-contents) <br>