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.

Sign up for GitHub

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

Merging develop into the main branch #788

Merged
merged 7 commits into from
Nov 12, 2024
Merged

Merging develop into the main branch #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
01388c8
Change regular expression to allow both upper and lower case letters …
sfisher Nov 1, 2024
a1ee2e0
Change "choose an identifier type to a fieldset.
sfisher Nov 4, 2024
460974a
Add to gulpfile to copy to the correct place so that the styles work …
sfisher Nov 5, 2024
3ace00a
Most of the changes for #541 EXCEPT converting form switching into aj…
sfisher Nov 6, 2024
532c2c5
Need to change this fieldset back to a div since otherwise it destroy…
sfisher Nov 9, 2024
f9c1ecc
Merge pull request #780 from CDLUC3/710-maintenance-update-language-c…
sfisher Nov 12, 2024
f287d38
Merge pull request #784 from CDLUC3/541-accessibility-fixes-homepage
sfisher Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dev/includes/home-banner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
30 changes: 13 additions & 17 deletions dev/layout_create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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">

Expand Down
16 changes: 7 additions & 9 deletions dev/layout_home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down
4 changes: 2 additions & 2 deletions dev/legacy-scss/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions dev/scss/_fieldsets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ $subfieldset-label-spacing: 0.3em;

.fieldset-inline {

border: none;
padding: 0;

@include bp(screen1) {
display: flex;
flex-flow: row wrap;
Expand Down
9 changes: 8 additions & 1 deletion gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion impl/form_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
44 changes: 24 additions & 20 deletions static_src/stylesheets/main2.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion templates/includes/simple_id_type.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 %}
Expand All @@ -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 }}
Expand Down