Update eduroam fees info

tenet-ac-za · Jun 1, 2024 · f8db685 · f8db685
1 parent 5ad7a82
commit f8db685
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 9 deletions.
diff --git a/content/participants/idp/fees.md b/content/participants/idp/fees.md
@@ -14,6 +14,10 @@ url: /participants/idp/fees/
 ## Non-recurring costs
 
 A once-off take-on charge of ***R 2 550*** will be levied for each new production entity registered under the [SAML2 technology profile]({{< ref "/technical/saml2/_index.md" >}}) to cover the [administrative overheads]({{< ref "/technical/saml2/idp-requirements/_index.md" >}}) of processing a new identity provider registration.
+{.fees-saml2}
+
+There are no take-on or other initial non-recurring charges associated with the [RADIUS/EAP ("eduroam")]({{< ref "/technical/radius-eap/_index.md" >}}) technology profile.
+{.fees-radius}
 
 ## Annual recurring costs
 

diff --git a/content/technical/radius-eap/_index.md b/content/technical/radius-eap/_index.md
@@ -16,4 +16,5 @@ eduroam in South Africa has its own website at <https://eduroam.ac.za/>. That si
  * [Policy](https://eduroam.ac.za/policy/)
  * [Technical Requirements](https://eduroam.ac.za/policy/)
  * [Registration Request Forms](https://eduroam.ac.za/policy/)
+ * [Costs](https://eduroam.ac.za/faq/costs/)
  * a [management portal](https://eduroam.ac.za/manage/)
diff --git a/layouts/shortcodes/fees.html b/layouts/shortcodes/fees.html
@@ -1,23 +1,61 @@
-{{/* last fees update: Feb 2023 */}}
-{{- $SAMLcostPerFTE := 7.05 -}}
+{{/* last fees update: Jun 2024 */}}
+{{- $EffectiveYear := 2024 -}}
+{{- $SAMLcostPerFTE := 7.40 -}}
 {{- $RADIUScostPerFTE := 1.30 -}}
-{{- $HideRADIUS := true -}}
-{{ if $HideRADIUS }}
 <style>
-.fees-radius { display: none; }
+  .fees-radius { display: none; }
 </style>
-{{ end }}
+<script>
+    // https://www.c-sharpcorner.com/UploadFile/cd7c2e/get-values-from-query-string-using-jquery/
+    function GetParameterValues(param) {
+        var url = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+        for (var i = 0; i < url.length; i++) {
+            var urlparam = url[i].split('=');
+            if (urlparam[0] == param) {
+                return urlparam[1];
+            }
+        }
+    }
+
+    $(document).ready(function() {
+        var show = [ window.top.location.hash.substring(1), GetParameterValues('show')  ];
+        show = show.find((element) => !! element);
+        if (show) {
+            console.log(show);
+            show = show.split(',');
+            console.log(show);
+            var colspan = 0;
+            if (show.includes('saml') || show.includes('saml2')) {
+                $('.fees-saml2').show();
+                colspan++;
+            } else {
+                $('.fees-saml2').hide();
+            }
+            if (show.includes('radius') || show.includes('eduroam')) {
+                $('.fees-radius').show();
+                colspan++;
+            } else {
+                $('.fees-radius').hide();
+            }
+            $('.fees #fees-profile').attr('colspan', colspan);
+        } else {
+            $('.fees-saml2').show();
+            $('.fees-radius').hide();
+            $('.fees #fees-profile').attr('colspan', 1);
+        }
+    });
+</script>
 <table class="fees idp" id="idp-fees">
-    <caption>Annual fees for Identity Providers</caption>
+    <caption>Annual ({{ $EffectiveYear }}) fees for Identity Providers</caption>
     <thead>
         <tr>
             <th rowspan="2">FTE Band</th>
-            <th colspan="{{ if $HideRADIUS }}1{{ else }}2{{ end }}">Technology Profile</th>
+            <th id="fees-profile" colspan="2">Technology Profile</th>
             <th rowspan="2">Effective Max Discount</th>
         </tr>
         <tr>
             <th class="fees-saml2">SAML2</th>
-            <th class="fees-radius">RADIUS</th>
+            <th class="fees-radius">RADIUS/EAP (<span class="eduroam">eduroam</span>)</th>
         </tr>
     </thead>
     <tbody>

diff --git a/themes/twentyfourteen-safire/static/css/style.css b/themes/twentyfourteen-safire/static/css/style.css
@@ -3032,6 +3032,9 @@ a.post-thumbnail:hover {
 	display: none;
 }
 
+.eduroam {
+    text-transform: lowercase !important;
+}
 
 /**
  * 10.0 Multisite