diff --git a/arches/app/media/css/arches.scss b/arches/app/media/css/arches.scss index 067819e8a1a..b6ca6327ee8 100644 --- a/arches/app/media/css/arches.scss +++ b/arches/app/media/css/arches.scss @@ -9201,11 +9201,19 @@ a.mega-dropdown-toggle.disabled { font-size: 17px; font-weight: 500; margin-top: 0px; - width: 400px; + width: auto; padding: 14px 0 5px 25px; color: #555; } +.report-toolbar-left-position{ + float:left; +} + +.report-toolbar-right-position{ + float:right; +} + h4.report-toolbar-title { width: 500px; } @@ -15119,20 +15127,36 @@ a.jstree-anchor.permissions-widget { @media print { + * { + overflow: visible !important; + } + .page { + page-break-after:always; + } + header, nav, footer, button, aside, + #skip-link-holder, .print-btn, .ep-tools, .geocode-container, .geometry-tools-container, .geometry-editing-notifications, + .resource-component-abstract-container footer, #map-widget-container>.map-widget-container { display: none; } + #menu-toggle, + div.report-print-date, + #mainnav-menu{ + display:none !important; + } + + #content-container { padding: 0 !important; } @@ -15176,7 +15200,11 @@ a.jstree-anchor.permissions-widget { } .mapboxgl-map { - display: none; + display: block; + } + + .workbench-card-sidebar, .mapboxgl-control-container{ + display: none } .print-map { diff --git a/arches/app/media/js/views/resource/report.js b/arches/app/media/js/views/resource/report.js index 8242cf9e331..fc34ffd2bf3 100644 --- a/arches/app/media/js/views/resource/report.js +++ b/arches/app/media/js/views/resource/report.js @@ -18,7 +18,7 @@ require([ self.viewModel.loading(false); window.print(); }, - 7000 // a generous timeout here to allow maps/images to load + 25000 // a generous timeout here to allow maps/images to load ); } } diff --git a/arches/app/templates/base.htm b/arches/app/templates/base.htm index a54fb099a69..4d78625f0cc 100644 --- a/arches/app/templates/base.htm +++ b/arches/app/templates/base.htm @@ -46,7 +46,7 @@ {% block css %} {% compress css %} - + {% endcompress %} {% if app_settings.ACCESSIBILITY_MODE %} diff --git a/arches/app/templates/views/report-templates/default.htm b/arches/app/templates/views/report-templates/default.htm index 39020e9e252..90b2f606b22 100644 --- a/arches/app/templates/views/report-templates/default.htm +++ b/arches/app/templates/views/report-templates/default.htm @@ -10,10 +10,10 @@
-

-

+

-

-
+

{% trans "Report Date:" %}