Skip to content
This repository was archived by the owner on Jun 18, 2024. It is now read-only.

Commit e0f59ae

Browse files
konklonekonklone
committed
Merge branch 'master' into new-url
Conflicts: _config.yml _includes/header.html implementation-guide.md policy-docs.md schema.md
2 parents 4c8e1e3 + d17863d commit e0f59ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+8720
-1675
lines changed

Diff for: ‎CNAME

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
project-open-data.cio.gov

Diff for: ‎CONTRIBUTING.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44

55
## How to Contribute
66

7-
This project constitutes a collaborative work ("open source"). Federal employees and members of the public are encouraged to improve the project by contributing. For more information, please see [the FAQ](/faq/)
7+
This project constitutes a collaborative work ("open source"). Federal employees and members of the public are encouraged to improve the project by contributing. For more information, please see [the FAQ](https://project-open-data.cio.gov/faq/)
88

99
Contributions can be made, primarily in two ways:
1010

1111
### Easy
1212

13-
1. Browse the content at http://project-open-data.github.io/
14-
2. Click the "Improve this content" button in the top right corner of any page
15-
3. Make changes as you would normally
13+
1. Browse the content at http://project-open-data.github.io/.
14+
2. Click the "Improve this content" button in the top right corner of any page.
15+
3. Make changes as you would normally.
1616
4. Click "Submit".
17-
5. You change should appear once approved.
17+
5. Your change(s) should appear once approved.
1818

1919
*Note: You may need to [create a free GitHub account](https://github.com/signup/free) if you do not already have one*
2020

@@ -25,7 +25,7 @@ Contributions can be made, primarily in two ways:
2525
3. Make changes as you would normally using the tools installed in step #1.
2626
4. Push the changes back to your fork
2727
5. Submitting a pull request to this repository
28-
6. You change should appear once approved.
28+
6. Your change(s) should appear once approved.
2929

3030
## Running Locally
3131

Diff for: ‎_includes/footer.html

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
<hr>
2-
<div class="container-fluid" id="footer">
2+
<div class="container" id="footer">
33
<div class="row-fluid">
44
<div class="span12">
5-
<a class="btn btn-primary" href="{{ edit_url }}">Help Improve this Content</a>
5+
<div class="pull-left">
6+
<a class="btn btn-primary" href="{{ edit_url }}">Edit this Page</a>
7+
<a class="btn btn-default" href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/commits/{{ site.branch }}">View Revision History</a>
8+
</div>
69
<div class="pull-right">
710
<iframe src="/assets/ghbtns/github-btn.html?user={{ site.org_name }}&repo={{ site.repo_name }}&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="95" height="20"></iframe>
811
</div>
912
</div>
1013
</div>
1114
</div><!-- /container -->
1215

13-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js"></script>
14-
<script>window.jQuery || document.write('<script src="{{ site.root_url }}/assets/js/vendor/jquery-1.8.1.min.js"><\/script>')</script>
15-
<script src="{{ site.root_url }}/assets/js/bootstrap.min.js"></script>
16+
17+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
18+
<script>window.jQuery || document.write('<script src="/assets/js/vendor/jquery-1.11.1.min.js"><\/script>')</script>
19+
<script src="/assets/js/bootstrap.min.js"></script>
20+
21+
1622

1723
</body>
1824
</html>

Diff for: ‎_includes/header.html

+43-26
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@
99
<meta name="description" content="{{ site.desc }}">
1010
<meta name="viewport" content="width=device-width">
1111

12-
<title>{{ site.title }}</title>
12+
<title>{{ page.title }} - {{ site.title }}</title>
1313

14+
<link rel="shortcut icon" href="/favicon.ico"/>
1415
<link rel="stylesheet" href="/assets/css/bootstrap.css">
1516
<link rel="stylesheet" href="/assets/css/site.css">
1617

1718
<link rel="canonical" href="{{ site.url }}{{ page.url }}" />
1819

19-
{% capture edit_url %}https://github.com/{{ site.org_name }}/{{ site.repo_name }}/edit/{{ site.branch }}/{{ page.filename }}{% endcapture %}
20+
{% capture edit_url %}https://github.com/{{ site.org_name }}/{{ site.repo_name }}/edit/{{ site.branch }}/{{ page.path }}{% endcapture %}
21+
2022
</head>
2123
<body class="{{ page.id }}">
2224
<!--[if lt IE 7]>
@@ -29,29 +31,44 @@
2931
</div>
3032
<![endif]-->
3133

32-
<div id="header">
33-
<div class="container-fluid">
34-
<div class="row-fluid">
35-
<div class="span12">
36-
<div class="navbar navbar-inverse">
37-
<div class="navbar-inner">
38-
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
39-
<span class="icon-bar"></span>
40-
<span class="icon-bar"></span>
41-
<span class="icon-bar"></span>
42-
</a>
43-
<a class="brand" href="{{ site.root_url }}/">Project Open Data</a>
44-
<div class="nav-collapse collapse">
45-
<ul class="nav pull-right">
46-
<li><a href="{{ edit_url }}">Help Improve this Content</a></li>
47-
<li><a href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/commits/{{ site.branch }}">View Revision History</a></li>
48-
<li><a href="{{ site.root_url }}/faq">FAQ</a></li>
49-
<li><a href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/issues">Discuss</a></li>
50-
</ul>
51-
</div><!--/.nav-collapse -->
52-
</div>
53-
</div>
54-
</div>
34+
35+
<!-- Static navbar -->
36+
<div id="header" class="navbar navbar-default navbar-static-top" role="navigation">
37+
<div class="container">
38+
<div class="navbar-header">
39+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
40+
<span class="sr-only">Toggle navigation</span>
41+
<span class="icon-bar"></span>
42+
<span class="icon-bar"></span>
43+
<span class="icon-bar"></span>
44+
</button>
45+
<a class="navbar-brand" href="{{ site.root_url }}/">Project Open Data</a>
5546
</div>
47+
<div class="navbar-collapse collapse">
48+
<ul class="nav navbar-nav navbar-right">
49+
<li><a class="edit-button" href="{{ edit_url }}"><span>Edit this Page</span></a></li>
50+
<li class="dropdown">
51+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Definitions<span class="caret"></span></a>
52+
<ul class="dropdown-menu" role="menu">
53+
<li><a href="/v1.1/schema">Metadata Schema v1.1</a></li>
54+
<li><a href="/glossary">Open Data Glossary</a></li>
55+
<li><a href="/open-standards">Data Standards</a></li>
56+
<li><a href="/principles">Open Data Principles </a></li>
57+
<li><a href="/open-licenses">Open Licenses</a></li>
58+
</ul>
59+
</li>
60+
<li class="dropdown">
61+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Guidance<span class="caret"></span></a>
62+
<ul class="dropdown-menu" role="menu">
63+
<li><a href="/policy-memo">Policy - OMB M-13-13</a></li>
64+
<li><a href="/implementation-guide">Implementation Guide</a></li>
65+
<li><a href="/catalog">Public Data Listing</a></li>
66+
<li><a href="http://goals.performance.gov/opendata">Open Data CAP Goal</a></li>
67+
<li><a href="/faq">FAQ</a></li>
68+
</ul>
69+
</li>
70+
<li><a href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/issues">Discuss</a></li>
71+
</ul>
72+
</div><!--/.nav-collapse -->
5673
</div>
57-
</div>
74+
</div>

Diff for: ‎_layouts/default.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% include header.html %}
22

3-
<div class="container-fluid">
3+
<div class="container">
44
<div class="row-fluid">
55
<div class="span12">
66
<h1>{{ page.title }}</h1>

Diff for: ‎_layouts/hero.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% include header.html %}
22

