Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jekyllize legacy pages #252

Merged
merged 23 commits into from
Oct 26, 2017
Merged

Jekyllize legacy pages #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4b3802f
One-off migration script to jekyllize legacy pages
adborden Oct 20, 2017
21a9193
Convert windows line endings to unix
adborden Oct 16, 2017
1c82baa
Remove extra end tags in footer
adborden Oct 19, 2017
8337b8e
Move common legacy scripts to include
adborden Oct 19, 2017
a53d300
Jekyllize legacy pages
adborden Oct 19, 2017
246da54
Jekyllize glance.html
adborden Oct 19, 2017
6688507
Override legacy styles
adborden Oct 19, 2017
66cb895
Jekyllize legacy pages
adborden Oct 20, 2017
a7a24cb
Add grid-legacy for fixed legacy grid
adborden Oct 24, 2017
b6a0676
Jekyllize legacy pages
adborden Oct 24, 2017
01d3003
Jekyllize report-makerequest.html
adborden Oct 24, 2017
a1eeb63
Fix about layout if syntax
adborden Oct 24, 2017
e27da8a
Jekyllize legacy pages
adborden Oct 24, 2017
25cc2a2
Update grid-legacy to match usa-grid
adborden Oct 25, 2017
e77aa40
Move legacy styles to temp-fixes
adborden Oct 25, 2017
1418d7a
Fix bad characters in news-spotlight
adborden Oct 25, 2017
1313786
Update canary
adborden Oct 25, 2017
78a0a00
Ignore all kinds of whitespace in canary test
adborden Oct 25, 2017
ed8b1c4
Remove data popup, included elsewhere
adborden Oct 25, 2017
6e8531a
Merge branch 'master' into adb-legacy
adborden Oct 25, 2017
50cb824
Add missing js files to canary
adborden Oct 25, 2017
2d986d6
Fix legacy grid
adborden Oct 25, 2017
03a9c7b
Merge branch 'master' into adb-legacy
adborden Oct 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
@@ -1,5 +1,5 @@

DIFFOPTS=-u -b -B -r -X .canaryignore
DIFFOPTS=-u -i -E -Z -b -w -B -r -X .canaryignore

ifneq ($(DEBUG), 1)
DIFFOPTS+=-q
Expand Down
118 changes: 59 additions & 59 deletions _www.foia.gov-canary/2011foiapost03.html
View file
Open in desktop
Expand Up @@ -58,39 +58,39 @@
<div id="background">
<div id="container">
<!-- Start Header -->
<script async type="text/javascript" id="_fed_an_ua_tag" src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=DOJ"></script>
<script type="text/javascript" src="scripts/breakout.js"></script>
<div id="header">
<div class="skip"><a id="skip-link" href="2011foiapost03.html#mainContent">Skip to Main Content</a>|<a id="skip-link" href="2011foiapost03.html#footerLinks">Skip to Footer</a></div>
<div id="doj"><img src="images/doj-top-logo.jpg" alt="United States Department of Justice" width="360" height="35" class="headerDOJ" /></div>
<div id="headNav">
<div><a href="index.html"><img src="images/foia-title-final.jpg" alt="Foia.gov" width="330" height="80" class="foiaTitle" /></a></div>
<div class="right">
<ul>
<li><a href="news.html">News</a></li>
<li><a href="glossary.html">Glossary</a></li>
<li><a href="faq.html">FAQs</a></li>
<li><a href="index-es.html">en Espa&ntilde;ol</a></li>
<li><a href="feedback.html">Feedback</a></li>
<li><a href="report-makerequest.html">FOIA Contacts</a></li>
</ul>
</div>
</div>
<div class="clear"></div>
<div id="tabs">
<div id="tabnav">
<ul>
<li><a href="index.html" class="home"><p>Home</p></a></li>
<li><a href="data.html" class="data"><p>Data</p></a></li>
<li><a href="reports.html" class="reports"><p>Reports</p></a></li>
<li><a href="search.html" class="find"><p>Find</p></a></li>
<li><a href="about.html" class="about"><p>Learn</p></a></li>
</ul>
</div>
<a id="mainContent"></a>
</div>
</div>
<script async type="text/javascript" id="_fed_an_ua_tag" src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=DOJ"></script>
<script type="text/javascript" src="scripts/breakout.js"></script>
<div id="header">
<div class="skip"><a id="skip-link" href="2011foiapost03.html#mainContent">Skip to Main Content</a>|<a id="skip-link" href="2011foiapost03.html#footerLinks">Skip to Footer</a></div>
<div id="doj"><img src="images/doj-top-logo.jpg" alt="United States Department of Justice" width="360" height="35" class="headerDOJ" /></div>
<div id="headNav">
<div><a href="index.html"><img src="images/foia-title-final.jpg" alt="Foia.gov" width="330" height="80" class="foiaTitle" /></a></div>
<div class="right">
<ul>
<li><a href="news.html">News</a></li>
<li><a href="glossary.html">Glossary</a></li>
<li><a href="faq.html">FAQs</a></li>
<li><a href="index-es.html">en Espa&ntilde;ol</a></li>
<li><a href="feedback.html">Feedback</a></li>
<li><a href="report-makerequest.html">FOIA Contacts</a></li>
</ul>
</div>
</div>
<div class="clear"></div>
<div id="tabs">
<div id="tabnav">
<ul>
<li><a href="index.html" class="home"><p>Home</p></a></li>
<li><a href="data.html" class="data"><p>Data</p></a></li>
<li><a href="reports.html" class="reports"><p>Reports</p></a></li>
<li><a href="search.html" class="find"><p>Find</p></a></li>
<li><a href="about.html" class="about"><p>Learn</p></a></li>
</ul>
</div>

