Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update xslt which generates website content
- Add utilities/templates in PMwiki style
- Update xsl
- Add concatenation steps to build.xml 

Resolves ukf/ukf-meta#444
Steve Glover authored and Jon Agland committed Oct 3, 2024
1 parent 769899e commit fa54165
Showing 8 changed files with 363 additions and 4 deletions.
21 changes: 18 additions & 3 deletions build.xml
@@ -2852,10 +2852,15 @@
<echo>Running generate.html.orgnamescope XSLT</echo>
<exec executable="xsltproc" failonerror="true">
<arg value="--output" />
<arg value="${build.dir}/orgnamescope.html" />
<arg value="${build.dir}/orgnamescope-temp.html" />
<arg value="${utilities.dir}/orgnamescope.xsl" />
<arg value="${aggregates.dir}/ukfederation-metadata.xml" />
</exec>
<exec executable="cat" failonerror="true" output="${build.dir}/orgnamescope.html">
<arg value="${utilities.dir}/templates/orgnamescope-top.html" />
<arg value="${build.dir}/orgnamescope-temp.html" />
<arg value="${utilities.dir}/templates/orgnamescope-tail.html" />
</exec>
<exec executable="perl" failonerror="true">
<arg value="${utilities.dir}/bodge-eacute.pl" />
<arg value="${build.dir}/orgnamescope.html" />
@@ -2873,10 +2878,15 @@
<echo>Running generate.html.members XSLT</echo>
<exec executable="xsltproc" failonerror="true">
<arg value="--output" />
<arg value="${build.dir}/dml.html" />
<arg value="${build.dir}/dml-temp.html" />
<arg value="${utilities.dir}/memberlist.xsl" />
<arg value="${members.dir}/members.xml" />
</exec>
<exec executable="cat" failonerror="true" output="${build.dir}/dml.html">
<arg value="${utilities.dir}/templates/dml-top.html" />
<arg value="${build.dir}/dml-temp.html" />
<arg value="${utilities.dir}/templates/dml-tail.html" />
</exec>
<exec executable="perl" failonerror="true">
<arg value="${utilities.dir}/bodge-eacute.pl" />
<arg value="${build.dir}/dml.html" />
@@ -2907,10 +2917,15 @@
<echo>Running generate.html.uai XSLT</echo>
<exec executable="xsltproc" failonerror="true">
<arg value="--output" />
<arg value="${build.dir}/uai.html" />
<arg value="${build.dir}/uai-temp.html" />
<arg value="${utilities.dir}/ua-idp.xsl" />
<arg value="${aggregates.dir}/ukfederation-metadata.xml" />
</exec>
<exec executable="cat" failonerror="true" output="${build.dir}/uai.html">
<arg value="${utilities.dir}/templates/uai-top.html" />
<arg value="${build.dir}/uai-temp.html" />
<arg value="${utilities.dir}/templates/uai-tail.html" />
</exec>
</target>

<!--
16 changes: 16 additions & 0 deletions utilities/templates/dml-tail.html
@@ -0,0 +1,16 @@

</p><h2>Available Services</h2>
<p>Some <a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/AvailableServices'>services</a> available <em>via</em> the UK federation.
</p>
</div>
</div>
<div role="contentinfo">
<div id="footer"><p style='text-align: center;'> <a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/AccessibilityStatement'>Accessibility Statement</a> | <a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/WebsiteInfo'>Website Information</a><br clear='all' /><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/UKFederationHelpdesk'>Helpdesk</a> | <a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/CopyrightAndDisclaimer'>&copy; Jisc</a></p>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
94 changes: 94 additions & 0 deletions utilities/templates/dml-top.html
@@ -0,0 +1,94 @@
<!DOCTYPE html>
<html lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>UK federation member organisations</title>
<style media="all">@import url( /css/new.css );</style>
<link rel="stylesheet" href="/pmwiki/pub/skins/ukfed/pmwiki.css"/> <!--HeaderText--><style type='text/css'><!--
ul, ol, pre, dl, p { margin-top:0px; margin-bottom:0px; }
code.escaped { white-space: pre; }
.vspace { margin-top:1.33em; }
.indent { margin-left:40px; }
.outdent { margin-left:40px; text-indent:-40px; }
a.createlinktext { text-decoration:none; border-bottom:1px dotted gray; }
a.createlink { text-decoration:none; position:relative; top:-0.5em;
font-weight:bold; font-size:smaller; border-bottom:none; }
img { border:0px; }
.editconflict { color:green;
font-style:italic; margin-top:1.33em; margin-bottom:1.33em; }

