Skip to content

Commit

Permalink
Peter parslow patch 1 (#112)
Browse files Browse the repository at this point in the history
* Update dev-build.yml

include patch-styling-code branch in dev action

* Update build-adocs.yml

* Update dev-build.yml

To include dev-agi branch as push trigger

* Massive PR to get main updated with changes to dev branch (#105)

* Update build-adocs.yml

testing adding a personal deploy key (JO_PAT)

* Update build-adocs.yml

Reverting previous change

* WIP: creating dev deployment workflow

* WIP deploy to dev repository

* Update README.md

A test commit to the dev branch

* Update dev-build.yml

WIP- changing to new deploy key for dev

* Update README.md

Force a change to dev branch

* Update dev-build.yml

switch to PAT

* Update datasets.adoc

Forcing a change to datasets.adoc to test dev workflow

* Clearly state "DEV BRANCH" in Readme

* Try floating the menu

To bring the content nearer the top

* Update README.md

Remove the misleading stuff

* Update README.md

Use relative links so that they go to files in the same repository

* Link to the GitPages

Allows developer to see what they have achieved!

* Update abstract.asciidoc

https://docs.asciidoctor.org/asciidoc/latest/blocks/collapsible/ suggests that we can provide our own 'clickable text' instead of the default "Details". I have only done that to this element as an experiment to check it works.

* Update README.md

Link to where you should see the output of changes

* Reducing size of Index table

Remove "float" trial; make as two cells, like in the current GEMINI

* Update README.md

Changed title to say this is the dev branch, while working through step by step guide to editing in place

* Update README.md

* Update README.md

Changed the two absolute URLs to the correct domain

* Update dev-build.yml

* Changed gemini css to handle asciidoc collapsible blocks more like links, and changed the metadatadate partial to show how it works

* Update 1055-uk-gemini-major-changes-since-1-0.asciidoc

Added a colon to make the list styling more consistent throughout

* Updated static URLs in docs readme

* Updated all the partials asciidoc files with the new style for the collapsible elements

* Update README.md

Made a minor change to the readme to check that the updated personal access token works correctly

* Update 1048-uk-gemini-encoding-guidance.asciidoc

Some minor corrections:
section numbering leads to duplication of table of contents; I removed the "manual" one - on preview, this loses both, so I'll have to wait to see what happens on publication (to dev)

According to #2, the sample links should already have been to GitHub, although as of 2023-03-08, that is only true of one of each link on the live site. To save migrating the invalid XML samples from the live site (!), I've changed the second of each pair of links to point to GitHub (and removed the 'series' example link).

Need to migrate 1046-xml-order, or remove a lot of links to it (as it is no longer possible to automatically generate it as we could with the old "massive XML -> HTML" process.)

Fixed "end note" links to go directly to the relevant page (i.e. not [4] -> page 1047 "bibliography" under a different name -> an old edition of GEMINI!) - in fact, I removed that link as basically circular!

The source (live) page included a duplicate of "Figure 2" and the following explanatory paragraph; the duplicate figure had been migrated (but not the following paragraph). I've removed it. Similarly for the explanation of Figure 22a. Corrected 2.4.2 reference to "Figure 23" to the correct Figure 25.

How  to avoid URI namespace identifiers being converted to links in ASCII Doc? Fortunately, some of them have landing pages...

Manually numbered the "figures". They (the code fragments) look good in preview, less good in HTML)

* internal links should be to .html, not .htm!

* Update 1049-metadata-guidelines-for-geospatial-data-resources-part-2.asciidoc

Fix links mainly (including bizarre one which has for a long time pointed out to a quite different page on AGI's site & one which was pointing to 1244 but should have been to 1051!)
Also fixed headings and removed quite a few instances of {nbsp}

* Check & update 1051

Fixed links e.g. to be relative, to avoid going via the 'bibliography'
Removed link to 1040 (see #64 (comment))
Fix the two links which said they were to 1250-summary-table but weren't (even in the live page!)
Removed {nbsp}s, some of which were preventing ASCIIdoc "constrained bold" formatting

See #96 - there's some duplication between this page & 1051.

* Update 1051-uk-gemini-v2-2-specification-for-discovery-metadata-for-geospatial-resources.asciidoc

Remove odd link that claimed to be to some summary of INSPIRE IRs, but never has been.
And one formatting issue.
I don't know why the "sectnums" bit doesn't work; it looks the same pas page 1049, where it does!

* tidying

* Update 1052-metadata-guidelines-for-geospatial-data-resources-part-1.asciidoc

Change internal links to link:, and manually full-URL index to sectnums
Fix data.gov.uk CSW link - now at ckan.publishing.service.gov.uk
Tidy heading styles
Remove mention of bibliography on the assumption we won't migrate it (see #64 (comment))
Fix link to "Part 3", which had gone to the bibliography - even in the live pages!

* Update 1052 - fixed one heading w/ migrated format

* WIP PR to address discussion issue #91 (comment) around how to better style code fragments. This branch uses pygments for code highlighting, with some styling overrides in assets/gemini.css. It's not perfect but at least demonstrates how to get the styling to work. So far, abstract, additionalinformation, boundingbox, characterencoding and metadatadate have been done

* added pygments-default.css to the WIP patch-styling-branch

* added highlighttest to see if pygments is actually working in the github version of asciidoctor

* Update dev-build.yml

* Update dev-build.yml

* WIP test relative URLs in readme page

* WIP- made changes to encoding guidelines for conformity, coupledresource, dataformat, dataquality, datasetlanguage, equivalentscale and extent

* 1056 Glossary Page checked- plus tweak to stylesheet to add some padding to the left and right of the content and header divs

* finished the encoding changes for the remaining partials. Renamed datasets and services to the correct name. Added ulist.html.slim to improve line-spacing for ordered lists. Edited gemini.css to change list-style inside disclosure blocks to remove linebreak between number and list item

* corrected urls in readme and added additional parameters for using slim template in command examples

* Update dev-build.yml

* Update dev-build.yml

* Update dev-build.yml

* corrected URL for datasets page

* Update dev-build.yml

* Made some corrections to services doc and partials

* Checked and tweaked 1037

* added a page for 1046-xml-element-order, made a few editorial changes to make it look neater

* added 1250-element-summary

* added 1053 common metadata errors

* added first pass at 1054 operational guide

* added additional pages to README

* created a separate branch to hold version of docs that have agi URLs rather than archaeogeek

* added corrected dev-build.yml

* Added pages that were previously missing

* Finished formatting guidelines part 3 and corrected typo in conformity

---------

Co-authored-by: Peter Parslow <[email protected]>

* Fixed readme and workflow actions for main branch

* Fixed title of datasets and series page

* Fixed title of docs readme page

* Fixed links in docs readme

* fixed workflow action in main branch

* Styling fixes for 1051 page

* Styling fixes for 1051 page

* Fixes to references in 1054

* additional fonts needed (#108)

* Css changes for additional fonts (#109)

* additional fonts needed

* additional fonts needed

* Css changes (#110)

* additional fonts needed

* additional fonts needed

* additional fonts needed

* Update README.md

* Update README.md

* Update 1062-gemini-datasets-and-data-series.adoc

* Change "return to home page" link

* Change "return to home page" link

* Change "return to home page" link

* Update 1048-uk-gemini-encoding-guidance.asciidoc

* Change "return to home page" link

* Change "return to home page" link

* Change "return to home page" link

* Change "return to home page" link

* Change "return to home page" link

* Change "return to home page" link

* Change "return to home page" link

* Change "return to home page" link

* Update 1063-gemini-services.adoc

* Update 1250-element-summary.asciidoc

* Delete file no longer pending if this PR is accepted

* Delete file that is not longer pending if this PR is accepted

* Remove mention of UK Metadata Editor

* Update 1055-uk-gemini-major-changes-since-1-0.asciidoc

* Update 1055-uk-gemini-major-changes-since-1-0.asciidoc

---------

Co-authored-by: Jo Cook <[email protected]>
Co-authored-by: Jo Cook <[email protected]>
  • Loading branch information
3 people authored Oct 11, 2023
1 parent d14b14e commit 6689d35
Show file tree
Hide file tree
Showing 19 changed files with 54 additions and 42 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# gemini DEV BRANCH
# gemini
Resources relating to the UK Gemini metadata profile

Pull requests accepted to this branch get published to the GitPages repository at https://agiorguk.github.io/gemini-dev/
Pull requests accepted to this branch get published to the GitPages repository at https://agiorguk.github.io/gemini/

The published version of GEMINI 2.3 lives at https://www.agi.org.uk/gemini/1037-uk-gemini-standard-and-inspire-implementing-rules/

This branch is for trying out solutions to issues
This is the place to raise and manage issues
4 changes: 1 addition & 3 deletions docs/1037-uk-gemini-introduction.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ GEMINI 2.2.

Several software implementations exist and are in use across the UK:

* https://locationmde.data.gov.uk/[UK Location Metadata Editor]: online
editor owned by the Defra INSPIRE team
* https://geonetwork-opensource.org/[GeoNetwork Open
Source]{nbsp}-{nbsp}https://github.com/AstunTechnology/iso19139.gemini23[GEMINI
plugin]: server software in use in several government departments
Expand All @@ -94,4 +92,4 @@ http://creativecommons.org/licenses/by/4.0/[image:https://i.creativecommons.org/
Commons Licence]] +
This work is licensed under
a{nbsp}http://creativecommons.org/licenses/by/4.0/[Creative Commons
Attribution 4.0 International License]
Attribution 4.0 International License]
4 changes: 2 additions & 2 deletions docs/1040-checklist-for-conformity.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
include::./includes/attributes.asciidoc[]