<a id="mainContent"></a>
</div>
</div>

<!-- End Header -->

Expand Down Expand Up @@ -247,10 +247,10 @@ <h2><a href="reports.html"><img src="images/reports-homepage-title.gif" alt="Rep
</div>

<div id="tab-popular" class="tabContent">
<ul><div class="reportText">The most popular reports run by users of FOIA.gov</div><li><a href="data.html?foia/Services/DataRequest.jsp?agencyName=DHS&amp;requestYear=2016">Department of Homeland Security: Requests 2016</a></li>
<li><a href="data.html?foia/Services/DataRequest.jsp?agencyName=DOJ&amp;requestYear=2016">Department of Justice: Requests 2016</a></li>
<li><a href="data.html?foia/Services/DataRequest.jsp?agencyName=DoD&amp;requestYear=2016">Department of Defense: Requests 2016</a></li>
<li><a href="data.html?foia/Services/DataRequest.jsp?agencyName=DHS&amp;requestYear=2015">Department of Homeland Security: Requests 2015</a></li>
<ul><div class="reportText">The most popular reports run by users of FOIA.gov</div><li><a href="data.html?foia/Services/DataRequest.jsp?agencyName=DHS&amp;requestYear=2016">Department of Homeland Security: Requests 2016</a></li>
<li><a href="data.html?foia/Services/DataRequest.jsp?agencyName=DOJ&amp;requestYear=2016">Department of Justice: Requests 2016</a></li>
<li><a href="data.html?foia/Services/DataRequest.jsp?agencyName=DoD&amp;requestYear=2016">Department of Defense: Requests 2016</a></li>
<li><a href="data.html?foia/Services/DataRequest.jsp?agencyName=DHS&amp;requestYear=2015">Department of Homeland Security: Requests 2015</a></li>
</ul>
<div class="tabMore"><a href="reports.html">VIEW MORE</a></div>
</div>
Expand Down Expand Up @@ -328,28 +328,28 @@ <h3><a href="news-spotlight.html#boemrenewableenergy">BOEM Launches Interactive
<div id="shadowFilter" class="blockout" style="display:none;"></div>
<div id="exitMsg" class="exitMsg" style="display:none;"></div>
<!-- Start Footer -->
<div id="footer"><a href="index.html"><img src="images/foia-footer.gif" alt="foia.gov" /><span>Foia.gov</span></a>
<div id="footerNav">
<a id="footerLinks"></a>
<ul>
<li><a href="sitemap.html">Site Map</a></li>
<li><a href="https://www.justice.gov/accessibility/accessibility-information">Accessibility</a></li>
<li><a href="foia-info.html">FOIA</a></li>
<li><a href="https://www.justice.gov/doj/privacy-policy">Privacy Policy</a></li>
<li><a href="https://www.justice.gov/legalpolicies">Policies &amp; Disclaimers</a></li>
<li><a href="quality.html">Information Quality</a></li>
<li><a href="developer.html">Developer Resources</a></li>
<li><a href="http://www.justice.gov">Justice.gov</a></li>
<li><a href="http://www.usa.gov">USA.gov</a></li>
</ul>
</div>
<div class="clear">&nbsp;</div>
<div align="center">
<a href="http://www.data.gov/"><img src="images/datagov-footer.gif" alt="data.gov" /><span>Data.gov</span></a>
<a href="http://www.whitehouse.gov/open"><img src="images/opengov-footer.gif" alt="whitehouse.gov/open" /><span>Whitehouse.gov/open</span></a>
<a href="http://www.usaspending.gov/"><img src="images/usaspending-footer.gif" alt="usaspending.gov" /><span>USASpending.gov</span></a>
<a href="http://www.recovery.gov/"><img src="images/recoverygov-footer.gif" alt="recovery.gov" /><span>Recovery.gov</span></a>
</div>
<div id="footer"><a href="index.html"><img src="images/foia-footer.gif" alt="foia.gov" /><span>Foia.gov</span></a>
<div id="footerNav">
<a id="footerLinks"></a>
<ul>
<li><a href="sitemap.html">Site Map</a></li>
<li><a href="https://www.justice.gov/accessibility/accessibility-information">Accessibility</a></li>
<li><a href="foia-info.html">FOIA</a></li>
<li><a href="https://www.justice.gov/doj/privacy-policy">Privacy Policy</a></li>
<li><a href="https://www.justice.gov/legalpolicies">Policies &amp; Disclaimers</a></li>
<li><a href="quality.html">Information Quality</a></li>
<li><a href="developer.html">Developer Resources</a></li>
<li><a href="http://www.justice.gov">Justice.gov</a></li>
<li><a href="http://www.usa.gov">USA.gov</a></li>
</ul>
</div>
<div class="clear">&nbsp;</div>
<div align="center">
<a href="http://www.data.gov/"><img src="images/datagov-footer.gif" alt="data.gov" /><span>Data.gov</span></a>
<a href="http://www.whitehouse.gov/open"><img src="images/opengov-footer.gif" alt="whitehouse.gov/open" /><span>Whitehouse.gov/open</span></a>
<a href="http://www.usaspending.gov/"><img src="images/usaspending-footer.gif" alt="usaspending.gov" /><span>USASpending.gov</span></a>
<a href="http://www.recovery.gov/"><img src="images/recoverygov-footer.gif" alt="recovery.gov" /><span>Recovery.gov</span></a>
</div>
</div>
<!-- End Footer -->
</div>
Expand Down
43 changes: 25 additions & 18 deletions _www.foia.gov-canary/about.html
View file
Open in desktop
Expand Up @@ -10,26 +10,20 @@
<meta name="dc.creator" content="Freedom of Information Act (FOIA)" />
<meta name="dc.language" scheme="ISO639" content="en-us" />
<meta name="dc.date.created" content="2011-03-14" />
<link rel="stylesheet" type="text/css" href="/foia-style.css" />


