diff --git a/atlas/templates/atlas/collection_detail.html b/atlas/templates/atlas/collection_detail.html index 71a075f4..ab8f479e 100644 --- a/atlas/templates/atlas/collection_detail.html +++ b/atlas/templates/atlas/collection_detail.html @@ -15,6 +15,21 @@ Self review: {{collection.self_review}}
Open access: {{collection.open_access}}
+ + + {% if collection.collection_type == "VIV" %} +

+ {% else %} +

This collection will be available to view/take here{% if not collection.active %} (when active){% endif %} +

Review collection here + {% endif %} +

Cases

    {% for casedetail in casesdetails %} @@ -50,18 +65,6 @@ - {% if collection.collection_type == "VIV" %} -

    View as a viva collection here - {% else %} -

    This collection will be available to view/take here{% if not collection.active %} (when active){% endif %} -

    Review collection here - {% endif %} {% if can_edit %}

    diff --git a/atlas/templates/atlas/collection_viva.html b/atlas/templates/atlas/collection_viva.html index 1f14a80e..a8d7c0c6 100644 --- a/atlas/templates/atlas/collection_viva.html +++ b/atlas/templates/atlas/collection_viva.html @@ -2,7 +2,7 @@ {% block content %}
    - Instructions + Help

    This set up is designed to allow you to project/share cases in a seperate window whilst controlling/tracking their display from this page.

    First you will need to open the linked viewer window by clicking the 'Open Viewer' button. This will open a new window/tab with the viewer in it. You will probably need to detach this from your current window.

    If you are sharing the window you can maximise the screen area by hiding the tab/bookmark bar and the address bar. In Microsoft Edge this can be done by installing as an app, in Chrome you can use an extension such as Open-as-Popup.

    @@ -294,7 +294,11 @@ }); function openSecondaryWindow(url) { //return win2 = window.open(url,'secondary','width=300,height=100'); - return win2 = window.open(url,'secondary'); + return win2 = window.open( + url, + 'secondary', + 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=1200,height=800' + ); } diff --git a/atlas/templates/atlas/viewer_local.html b/atlas/templates/atlas/viewer_local.html index 866c794d..fe0d72aa 100644 --- a/atlas/templates/atlas/viewer_local.html +++ b/atlas/templates/atlas/viewer_local.html @@ -1,27 +1,72 @@ - {% load static %} Viewer - + -
    -

    Awating load request

    - This page will display series when loaded from other pages. + +
    +
    + Share this screen +

    Awaiting Load Request

    +

    This page will display a DICOM series when loaded from another page.

    +
      +
    • Return to the previous page and select a series to view.
    • +
    • This viewer will update automatically when a series is loaded.
    • +
    • Keep this tab open to receive data.
    • +
    +
    - + \ No newline at end of file