From 025452a2c302da65f77b7d414ab8c2b47e19ef85 Mon Sep 17 00:00:00 2001
From: ksiller <ksiller@users.noreply.github.com>
Date: Fri, 27 Sep 2024 18:14:42 -0400
Subject: [PATCH] fix shortcodes and service yaml for rebranding of hsz storage

---
 content/form/storage.md                                     | 2 +-
 data/service.yaml                                           | 4 ++--
 layouts/shortcodes/extract_storage_cost.html                | 6 +++---
 .../rc-bootstrap-v4/layouts/partials/pricing/storage.html   | 2 +-
 .../layouts/partials/pricing/storage_main_page_second.html  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/content/form/storage.md b/content/form/storage.md
index 16837acea..531196be9 100644
--- a/content/form/storage.md
+++ b/content/form/storage.md
@@ -67,7 +67,7 @@ private = true
         <input required="required" type="radio" id="storage-choice3" name="storage-choice" value="Research Standard" class="form-radio" /> &nbsp; Research Standard Storage ({{< extract_storage_cost type="standard" >}})</label>
       </div>
       <div class="form-item form-type-radio radio">
-        <input required="required" type="radio" id="storage-choice2" name="storage-choice" value="ivy" class="form-radio" /> &nbsp; Ivy Central Storage ({{< extract_storage_cost type="ivy" >}})</label>
+        <input required="required" type="radio" id="storage-choice2" name="storage-choice" value="High-Security Research Standard" class="form-radio" /> &nbsp; High-Security Research Standard Storage ({{< extract_storage_cost type="hsz standard" >}})</label>
       </div>
     </div>
     <div class="alert alert-warning" style="font-size:92%;margin-top:1.5rem;margin-bottom:1.5rem;" role="alert">
diff --git a/data/service.yaml b/data/service.yaml
index c2a6363dc..092d0828f 100644
--- a/data/service.yaml
+++ b/data/service.yaml
@@ -68,9 +68,9 @@ service:
         filesystem_location: "<code>/standard</code>"
         highly-sens-ds-compliant: "No"
         use_cases: "Budget solution for storing data that can be accessed by a personal computer or Rivanna. It is not recommended to run Slurm jobs against research standard storage unless absolutely necessary. File operations on Research Standard storage are slower than on Rivanna <code>/home</code>, <code>/scratch</code>, or <code>Research Project</code> storage."
-      - name: "High-Security Research Standard Storage"
+      - name: "High-Security Research Standard"
         security: "High"
-        cost: "$45 TB/year"
+        cost: "$45/TB/year"
         quota: "1TB increments"
         snapshots: "No"
         replication: "No"
diff --git a/layouts/shortcodes/extract_storage_cost.html b/layouts/shortcodes/extract_storage_cost.html
index ed2f9c449..b50c37970 100644
--- a/layouts/shortcodes/extract_storage_cost.html
+++ b/layouts/shortcodes/extract_storage_cost.html
@@ -10,15 +10,15 @@
 
 {{ $standard_storage := index (where $options "name" "Research Standard") 0 }}
 {{ $project_storage := index (where $options "name" "Research Project") 0 }}
-{{ $ivy_central_storage := index (where $options "name" "Ivy Central Storage") 0 }}
+{{ $ivy_central_storage := index (where $options "name" "High-Security Research Standard") 0 }}
 
 {{ with .Get "type" }}
   {{ if eq . "standard" }}
     {{ index $standard_storage "cost" | markdownify}}
   {{ else if eq . "project" }}
     {{ index $project_storage "cost" | markdownify}}
-  {{ else if eq . "ivy" }}
-    {{ index $ivy_central_storage "cost" }}
+  {{ else if eq . "hsz standard" }}
+    {{ index $ivy_central_storage "cost" | markdownify }}
   {{ else }}
     Unknown storage type
   {{ end }}
diff --git a/themes/rc-bootstrap-v4/layouts/partials/pricing/storage.html b/themes/rc-bootstrap-v4/layouts/partials/pricing/storage.html
index 4b41010e0..cb9e519ee 100644
--- a/themes/rc-bootstrap-v4/layouts/partials/pricing/storage.html
+++ b/themes/rc-bootstrap-v4/layouts/partials/pricing/storage.html
@@ -11,7 +11,7 @@
 
 {{ $standard_storage := index (where $options "name" "Research Standard") 0 }}
 {{ $project_storage := index (where $options "name" "Research Project") 0 }}
-{{ $ivy_central_storage := index (where $options "name" "Ivy Central Storage") 0 }}
+{{ $ivy_central_storage := index (where $options "name" "High-Security Research Standard") 0 }}
 
 <table class="table">
     <thead>
diff --git a/themes/rc-bootstrap-v4/layouts/partials/pricing/storage_main_page_second.html b/themes/rc-bootstrap-v4/layouts/partials/pricing/storage_main_page_second.html
index 40ecf4e93..3ae53dbb8 100644
--- a/themes/rc-bootstrap-v4/layouts/partials/pricing/storage_main_page_second.html
+++ b/themes/rc-bootstrap-v4/layouts/partials/pricing/storage_main_page_second.html
@@ -9,7 +9,7 @@
 
 {{ $options := index (index $services $storage_index) "options" }}
 
-{{ $hs_standard_storage := index (where $options "name" "High-Security Research Standard Storage") 0 }}
+{{ $hs_standard_storage := index (where $options "name" "High-Security Research Standard") 0 }}
 
 <table class="table table-striped table-sm" style="font-size:90%;">
     <thead class="thead-dark">