diff --git a/.gitignore b/.gitignore index 50da21c10b..69293b7b06 100644 --- a/.gitignore +++ b/.gitignore @@ -34,30 +34,8 @@ dist .ruff_cache .on-save.json +rdmo/core/static/ rdmo/management/static +rdmo/projects/static/ -rdmo/core/static/core/css/app-bs53.css -rdmo/core/static/core/js/app-bs53.js -rdmo/core/static/core/js/base.js -rdmo/core/static/core/js/base.js.LICENSE.txt -rdmo/core/static/core/js/base-bs53.js -rdmo/core/static/core/js/base-bs53.js.LICENSE.txt -rdmo/core/static/core/js/bootstrap-bs53.js -rdmo/core/static/core/js/bootstrap-bs53.js.LICENSE.txt -rdmo/core/static/core/css/base.css -rdmo/core/static/core/css/base-bs53.css -rdmo/core/static/core/css/bootstrap.css -rdmo/core/static/core/css/bootstrap-bs53.css -rdmo/core/static/core/fonts - -rdmo/projects/static/projects/css/interview.css -rdmo/projects/static/projects/css/projects.css -rdmo/projects/static/projects/css/project.css -rdmo/projects/static/projects/fonts/ -rdmo/projects/static/projects/js/interview.js -rdmo/projects/static/projects/js/interview.js.LICENSE.txt -rdmo/projects/static/projects/js/projects.js -rdmo/projects/static/projects/js/projects.js.LICENSE.txt -rdmo/projects/static/projects/js/project.js -rdmo/projects/static/projects/js/project.js.LICENSE.txt screenshots diff --git a/conftest.py b/conftest.py index 46de3de7cc..841fb65bce 100644 --- a/conftest.py +++ b/conftest.py @@ -19,7 +19,6 @@ def fixtures(): 'domain', 'groups', 'options', - 'overlays', 'projects', 'questions', 'sites', diff --git a/pyproject.toml b/pyproject.toml index 08fbaf2f4a..5b1523d572 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,10 +44,8 @@ dependencies = [ "defusedxml>=0.7.1,<1.0", "django>=5.2.8,<6.0", "django-cleanup>=8.0,<10.0", - "django-compressor>=4.4,<5.0", "django-extensions>=3.2,<5.0", "django-filter>=23.2,<26.0", - "django-libsass>=0.9,<1.0", "django-mathfilters>=1.0,<2.0", "django-mptt>=0.16.0,<1.0.0", "django-settings-export>=1.2,<2.0", @@ -231,7 +229,7 @@ default.extend-ignore-re = [ "(?Rm)^.*(#|//)\\s*spellchecker:disable-line$", # for .py files "(?Rm)^.*$", # for .html files ] -files.extend-exclude = ["rdmo/core/templates/core/bs53/home.html"] +files.extend-exclude = ["rdmo/core/templates/core/home.html"] [tool.check-wheel-contents] # Ref: https://github.com/jwodder/check-wheel-contents ignore = [ diff --git a/rdmo/accounts/templates/account/account_token.html b/rdmo/accounts/templates/account/account_token.html index 3b08e2590e..35d1941cc5 100644 --- a/rdmo/accounts/templates/account/account_token.html +++ b/rdmo/accounts/templates/account/account_token.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/account/email.html b/rdmo/accounts/templates/account/email.html index 649a0f2ecf..12f06afe71 100644 --- a/rdmo/accounts/templates/account/email.html +++ b/rdmo/accounts/templates/account/email.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/account/email_confirm.html b/rdmo/accounts/templates/account/email_confirm.html index 5d3c1c3a0e..16a2e0f0cf 100644 --- a/rdmo/accounts/templates/account/email_confirm.html +++ b/rdmo/accounts/templates/account/email_confirm.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% load account %} diff --git a/rdmo/accounts/templates/account/login.html b/rdmo/accounts/templates/account/login.html index d99dac3654..7a19171a32 100644 --- a/rdmo/accounts/templates/account/login.html +++ b/rdmo/accounts/templates/account/login.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/account/logout.html b/rdmo/accounts/templates/account/logout.html index 1e80b5b0fd..4993690cb0 100644 --- a/rdmo/accounts/templates/account/logout.html +++ b/rdmo/accounts/templates/account/logout.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/account/password_change.html b/rdmo/accounts/templates/account/password_change.html index 14ead05a7c..6577a9a71e 100644 --- a/rdmo/accounts/templates/account/password_change.html +++ b/rdmo/accounts/templates/account/password_change.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% load core_tags %} diff --git a/rdmo/accounts/templates/account/password_reset.html b/rdmo/accounts/templates/account/password_reset.html index e6371cda4e..6c9cff6b6f 100644 --- a/rdmo/accounts/templates/account/password_reset.html +++ b/rdmo/accounts/templates/account/password_reset.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% load core_tags %} diff --git a/rdmo/accounts/templates/account/password_reset_done.html b/rdmo/accounts/templates/account/password_reset_done.html index 7d51430f31..5e1797c561 100644 --- a/rdmo/accounts/templates/account/password_reset_done.html +++ b/rdmo/accounts/templates/account/password_reset_done.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/account/password_reset_from_key.html b/rdmo/accounts/templates/account/password_reset_from_key.html index 599498964e..b516598ad0 100644 --- a/rdmo/accounts/templates/account/password_reset_from_key.html +++ b/rdmo/accounts/templates/account/password_reset_from_key.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% load core_tags %} diff --git a/rdmo/accounts/templates/account/password_reset_from_key_done.html b/rdmo/accounts/templates/account/password_reset_from_key_done.html index 1c58a125c2..0483009994 100644 --- a/rdmo/accounts/templates/account/password_reset_from_key_done.html +++ b/rdmo/accounts/templates/account/password_reset_from_key_done.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% load core_tags %} diff --git a/rdmo/accounts/templates/account/password_set.html b/rdmo/accounts/templates/account/password_set.html index fd2b9c4e90..37fcdaf291 100644 --- a/rdmo/accounts/templates/account/password_set.html +++ b/rdmo/accounts/templates/account/password_set.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/account/signup.html b/rdmo/accounts/templates/account/signup.html index f63275a753..e82f0333c9 100644 --- a/rdmo/accounts/templates/account/signup.html +++ b/rdmo/accounts/templates/account/signup.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/account/terms_of_use.html b/rdmo/accounts/templates/account/terms_of_use.html index 9f6ec292a9..6ecf658363 100644 --- a/rdmo/accounts/templates/account/terms_of_use.html +++ b/rdmo/accounts/templates/account/terms_of_use.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/account/verification_sent.html b/rdmo/accounts/templates/account/verification_sent.html index 061adedfaa..5f41a39e00 100644 --- a/rdmo/accounts/templates/account/verification_sent.html +++ b/rdmo/accounts/templates/account/verification_sent.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/account/verified_email_required.html b/rdmo/accounts/templates/account/verified_email_required.html index a9146d0172..8fd043160d 100644 --- a/rdmo/accounts/templates/account/verified_email_required.html +++ b/rdmo/accounts/templates/account/verified_email_required.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block content %} diff --git a/rdmo/accounts/templates/profile/profile_remove_closed.html b/rdmo/accounts/templates/profile/profile_remove_closed.html index 74fb480a83..3e37cefa62 100644 --- a/rdmo/accounts/templates/profile/profile_remove_closed.html +++ b/rdmo/accounts/templates/profile/profile_remove_closed.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/profile/profile_remove_failed.html b/rdmo/accounts/templates/profile/profile_remove_failed.html index a27e753834..d164876d70 100644 --- a/rdmo/accounts/templates/profile/profile_remove_failed.html +++ b/rdmo/accounts/templates/profile/profile_remove_failed.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/profile/profile_remove_form.html b/rdmo/accounts/templates/profile/profile_remove_form.html index 955e8e3b2e..07b2389543 100644 --- a/rdmo/accounts/templates/profile/profile_remove_form.html +++ b/rdmo/accounts/templates/profile/profile_remove_form.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% load core_tags %} diff --git a/rdmo/accounts/templates/profile/profile_remove_success.html b/rdmo/accounts/templates/profile/profile_remove_success.html index 77d7c827e6..d81256496e 100644 --- a/rdmo/accounts/templates/profile/profile_remove_success.html +++ b/rdmo/accounts/templates/profile/profile_remove_success.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/profile/profile_update_closed.html b/rdmo/accounts/templates/profile/profile_update_closed.html index 26c09b46a2..acff246b2a 100644 --- a/rdmo/accounts/templates/profile/profile_update_closed.html +++ b/rdmo/accounts/templates/profile/profile_update_closed.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/profile/profile_update_form.html b/rdmo/accounts/templates/profile/profile_update_form.html index f1f0623495..5aba4b9508 100644 --- a/rdmo/accounts/templates/profile/profile_update_form.html +++ b/rdmo/accounts/templates/profile/profile_update_form.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% load core_tags %} diff --git a/rdmo/accounts/templates/socialaccount/authentication_error.html b/rdmo/accounts/templates/socialaccount/authentication_error.html index 9611cf6b76..58cdb917f1 100644 --- a/rdmo/accounts/templates/socialaccount/authentication_error.html +++ b/rdmo/accounts/templates/socialaccount/authentication_error.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% load account %} {% load socialaccount %} diff --git a/rdmo/accounts/templates/socialaccount/connections.html b/rdmo/accounts/templates/socialaccount/connections.html index a839348c54..33330cbbbf 100644 --- a/rdmo/accounts/templates/socialaccount/connections.html +++ b/rdmo/accounts/templates/socialaccount/connections.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/accounts/templates/socialaccount/login.html b/rdmo/accounts/templates/socialaccount/login.html index d98550de2b..90c97cb446 100644 --- a/rdmo/accounts/templates/socialaccount/login.html +++ b/rdmo/accounts/templates/socialaccount/login.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block head_title %} diff --git a/rdmo/accounts/templates/socialaccount/login_cancelled.html b/rdmo/accounts/templates/socialaccount/login_cancelled.html index 0434a6e107..5ceca0781c 100644 --- a/rdmo/accounts/templates/socialaccount/login_cancelled.html +++ b/rdmo/accounts/templates/socialaccount/login_cancelled.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% load account %} {% load socialaccount %} diff --git a/rdmo/accounts/templates/socialaccount/signup.html b/rdmo/accounts/templates/socialaccount/signup.html index b1ee1866a2..56a7435b6f 100644 --- a/rdmo/accounts/templates/socialaccount/signup.html +++ b/rdmo/accounts/templates/socialaccount/signup.html @@ -1,4 +1,4 @@ -{% extends 'core/bs53/main.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% block main %} diff --git a/rdmo/core/static/core/img/document.png b/rdmo/core/assets/img/document.png similarity index 100% rename from rdmo/core/static/core/img/document.png rename to rdmo/core/assets/img/document.png diff --git a/rdmo/core/static/core/img/header/collection.jpg b/rdmo/core/assets/img/header/collection.jpg similarity index 100% rename from rdmo/core/static/core/img/header/collection.jpg rename to rdmo/core/assets/img/header/collection.jpg diff --git a/rdmo/core/static/core/img/header/library.jpg b/rdmo/core/assets/img/header/library.jpg similarity index 100% rename from rdmo/core/static/core/img/header/library.jpg rename to rdmo/core/assets/img/header/library.jpg diff --git a/rdmo/core/static/core/img/header/supercomputer.jpg b/rdmo/core/assets/img/header/supercomputer.jpg similarity index 100% rename from rdmo/core/static/core/img/header/supercomputer.jpg rename to rdmo/core/assets/img/header/supercomputer.jpg diff --git a/rdmo/core/static/core/img/rdmo-logo.png b/rdmo/core/assets/img/rdmo-logo.png similarity index 100% rename from rdmo/core/static/core/img/rdmo-logo.png rename to rdmo/core/assets/img/rdmo-logo.png diff --git a/rdmo/core/assets/js/_bs53/components/Modal.js b/rdmo/core/assets/js/_bs53/components/Modal.js deleted file mode 100644 index 8f7b89d3b6..0000000000 --- a/rdmo/core/assets/js/_bs53/components/Modal.js +++ /dev/null @@ -1,86 +0,0 @@ -import React, { useEffect, useRef } from 'react' -import PropTypes from 'prop-types' -import { Modal as BootstrapModal } from 'bootstrap' - -const Modal = ({ title, show, onClose, onSubmit, submitLabel, submitProps, children, modalProps = {}, size = '' }) => { - const modalRef = useRef(null) - - useEffect(() => { - const modalElement = modalRef.current - if (!modalElement) return - - const modal = BootstrapModal.getOrCreateInstance(modalElement, { - backdrop: 'static', - keyboard: true, - ...modalProps - }) - - const handleHide = () => { - if (show) { - onClose() - } - } - - modalElement.addEventListener('hide.bs.modal', handleHide) - - if (show) { - modal.show() - } - - return () => { - modalElement.removeEventListener('hide.bs.modal', handleHide) - modal.hide() - } - }, [show]) - - return ( -
-
-
-
-

{title}

- -
- - { - children && ( -
- {children} -
- ) - } - -
- { - onSubmit && ( - - ) - } - -
-
-
-
- ) -} - -Modal.propTypes = { - title: PropTypes.string.isRequired, - show: PropTypes.bool.isRequired, - onClose: PropTypes.func.isRequired, - onSubmit: PropTypes.func, - submitLabel: PropTypes.string, - submitProps: PropTypes.object, - children: PropTypes.oneOfType([ - PropTypes.arrayOf(PropTypes.node), - PropTypes.node - ]), - modalProps: PropTypes.object, - size: PropTypes.string -} - -export default Modal diff --git a/rdmo/core/assets/js/_bs53/components/index.js b/rdmo/core/assets/js/_bs53/components/index.js deleted file mode 100644 index 8306153fc5..0000000000 --- a/rdmo/core/assets/js/_bs53/components/index.js +++ /dev/null @@ -1,2 +0,0 @@ -export { default as Modal } from './Modal' -export { default as Tooltip } from './Tooltip' diff --git a/rdmo/core/assets/js/_bs53/app.js b/rdmo/core/assets/js/app.js similarity index 100% rename from rdmo/core/assets/js/_bs53/app.js rename to rdmo/core/assets/js/app.js diff --git a/rdmo/core/assets/js/base.js b/rdmo/core/assets/js/base.js index 1653c3c47c..d4c0cde622 100644 --- a/rdmo/core/assets/js/base.js +++ b/rdmo/core/assets/js/base.js @@ -1,4 +1 @@ -import 'bootstrap-sass' - -window.$ = require('jquery') -window.Cookies = require('js-cookie') +// This file is intentionally left empty. diff --git a/rdmo/core/assets/js/_bs53/bootstrap.js b/rdmo/core/assets/js/bootstrap.js similarity index 100% rename from rdmo/core/assets/js/_bs53/bootstrap.js rename to rdmo/core/assets/js/bootstrap.js diff --git a/rdmo/core/assets/js/components/Modal.js b/rdmo/core/assets/js/components/Modal.js index acbaa59c45..8f7b89d3b6 100644 --- a/rdmo/core/assets/js/components/Modal.js +++ b/rdmo/core/assets/js/components/Modal.js @@ -1,47 +1,86 @@ -import React from 'react' +import React, { useEffect, useRef } from 'react' import PropTypes from 'prop-types' -import { Modal as BootstrapModal } from 'react-bootstrap' +import { Modal as BootstrapModal } from 'bootstrap' -const Modal = ({ title, show, modalProps, submitLabel, submitProps, onClose, onSubmit, children, buttons }) => { - return ( - - -

