Merge branch 'master' of https://github.com/ImagingDataCommons/IDC-WebApp into idc-test

s-paquette · s-paquette · commit e34773a18149 · 2026-02-08T15:05:40.000-08:00
diff --git a/idc/urls.py b/idc/urls.py
@@ -31,6 +31,7 @@
 
     re_path(r'^$', views.landing_page, name='landing_page'),
     re_path(r'^quota/$', views.quota_page, name='quota_page'),
+    re_path(r'^quota/index.html$', views.quota_page, name='quota_page_index'),
     re_path(r'^users/(?P<user_id>\d+)/$', views.user_detail, name='user_detail'),
     re_path(r'^users/api/', views_api.user_detail, name='user_detail_api'),
 
diff --git a/static/css/bootstrap-idc.css b/static/css/bootstrap-idc.css
@@ -102,4 +102,25 @@
 .doi-list.ar-collex-set {
     margin-left: var(--fa-li-margin,0.75em);
     margin-bottom: 1em;
+}
+
+.quota-card {
+    margin-top: 100px;
+}
+
+.quota-card .card-header {
+    background: #d98033;
+    color: #fff;
+    font-family: system-ui;
+}
+
+.quota-details {
+    height: 80vh;
+    min-height: 500px;
+    font-size: large;
+    font-family: system-ui;
+}
+
+.quota-details a {
+    font-weight: bold;
 }
diff --git a/static/js/bq-string.js b/static/js/bq-string.js
@@ -18,6 +18,7 @@
 
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         base: 'base',
diff --git a/static/js/cart_page.js b/static/js/cart_page.js
@@ -17,6 +17,7 @@
  */
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         bootstrap: 'libs/bootstrap.min',
diff --git a/static/js/citations_modal.js b/static/js/citations_modal.js
@@ -18,6 +18,7 @@
 
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         bootstrap: 'libs/bootstrap.min',
diff --git a/static/js/cohorts/cohort-details.js b/static/js/cohorts/cohort-details.js
@@ -18,6 +18,7 @@
 
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         bootstrap: 'libs/bootstrap.min',
diff --git a/static/js/cohorts/export-manifest.js b/static/js/cohorts/export-manifest.js
@@ -18,6 +18,7 @@
 
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         bootstrap: 'libs/bootstrap.min',
diff --git a/static/js/collection_details.js b/static/js/collection_details.js
@@ -1,5 +1,6 @@
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         bootstrap: 'libs/bootstrap.min',
diff --git a/static/js/collections_list.js b/static/js/collections_list.js
@@ -1,5 +1,6 @@
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         bootstrap: 'libs/bootstrap.min',
diff --git a/static/js/dashboard.js b/static/js/dashboard.js
@@ -1,5 +1,6 @@
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         bootstrap: 'libs/bootstrap.min',
diff --git a/static/js/downloader.js b/static/js/downloader.js
@@ -19,6 +19,7 @@
 // initial design by @pieper 6/25/25
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         base: 'base',
diff --git a/static/js/explore.js b/static/js/explore.js
@@ -17,6 +17,7 @@
  */
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         bootstrap: 'libs/bootstrap.min',
diff --git a/static/js/image_search.js b/static/js/image_search.js
@@ -17,6 +17,7 @@
  */
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         downloader: 'downloader',
         jquery: 'libs/jquery-3.7.1.min',
