Merge pull request #357 from project-open-data/metadata-v-1.1

Metadata v 1.1
project-open-data · Nov 6, 2014 · 49d8591 · 49d8591
2 parents 05b5dcb + 34802c8
commit 49d8591
Show file tree

Hide file tree

Showing 27 changed files with 7,374 additions and 1,552 deletions.
diff --git a/_config.yml b/_config.yml
@@ -1,12 +1,12 @@
 #document settings
 title: Project Open Data
 desc: "Open Data Policy — Managing Information as an Asset"
-url: //project-open-data.github.io/
+url: //project-open-data.cio.gov/
 repo_name: project-open-data.github.io
 branch: master
 
 #global settings, no need to change these
-root_url: //project-open-data.github.io
+root_url: //project-open-data.cio.gov
 org_name: project-open-data
 
 # default build settings for running locally, no need to edit

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,18 +1,24 @@
   <hr>
-  <div class="container-fluid" id="footer">
+  <div class="container" id="footer">
     <div class="row-fluid">
       <div class="span12">
-        <a class="btn btn-primary" href="{{ edit_url }}">Help Improve this Content</a>
+        <div class="pull-left">
+          <a class="btn btn-primary" href="{{ edit_url }}">Edit this Page</a>
+          <a class="btn btn-default" href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/commits/{{ site.branch }}">View Revision History</a>
+        </div>
         <div class="pull-right">
           <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>
         </div>
       </div>
     </div>
   </div><!-- /container -->
 
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js"></script>
-  <script>window.jQuery || document.write('<script src="{{ site.root_url }}/assets/js/vendor/jquery-1.8.1.min.js"><\/script>')</script>
-  <script src="{{ site.root_url }}/assets/js/bootstrap.min.js"></script>
+
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+  <script>window.jQuery || document.write('<script src="/assets/js/vendor/jquery-1.11.1.min.js"><\/script>')</script>
+  <script src="/assets/js/bootstrap.min.js"></script>
+
+
 
 </body>
 </html>

diff --git a/_includes/header.html b/_includes/header.html
@@ -9,13 +9,14 @@
   <meta name="description" content="{{ site.desc }}">
   <meta name="viewport" content="width=device-width">
 
-  <title>{{ site.title }}</title>
+  <title>{{ page.title }} - {{ site.title }}</title>
 
   <link rel="shortcut icon" href="/favicon.ico"/>
   <link rel="stylesheet" href="/assets/css/bootstrap.css">
   <link rel="stylesheet" href="/assets/css/site.css">
 
   {% capture edit_url %}https://github.com/{{ site.org_name }}/{{ site.repo_name }}/edit/{{ site.branch }}/{{ page.path }}{% endcapture %}
+
 </head>
 <body class="{{ page.id }}">
   <!--[if lt IE 7]>
@@ -28,29 +29,44 @@
   </div>
   <![endif]-->
 
-  <div id="header">
-    <div class="container-fluid">
-      <div class="row-fluid">
-        <div class="span12">
-          <div class="navbar navbar-inverse">
-            <div class="navbar-inner">
-              <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-              </a>
-              <a class="brand" href="{{ site.root_url }}/">Project Open Data</a>
-              <div class="nav-collapse collapse">
-                <ul class="nav pull-right">
-                  <li><a href="{{ edit_url }}">Help Improve this Content</a></li>
-                  <li><a href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/commits/{{ site.branch }}">View Revision History</a></li>
-                  <li><a href="{{ site.root_url }}/faq">FAQ</a></li>
-                  <li><a href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/issues">Discuss</a></li>
-                </ul>
-              </div><!--/.nav-collapse -->
-            </div>
-          </div>
-        </div>
+
+  <!-- Static navbar -->
+  <div id="header" class="navbar navbar-default navbar-static-top" role="navigation">
+    <div class="container">
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="{{ site.root_url }}/">Project Open Data</a>
       </div>
+      <div class="navbar-collapse collapse">
+        <ul class="nav navbar-nav navbar-right">
+          <li><a class="edit-button" href="{{ edit_url }}"><span>Edit this Page</span></a></li>
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Definitions<span class="caret"></span></a>
+            <ul class="dropdown-menu" role="menu">
+              <li><a href="/v1.1/schema">Metadata Schema v1.1</a></li>
+              <li><a href="/glossary">Open Data Glossary</a></li>              
+              <li><a href="/open-standards">Data Standards</a></li>
+              <li><a href="/principles">Open Data Principles </a></li>
+              <li><a href="/open-licenses">Open Licenses</a></li>
+            </ul>
+          </li>     
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Guidance<span class="caret"></span></a>
+            <ul class="dropdown-menu" role="menu">
+              <li><a href="/policy-memo">Policy - OMB M-13-13</a></li>
+              <li><a href="/implementation-guide">Implementation Guide</a></li>
+              <li><a href="/catalog">Public Data Listing</a></li> 
+              <li><a href="http://goals.performance.gov/opendata">Open Data CAP Goal</a></li>              
+              <li><a href="/faq">FAQ</a></li>          
+            </ul>
+          </li>               
+          <li><a href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/issues">Discuss</a></li>
+        </ul>
+      </div><!--/.nav-collapse -->
     </div>
-  </div>
+  </div>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,6 +1,6 @@
 {% include header.html %}            
 
-<div class="container-fluid">
+<div class="container">
   <div class="row-fluid">
     <div class="span12">
       <h1>{{ page.title }}</h1>

diff --git a/_layouts/hero.html b/_layouts/hero.html
@@ -1,7 +1,7 @@
 {% include header.html %}            
 
 <div class="hero-unit home">
-  <div class="container-fluid">
+  <div class="container">
     <div class="row-fluid">
       <div class="span12">
         <h1>{{ site.title }}</h1>
@@ -11,7 +11,7 @@ <h2>{{ site.desc }}</h2>
   </div>
 </div>
 
-<div class="container-fluid">
+<div class="container">
   <div class="row-fluid">
     <div class="span12">
       {{ content }}