{title}

- - { - children && ( - - {children} - - ) +const Modal = ({ title, show, onClose, onSubmit, submitLabel, submitProps, children, modalProps = {}, size = '' }) => { + const modalRef = useRef(null) + + useEffect(() => { + const modalElement = modalRef.current + if (!modalElement) return + + const modal = BootstrapModal.getOrCreateInstance(modalElement, { + backdrop: 'static', + keyboard: true, + ...modalProps + }) + + const handleHide = () => { + if (show) { + onClose() } - - - {buttons} - { - onSubmit && ( - + + + { + children && ( +
+ {children} +
+ ) + } + +
+ { + onSubmit && ( + + ) + } + - ) - } - - +
+ + + ) } Modal.propTypes = { title: PropTypes.string.isRequired, show: PropTypes.bool.isRequired, - modalProps: PropTypes.object, - submitLabel: PropTypes.string, - submitProps: PropTypes.object, onClose: PropTypes.func.isRequired, onSubmit: PropTypes.func, - children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]), - buttons: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]), + submitLabel: PropTypes.string, + submitProps: PropTypes.object, + children: PropTypes.oneOfType([ + PropTypes.arrayOf(PropTypes.node), + PropTypes.node + ]), + modalProps: PropTypes.object, + size: PropTypes.string } export default Modal diff --git a/rdmo/core/assets/js/_bs53/components/Tooltip.js b/rdmo/core/assets/js/components/Tooltip.js similarity index 100% rename from rdmo/core/assets/js/_bs53/components/Tooltip.js rename to rdmo/core/assets/js/components/Tooltip.js diff --git a/rdmo/core/assets/js/_bs53/base.js b/rdmo/core/assets/js/home.js similarity index 100% rename from rdmo/core/assets/js/_bs53/base.js rename to rdmo/core/assets/js/home.js diff --git a/rdmo/core/assets/scss/_bs53/base.scss b/rdmo/core/assets/scss/_bs53/base.scss deleted file mode 100644 index 2cb4e72402..0000000000 --- a/rdmo/core/assets/scss/_bs53/base.scss +++ /dev/null @@ -1,13 +0,0 @@ -@import 'base/card'; -@import 'base/code'; -@import 'base/content'; -@import 'base/datepicker'; -@import 'base/dropdown'; -@import 'base/dropzone'; -@import 'base/forms'; -@import 'base/nav'; -@import 'base/select'; -@import 'base/sidebar'; -@import 'base/table'; -@import 'base/typography'; -@import 'base/variables'; diff --git a/rdmo/core/assets/scss/_bs53/app.scss b/rdmo/core/assets/scss/app.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/app.scss rename to rdmo/core/assets/scss/app.scss diff --git a/rdmo/core/assets/scss/base.scss b/rdmo/core/assets/scss/base.scss index be6083d61a..2cb4e72402 100644 --- a/rdmo/core/assets/scss/base.scss +++ b/rdmo/core/assets/scss/base.scss @@ -1,7 +1,13 @@ -$icon-font-path: "bootstrap-sass/assets/fonts/bootstrap/"; - -@import '~bootstrap-sass'; -@import '~font-awesome/css/font-awesome.css'; -@import 'react-datepicker/dist/react-datepicker.css'; - -@import 'utils.scss' +@import 'base/card'; +@import 'base/code'; +@import 'base/content'; +@import 'base/datepicker'; +@import 'base/dropdown'; +@import 'base/dropzone'; +@import 'base/forms'; +@import 'base/nav'; +@import 'base/select'; +@import 'base/sidebar'; +@import 'base/table'; +@import 'base/typography'; +@import 'base/variables'; diff --git a/rdmo/core/assets/scss/_bs53/base/card.scss b/rdmo/core/assets/scss/base/card.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/card.scss rename to rdmo/core/assets/scss/base/card.scss diff --git a/rdmo/core/assets/scss/_bs53/base/code.scss b/rdmo/core/assets/scss/base/code.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/code.scss rename to rdmo/core/assets/scss/base/code.scss diff --git a/rdmo/core/assets/scss/_bs53/base/content.scss b/rdmo/core/assets/scss/base/content.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/content.scss rename to rdmo/core/assets/scss/base/content.scss diff --git a/rdmo/core/assets/scss/_bs53/base/datepicker.scss b/rdmo/core/assets/scss/base/datepicker.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/datepicker.scss rename to rdmo/core/assets/scss/base/datepicker.scss diff --git a/rdmo/core/assets/scss/_bs53/base/dropdown.scss b/rdmo/core/assets/scss/base/dropdown.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/dropdown.scss rename to rdmo/core/assets/scss/base/dropdown.scss diff --git a/rdmo/core/assets/scss/_bs53/base/dropzone.scss b/rdmo/core/assets/scss/base/dropzone.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/dropzone.scss rename to rdmo/core/assets/scss/base/dropzone.scss diff --git a/rdmo/core/assets/scss/_bs53/base/forms.scss b/rdmo/core/assets/scss/base/forms.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/forms.scss rename to rdmo/core/assets/scss/base/forms.scss diff --git a/rdmo/core/assets/scss/_bs53/base/nav.scss b/rdmo/core/assets/scss/base/nav.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/nav.scss rename to rdmo/core/assets/scss/base/nav.scss diff --git a/rdmo/core/assets/scss/_bs53/base/select.scss b/rdmo/core/assets/scss/base/select.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/select.scss rename to rdmo/core/assets/scss/base/select.scss diff --git a/rdmo/core/assets/scss/_bs53/base/sidebar.scss b/rdmo/core/assets/scss/base/sidebar.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/sidebar.scss rename to rdmo/core/assets/scss/base/sidebar.scss diff --git a/rdmo/core/assets/scss/_bs53/base/table.scss b/rdmo/core/assets/scss/base/table.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/table.scss rename to rdmo/core/assets/scss/base/table.scss diff --git a/rdmo/core/assets/scss/_bs53/base/typography.scss b/rdmo/core/assets/scss/base/typography.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/typography.scss rename to rdmo/core/assets/scss/base/typography.scss diff --git a/rdmo/core/assets/scss/_bs53/base/variables.scss b/rdmo/core/assets/scss/base/variables.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/base/variables.scss rename to rdmo/core/assets/scss/base/variables.scss diff --git a/rdmo/core/assets/scss/_bs53/bootstrap.scss b/rdmo/core/assets/scss/bootstrap.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/bootstrap.scss rename to rdmo/core/assets/scss/bootstrap.scss diff --git a/rdmo/core/assets/scss/_bs53/breakpoints.scss b/rdmo/core/assets/scss/breakpoints.scss similarity index 100% rename from rdmo/core/assets/scss/_bs53/breakpoints.scss rename to rdmo/core/assets/scss/breakpoints.scss diff --git a/rdmo/core/assets/scss/home.scss b/rdmo/core/assets/scss/home.scss new file mode 100644 index 0000000000..d4c0cde622 --- /dev/null +++ b/rdmo/core/assets/scss/home.scss @@ -0,0 +1 @@ +// This file is intentionally left empty. diff --git a/rdmo/core/assets/scss/utils.scss b/rdmo/core/assets/scss/utils.scss deleted file mode 100644 index da255d7d82..0000000000 --- a/rdmo/core/assets/scss/utils.scss +++ /dev/null @@ -1,104 +0,0 @@ -.flip { - transform: rotate(180deg) scaleX(-1); -} - -.w-100 { - width: 100%; -} -.mt-0 { - margin-top: 0; -} -.mt-5 { - margin-top: 5px; -} -.mt-10 { - margin-top: 10px; -} -.mt-15 { - margin-top: 15px; -} -.mt-20 { - margin-top: 20px; -} -.mr-0 { - margin-right: 0; -} -.mr-5 { - margin-right: 5px; -} -.mr-10 { - margin-right: 10px; -} -.mr-15 { - margin-right: 15px; -} -.mr-20 { - margin-right: 20px; -} -.mb-0 { - margin-bottom: 0; -} -.mb-5 { - margin-bottom: 5px; -} -.mb-10 { - margin-bottom: 10px; -} -.mb-15 { - margin-bottom: 15px; -} -.mb-20 { - margin-bottom: 20px; -} -.ml-0 { - margin-left: 0; -} -.ml-5 { - margin-left: 5px; -} -.ml-10 { - margin-left: 10px; -} -.ml-15 { - margin-left: 15px; -} -.ml-20 { - margin-left: 20px; -} - -.pt-0 { - padding-top: 0; -} -.pt-10 { - padding-top: 10px; -} -.pt-20 { - padding-top: 20px; -} -.pr-0 { - padding-right: 0; -} -.pr-10 { - padding-right: 10px; -} -.pr-20 { - padding-right: 20px; -} -.pb-0 { - padding-bottom: 0; -} -.pb-10 { - padding-bottom: 10px; -} -.pb-20 { - padding-bottom: 20px; -} -.pl-0 { - padding-left: 0; -} -.pl-10 { - padding-left: 10px; -} -.pl-20 { - padding-left: 20px; -} diff --git a/rdmo/core/schema.py b/rdmo/core/schema.py index 91593b217f..66b8c29e32 100644 --- a/rdmo/core/schema.py +++ b/rdmo/core/schema.py @@ -8,7 +8,6 @@ def filter_endpoints(endpoints): for (path, path_regex, method, callback) in endpoints: if not path.startswith(( '/api/v1/management/', - '/api/v1/overlays/' )): yield (path, path_regex, method, callback) diff --git a/rdmo/core/settings.py b/rdmo/core/settings.py index 9b85058b34..dca977278e 100644 --- a/rdmo/core/settings.py +++ b/rdmo/core/settings.py @@ -18,7 +18,6 @@ # rdmo modules 'rdmo', 'rdmo.core', - 'rdmo.overlays', 'rdmo.accounts', 'rdmo.services', 'rdmo.domain', @@ -34,7 +33,6 @@ 'rest_framework.authtoken', 'widget_tweaks', 'markdown', - 'compressor', 'django_cleanup', 'django_extensions', 'django_filters', @@ -77,10 +75,6 @@ MESSAGE_STORAGE = "django.contrib.messages.storage.session.SessionStorage" -COMPRESS_PRECOMPILERS = ( - ('text/x-scss', 'django_libsass.SassCompiler'), -) - WSGI_APPLICATION = 'config.wsgi.application' AUTHENTICATION_BACKENDS = [ @@ -162,7 +156,6 @@ STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - 'compressor.finders.CompressorFinder', ) DATABASES = { @@ -293,31 +286,6 @@ USER_API = True -OVERLAYS = { - 'projects': [ - 'projects-table', - 'create-project', - 'import-project', - 'support-info' - ], - 'project': [ - 'project-questions', - 'project-catalog', - 'project-issues', - 'project-views', - 'project-memberships', - 'project-snapshots', - 'export-project', - 'import-project', - 'support-info' - ], - 'issue_send': [ - 'issue-message', - 'issue-attachments', - 'support-info' - ] -} - EXPORT_FORMATS = ( ('pdf', _('PDF')), ('rtf', _('Rich Text Format')), diff --git a/rdmo/core/static/core/css/base.scss b/rdmo/core/static/core/css/base.scss deleted file mode 100644 index 40373e48f0..0000000000 --- a/rdmo/core/static/core/css/base.scss +++ /dev/null @@ -1,537 +0,0 @@ -@import 'core/css/variables'; - -html, body { - height: 100%; - background-color: $background-color; -} - -h1, h2, h3, h4 { - color: $headline-color; - background-color: $headline-background-color; - line-height: 40px; -} -h5, h6 { - color: $headline-color; - background-color: $headline-background-color; - font-size: medium; - line-height: 20px; -} -h1 { - font-size: 28px; -} -h2 { - font-size: 24px; -} -.sidebar h2, -.modal h2 { - font-size: 20px; -} -h3 { - font-size: 16px; -} -h4 { - font-size: 14px; -} -form { - margin-bottom: 20px; -} -textarea { - resize: vertical; -} - -.extend { - width: 100%; -} - -a { - color: $link-color; - - &:visited { - color: $link-color-visited; - } - &:hover { - color: $link-color-hover; - } - &:focus { - color: $link-color-focus; - } - - &.btn { - color: white; - - &:visited, - &:hover, - &:focus { - color: white; - } - } - &.text-warning { - &:visited, - &:hover, - &:focus { - color: #8a6d3b; - } - } - &.text-danger { - &:visited, - &:hover, - &:focus { - color: #a94442; - } - } - - &.disabled { - cursor: not-allowed; - } - - &.fa { - text-decoration: none !important; - - &:visited, - &:hover, - &:focus { - text-decoration: none !important; - } - } -} - -.btn.btn-link { - color: $link-color; - padding: 0; - border: 0; - text-decoration: none; - - &:hover { - color: $link-color-hover; - text-decoration: none; - } - &:active, - &:focus { - outline: none; - } -} - -code { - word-wrap: break-word; - - &.code-questions { - color: rgb(16, 31, 112); - background-color: rgba(16, 31, 112, 0.1); - } - &.code-options { - color: rgb(255, 100, 0); - background-color: rgba(255, 100, 0, 0.1); - } - &.code-options-provider { - color: white; - background-color: rgba(255, 100, 0, 0.8); - } - &.code-conditions { - color: rgb(128, 0, 128); - background-color: rgba(128, 0, 128, 0.1); - } - &.code-tasks { - color: rgb(128, 0, 0); - background-color: rgba(128, 0, 0, 0.1); - } - &.code-views { - color: rgb(0, 128, 0); - background-color: rgba(0, 128, 0, 0.1); - } - &.code-order { - color: rgb(96, 96, 96); - background-color: rgba(96, 96, 96, 0.1); - } - &.code-default { - color: rgb(96, 96, 96); - background-color: rgba(96, 96, 96, 0.1); - } - &.code-optional { - color: white; - background-color: rgb(119.085, 119.085, 119.085); - } - &.code-import { - color: black; - background-color: rgba(96, 96, 96, 0.1); - } -} - -table { - p { - margin-bottom: 5px; - } - p:last-child { - margin-bottom: 0; - } -} - -.table-break-word { - td { - word-break: break-all; - } -} - -details { - margin-bottom: 10px; -} - -summary { - display: list-item; - cursor: pointer; - margin-bottom: 5px; -} - -metadata { - display: none; -} - -/* navbar */ - -.navbar-default { - background-color: $navigation-background-color; - border-bottom: none; - - .navbar-brand, - .navbar-nav > li > a, - .navbar-nav > li > a:focus { - color: $navigation-color; - background-color: transparent; - } - .navbar-brand:hover, - .navbar-nav > li > a:hover, - .navbar-nav > .open > a, - .navbar-nav > .open > a:focus, - .navbar-nav > .open > a:hover { - color: $navigation-hover-color; - background-color: $navigation-hover-background-color; - } - - .dropdown li.divider:first-child { - display: none; - } -} - -/* content */ - -.content { - padding-top: 50px; /* same height as the navbar */ -} -.sidebar { - /* make the sidebar sticky */ - position: -webkit-sticky; - position: sticky; - top: 0; -} -.page, .sidebar { - height: 100%; - margin-top: 10px; - margin-bottom: 60px; -} -.page h2:nth-child(2) { - margin-top: 0; -} -.sidebar h2:first-child, -.sidebar-mt { - margin-top: 70px; -} - -/* questions overview */ - -.section-panel { - -} - -.subsection-panel { - margin-left: 40px; -} - -.group-panel { - margin-left: 80px; - - table th:first-child, - table td:first-child { - padding-left: 15px; - } - - table th:last-child, - table td:last-child { - padding-right: 15px; - } -} - -/* angular forms */ - -.input-collection { - margin-bottom: 15px; -} - -/* forms */ - -.form-label { - margin-bottom: 5px; - font-weight: 700; -} - -form .yesno label { - margin-right: 10px; -} - -.row { - .checkbox, - .radio { - margin-top: 10px; - margin-bottom: 10px; - } - - @media (min-width: $screen-xs-max) { - .checkbox-padding .checkbox, - .radio-padding .radio { - margin-top: 32px; - margin-bottom: 11px; - } - } -} - -.input-xs { - height: 24px; - padding: 5px 10px; - font-size: 11px; - line-height: 1; - border-radius: 2px; -} - -.help-block.info { - margin-top: 0; -} - -.sidebar-form { - display: flex; - gap: 5px; -} - -.upload-form { - .upload-form-field { - position: relative; - - cursor: pointer; - border-radius: 4px; - - flex-grow: 1; - overflow: hidden; - - p, - input { - height: 34px; - margin: 0px; - } - - p { - text-align: left; - cursor: pointer; - - color: $link-color; - border: 1px solid silver; - border-radius: 4px; - - width: calc(100% - 1px); - padding: 6px 14px; - - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - - input { - position: absolute; - z-index: 1; - padding: 0; - opacity: 0; - } - - &:hover { - background-color: #e6e6e6; - } - } -} - -/* modals */ - -.modal-body { - > p:last-child, - formgroup:last-child .form-group { - margin-bottom: 0; - } - - .copy-block { - margin-bottom: 20px; - } - - .help-block { - font-size: small; - word-break: break-word; - } - - .nav.nav-tabs { - margin-bottom: 20px; - } -} - -/* options */ - -.options-dropdown { - display: inline-block; - - > a { - cursor: pointer; - } -} - -/* panels */ - -.panel-default { - min-height: 5px; -} - -.panel-body { - padding-top: 10px; - padding-bottom: 10px; -} - -.panel li > p:last-child { - margin-bottom: 0; -} - -/* lists */ - -ul.list-arrow li { - margin-left: 20px; - - &.active { - margin-left: 0; - } - - &.active a:before { - float: left; - width: 20px; - text-align: right; - content: '\2192\0000a0'; /* right-arrow followed by a space */ - } -} - -/* misc */ -.form-errors { - margin-bottom: 20px; -} -li > a.control-label > i { - display: none; -} -li.has-error > a.control-label > i, -li.has-warning > a.control-label > i { - display: inline; -} -.email-form label, -.connections-form label { - display: block; - margin: 0; - line-height: 40px; - border-bottom: 1px solid $modal-border-color; -} -.email-form label:first-child, -.connections-form label:first-child { - border-top: 1px solid $modal-border-color; -} -.email-form label input, -.connections-form label input { - margin-left: 5px; - margin-right: 5px; -} -.email-form .email-form-buttons, -.connections-form .connections-form-buttons { - margin-top: 10px; -} -.socialaccount_providers { - margin: 0; - padding: 0; - height: 42px; -} -.socialaccount_providers li { - float: left; - margin: 0 5px 10px 5px; - list-style: none; -} -.socialaccount_providers li.socialaccount_provider_break { - float: none; - margin-left: 0; - margin-right: 0; -} -.socialaccount_provider_name { - line-height: 29px; - font-weight: bold; -} -.logout-form { - margin: 0; -} -.logout-form .btn-link { - padding: 3px 20px; - color: $navigation-dropdown-color; - display: block; - width: 100%; - text-align: left; - border: none; - clear: both; - font-weight: 400; - line-height: 1.42857143; - white-space: nowrap; -} -.logout-form .btn-link:hover { - color: $navigation-dropdown-hover-color; - background-color: $navigation-dropdown-hover-background-color; - text-decoration: none; -} -.logout-form .btn-link:focus { - color: $navigation-dropdown-hover-color; - background-color: $navigation-dropdown-hover-background-color; - text-decoration: none; - outline: none; -} -.rdmo-logo { - width: 240px; - margin-top: 40px; -} - -// adjust background "hover" color in select2 to $link-color -.select2-results__option--highlighted { - background-color: $link-color !important -} - -.cc-myself { - .checkbox { - margin: 0; - } -} - -.ng-binding { - :last-child { - margin-bottom: 0; - } -} - -.inline_image { - max-width: 100%; -} - -[data-toggle="tooltip"] { - cursor: help; - text-decoration: underline; - text-decoration-style: dotted; -} - -.more, -.show-less { - display: none; -} -.show-more, -.show-less { - color: $link-color; - cursor: pointer; -} diff --git a/rdmo/core/static/core/css/fonts.scss b/rdmo/core/static/core/css/fonts.scss deleted file mode 100644 index 233e08076f..0000000000 --- a/rdmo/core/static/core/css/fonts.scss +++ /dev/null @@ -1,46 +0,0 @@ -@font-face { - font-family: "DroidSans"; - src: url(static('core/fonts/DroidSans.ttf')); -} -@font-face { - font-family: "DroidSans"; - src: url(static('core/fonts/DroidSans-Bold.ttf')); - font-weight: bold; -} -@font-face { - font-family: "DroidSans-Mono"; - src: url(static('core/fonts/DroidSansMono.ttf')); -} -@font-face { - font-family: "DroidSerif"; - src: url(static('core/fonts/DroidSerif.ttf')); -} -@font-face { - font-family: "DroidSerif"; - src: url(static('core/fonts/DroidSerif-Bold.ttf')); - font-weight: bold; -} -@font-face { - font-family: "DroidSerif"; - src: url(static('core/fonts/DroidSerif-Italic.ttf')); - font-style: italic; -} -@font-face { - font-family: "DroidSerif"; - src: url(static('core/fonts/DroidSerif-BoldItalic.ttf')); - font-style: italic; - font-weight: bold; -} - -body { - font-family: DroidSans, sans; -} -h1, h2, h3, h4, h5, h6 { - font-family: DroidSerif, serif; -} - -.react-datepicker { - h1, h2, h3, h4, h5, h6 { - font-family: DroidSans, sans; - } -} diff --git a/rdmo/core/static/core/css/footer.scss b/rdmo/core/static/core/css/footer.scss deleted file mode 100644 index 0e7e1bcd9c..0000000000 --- a/rdmo/core/static/core/css/footer.scss +++ /dev/null @@ -1,57 +0,0 @@ -@import 'core/css/variables'; - -$footer-height: 280px; -$footer-height-md: 600px; -$footer-height-sm: 260px; - -/* footer layout */ - -.content { - min-height: 100%; - margin-bottom: -$footer-height; - padding-bottom: $footer-height; -} -footer { - height: $footer-height; -} -@media (max-width: $screen-sm-max) { - .content { - margin-bottom: -$footer-height-md; - padding-bottom: $footer-height-md; - } - footer { - height: $footer-height-md; - } -} -@media (max-width: $screen-xs-max) { - .content { - margin-bottom: -$footer-height-md; - padding-bottom: $footer-height-md; - } - footer { - height: $footer-height-md; - } -} - -/* footer style */ - -footer { - color: $footer-color; - background-color: $footer-background-color; - padding-top: 20px; - - a, - a:visited, - a:hover { - color: $footer-link-color; - } - h4 { - color: $footer-link-color; - } - p { - text-align: left; - } - img { - display: block; - } -} diff --git a/rdmo/core/static/core/css/header.scss b/rdmo/core/static/core/css/header.scss deleted file mode 100644 index 972439084e..0000000000 --- a/rdmo/core/static/core/css/header.scss +++ /dev/null @@ -1,91 +0,0 @@ -@import 'core/css/variables'; - -$header-height: 400px; -$header-height-md: 300px; - -header { - position: relative; - - height: $header-height; - background-color: black; - - .header-image { - position: absolute; - left: 0; - right: 0; - - opacity: 0; - -webkit-transition: $image-transition; - -moz-transition: $image-transition; - -ms-transition: $image-transition; - -o-transition: $image-transition; - transition: $image-transition; - - &.visible { - opacity: 1; - } - img { - display: block; - width: 100%; - height: $header-height; - } - p { - position: absolute; - bottom: 0; - right: 0; - z-index: 10; - - padding-right: 5px; - margin-bottom: 5px; - font-size: 10px; - color: $footer-link-color; - - } - a, - a:visited, - a:hover { - color: $footer-link-color; - } - } - .header-text { - position: relative; - padding-top: 100px; - - h1 { - font-size: 60px; - color: white; - } - p { - font-size: 30px; - color: white; - } - } -} -@media (max-width: $screen-md-max) { - header { - height: $header-height-md; - } - header .header-image img { - height: $header-height-md; - } - header .header-text { - padding-top: 50px; - } -} -@media (max-width: $screen-xs-max) { - header { - background-color: inherit; - height: auto; - } - header .header-text { - padding-top: 0; - } - header .header-text h1 { - font-size: 40px; - color: $headline-color; - } - header .header-text p { - font-size: 20px; - color: $variant-color; - } -} diff --git a/rdmo/core/static/core/css/style-bs53.css b/rdmo/core/static/core/css/style-bs53.css deleted file mode 100644 index 641e2e6460..0000000000 --- a/rdmo/core/static/core/css/style-bs53.css +++ /dev/null @@ -1,14 +0,0 @@ -:root, -[data-bs-theme=light] { - --rdmo-blue: #101F70; - --rdmo-blue-dark: #0d195a; -} - -.btn-primary { - --bs-btn-bg: var(--rdmo-blue); - --bs-btn-border-color: var(--rdmo-blue); - --bs-btn-hover-bg: var(--rdmo-blue-dark); - --bs-btn-hover-border-color: var(--rdmo-blue-dark); - --bs-btn-active-bg: var(--rdmo-blue); - --bs-btn-active-border-color: var(--rdmo-blue); -} diff --git a/rdmo/core/static/core/css/style.scss b/rdmo/core/static/core/css/style.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/rdmo/core/static/core/css/utils.scss b/rdmo/core/static/core/css/utils.scss deleted file mode 100644 index da255d7d82..0000000000 --- a/rdmo/core/static/core/css/utils.scss +++ /dev/null @@ -1,104 +0,0 @@ -.flip { - transform: rotate(180deg) scaleX(-1); -} - -.w-100 { - width: 100%; -} -.mt-0 { - margin-top: 0; -} -.mt-5 { - margin-top: 5px; -} -.mt-10 { - margin-top: 10px; -} -.mt-15 { - margin-top: 15px; -} -.mt-20 { - margin-top: 20px; -} -.mr-0 { - margin-right: 0; -} -.mr-5 { - margin-right: 5px; -} -.mr-10 { - margin-right: 10px; -} -.mr-15 { - margin-right: 15px; -} -.mr-20 { - margin-right: 20px; -} -.mb-0 { - margin-bottom: 0; -} -.mb-5 { - margin-bottom: 5px; -} -.mb-10 { - margin-bottom: 10px; -} -.mb-15 { - margin-bottom: 15px; -} -.mb-20 { - margin-bottom: 20px; -} -.ml-0 { - margin-left: 0; -} -.ml-5 { - margin-left: 5px; -} -.ml-10 { - margin-left: 10px; -} -.ml-15 { - margin-left: 15px; -} -.ml-20 { - margin-left: 20px; -} - -.pt-0 { - padding-top: 0; -} -.pt-10 { - padding-top: 10px; -} -.pt-20 { - padding-top: 20px; -} -.pr-0 { - padding-right: 0; -} -.pr-10 { - padding-right: 10px; -} -.pr-20 { - padding-right: 20px; -} -.pb-0 { - padding-bottom: 0; -} -.pb-10 { - padding-bottom: 10px; -} -.pb-20 { - padding-bottom: 20px; -} -.pl-0 { - padding-left: 0; -} -.pl-10 { - padding-left: 10px; -} -.pl-20 { - padding-left: 20px; -} diff --git a/rdmo/core/static/core/css/variables.scss b/rdmo/core/static/core/css/variables.scss deleted file mode 100644 index 22d4f89735..0000000000 --- a/rdmo/core/static/core/css/variables.scss +++ /dev/null @@ -1,40 +0,0 @@ -/* colors */ - -$text-color: #101F70; -$variant-color: #666; -$background-color: #fefefe; -$variant-background-color: #f5f5f5; - -$headline-color: #101F70; -$headline-background-color: transparent; - -$link-color: #337ab7; -$link-color-visited: #337ab7; -$link-color-hover: #337ab7; -$link-color-focus: #337ab7; - -$navigation-color: #9d9d9d; -$navigation-background-color: #101F70; -$navigation-hover-color: #fff; -$navigation-hover-background-color: rgba(255, 255, 255, 0.1); -$navigation-dropdown-color: #333; -$navigation-dropdown-hover-color: #262626; -$navigation-dropdown-hover-background-color: #f5f5f5; - -$footer-color: #999; -$footer-link-color: #999; -$footer-background-color: #001; - -$danger-color: #a94442; -$success-color: #5cb85c; -$modal-border-color: #e5e5e5; - -/* transitions */ - -$image-transition: opacity 2s ease-in-out; - -/* responsive thresholds */ - -$screen-xs-max: 768px; -$screen-sm-max: 992px; -$screen-md-max: 1200px; diff --git a/rdmo/core/static/core/img/favicon.png b/rdmo/core/static/core/img/favicon.png deleted file mode 100644 index 042bcf2bbb..0000000000 Binary files a/rdmo/core/static/core/img/favicon.png and /dev/null differ diff --git a/rdmo/core/static/core/img/rdmo-logo.svg b/rdmo/core/static/core/img/rdmo-logo.svg deleted file mode 100644 index 93fc2eae24..0000000000 --- a/rdmo/core/static/core/img/rdmo-logo.svg +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - RDMO - - diff --git a/rdmo/core/static/core/js/header.js b/rdmo/core/static/core/js/header.js deleted file mode 100644 index 98076b1633..0000000000 --- a/rdmo/core/static/core/js/header.js +++ /dev/null @@ -1,19 +0,0 @@ -var _current_image = 0; -var _max_image = 2; -var _timeout = 5000; - -function swap_image() { - $('.header-image-' + _current_image).removeClass('visible'); - if (_current_image >= _max_image) { - _current_image = 0; - } else { - _current_image += 1; - } - $('.header-image-' + _current_image).addClass('visible'); - - setTimeout(swap_image, _timeout); -} - -$(document).ready(function() { - setTimeout(swap_image, _timeout); -}); diff --git a/rdmo/core/static/core/js/utils.js b/rdmo/core/static/core/js/utils.js deleted file mode 100644 index 8c34a73526..0000000000 --- a/rdmo/core/static/core/js/utils.js +++ /dev/null @@ -1,11 +0,0 @@ -function showMore(element) { - $(element).siblings('.more').show(); - $(element).siblings('.show-less').show(); - $(element).hide(); -} - -function showLess(element) { - $(element).siblings('.more').hide(); - $(element).siblings('.show-more').show(); - $(element).hide(); -} diff --git a/rdmo/core/templates/core/about.html b/rdmo/core/templates/core/about.html index 0076a5da0b..2299507dcd 100644 --- a/rdmo/core/templates/core/about.html +++ b/rdmo/core/templates/core/about.html @@ -1,18 +1,16 @@ -{% extends 'core/base.html' %} +{% extends 'core/main.html' %} {% load static core_tags %} {% load i18n %} {% block content %} -
-
-
-
-
- {% render_lang_template "core/about_text" %} -
-
-
+
+
+
+
+ {% render_lang_template "core/about_text" %} +
+
diff --git a/rdmo/core/templates/core/api.html b/rdmo/core/templates/core/api.html index bc18cf7cae..91c84fd461 100644 --- a/rdmo/core/templates/core/api.html +++ b/rdmo/core/templates/core/api.html @@ -1,10 +1,8 @@ -{% extends 'core/base.html' %} +{% extends 'core/main.html' %} {% load i18n %} {% load core_tags %} -{% block content %} - -
+{% block main %}