<script type="text/javascript" src="/qtip/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/swfobject/2.1/swfobject.js"></script>
<script type="text/javascript" src="/tipVideo.js"></script>
<script type="text/javascript" src="/foiareport.js"></script>
<script type="text/javascript" src="/FusionCharts.js"></script>

<script type="text/javascript" src="foiareport.js"></script>

<script type="text/javascript" src="FusionCharts.js"></script>

<script type="text/javascript" src="tipVideo.js"></script>

<script type="text/javascript" src="/scripts/breakout.js"></script>

<script src="/assets/js/uswds.bundle.js"></script>
<script src="/assets/js/glossary.bundle.js"></script>

<script type="text/javascript" src="/qtip/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>


<link rel="stylesheet" type="text/css" href="/foia-style.css" />
<title>FOIA.gov - Freedom of Information Act: Learn</title>
</head>

Expand Down Expand Up @@ -187,7 +181,9 @@ <h1 class="usa-header-title">FOIA.gov</h1>
<div id="content">
<a name="top" id="top"></a>
<div id="subLeft">

<img src="/images/about-title.gif" alt="Learn" class="subTitle" />

<ul id="subNav">

<li class="about selected"><a href="/about.html">What is FOIA?</a></li>
Expand All @@ -200,7 +196,7 @@ <h1 class="usa-header-title">FOIA.gov</h1>

