Skip to content

Commit

Permalink
MERGE: Fixed conflicts and disabled Travis
Browse files Browse the repository at this point in the history
Merge branch 'gh-pages' into merge/gh-pages
  • Loading branch information
carlwilson committed Jul 20, 2023
2 parents e50a3f0 + 9abcf6f commit 8a4d1ce
Show file tree
Hide file tree
Showing 1,021 changed files with 314,115 additions and 52 deletions.
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,11 @@
*.jpx binary
*.tif binary
*.wav binary

# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.html text
*.css text
52 changes: 0 additions & 52 deletions .travis.yml

This file was deleted.

3 changes: 3 additions & 0 deletions docs/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'
gem 'github-pages'
gem 'html-proofer'
52 changes: 52 additions & 0 deletions docs/_data/navbar.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
- title: "Getting started"
href: "/getting-started/"

- title: "Documentation"
href: "/documentation/"

- title: "Modules"
href: "/modules/"
subcategories:
- subtitle: "AIFF"
subhref: "aiff/"
- subtitle: "ASCII"
subhref: "ascii/"
- subtitle: "Bytestream"
subhref: "bytestream/"
- subtitle: "GIF"
subhref: "gif/"
- subtitle: "GZIP"
subhref: "gzip/"
- subtitle: "HTML"
subhref: "html/"
- subtitle: "JPEG"
subhref: "jpeg/"
- subtitle: "JPEG2000"
subhref: "jpeg2000/"
- subtitle: "PDF"
subhref: "pdf/"
- subtitle: "TIFF"
subhref: "tiff/"
- subtitle: "UTF-8"
subhref: "utf8/"
- subtitle: "WARC"
subhref: "warc/"
- subtitle: "WAVE"
subhref: "wave/"
- subtitle: "XML"
subhref: "xml/"
- subtitle: "EPUB"
subhref: "third-party/epub/"
- subtitle: "MP3"
subhref: "third-party/mp3/"
- subtitle: "ZIP"
subhref: "third-party/zip/"

- title: "Resources"
href: "/resources/"

- title: "Support"
href: "/support/"

- title: "About"
href: "/about/"
13 changes: 13 additions & 0 deletions docs/_includes/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<footer class="container">
<p>
Copyright © 2015 Open Preservation Foundation.
</p>
<p>
Updated October 2015
</p>
</footer>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<!-- Latest compiled and minified JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
35 changes: 35 additions & 0 deletions docs/_includes/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="Description" content="Main page for JHOVE, the JSTOR/Harvard Object Validation Environment">
<meta name="keywords" content="JHOVE, JOVE, JSTOR, Harvard, object, validation,
environment, Java, extensible, format, AIFF, ASCII, GIF, HTML, JPEG, JPEG2000,
2000, PDF, TIFF, UTF-8, WAVE, XML, XMP, Adobe, ISO, ANSI, IETF, RFC">
<title>JHOVE | {{ page.title }}</title>


<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="/manifest.json">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="apple-mobile-web-app-title" content="JHOVE">
<meta name="application-name" content="JHOVE">
<meta name="theme-color" content="#ffffff">

<!-- Bootstrap -->
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
<!-- Optional theme -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css">
<!-- Our theme -->
<link rel="stylesheet" href="/css/jhove.css">

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head>
39 changes: 39 additions & 0 deletions docs/_includes/navbar.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{% assign navurl = page.url | remove: 'index.html' %}
<nav class="navbar navbar-default navbar-static-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<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="/" title="JHOVE home page."><img src="/img/jhovelogo-nav.png" alt="JHOVE logo"/></a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
{% for item in include.nav %}
{% if item.subcategories != null %}
<li class="dropdown">
<a href="{{ site.url }}{{ item.href }}" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown">{{ item.title }} <span class="caret"></a>
<ul class="dropdown-menu">
{% for subcategory in item.subcategories %}
<li><a href="{{ site.url }}{{ item.href }}{{ subcategory.subhref }}">{{ subcategory.subtitle }}</a></li>
{% endfor %}
</ul>
{% else %}

<!-- display the top level navigation for items that don’t have a submenu -->
{% if item.url == navurl %}
<li class="active">
{% else %}
<li>
{% endif %}
<a href="{{ site.url }}{{ item.href }}">{{ item.title }}</a>
{% endif %}
</li>
{% endfor %}
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
11 changes: 11 additions & 0 deletions docs/_layouts/page.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html lang="en">
{% include header.html %}
<body role="document">
{% include navbar.html nav=site.data.navbar %}
<div class="container theme-showcase" role="main">
{{ content }}
</div>
{% include footer.html %}
</body>
</html>
25 changes: 25 additions & 0 deletions docs/about/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
title: About
---
<!DOCTYPE html>
<html lang="en">
{% include header.html %}
<body role="document">

{% include navbar.html nav=site.data.navbar %}
<div class="container theme-showcase" role="main">
<h1>About JHOVE</h1>
<p>
JHOVE is currently maintained by the <a href="http://openpreservation.org">Open Preservation Foundation</a>.
Development effort is guided by the JHOVE Product Board, comprising OPF members and software supporters.
</p>
<p>
The original JHOVE project was a collaboration between <a href="http://www.jstor.org">JSTOR</a> and
<a href="http://hul.harvard.edu/">Harvard University Library</a> with funding from the
<a href="http://www.mellon.org">Andrew W. Mellon Foundation</a> for the Electronic-Archiving Initiative.
</p>
</div>
{% include footer.html %}

</body>
</html>
Binary file added docs/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions docs/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#2b5797</TileColor>
</tile>
</msapplication>
</browserconfig>
27 changes: 27 additions & 0 deletions docs/css/jhove.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
body {
min-height: 2000px;
}

.navbar-static-top {
margin-bottom: 19px;
}

.navbar-brand img {
margin-top: -10px;
}

.vertical-center {
text-align: center;
}

header a.btn {
margin-top: 20px;
}

dt {
margin-bottom: 10px;
}

dd {
margin-left: 10px;
}
Loading

0 comments on commit 8a4d1ce

Please sign in to comment.