Return
to link:1037-uk-gemini-standard-and-inspire-implementing-rules.html[GEMINI
to link:1037-uk-gemini-introduction.html[GEMINI
2.3 home page]

Metadata for a data resource shall be conformant with UK GEMINI if:
Expand Down Expand Up @@ -30,4 +30,4 @@ http://creativecommons.org/licenses/by/4.0/[image:https://i.creativecommons.org/
Commons Licence]] +
This work is licensed under
a{nbsp}http://creativecommons.org/licenses/by/4.0/[Creative Commons
Attribution 4.0 International License]
Attribution 4.0 International License]
2 changes: 1 addition & 1 deletion docs/1046-xml-element-order.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include::./includes/attributes.asciidoc[]
== Dataset and Dataset Series Metadata

Return
to{nbsp}link:1037-uk-gemini-standard-and-inspire-implementing-rules.html[GEMINI
to{nbsp}link:1037-uk-gemini-introduction.html[GEMINI
2.3 home page]

[cols=",,",]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
include::./includes/attributes.asciidoc[]

Return
to link:1037-uk-gemini-standard-and-inspire-implementing-rules.html[GEMINI
to link:1037-uk-gemini-introduction.html[GEMINI
2.3 home page]

[%header,cols="1,.^9"]
Expand Down Expand Up @@ -77,4 +77,4 @@ http://creativecommons.org/licenses/by/4.0/[image:https://i.creativecommons.org/
Commons Licence]] +
This work is licensed under
a{nbsp}http://creativecommons.org/licenses/by/4.0/[Creative Commons
Attribution 4.0 International License]
Attribution 4.0 International License]
2 changes: 1 addition & 1 deletion docs/1048-uk-gemini-encoding-guidance.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include::./includes/attributes.asciidoc[]