</div>
<div id="subRight">
<h1><a name="top" id="top"></a>What is FOIA?&nbsp;</h1>
<h1>What is FOIA?&nbsp;</h1>

<p>Since 1967, the Freedom of Information Act (FOIA) has provided the public the right to request access to records from any federal agency. It is often described as the law that keeps citizens in the know about their government. Federal agencies are required to disclose any information requested under the FOIA unless it falls under one of nine exemptions which protect interests such as personal privacy, national security, and law enforcement.</p>

Expand All @@ -222,22 +218,19 @@ <h1><a name="top" id="top"></a>What is FOIA?&nbsp;</h1>

<p>&nbsp;</p>

<div class="lineshadow"></div>

<h2><a name="who" id="who"></a>What is the Presumption of Openness and Who Issues Guidance to Agencies on the FOIA?</h2>

<p>The FOIA provides that when processing requests, agencies should withhold information only if they reasonably foresee that disclosure would harm an interest protected by an exemption, or if disclosure is prohibited by law. Agencies should also consider whether partial disclosure of information is possible whenever they determine that full disclosure is not possible and they should take reasonable steps to segregate and release nonexempt information. The Office of Information Policy at the Department of Justice is responsible for issuing government-wide guidance on the FOIA as part of its responsibilities to encourage all agencies to fully comply with both the letter and the spirit of the FOIA.</p>

<p align="right"><a href="#top">Return to Top</a></p>
<p align="right"><a href="#top">Return to top</a></p>

</div>
<div class="clear"></div>

</div>
</div>
<!-- Start Footer -->

<div id="shadowFilter" class="blockout" style="display:none;"></div>
<div id="exitMsg" class="exitMsg" style="display:none;"></div>
<div class="footer usa-grid-full">
<a href="/"><img src="/images/foia-footer.gif" alt="FOIA.gov" /><span>Foia.gov</span></a>
<div id="footerNav">
Expand Down Expand Up @@ -278,6 +271,20 @@ <h2 id="glossary-title">Glossary</h2>
</div>


<div id="shadowFilter" class="blockout" style="display:none;"></div>
<div id="exitMsg" class="exitMsg" style="display:none;"></div>
<!-- Start Popup Window -->
<div id="popupMsg" class="popupWindow" style="display:none;">
<div class="popupClose"><a href="javascript:popupCloseToData();">close</a><a href="javascript:popupCloseToData();"><img src="/images/popup-close.gif" alt="Close Window" /></a></div>
<div class="clear"></div>
<div class="popupBody" id="popupMsgBody">
<!-- Popup Body -->

</div>
</div>
<!-- End Popup Window -->


<script type="text/javascript" src="/about.js"></script>

</body>
Expand Down
54 changes: 29 additions & 25 deletions _www.foia.gov-canary/data.html
View file
Open in desktop
Expand Up @@ -10,28 +10,30 @@
<meta name="dc.creator" content="Freedom of Information Act (FOIA)" />
<meta name="dc.language" scheme="ISO639" content="en-us" />
<meta name="dc.date.created" content="2011-03-14" />
<link rel="stylesheet" type="text/css" href="reports.css" />
<link rel="stylesheet" type="text/css" href="/foia-style.css" />

<link rel="stylesheet" type="text/css" href="/reports.css" />


<script type="text/javascript" src="/qtip/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/swfobject/2.1/swfobject.js"></script>
<script type="text/javascript" src="/tipVideo.js"></script>
<script type="text/javascript" src="/foiareport.js"></script>
<script type="text/javascript" src="/FusionCharts.js"></script>

