Merge pull request #788 from CDLUC3/develop

Merging develop into the main branch
CDLUC3 · Nov 12, 2024 · aac4682 · aac4682
2 parents f70214b + f287d38
commit aac4682
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 61 deletions.
diff --git a/dev/includes/home-banner.html b/dev/includes/home-banner.html
@@ -2,15 +2,15 @@
 <div class="home-banner" style="background-image: url('images/homeHero_01.jpg')">
 	<div class="home-banner__lead">
 		<p class="home-banner__lead-text">Create and manage long-term globally unique IDs for data and other sources using EZID</p>
-		<a href="" class="home-banner__lead-button">Learn More</a>
+		<a href="" class="home-banner__lead-button">Learn more about EZID</a>
 	</div>
 </div>
 
 <h3>Using Alternative Image</h3>
 
 <div class="home-banner" style="background-image: url('images/homeHero_02.jpg')">
 	<div class="home-banner__lead">
-		<p class="home-banner__lead-text">Create and manage long-term globally unique IDs for data and other sources using EZID</p>
-		<a href="" class="home-banner__lead-button">Learn More</a>
+		<p class="home-banner__lead-text">Create and manage long-term globally unique IDs for data and other sources</p>
+		<a href="" class="home-banner__lead-button">Learn more about EZID</a>
 	</div>
 </div>
diff --git a/dev/layout_create.html b/dev/layout_create.html
@@ -43,19 +43,17 @@ <h1 class="heading__primary-text">Create an identifier</h1>
 
           <div class="col-md-8">
 
-            <div class="fieldset-stacked" role="group" aria-labelledby="create__fieldset1">
-
+            <fieldset class="fieldset-stacked" role="group" aria-labelledby="create__fieldset1">
               <div id="create__fieldset1" class="fieldset-stacked__legend-number-1">Choose an identifier type</div>
-            
+
               <label for="create__radio1" class="fcontrol__radio-label-stacked create__radio-button">
                 <input id="create__radio1" class="fcontrol__radio-button-stacked" type="radio" value="" name="radio-group1" checked> <span>ARK (ark:/99999/fk4/... )</span>
               </label>
 
               <label for="create__radio2" class="fcontrol__radio-label-stacked create__radio-button">
                 <input id="create__radio2" class="fcontrol__radio-button-stacked" type="radio" value="" name="radio-group1"> <span>DOI (doi:10.5072/FK2/... )</span>
               </label>
-
-            </div>
+            </fieldset>
 
           </div>
 
@@ -120,21 +118,19 @@ <h2 class="sidebox__heading">Quick Start Guide</h2>
 
         <div class="row">
 
-          <div class="col-md-8">
+          <fieldset class="col-md-8">
 
-            <div class="fieldset-stacked" role="group" aria-labelledby="create__fieldset3">
+            <fieldset class="fieldset-stacked" role="group" aria-labelledby="create__fieldset3">
+                <div id="create__fieldset3" class="fieldset-stacked__legend-number-1">Choose an identifier type</div>
 
-              <div id="create__fieldset3" class="fieldset-stacked__legend-number-1">Choose an identifier type</div>
-
-              <label for="create__radio3" class="fcontrol__radio-label-stacked create__radio-button">
-                <input id="create__radio3" class="fcontrol__radio-button-stacked" type="radio" value="" name="radio-group2" checked> <span>ARK (ark:/99999/fk4/... )</span>
-              </label>
-
-              <label for="create__radio4" class="fcontrol__radio-label-stacked create__radio-button">
-                <input id="create__radio4" class="fcontrol__radio-button-stacked" type="radio" value="" name="radio-group2"> <span>DOI (doi:10.5072/FK2/... )</span>
-              </label>
+                <label for="create__radio3" class="fcontrol__radio-label-stacked create__radio-button">
+                  <input id="create__radio3" class="fcontrol__radio-button-stacked" type="radio" value="" name="radio-group2" checked> <span>ARK (ark:/99999/fk4/... )</span>
+                </label>
 
-            </div>
+                <label for="create__radio4" class="fcontrol__radio-label-stacked create__radio-button">
+                  <input id="create__radio4" class="fcontrol__radio-button-stacked" type="radio" value="" name="radio-group2"> <span>DOI (doi:10.5072/FK2/... )</span>
+                </label>
+            </fieldset>
 
             <div class="fieldset-stacked" role="group" aria-labelledby="create__fieldset4">
 