Technical guidance on the encoding of UK GEMINI

Return to link:1037-uk-gemini-standard-and-inspire-implementing-rules.html[GEMINI 2.3 home page]
Return to link:1037-uk-gemini-introudction.html[GEMINI 2.3 home page]

Appendices

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include::./includes/attributes.asciidoc[]

Creating metadata using UK GEMINI (v2.3) May 2018 -{nbsp}_being revised_

Return to link:1037-uk-gemini-standard-and-inspire-implementing-rules[GEMINI 2.3 home page]
Return to link:1037-uk-gemini-introduction.html[GEMINI 2.3 home page]

:sectnums:
:sectnumlevels: 3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= UK GEMINI v2-2 Specification for Discovery Metadata for Geospatial Resources
include::./includes/attributes.asciidoc[]

Return to link:1037-uk-gemini-standard-and-inspire-implementing-rules[GEMINI 2.3 home page]
Return to link:1037-uk-gemini-introduction[GEMINI 2.3 home page]

== Foreword

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include::./includes/attributes.asciidoc[]

*July 2018*

Return to link:1037-uk-gemini-standard-and-inspire-implementing-rules[GEMINI 2.3 home page]
Return to link:1037-uk-gemini-introduction[GEMINI 2.3 home page]

:sectnums:
:sectnumlevels: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
include::./includes/attributes.asciidoc[]