table.markup { border:2px dotted #ccf; width:90%; }
td.markup1, td.markup2 { padding-left:10px; padding-right:10px; }
table.vert td.markup1 { border-bottom:1px solid #ccf; }
table.horiz td.markup1 { width:23em; border-right:1px solid #ccf; }
table.markup caption { text-align:left; }
div.faq p, div.faq pre { margin-left:2em; }
div.faq p.question { margin:1em 0 0.75em 0; font-weight:bold; }
div.faqtoc div.faq * { display:none; }
div.faqtoc div.faq p.question
{ display:block; font-weight:normal; margin:0.5em 0 0.5em 20px; line-height:normal; }
div.faqtoc div.faq p.question * { display:inline; }
td.markup1 pre { white-space: pre-wrap; }
.noPmTOC, .PmTOCdiv:empty {display:none;}
.PmTOCdiv { display: inline-block; font-size: 13px; overflow: auto; max-height: 500px;}
.PmTOCdiv a { text-decoration: none; display: block; line-height: 1;}
.PmTOCdiv a.pmtoc-indent1 { margin-left: 1em; }
.PmTOCdiv a.pmtoc-indent2 { margin-left: 2em; }
.PmTOCdiv a.pmtoc-indent3 { margin-left: 3em; }
.PmTOCdiv a.pmtoc-indent4 { margin-left: 4em; }
.PmTOCdiv a.pmtoc-indent5 { margin-left: 5em; }
.PmTOCdiv a.pmtoc-indent6 { margin-left: 6em; }
.back-arrow {font-size: .8rem; text-decoration: none; vertical-align: text-top;}
#PmTOCchk + label {cursor: pointer;}
#PmTOCchk {display: none;}
#PmTOCchk:not(:checked) + label > .pmtoc-show {display: none;}
#PmTOCchk:checked + label > .pmtoc-hide {display: none;}
#PmTOCchk:checked + label + div {display: none;}table.sortable th { cursor: pointer; }
table.sortable th::after { color: transparent; content: "\00A0\025B8"; }
table.sortable th:hover::after { color: inherit; content: "\00A0\025B8"; }
table.sortable th.dir-u::after { color: inherit; content: "\00A0\025BE"; }
table.sortable th.dir-d::after { color: inherit; content: "\00A0\025B4"; }
.frame
{ border:1px solid #cccccc; padding:4px; background-color:#f9f9f9; }
.lfloat { float:left; margin-right:0.5em; }
.rfloat { float:right; margin-left:0.5em; }
a.varlink { text-decoration:none;}

--></style>
<link rel='stylesheet' href='/pmwiki/pub/wsplus/wsplus.css'
type='text/css' />
<!--[if IE]><style type='text/css' media='screen'>
body { behavior:url('/pmwiki/pub/wsplus/csshover.htc'); }
.rollover * { visibility: visible; }
</style><![endif]-->
<meta name='robots' content='index,follow' />

<style>
body{margin:0px;}
html{padding:0px;}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
<div id="wrapper">
<header aria-label="header">
<div><a href="//www.jisc.ac.uk/" title="Go to the Jisc homepage"><img height="36" width="36" src="/images/jisc-logo.svg" alt="Jisc"></a></div>
<div id="header">
<div id="image"><img src="/images/orange-topv3.jpg" alt="Masthead"/></div>
<div id="nav" role="navigation" title="header menu"><ul><li class='first'> <a class='urllink' href='/' rel='nofollow'>Home</a>
</li><li><a class='urllink' href='/news/' rel='nofollow'>News</a>
</li><li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/AvailableServices'>Services</a>
</li><li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/JoinFederation'>Join</a>
</li><li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/FedSupport'>Support</a>
</li><li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/Welcome'>Info Centre</a>
</li></ul>
</div>
</div>
</header>
<div id="body">
<div id="both">
<div id="main-content">
<div class='vspace'></div>
<br />
<div role="main" aria-label="main">
<div id='wikitext'>
13 changes: 13 additions & 0 deletions utilities/templates/orgnamescope-tail.html
@@ -0,0 +1,13 @@

</div>
</div>
<div role="contentinfo">
<div id="footer"><p style='text-align: center;'> <a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/AccessibilityStatement'>Accessibility Statement</a> | <a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/WebsiteInfo'>Website Information</a><br clear='all' /><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/UKFederationHelpdesk'>Helpdesk</a> | <a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/CopyrightAndDisclaimer'>&copy; Jisc</a></p>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
109 changes: 109 additions & 0 deletions utilities/templates/orgnamescope-top.html
@@ -0,0 +1,109 @@
<!DOCTYPE html>
<html lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>IdP Information List</title>
<style media="all">@import url( /css/new.css );</style>
<link rel="stylesheet" href="/pmwiki/pub/skins/ukfed/pmwiki.css"/> <!--HeaderText--><style type='text/css'><!--
ul, ol, pre, dl, p { margin-top:0px; margin-bottom:0px; }
code.escaped { white-space: pre; }
.vspace { margin-top:1.33em; }
.indent { margin-left:40px; }
.outdent { margin-left:40px; text-indent:-40px; }
a.createlinktext { text-decoration:none; border-bottom:1px dotted gray; }
a.createlink { text-decoration:none; position:relative; top:-0.5em;
font-weight:bold; font-size:smaller; border-bottom:none; }
img { border:0px; }
.editconflict { color:green;
font-style:italic; margin-top:1.33em; margin-bottom:1.33em; }

table.markup { border:2px dotted #ccf; width:90%; }
td.markup1, td.markup2 { padding-left:10px; padding-right:10px; }
table.vert td.markup1 { border-bottom:1px solid #ccf; }
table.horiz td.markup1 { width:23em; border-right:1px solid #ccf; }
table.markup caption { text-align:left; }
div.faq p, div.faq pre { margin-left:2em; }
div.faq p.question { margin:1em 0 0.75em 0; font-weight:bold; }
div.faqtoc div.faq * { display:none; }
div.faqtoc div.faq p.question
{ display:block; font-weight:normal; margin:0.5em 0 0.5em 20px; line-height:normal; }
div.faqtoc div.faq p.question * { display:inline; }
td.markup1 pre { white-space: pre-wrap; }
.noPmTOC, .PmTOCdiv:empty {display:none;}
.PmTOCdiv { display: inline-block; font-size: 13px; overflow: auto; max-height: 500px;}
.PmTOCdiv a { text-decoration: none; display: block; line-height: 1;}
.PmTOCdiv a.pmtoc-indent1 { margin-left: 1em; }
.PmTOCdiv a.pmtoc-indent2 { margin-left: 2em; }
.PmTOCdiv a.pmtoc-indent3 { margin-left: 3em; }
.PmTOCdiv a.pmtoc-indent4 { margin-left: 4em; }
.PmTOCdiv a.pmtoc-indent5 { margin-left: 5em; }
.PmTOCdiv a.pmtoc-indent6 { margin-left: 6em; }
.back-arrow {font-size: .8rem; text-decoration: none; vertical-align: text-top;}
#PmTOCchk + label {cursor: pointer;}
#PmTOCchk {display: none;}
#PmTOCchk:not(:checked) + label > .pmtoc-show {display: none;}
#PmTOCchk:checked + label > .pmtoc-hide {display: none;}
#PmTOCchk:checked + label + div {display: none;}table.sortable th { cursor: pointer; }
table.sortable th::after { color: transparent; content: "\00A0\025B8"; }
table.sortable th:hover::after { color: inherit; content: "\00A0\025B8"; }
table.sortable th.dir-u::after { color: inherit; content: "\00A0\025BE"; }
table.sortable th.dir-d::after { color: inherit; content: "\00A0\025B4"; }
.frame
{ border:1px solid #cccccc; padding:4px; background-color:#f9f9f9; }
.lfloat { float:left; margin-right:0.5em; }
.rfloat { float:right; margin-left:0.5em; }
a.varlink { text-decoration:none;}

--></style>
<link rel='stylesheet' href='/pmwiki/pub/wsplus/wsplus.css'
type='text/css' />
<!--[if IE]><style type='text/css' media='screen'>
body { behavior:url('/pmwiki/pub/wsplus/csshover.htc'); }
.rollover * { visibility: visible; }
</style><![endif]-->
<meta name='robots' content='index,follow' />

<style>
body{margin:0px;}
html{padding:0px;}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
<div id="wrapper">
<header aria-label="header">
<div><a href="//www.jisc.ac.uk/" title="Go to the Jisc homepage"><img height="36" width="36" src="/images/jisc-logo.svg" alt="Jisc"></a></div>
<div id="header">
<div id="image"><img src="/images/orange-topv3.jpg" alt="Masthead"/></div>
<div id="nav" role="navigation" title="header menu"><ul><li class='first'> <a class='urllink' href='/' rel='nofollow'>Home</a>
</li><li><a class='urllink' href='/news/' rel='nofollow'>News</a>
</li><li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/AvailableServices'>Services</a>
</li><li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/JoinFederation'>Join</a>
</li><li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/FedSupport'>Support</a>
</li><li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/Welcome'>Info Centre</a>
</li></ul>
</div>
</div>
</header>
<div id="body">
<div id="both">
<div id="main-content">
<div class='vspace'></div>
<br />
<div role="main" aria-label="main">
<div id='wikitext'>
<h1>IdP Information List</h1>
<p>The following is an IdP information list which could be used by SPs in granting and controlling access to their services.
</p>
<p class='vspace'>Please consider the following
</p>
<div class='vspace'></div><ul><li>An IdP with greater than 5 scopes will not have their scopes revealed and will simply list the number of "Scopes", click the arrow next to this to expand and reveal these.
<ul><li>This applies particularly to IdPs for schools and local authorities, which have multiple scopes in ukfederation.org.uk
</li></ul></li><li>Some scopes are regular expressions and not strings
</li><li>The list is sorted based on Organisation Display Name
</li><li>Some IdPs may be registered to an Organisation that is not their own, for instance OpenAthens IdP registered to Eduserv
</li><li>Data is based on the UK federation metadata at <a class='external' href='http://metadata.ukfederation.org.uk'>http://metadata.ukfederation.org.uk</a>
</li><li>Clicking on the entityID will open the in the <a class='external' href='https://met.refeds.org'>REFEDS Metadata Explorer Tool</a> or MET, which amongst other features gives a helpful summary of the metadata for that entityID.
<ul><li>MET is a separate service provided by the <a class='external' href='https://www.geant.org/'>GÉANT Association</a> and <a class='external' href='https://refeds.org'>REFEDS</a>
</li><li>Data available via MET is separately refreshed and may not always be completely in-sync with this page or the UK federation metadata.
</li></ul></li></ul><div class='vspace'></div>
13 changes: 13 additions & 0 deletions utilities/templates/uai-tail.html
@@ -0,0 +1,13 @@

</div>
</div>
<div role="contentinfo">
<div id="footer"><p style='text-align: center;'> <a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/AccessibilityStatement'>Accessibility Statement</a> | <a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/WebsiteInfo'>Website Information</a><br clear='all' /><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/UKFederationHelpdesk'>Helpdesk</a> | <a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/CopyrightAndDisclaimer'>&copy; Jisc</a></p>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
99 changes: 99 additions & 0 deletions utilities/templates/uai-top.html
@@ -0,0 +1,99 @@
<!DOCTYPE html>
<html lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>


<title>Federation Identity Providers Asserting User Accountability</title>


<style media="all">@import url( /css/new.css );</style>
<link rel="stylesheet" href="/pmwiki/pub/skins/ukfed/pmwiki.css"/> <!--HeaderText--><style type='text/css'><!--
ul, ol, pre, dl, p { margin-top:0px; margin-bottom:0px; }
code.escaped { white-space: pre; }
.vspace { margin-top:1.33em; }
.indent { margin-left:40px; }
.outdent { margin-left:40px; text-indent:-40px; }
a.createlinktext { text-decoration:none; border-bottom:1px dotted gray; }
a.createlink { text-decoration:none; position:relative; top:-0.5em;
font-weight:bold; font-size:smaller; border-bottom:none; }
img { border:0px; }
.editconflict { color:green;
font-style:italic; margin-top:1.33em; margin-bottom:1.33em; }

table.markup { border:2px dotted #ccf; width:90%; }
td.markup1, td.markup2 { padding-left:10px; padding-right:10px; }
table.vert td.markup1 { border-bottom:1px solid #ccf; }
table.horiz td.markup1 { width:23em; border-right:1px solid #ccf; }
table.markup caption { text-align:left; }
div.faq p, div.faq pre { margin-left:2em; }
div.faq p.question { margin:1em 0 0.75em 0; font-weight:bold; }
div.faqtoc div.faq * { display:none; }
div.faqtoc div.faq p.question
{ display:block; font-weight:normal; margin:0.5em 0 0.5em 20px; line-height:normal; }
div.faqtoc div.faq p.question * { display:inline; }
td.markup1 pre { white-space: pre-wrap; }
.noPmTOC, .PmTOCdiv:empty {display:none;}
.PmTOCdiv { display: inline-block; font-size: 13px; overflow: auto; max-height: 500px;}
.PmTOCdiv a { text-decoration: none; display: block; line-height: 1;}
.PmTOCdiv a.pmtoc-indent1 { margin-left: 1em; }
.PmTOCdiv a.pmtoc-indent2 { margin-left: 2em; }
.PmTOCdiv a.pmtoc-indent3 { margin-left: 3em; }
.PmTOCdiv a.pmtoc-indent4 { margin-left: 4em; }
.PmTOCdiv a.pmtoc-indent5 { margin-left: 5em; }
.PmTOCdiv a.pmtoc-indent6 { margin-left: 6em; }
.back-arrow {font-size: .8rem; text-decoration: none; vertical-align: text-top;}
#PmTOCchk + label {cursor: pointer;}
#PmTOCchk {display: none;}
#PmTOCchk:not(:checked) + label > .pmtoc-show {display: none;}
#PmTOCchk:checked + label > .pmtoc-hide {display: none;}
#PmTOCchk:checked + label + div {display: none;}table.sortable th { cursor: pointer; }
table.sortable th::after { color: transparent; content: "\00A0\025B8"; }
table.sortable th:hover::after { color: inherit; content: "\00A0\025B8"; }
table.sortable th.dir-u::after { color: inherit; content: "\00A0\025BE"; }
table.sortable th.dir-d::after { color: inherit; content: "\00A0\025B4"; }
.frame
{ border:1px solid #cccccc; padding:4px; background-color:#f9f9f9; }
.lfloat { float:left; margin-right:0.5em; }
.rfloat { float:right; margin-left:0.5em; }
a.varlink { text-decoration:none;}

--></style>
<link rel='stylesheet' href='/pmwiki/pub/wsplus/wsplus.css'
type='text/css' />
<!--[if IE]><style type='text/css' media='screen'>
body { behavior:url('/pmwiki/pub/wsplus/csshover.htc'); }
.rollover * { visibility: visible; }
</style><![endif]-->
<meta name='robots' content='index,follow' />

<style>
body{margin:0px;}
html{padding:0px;}
</style>
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
<div id="wrapper">
<header aria-label="header">
<div><a href="//www.jisc.ac.uk/" title="Go to the Jisc homepage"><img height="36" width="36" src="/images/jisc-logo.svg" alt="Jisc"></a></div>
<div id="header">
<div id="image"><img src="/images/orange-topv3.jpg" alt="Masthead"/></div>
<div id="nav" role="navigation" title="header menu">
<ul>
<li class='first'><a class='urllink' href='/' rel='nofollow'>Home</a></li>
<li><a class='urllink' href='/news/' rel='nofollow'>News</a></li>
<li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/AvailableServices'>Services</a></li>
<li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/JoinFederation'>Join</a></li>
<li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/FedSupport'>Support</a></li>
<li><a class='wikilink' href='https://www.ukfederation.org.uk/content/Documents/Welcome'>Info Centre</a></li>
</ul>
</div>
</div>
</header>
<div id="body">
<div id="both">
<div id="main-content">
<br />
<div role="main" aria-label="main">
<div id='wikitext'>
2 changes: 1 addition & 1 deletion utilities/ua-idp.xsl
@@ -11,7 +11,7 @@

<xsl:template match="md:EntitiesDescriptor">

<h3>Federation Identity Providers Asserting User Accountability</h3>
<h1>Federation Identity Providers Asserting User Accountability</h1>

<p>The following IdPs assert user accountability (in accordance with section six of the <a href="https://www.ukfederation.org.uk/doc/rules-of-membership">UK federation's rules of membership</a>):</p>
<br />

0 comments on commit fa54165

Please sign in to comment.