33
<div class="hero-unit home">
4-
<div class="container-fluid">
4+
<div class="container">
55
<div class="row-fluid">
66
<div class="span12">
77
<h1>{{ site.title }}</h1>
@@ -11,7 +11,7 @@ <h2>{{ site.desc }}</h2>
1111
</div>
1212
</div>
1313

14-
<div class="container-fluid">
14+
<div class="container">
1515
<div class="row-fluid">
1616
<div class="span12">
1717
{{ content }}

Diff for: ‎api-basics.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ APIs have been around since the 1980s, when they were used in hardware and softw
2424

2525
### How government agencies are using APIs
2626

27-
DigitalGov University has recorded a [variety of courses](http://www.howto.gov/training/classes#apis-and-data) on how APIs can be used by government organizations and made them available online.
27+
DigitalGov University has recorded a [variety of courses](http://18f.github.io/API-All-the-X/pages/education) on how APIs can be used by government organizations and made them available online.
2828

2929

3030
### First Mover
@@ -61,15 +61,15 @@ Many of these pioneers have shaped the way in which we develop, deploy, consume,
6161

6262
APIs are driven by a set of specific technologies, making them easily understood by developers. This type of focus means that APIs can work with any common programming language, with the most popular approach to delivering web APIs being REST, or [REpresentational State Transfer](http://en.wikipedia.org/wiki/Representational_state_transfer).
6363

64-
REST takes advantage of the same Internet mechanisms that are used to view regular web pages, giving it many advantages, that can result in faster implementations and easier for developers to understand and use. REST APIs allow you to take data and functionality that may already be available on your website and make them available through a programmatic API, that both web and mobile applications can use. Then, instead of returning HTML to represent the information like a website would, an API returns data in one of two possible formats:
65-
* [Extensible Markup Language (XML)](http://en.wikipedia.org/wiki/Xml)
66-
* [JavaScript Object Notation (JSON)](http://en.wikipedia.org/wiki/JSON)
64+
REST takes advantage of the same Internet mechanisms that are used to view regular web pages, giving it many advantages, that can result in faster implementations and easier for developers to understand and use. REST APIs allow you to take data and functionality that may already be available on your website and make them available through a programmatic API, that both web and mobile applications can use. Then, instead of returning HTML to represent the information like a website would, an API returns data in one of two possible formats:
65+
* [Extensible Markup Language (XML)](http://en.wikipedia.org/wiki/Xml)
66+
* [JavaScript Object Notation (JSON)](http://en.wikipedia.org/wiki/JSON)
6767

6868
Developers can then take this data and use in web and mobile applications. However XML and JSON are easily consumed by spreadsheets and other tools non-developers can use as well, making APIs accessible by potentially anyone.
6969

70-
Easy access to all this data and resources is great, but sometimes we need to control access to APIs. There are two primary ways to secure an API by providing authentication using:
71-
* [Basic Auth](http://en.wikipedia.org/wiki/Basic_auth)
72-
* [OAuth](http://en.wikipedia.org/wiki/Oauth)
70+
Easy access to all this data and resources is great, but sometimes we need to control access to APIs. There are two primary ways to secure an API by providing authentication using:
71+
* [Basic Auth](http://en.wikipedia.org/wiki/Basic_auth)
72+
* [OAuth](http://en.wikipedia.org/wiki/Oauth)
7373

7474
REST with JSON has become the favorite of developers and API owners, because it is easier to both deploy and consume than other implementations. Even though REST + JSON is not a standard, it is seeing wide acceptance across the industry.
7575

0 commit comments

Comments
 (0)