Return
to{nbsp}link:1037-uk-gemini-standard-and-inspire-implementing-rules.html[GEMINI
to{nbsp}link:1037-uk-gemini-introduction.html[GEMINI
2.3 home page]

link:1053-common-metadata-errors-uk-location-discovery-metadata-service.html#Intro[1.
Expand Down Expand Up @@ -411,4 +411,4 @@ http://creativecommons.org/licenses/by/4.0/[image:https://i.creativecommons.org/
Commons Licence]] +
This work is licensed under
a{nbsp}http://creativecommons.org/licenses/by/4.0/[Creative Commons
Attribution 4.0 International License]
Attribution 4.0 International License]
4 changes: 2 additions & 2 deletions docs/1054-operational-guide.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include::./includes/attributes.asciidoc[]

== UK Location Discovery Metadata Service

Return to link:1037-uk-gemini-standard-and-inspire-implementing-rules.html[GEMINI
Return to link:1037-uk-gemini-introduction.html[GEMINI
2.3 home page]

Contents
Expand Down Expand Up @@ -928,4 +928,4 @@ http://creativecommons.org/licenses/by/4.0/[image:https://i.creativecommons.org/
Commons Licence]] +
This work is licensed under
a{nbsp}http://creativecommons.org/licenses/by/4.0/[Creative Commons
Attribution 4.0 International License]
Attribution 4.0 International License]
16 changes: 15 additions & 1 deletion docs/1055-uk-gemini-major-changes-since-1-0.asciidoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= [[top]]UK GEMINI Changes Log
include::./includes/attributes.asciidoc[]