diff --git a/dev/layout_home.html b/dev/layout_home.html
@@ -23,33 +23,31 @@ <h2>Home Layout With Login Modal</h2>
     <!-- Home Banner -->
     <div class="home-banner" style="background-image: url('images/homeHero_01.jpg')">
       <div class="home-banner__lead">
-        <p class="home-banner__lead-text">Create and manage long-term globally unique IDs for data and other sources using EZID</p>
-        <a href="" class="home-banner__lead-button">Learn More</a>
+        <p class="home-banner__lead-text">Create and manage long-term globally unique IDs for data and other sources</p>
+        <a href="" class="home-banner__lead-button">Learn more about EZID</a>
       </div>
     </div>
 
     <div class="home__identifier-container">
 
       <div class="home__identifier-lead-box">
-        <p class="home__identifier-lead-heading">See how easy it is:</p>
-        <p class="home__identifier-lead-note"><b>NOTE:</b> This is just a demo. To create a real identifier, you must have an account.</p>
+        <h2 class="home__identifier-lead-heading">See how easy it is:</h2>
+        <p class="home__identifier-lead-note">NOTE: This is just a demo. To create a real identifier, you must have an account.</p>
       </div>
 
       <div class="home__identifier-form">
 
-        <div class="fieldset-inline" role="group" aria-labelledby="fieldset__example2">
-
+        <fieldset class="fieldset-inline" role="group" aria-labelledby="fieldset__example2">
           <span id="fieldset__example2" class="fieldset-inline__legend-number-1">Choose an identifier type</span>
-          
+
           <label for="fcontrol__example-label8" class="fcontrol__radio-label-inline home__radio-labels">
             <input id="fcontrol__example-label8" class="fcontrol__radio-button-stacked" type="radio" value="" name="name2" checked> <span>ARK</span>
           </label>
 
           <label for="fcontrol__example-label9" class="fcontrol__radio-label-inline home__radio-labels">
             <input id="fcontrol__example-label9" class="fcontrol__radio-button-stacked" type="radio" value="" name="name2"> <span>DOI</span>
           </label>
-
-        </div>
+        </fieldset>
 
         <div class="fieldset-stacked fieldset__top-border home__fieldset" role="group" aria-labelledby="fieldset__example1">
 

diff --git a/dev/legacy-scss/variables.scss b/dev/legacy-scss/variables.scss
@@ -19,8 +19,8 @@ $text-link-color: rgb(176, 189, 202); // muted blue #B0BDCA
 $text-link-over-beige: rgb(0, 86, 149); // #005695 blue link over beige backgrounds
 
 $design-primary-color: rgb(0, 119, 138); // Teal Blue #00778b
-$design-primary-gradient-top: rgb(22, 139, 153); // Lighter Teal Blue #168b99 was #17A2AC
-$design-primary-gradient-bottom: rgb(5, 106, 123); // Slightly darker Teal Blue #056a7b
+$design-primary-gradient-top: rgb(6, 80, 89); // Lighter Teal Blue #168b99 was #17A2AC
+$design-primary-gradient-bottom: rgb(1, 64, 71); // Slightly darker Teal Blue #056a7b
 
 // Brown colors
 $design-secondary-gradient-top: rgb(198, 176, 130); // #C6B082  Used for subnav