diff --git a/static/js/landing.js b/static/js/landing.js
@@ -18,6 +18,7 @@
 
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         bootstrap: 'libs/bootstrap.min',
diff --git a/static/js/news.js b/static/js/news.js
@@ -1,5 +1,6 @@
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         bootstrap: 'libs/bootstrap.min',
diff --git a/static/js/sapien.js b/static/js/sapien.js
@@ -18,6 +18,7 @@
 
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         jqueryui: 'libs/jquery-ui.min',
diff --git a/static/js/tooltips.js b/static/js/tooltips.js
@@ -17,6 +17,7 @@
  */
 require.config({
     baseUrl: STATIC_FILES_URL + 'js/',
+    urlArgs: "v="+APP_VERSION,
     paths: {
         jquery: 'libs/jquery-3.7.1.min',
         bootstrap: 'libs/bootstrap.min',
diff --git a/templates/base.html b/templates/base.html
@@ -54,6 +54,7 @@
         const STATIC_FILES_URL = '{{ STATIC_FILES_URL }}';
         const BASE_URL = '{{ BASE_URL }}' || "";
         const STORAGE_URI = '{{ STORAGE_URI }}';
+        const APP_VERSION = '{{ APP_VERSION }}';
         const OHIF_V2_PATH = '{{ OHIF_V2_PATH }}';
         const OHIF_V3_PATH = '{{ OHIF_V3_PATH }}';
         const VOLVIEW_PATH = '{{ VOLVIEW_PATH }}';
diff --git a/templates/collections/collection_details.html b/templates/collections/collection_details.html
@@ -2,7 +2,7 @@
 {% load static %}
 {% load custom_tags %}
 {% load idc_collections_custom_tags %}
-{% block title %}Collection Details {{ collection_id }} | IDC{% endblock %}}
+{% block title %}Collection Details {{ collection_id }} | IDC{% endblock %}
 {% block extra_css_libs %}
     <link type="text/css" rel="stylesheet" href="{% static 'css/bootstrap-5.css' %}" />
     <link type="text/css" rel="stylesheet" href="{% static 'css/bootstrap-idc.css' %}" />
diff --git a/templates/idc/quota.html b/templates/idc/quota.html
@@ -1,8 +1,6 @@
 {% extends 'base.html' %}
-
 {% comment %}
-
-   Copyright 2019, Institute for Systems Biology
+   Copyright 2025, Institute for Systems Biology
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -17,17 +15,53 @@
    limitations under the License.
 
 {% endcomment %}
+{% load static %}
+{% load custom_tags %}
+{% block title %}Quota Reached | IDC{% endblock %}
+{% block extra_css_libs %}
+    <link type="text/css" rel="stylesheet" href="{% static 'css/bootstrap-5.css' %}" />
+    <link type="text/css" rel="stylesheet" href="{% static 'css/bootstrap-idc.css' %}" />
+{% endblock %}
+{% block header %}
+
+{% endblock %}
+
+{% block link_page_name %}quota_page{% endblock %}
+{% block page_name %}quota_notice{% endblock %}
+
+{% block page_header %}{% endblock %}
 
 {% block content %}
-    <div>
-        <div class="quota-body">
-            <div class="center">
-                <h1 class="center"><span>Daily Imaging Data Quota Exceeded</span></h1>
-                <p>Users are restricted to a quota of {{ quota }} GB per day of medical imaging files. You have reached your daily quota. Your quota will be reset at midnight GMT. For further details consult our <a href="https://learn.canceridc.dev/portal/proxy-policy">proxy policy</a>.</p>
+<div class="container-fluid quota-details">
+    <div class="row">
+        <div class="col-3"></div>
+        <div class="col">
+            <div class="card quota-card text-center">
+                <div class="card-header">
+                      <h3>Daily Imaging Data Quota Exceeded</h3>
+                </div>
+                <div class="card-body">
+                  <p>
+                      Users are restricted to a quota of <b>{{ quota }} GB</b> per day of medical imaging files accessed via
+                      our DICOM interface and viewers. You have reached your daily quota. Your quota will be reset at
+                      midnight UTC.
+                  </p>
+                  <p>
+                      For further details on methods of accessing IDC imaging data, consult our
+                      <a href="" url="https://learn.canceridc.dev/portal/proxy-policy/" title="Proxy Policy"
+                        class="external-link" data-toggle="modal" data-target="#external-web-warning"
+                         data-bs-toggle="modal" data-bs-target="#external-web-warning"
+                      >proxy policy <i class="fa-solid fa-external-link external-link-icon" aria-hidden="true"></i></a>.
+                  </p>
+                </div>
             </div>
         </div>
+        <div class="col-3"></div>
     </div>
+</div>
 {% endblock %}
 
 {% block js_file %}
+    {{ block.super }}
+    <script type="text/javascript" src="{% static 'js/landing.js' %}?v={{ APP_VERSION }}"></script>
 {% endblock %}