<script type="text/javascript" src="foiaFunctions.js"></script>

<script type="text/javascript" src="agencyWork.js"></script>

<script type="text/javascript" src="foiareport.js"></script>
<script type="text/javascript" src="foiaFunctions.js"></script>

<script type="text/javascript" src="FusionCharts.js"></script>
<script type="text/javascript" src="agencyWork.js"></script>

<script type="text/javascript" src="foiaAjax.js"></script>

<script type="text/javascript" src="tablehover.js"></script>

<script src="/assets/js/uswds.bundle.js"></script>
<script src="/assets/js/glossary.bundle.js"></script>

<script type="text/javascript" src="/qtip/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>


<link rel="stylesheet" type="text/css" href="/foia-style.css" />
<title>FOIA.gov - Freedom of Information Act: Data</title>
</head>

Expand Down Expand Up @@ -187,17 +189,7 @@ <h1 class="usa-header-title">FOIA.gov</h1>

<div class="usa-grid" id="main">
<div id="content">
<!-- Start Popup Window -->
<div id="popupMsg" class="popupWindow" style="display:none;">
<div class="popupClose"><a href="javascript:popupCloseToData();">close</a><a href="javascript:popupCloseToData();"><img src="images/popup-close.gif" alt="Close Window" /></a></div>
<div class="clear"></div>
<div class="popupBody" id="popupMsgBody">
<!-- Popup Body -->
</div>
</div>
<!-- End Popup Window -->

<div id="dataTable">
<div id="dataTable">
<div class="topWindow" >
<!-- Create Report Box -->
<div id="createReport">
Expand All @@ -217,7 +209,7 @@ <h1 class="usa-header-title">FOIA.gov</h1>
<div class="reportText">
<p><strong>Instructions:</strong> You can explore the <span data-term="foia">FOIA</span> data that makes up an agency&rsquo;s annual FOIA report. Search for data from a single agency or compare data from multiple agencies. Just follow these steps:</p>
<ol>
<li>At the &ldquo;Select Report&rdquo; column, click on a category, such as &ldquo;Requests&rdquo; or &ldquo;Administration&rdquo;&nbsp; to select the type of report you would like to run. Learn more about these categories in the<a href="glossary.html">Glossary</a>. </li>
<li>At the &ldquo;Select Report&rdquo; column, click on a category, such as &ldquo;Requests&rdquo; or &ldquo;Administration&rdquo;&nbsp; to select the type of report you would like to run. Learn more about these categories in the <a href="glossary.html">glossary</a>. </li>
<li>Use the (+) or (-) signs appearing next to the text box to select the agency/agencies you want to look up, selecting up to four at a time. </li>
<li>Choose the year you would like to see data from. </li>
<li>Click &ldquo;Create Report.&rdquo;&nbsp; Scroll down to see your customized report. </li>
Expand Down Expand Up @@ -847,8 +839,6 @@ <h2>This Number:</h2>
</div>
<!-- Start Footer -->

<div id="shadowFilter" class="blockout" style="display:none;"></div>
<div id="exitMsg" class="exitMsg" style="display:none;"></div>
<div class="footer usa-grid-full">
<a href="/"><img src="/images/foia-footer.gif" alt="FOIA.gov" /><span>Foia.gov</span></a>
<div id="footerNav">
Expand Down Expand Up @@ -889,6 +879,20 @@ <h2 id="glossary-title">Glossary</h2>
</div>


<div id="shadowFilter" class="blockout" style="display:none;"></div>
<div id="exitMsg" class="exitMsg" style="display:none;"></div>
<!-- Start Popup Window -->
<div id="popupMsg" class="popupWindow" style="display:none;">
<div class="popupClose"><a href="javascript:popupCloseToData();">close</a><a href="javascript:popupCloseToData();"><img src="/images/popup-close.gif" alt="Close Window" /></a></div>
<div class="clear"></div>
<div class="popupBody" id="popupMsgBody">
<!-- Popup Body -->

</div>
</div>
<!-- End Popup Window -->




</body>
Expand Down