diff --git a/dev/scss/_fieldsets.scss b/dev/scss/_fieldsets.scss
@@ -26,6 +26,9 @@ $subfieldset-label-spacing: 0.3em;
 
 .fieldset-inline {
 
+	border: none;
+	padding: 0;
+
 	@include bp(screen1) {
 		display: flex;
 		flex-flow: row wrap;

diff --git a/gulpfile.js b/gulpfile.js
@@ -31,7 +31,7 @@ var ghPages = require('gulp-gh-pages');
 exports.default = parallel(scss, start, watcher);
 
 // exports.build = series(clean, fonts, scsslint_legacy, scsslint, jslint, scss_legacy, scss, assemble, minifyCss, copyimages, fonts);
-exports.build = series(clean, fonts, jslint, scss_legacy, scss, assemble, minifyCss, copyimages, fonts);
+exports.build = series(clean, fonts, jslint, scss_legacy, scss, assemble, minifyCss, copyimages, fonts, copyCSS);
 
 exports.upload = githubpages;
 
@@ -124,6 +124,13 @@ function copyimages(cb) {
   cb();
 }
 
+// Copy the minified css to the place it actually needs to go in order to function
+function copyCSS(cb) {
+  return src('ui_library/css/main2.min.css')
+    .pipe(dest('static_src/stylesheets'));
+  cb();
+}
+
 // Copy font files from dev/fonts/ into dev/ui_library/fonts/:
 
 function fonts(cb) {

diff --git a/impl/form_objects.py b/impl/form_objects.py
@@ -76,7 +76,7 @@
    \(:unkn\)|\(:none\)|\(:null\)|\(:tba\)|\(:etal\)|\(:at\))$'
 REGEX_GEOPOINT = r'-?(\d+(\.\d*)?|\.\d+)$'
 # http://stackoverflow.com/questions/3962543/how-can-i-validate-a-culture-code-with-a-regular-expression
-REGEX_LANGUAGE = '^[a-z]{2,3}(?:-[A-Z]{2,3}(?:-[a-zA-Z]{4})?)?$'
+REGEX_LANGUAGE = '^[a-z]{2,3}(?:-[a-zA-Z]{2,3}(?:-[a-zA-Z]{4})?)?$'
 ERR_4DIGITYEAR = _("Four digits required")
 ERR_DATE = _("Please use format YYYY-MM-DD.")
 ERR_CREATOR = _("Please fill in a value for creator.")

diff --git a/static_src/stylesheets/main2.min.css b/static_src/stylesheets/main2.min.css
diff --git a/templates/includes/simple_id_type.html b/templates/includes/simple_id_type.html
@@ -8,7 +8,7 @@
     {% else %}
       {% help_icon "choose_id" _("on choosing the type of identifier") %}
     {% endif %}
-    </div>
+  </div>
   {% if prefixes|duplicate_id_types %}
   {% comment %}
     class 'ays-ignore' is used by 'are-you-sure.js' which prevents users from accidentally leaving

diff --git a/templates/index.html b/templates/index.html
@@ -24,8 +24,8 @@ <h1 style="display: none;">EZID: {% trans "Identifiers made easy" %}</h1>
     <div class="home-banner">
       <div class="home-banner__lead-container">
       <div class="home-banner__lead">
-        <p class="home-banner__lead-text">{% trans "Create and manage long-term globally unique IDs for data and other sources using EZID" %}</p>
-        <a href="{% url "ui_home.learn" %}" class="home-banner__lead-button">{% trans "Learn More" %}</a>
+        <p class="home-banner__lead-text">{% trans "Create and manage long-term globally unique IDs for data and other sources" %}</p>
+        <a href="{% url "ui_home.learn" %}" class="home-banner__lead-button">{% trans "Learn more about EZID" %}</a>
       </div>
       </div>
     </div>
@@ -55,8 +55,7 @@ <h1 style="display: none;">EZID: {% trans "Identifiers made easy" %}</h1>
         <form id="create_form" action="{% url "ui_home.index" %}" method="post" class="form-horizontal" role="form">
         <input type="hidden" name="current_profile" id="current_profile" value="{{current_profile.name}}" />
 
-        <div class="fieldset-inline" role="group" aria-labelledby="fieldset__1">
-
+        <fieldset class="fieldset-inline" role="group" aria-labelledby="fieldset__1">
           <span id="fieldset__1" aria-label="{% trans "Step 1 - Choose an identifier type" %}" class="fieldset-inline__legend-number-1">{% trans "Choose an identifier type" %}</span>
 
       {% for p in prefixes %}
@@ -65,12 +64,14 @@ <h1 style="display: none;">EZID: {% trans "Identifiers made easy" %}</h1>
           </label>
       {% endfor %}
           {% help_icon "choose_id_demo" _("on choosing the type of identifier") %}
-
-        </div>
+        </fieldset>
 
         <div class="fieldset-stacked fieldset__top-border home__fieldset" role="group" aria-labelledby="fieldset__2">
 
-          <div id="fieldset__2" aria-label="{% trans "Step 2 - Describe the identified object" %}" class="fieldset-stacked__legend-number-2">{% trans "Describe the identified object" %}</div>
+          <div id="fieldset__2" aria-label="{% trans "Step 2 - Describe the identified object" %}"
+            class="fieldset-stacked__legend-number-2">
+            {% trans "Describe the identified object" %}
+          </div>
 
           <div class="row">
             {{ form.non_field_errors }}