Return to link:1037-uk-gemini-standard-and-inspire-implementing-rules.html[GEMINI
Return to link:1037-uk-gemini-introduction.html[GEMINI
2.3 home page]

== UK GEMINI 2.3
Expand Down Expand Up @@ -57,6 +57,20 @@ longer just be the century.

=== Editorial changes since the launch of GEMINI 2.3

==== October 2023

Simplified home page ("introduction" / "landing page") as requested by Geospatial Commission
This included resolution of some specific requests for things to mention: https://github.com/agiorguk/gemini/issues/31; https://github.com/agiorguk/gemini/issues/58; https://github.com/agiorguk/gemini/issues/24

Remove mention of IPSV from guidance on Keyword (https://github.com/agiorguk/gemini/issues/19)

==== September 2023

Migrated maintenance of the pages to GitHub resulting in some changes to layout.
Fixed some editorial inconsistencies (https://github.com/agiorguk/gemini/issues/7; https://github.com/agiorguk/gemini/issues/14)
Fixed some broken links (https://github.com/agiorguk/gemini/issues/2)
Fixed some typos (https://github.com/agiorguk/gemini/issues/8; https://github.com/agiorguk/gemini/issues/60)

==== April 2020

Changed
Expand Down
4 changes: 2 additions & 2 deletions docs/1056-glossary.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include::./includes/attributes.asciidoc[]

<<A, A>>{nbsp}<<B, B>>{nbsp}<<C, C>>{nbsp}<<D, D>>{nbsp}<<E, E>>{nbsp}<<F, F>>{nbsp}<<G, G>>{nbsp}<<H, H>>{nbsp}<<I, I>>{nbsp}<<J, J>>{nbsp}<<K, K>>{nbsp}<<L, L>>{nbsp}<<M, M>>{nbsp}<<N, N>>{nbsp}<<O, O>>{nbsp}<<P, P>>{nbsp}<<Q, Q>>{nbsp}<<R, R>>{nbsp}<<S, S>>{nbsp}<<T, T>>{nbsp}<<U, U>>{nbsp}<<V, V>>{nbsp}<<W, W>>{nbsp}<<X, X>>{nbsp}<<Y, Y>>{nbsp}<<Z, Z>>

Return to link:1037-uk-gemini-standard-and-inspire-implementing-rules.html[GEMINI
Return to link:1037-uk-gemini-introduction.html[GEMINI
2.3 home page]

*acceptable quality level (AQL)*
Expand Down Expand Up @@ -372,4 +372,4 @@ http://creativecommons.org/licenses/by/4.0/[image:https://i.creativecommons.org/
Commons Licence]] +
This work is licensed under
a{nbsp}http://creativecommons.org/licenses/by/4.0/[Creative Commons
Attribution 4.0 International License]
Attribution 4.0 International License]
4 changes: 2 additions & 2 deletions docs/1062-gemini-datasets-and-data-series.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= [[top]]UK GEMINI 2.3 2020-04-07 dataset or series dev version
= [[top]]UK GEMINI 2.3 2020-04-07 dataset or series
include::./includes/attributes.asciidoc[]

== Contents
Expand Down Expand Up @@ -45,7 +45,7 @@ include::./includes/attributes.asciidoc[]
<<16, Vertical extent information>> +
|===

Return to link:1037-uk-gemini-standard-and-inspire-implementing-rules.html[GEMINI
Return to link:1037-uk-gemini-introduction.html[GEMINI
2.3 home page]

'''''
Expand Down
2 changes: 1 addition & 1 deletion docs/1063-gemini-services.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ include::./includes/attributes.asciidoc[]
<<16, Vertical extent information>> +
|===

Return to link:1037-uk-gemini-standard-and-inspire-implementing-rules.html[GEMINI
Return to link:1037-uk-gemini-introduction.html[GEMINI
2.3 home page]

'''''
Expand Down
2 changes: 1 addition & 1 deletion docs/1250-element-summary.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
include::./includes/attributes.asciidoc[]

Return
to{nbsp}link:1037-uk-gemini-standard-and-inspire-implementing-rules.html[GEMINI
to{nbsp}link:1037-uk-gemini-introduction.html[GEMINI
2.3 home page]

[cols=",,,,,,",]
Expand Down
32 changes: 16 additions & 16 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@

# Gemini documentation DEV branch
# Gemini documentation

* [Services](https://agiorguk.github.io/gemini-dev/1063-gemini-services.html)
* [Datasets](https://agiorguk.github.io/gemini-dev/1062-gemini-datasets-and-data-series.html)
* [Services](https://agiorguk.github.io/gemini/1063-gemini-services.html)
* [Datasets](https://agiorguk.github.io/gemini/1062-gemini-datasets-and-data-series.html)

The files below have been converted but have not been altered to work using the new workflow. Consequently internal links will go to the agi website and there may be other errors.
* [1037-uk-gemini-standard-and-inspire-implementing-rules](https://agiorguk.github.io/gemini-dev/1037-uk-gemini-standard-and-inspire-implementing-rules.html)
* [1048-uk-gemini-encoding-guidance](https://agiorguk.github.io/gemini-dev/1048-uk-gemini-encoding-guidance.html)
* [1049-metadata-guidelines-for-geospatial-data-resources-part-2](https://agiorguk.github.io/gemini-dev/1049-metadata-guidelines-for-geospatial-data-resources-part-2.html)
* [1051-uk-gemini-v2-2-specification-for-discovery-metadata-for-geospatial-resources](https://agiorguk.github.io/gemini-dev/1051-uk-gemini-v2-2-specification-for-discovery-metadata-for-geospatial-resources.html)
* [1052-metadata-guidelines-for-geospatial-data-resources-part-1](https://agiorguk.github.io/gemini-dev/1052-metadata-guidelines-for-geospatial-data-resources-part-1.html)
* [1053-common-metadata-errors-uk-location-discovery-metadata-service](https://agiorguk.github.io/gemini-dev/1053-common-metadata-errors-uk-location-discovery-metadata-service.html)
* [1054-operational-guide](https://agiorguk.github.io/gemini-dev/1054-operational-guide.html)
* [1055-uk-gemini-major-changes-since-1-0](https://agiorguk.github.io/gemini-dev/1055-uk-gemini-major-changes-since-1-0.html)
* [1056-glossary](https://agiorguk.github.io/gemini-dev/1056-glossary.html)
* [1046-xml-element-order](https://agiorguk.github.io/gemini-dev/1046-xml-element-order.html)
* [1250-element-summary](https://agiorguk.github.io/gemini-dev/1250-element-summary.html)

Links above this are to the GitHub pages published in https://agiorguk.github.io/gemini-dev/
* [1037-uk-gemini-standard-and-inspire-implementing-rules](https://agiorguk.github.io/gemini/1037-uk-gemini-standard-and-inspire-implementing-rules.html)
* [1048-uk-gemini-encoding-guidance](https://agiorguk.github.io/gemini/1048-uk-gemini-encoding-guidance.html)
* [1049-metadata-guidelines-for-geospatial-data-resources-part-2](https://agiorguk.github.io/gemini/1049-metadata-guidelines-for-geospatial-data-resources-part-2.html)
* [1051-uk-gemini-v2-2-specification-for-discovery-metadata-for-geospatial-resources](https://agiorguk.github.io/gemini/1051-uk-gemini-v2-2-specification-for-discovery-metadata-for-geospatial-resources.html)
* [1052-metadata-guidelines-for-geospatial-data-resources-part-1](https://agiorguk.github.io/gemini/1052-metadata-guidelines-for-geospatial-data-resources-part-1.html)
* [1053-common-metadata-errors-uk-location-discovery-metadata-service](https://agiorguk.github.io/gemini/1053-common-metadata-errors-uk-location-discovery-metadata-service.html)
* [1054-operational-guide](https://agiorguk.github.io/gemini/1054-operational-guide.html)
* [1055-uk-gemini-major-changes-since-1-0](https://agiorguk.github.io/gemini/1055-uk-gemini-major-changes-since-1-0.html)
* [1056-glossary](https://agiorguk.github.io/gemini/1056-glossary.html)
* [1046-xml-element-order](https://agiorguk.github.io/gemini/1046-xml-element-order.html)
* [1250-element-summary](https://agiorguk.github.io/gemini/1250-element-summary.html)

Links above this are to the GitHub pages published in https://agiorguk.github.io/gemini/

## Services and Datasets workflow

Expand Down
Binary file not shown.
Binary file removed pending/1037-uk-gemini-standard 2-3 revised.htm
Binary file not shown.

0 comments on commit 6689d35

Please sign in to comment.