Skip to content

Commit

Permalink
Merge branch 'develop' into merge_bdb_and_dc45
Browse files Browse the repository at this point in the history
  • Loading branch information
@jsjiang
jsjiang committed Apr 12, 2024
2 parents 4c9019e + 7fc1a35 commit 11d31d4
Show file tree
Hide file tree
Showing 232 changed files with 82,191 additions and 26,790 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -12,6 +12,7 @@ Z*
\.old[0-9]*$
\.project$
\.pydevproject$
\.python-version
.test-venv
db
dev/css/*
Expand All @@ -24,6 +25,7 @@ settings.py
static/javascripts/metadata_tooltips.js
ui_library
~$
templates/info


# Dirs
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Expand Up @@ -137,3 +137,5 @@ Set Git to ignore bulk edits in `git blame`:
$ cd <ezid root>
$ git config blame.ignoreRevsFile .git-blame-ignore-revs
```


2 changes: 1 addition & 1 deletion ansible/group_vars/all
View file
Expand Up @@ -26,7 +26,7 @@ http_protocol: http

# AWS SSM Params
# Gather any environment specific application settings from AWS SSM ParameterStore
# using aws_ssm pluggin
# using aws_ssm plugin
#
aws_region: "{{ lookup('env', 'AWS_REGION') | default('us-west-2') }}"
ssm_default_path: "{{ lookup('env', 'SSM_DEFAULT_PATH') | default('/no/path/') }}"
Expand Down
0 dev/README → dev/README.md
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions dev/component_accordion.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Accordion Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_citation.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Citation</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_cite.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Cite</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_customize-table.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Customize Table Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_download.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Download Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_footer.html
View file
Expand Up @@ -29,8 +29,8 @@ <h3>Geolocation Off</h3>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_header.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Header Component with Login Modal</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/picturefill.min.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_home-banner.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Home Banner Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_identifier-boxes.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Identifier Boxes Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_login-menu.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Login Menu Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_login-modal.html
View file
Expand Up @@ -33,8 +33,8 @@ <h2>Login Modal Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_pagination.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Pagination Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_share.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Share Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_showhide.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Show / Hide Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_sidebox.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Side Box Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_tab.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Tab Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_table.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Table Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_table2.html
View file
Expand Up @@ -25,8 +25,8 @@ <h2>Scrollable Table Component</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_table3.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Stackable Table v.2</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/component_testing.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Testing</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/picturefill.min.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/element_buttons.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Button Elements</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/element_fieldsets.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Fieldsets</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/element_form-controls.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Form Controls</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/element_headings.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Heading Elements</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dev/element_links.html
View file
Expand Up @@ -23,8 +23,8 @@ <h2>Link Elements</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/modernizr-custombuild.js"></script>
Expand Down
5 changes: 3 additions & 2 deletions dev/index.html
View file
Expand Up @@ -64,8 +64,9 @@ <h2>Elements</h2>
</div>

<!-- build:js js/main2.min.js -->
<script src="js/vendor/jquery.min.js"></script>
<script src="js/vendor/jquery-ui.min.js"></script>
<script src="js/vendor/jquery-3.7.1.js"></script>
<script src="js/vendor/jquery-ui.js"></script>
<script src="js/vendor/jquery-migrate-3.4.0.js"></script>
<script src="js/vendor/better-dom.min.js"></script>
<script src="js/vendor/better-details-polyfill.js"></script>
<script src="js/vendor/picturefill.min.js"></script>
Expand Down

0 comments on commit 11d31d4

Please sign in to comment.