Skip to content

3.0.0/cleanup #1582

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

Draft
jochenklar wants to merge 16 commits into
base: 3.0.0/release
Choose a base branch
from
Draft

3.0.0/cleanup #1582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0320c92
Remove project views and tests
jochenklar Mar 30, 2026
5fc76d3
Remove project templates
jochenklar Mar 30, 2026
6b9a709
Remove project templatetags
jochenklar Mar 30, 2026
b56bddd
Remove project forms and mixins
jochenklar Mar 30, 2026
81170bd
Remove project static
jochenklar Mar 30, 2026
71f9076
Remove overlays
jochenklar Mar 30, 2026
a8756dd
Remove core templates
jochenklar Mar 30, 2026
a94d486
Remove core static and refactor assets
jochenklar Mar 30, 2026
8181f2d
Update .gitignore
jochenklar Mar 30, 2026
73fd1ae
Update pyproject.toml
jochenklar Mar 30, 2026
5847fb9
Remove old base entry from webpack
jochenklar Apr 10, 2026
75f8cdd
Remove compressor from settings
jochenklar Apr 10, 2026
50abb4b
Fix webpack.config.js
jochenklar Apr 10, 2026
2d32c75
Fix projects urls order
jochenklar Apr 10, 2026
b6886e2
Remove bs53 directories, refactor templates and assets and add home e…
jochenklar Apr 10, 2026
4fa628e
Fix tests
jochenklar Apr 10, 2026
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
26 changes: 2 additions & 24 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ def fixtures():
'domain',
'groups',
'options',
'overlays',
'projects',
'questions',
'sites',
Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -231,7 +229,7 @@ default.extend-ignore-re = [
"(?Rm)^.*(#|//)\\s*spellchecker:disable-line$", # for .py files
"(?Rm)^.*<!-- spellchecker:disable-line -->$", # 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 = [
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/account_token.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/email.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/email_confirm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}
{% load account %}

Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/logout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/password_change.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}
{% load core_tags %}

Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/password_reset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}
{% load core_tags %}

Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/password_reset_done.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/password_reset_from_key.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}
{% load core_tags %}

Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/password_reset_from_key_done.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}
{% load core_tags %}

Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/password_set.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/signup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/terms_of_use.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/verification_sent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/account/verified_email_required.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block content %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/profile/profile_remove_closed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/profile/profile_remove_failed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/profile/profile_remove_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}
{% load core_tags %}

Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/profile/profile_remove_success.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/profile/profile_update_closed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/profile/profile_update_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}
{% load core_tags %}

Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/socialaccount/authentication_error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}
{% load account %}
{% load socialaccount %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/socialaccount/connections.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/socialaccount/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block head_title %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/socialaccount/login_cancelled.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}
{% load account %}
{% load socialaccount %}
Expand Down
2 changes: 1 addition & 1 deletion rdmo/accounts/templates/socialaccount/signup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'core/bs53/main.html' %}
{% extends 'core/main.html' %}
{% load i18n %}

{% block main %}
Expand Down
0 rdmo/core/static/core/img/document.png → rdmo/core/assets/img/document.png
View file
Open in desktop
File renamed without changes
0 ...ore/static/core/img/header/collection.jpg → rdmo/core/assets/img/header/collection.jpg
View file
Open in desktop
File renamed without changes
0 rdmo/core/static/core/img/header/library.jpg → rdmo/core/assets/img/header/library.jpg
View file
Open in desktop
File renamed without changes
0 .../static/core/img/header/supercomputer.jpg → .../core/assets/img/header/supercomputer.jpg
View file
Open in desktop
File renamed without changes
0 rdmo/core/static/core/img/rdmo-logo.png → rdmo/core/assets/img/rdmo-logo.png
View file
Open in desktop
File renamed without changes
86 changes: 0 additions & 86 deletions rdmo/core/assets/js/_bs53/components/Modal.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions rdmo/core/assets/js/_bs53/components/index.js
View file
Open in desktop

This file was deleted.

0 rdmo/core/assets/js/_bs53/app.js → rdmo/core/assets/js/app.js
View file
Open in desktop
File renamed without changes.
5 changes: 1 addition & 4 deletions rdmo/core/assets/js/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
import 'bootstrap-sass'

window.$ = require('jquery')
window.Cookies = require('js-cookie')
// This file is intentionally left empty.
0 rdmo/core/assets/js/_bs53/bootstrap.js → rdmo/core/assets/js/bootstrap.js
View file
Open in desktop
File renamed without changes.
Loading
Loading