API

@@ -52,6 +50,5 @@

Module endpoints

  • {{ module_url }}
    • {% endfor %} -
    {% endblock %} diff --git a/rdmo/core/templates/core/base.html b/rdmo/core/templates/core/base.html index 96e535fb03..035468b44d 100644 --- a/rdmo/core/templates/core/base.html +++ b/rdmo/core/templates/core/base.html @@ -1,24 +1,17 @@ -{% load static compress core_tags i18n %}{% get_current_language as lang_code %} - +{% load static core_tags %} + {% include 'core/base_head.html' %} {% block css %} + - - {% compress css %} - - - - - {% endcompress %} - + {% endblock %} {% block js %} + - - {% endblock %} {% block head %} @@ -27,27 +20,15 @@ - {% include 'core/base_navigation.html' %} - -
    {% block content %}{% endblock %}
    - - - -{% include 'core/base_footer.html' %} - {% if not debug %} - -{% include 'core/base_analytics.html' %} - + {% include 'core/base_analytics.html' %} {% endif %} -{% block extra_body %}{% endblock %} - diff --git a/rdmo/core/templates/core/base_footer.html b/rdmo/core/templates/core/base_footer.html deleted file mode 100644 index a2f083eb53..0000000000 --- a/rdmo/core/templates/core/base_footer.html +++ /dev/null @@ -1,7 +0,0 @@ -{% load i18n core_tags %} - -
    -
    - {% render_lang_template 'core/footer_text' %} -
    -
    diff --git a/rdmo/core/templates/core/base_navigation.html b/rdmo/core/templates/core/base_navigation.html index a4116cfdcc..ea8627ac45 100644 --- a/rdmo/core/templates/core/base_navigation.html +++ b/rdmo/core/templates/core/base_navigation.html @@ -3,60 +3,59 @@ {% load accounts_tags %} {% load rules %} -