diff --git a/Model/lib/conifer/roles/conifer/templates/EbrcWebsiteCommon/appBase.html.j2 b/Model/lib/conifer/roles/conifer/templates/EbrcWebsiteCommon/appBase.html.j2 index 8790c5d7..f879444d 100644 --- a/Model/lib/conifer/roles/conifer/templates/EbrcWebsiteCommon/appBase.html.j2 +++ b/Model/lib/conifer/roles/conifer/templates/EbrcWebsiteCommon/appBase.html.j2 @@ -7,9 +7,6 @@ {%- endif %}{%- endif %} - - + + {% set bodyClassName = 'vpdb-Body' if project != 'ClinEpiDB' and project != 'AllClinEpiDB' and project != 'MicrobiomeDB' else 'wdk-Body' %} @@ -77,7 +74,7 @@ room: '{{ room }}/community' }; document.addEventListener( - 'gitter-sidecar-instance-started', + 'gitter-sidecar-instance-started', function gitterSidecarHack() { const gitterBtn = document.querySelector('.gitter-open-chat-button'); const gitterAside = document.querySelector('.gitter-chat-embed'); @@ -87,17 +84,17 @@ document.querySelector('.gitter-chat-embed-loading-wrapper').style.display = 'none'; gitterBtn.addEventListener( - 'click', + 'click', function openGitterInNewTab(e) { e.stopPropagation(); e.preventDefault(); window.open('https://app.gitter.im/#/room/#VEuPathDB-genomic_community:gitter.im', "VEuPathDBGitterForum"); - }, + }, true ); gitterAside.addEventListener( - 'gitter-chat-toggle', + 'gitter-chat-toggle', function keepGitterBtnVisible() { // we want the chat button to remain visible when clicked gitterBtn.classList.remove('is-collapsed'); diff --git a/Model/lib/conifer/roles/conifer/vars/default.yml b/Model/lib/conifer/roles/conifer/vars/default.yml index b113cb0c..63606fc8 100644 --- a/Model/lib/conifer/roles/conifer/vars/default.yml +++ b/Model/lib/conifer/roles/conifer/vars/default.yml @@ -8,6 +8,10 @@ webapp_ctx: =c= Tomcat webapp context name, e.g. toxo.qa _webapp_ctx: '{{ webapp_ctx|prod_prom_ctx(hostname) }}' product: '{{ project }}' # product: ClinEpiDB vs. project/model: ClinEpiDB or Gates +# Client Container Config +webapp_host_uri: =c= URI (URL or path) under which the client code container is exposed (if it is a path, it MUST begin with /) TODO SET ME HERE WHEN THE CONTAINER IS DEPLOYED!!!! +webapp_bundle_type_segment: =c= Site "type" path segment e.g. [clinepi|genomics|mbio|ortho] + # short convenience names for most common user-defined vars accountDb_connectionUrl: =c= e.g. jdbc:oracle:oci:@acctDbS accountDb_login: =c= username for account database @@ -167,7 +171,7 @@ modelprop: GOOGLE_ANALYTICS_ID: FACEBOOK_URL: YOUTUBE_URL: - REDDIT_URL: + REDDIT_URL: SITE_SEARCH_SERVICE_URL: eda: