Skip to content

Commit

Permalink
Prepare rights and license data for refactoring (see issue #102).
Browse files Browse the repository at this point in the history
  • Loading branch information
cdchapman committed Dec 4, 2019
1 parent 48372a8 commit 6fd8f8f
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 6 deletions.
32 changes: 29 additions & 3 deletions METADATA.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,10 @@ to the `Locale.default` if not specified.

### `mtime`

REQUIRED_FOR_KINDS: (depending on the data source)
REQUIRED_FOR_KINDS: `{base,extra,acronym,personal}-dictionary` and all items from Nanoc's filesystem data source.

The last modification time of the source (e.g. file) upon which an item's data
is based. Required for most data sources as a heuristic to know whether or not
to recompile dependent items.
is based. Required as a heuristic to know when to recompile dependent items.

## Relating to item state

Expand Down Expand Up @@ -236,6 +235,31 @@ The kind of item. Currently we have the following kinds:
* `tag`: the tag itself (a controlled concept)
* `vocabulary`: an item that represents an RDF ontology.

### `license`

OPTIONAL_FOR_KINDS: all

A URI for a specific machine-readable license for an item. Defaults to
[Creative Commons Attribution 4.0 International][CC-BY], unless otherwise
specified.

### `license_type`

OPTIONAL_FOR_KINDS: all

The mimetype of the [`license`](#license) resource.

### `rights`

OPTIONAL_FOR_KINDS: all

A human-readable assertion of rights held over the content of the item.
Defaults to the following (or similar) unless otherwise specified:

> Copyright © 2011–2019 Pentandra Research Solutions, Inc. All content, except
> where otherwise noted, is licensed under a Creative Commons Attribution 4.0
> International license.
## Relating to relationships between items and other resources

### `cover_image_id`
Expand Down Expand Up @@ -583,3 +607,5 @@ default uses the identifier `me`.
[Company data source]: lib/data_sources/company.rb
[People data source]: lib/data_sources/people.rb
[W3C Datetime]: https://www.w3.org/TR/NOTE-datetime
[CC-BY]: http://creativecommons.org/licenses/by/4.0/
[dictionaries]: lib/data_sources/dictionaries.rb
2 changes: 1 addition & 1 deletion layouts/partials/fine_print.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<div class="bd">

<%= render('/partials/license.*') %>
<%= render('/partials/rights_and_license.*') %>
<%= render('/partials/source_code.*') %>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<ul class="none" property="rdfa:copy" resource="pentandra-website:license" typeof="rdfa:Pattern">

<li>
<li id="rights">
<small>
Copyright ©
<span property="schema:copyrightYear" datatype="xsd:gYear"><span property="doap:created" about="pentandra-website:project" datatype="xsd:date" content="2011-09-28">2011</span></span>--<%= Time.now.year %>
<span property="cc:attributionName"><a href="/company/" resource="pentandra:company" rel="schema:copyrightHolder schema:publisher" typeof="essglobal:SSEInitiative fea:Company schema:Corporation rov:RegisteredOrganization"><span property="schema:name schema:legalName rov:legalName"><%= company.fetch(:cn) %></span></a></span>
</small>
</li>

<li>
<li id="license">
<small>
Except <a href="/policy/" property="cc:useGuidelines">where otherwise noted</a>, content on
<a href="<%= @config[:base_url] %>" property="cc:attributionURL">this site</a> is licensed under a
Expand Down

0 comments on commit 6fd8f8f

Please sign in to comment.