Merge pull request #1449 from ImagingDataCommons/idc-test-sp

Hotfixes, size adjustments

Author: s-paquette

idc/views.py

@@ -44,10 +44,6 @@
 from django.contrib.auth.signals import user_login_failed
 from django.dispatch import receiver
 from idc.models import User_Data
-from concurrent.futures import ThreadPoolExecutor
-from multiprocessing import Manager
-from math import floor
-from functools import partial
 
 
 
@@ -809,15 +805,12 @@ def explore_data_page(request, filter_path=False, path_filters=None):
 
     try:
         req = request.GET or request.POST
-        mode=req.get('mode','1')
-        ref = (req.get('ref', 'False').lower() == "true")
-        if ref:
-            request.session.create()
 
         is_dicofdic = (req.get('is_dicofdic', "False").lower() == "true")
         source = req.get('data_source_type', DataSource.SOLR)
         versions = json.loads(req.get('versions', '[]'))
         filters = json.loads(req.get('filters', '{}'))
+        with_stats = (req.get('with_stats', 'true').lower() == "true")
         disk_size = (req.get('disk_size', 'False').lower() == "true")
 
         fields = json.loads(req.get('fields', '[]'))
@@ -860,7 +853,7 @@ def explore_data_page(request, filter_path=False, path_filters=None):
 
         context = build_explorer_context(
             is_dicofdic, source, versions, filters, fields, order_docs, counts_only, with_related, with_derived,
-            collapse_on, is_json, uniques=uniques, totals=totals, disk_size=disk_size
+            collapse_on, is_json, uniques=uniques, totals=totals, with_stats=with_stats, disk_size=disk_size
         )
 
         if not('totals' in context):
@@ -878,10 +871,9 @@ def explore_data_page(request, filter_path=False, path_filters=None):
         if not ('disk_size' in context['totals']):
           context['totals']['disk_size'] = '0.0 GB'
 
-
         if not is_json:
             # These are filters to be loaded *after* a page render
-            context['mode']=mode
+
             if wcohort:
                 context['filters_for_load'] = cohort_filters_dict
             elif filter_path:

static/css/style.css

@@ -4471,3 +4471,15 @@ d-topics-list iframe {
     fill: #b0d4f3;
 }
 
+.filter-display-panel .panel-body, .shopping-cart-panel .panel-body {
+  padding-top: 0px
+}
+
+.filter-display-panel .panel-heading, .shopping-cart-panel .panel-heading,
+#projects_panel_container .panel-heading {
+  padding-bottom: 0px
+}
+
+.filter-display-panel .panel-heading, .shopping-cart-panel .panel-heading {
+  padding-top: 0px
+}

templates/idc/landing.html

@@ -31,11 +31,10 @@
                 <div class="row ">
                     <div class="col-xs-1"></div>
                     <div class="col-xs-10">
-                        <b>IDC Community Office Hours open to all every Tuesday 16:30 – 17:30 (New York) and
-                           Wednesday 10:30-11:30 (New York) via Google Meet at
-                            <a class="external-link" href="" url="https://meet.google.com/xyt-vody-tvb"
+                        <b>Need personalized help? Sign up for a 1-on-1 meeting with an IDC team member here:
+                            <a class="external-link" href="" url="https://tinyurl.com/idc-help-request"
                                data-toggle="modal" data-target="#external-web-warning">
-                                https://meet.google.com/xyt-vody-tvb
+                                https://tinyurl.com/idc-help-request
                             </a></b>.
                     </div>
                     <div class="col-xs-1">