Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR to get dev back in line with main #111

Merged
merged 18 commits into from
Sep 13, 2023
Merged

PR to get dev back in line with main #111

merged 18 commits into from
Sep 13, 2023

Conversation

archaeogeek
Copy link
Member

No description provided.

Jo Cook and others added 18 commits March 20, 2023 17:57
include patch-styling-code branch in dev action
To include dev-agi branch as push trigger
* 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]>
* additional fonts needed

* additional fonts needed
* additional fonts needed

* additional fonts needed

* additional fonts needed
@archaeogeek archaeogeek merged commit f46754b into dev Sep 13, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant