diff --git a/landingzones/templates/landingzones/_zone_item.html b/landingzones/templates/landingzones/_zone_item.html index 7c19ca33..27618f37 100644 --- a/landingzones/templates/landingzones/_zone_item.html +++ b/landingzones/templates/landingzones/_zone_item.html @@ -19,6 +19,7 @@
@@ -34,9 +35,11 @@ {% endif %} {% if zone.description %} - {% get_zone_desc_html zone as zone_desc_html %} - {% get_info_link zone_desc_html html=True as info_link %} - {{ info_link | safe }} + + {% get_zone_desc_html zone as zone_desc_html %} + {% get_info_link zone_desc_html html=True as info_link %} + {{ info_link | safe }} + {% endif %} {% if zone.configuration %} {% get_config_legend zone %} diff --git a/landingzones/templates/landingzones/project_zones.html b/landingzones/templates/landingzones/project_zones.html index 814c650b..509df8d8 100644 --- a/landingzones/templates/landingzones/project_zones.html +++ b/landingzones/templates/landingzones/project_zones.html @@ -95,8 +95,7 @@

Landing Zones

{% if not zone_access_disabled and investigation and can_create_zone %}
+ class="btn btn-primary" role="button" id="sodar-lz-btn-create-zone"> Create Zone
@@ -177,9 +176,9 @@

Landing Zones

tour.addStep('zone_info', { title: 'Landing Zones', - text: 'In this app you are able to create and manage personal ' + - 'landing zones for uploading data to the project sample ' + - 'repository in iRODS.', + text: 'In this view you can create and manage personal landing zones ' + + 'for uploading data to the project sample data repository in ' + + 'iRODS.', advanceOn: '.docs-link click', showCancelLink: true }); @@ -198,7 +197,7 @@

Landing Zones

if ($('#sodar-lz-zone-list-own').length) { tour.addStep('own_zones', { - title: 'Your Own Zones', + title: 'Your Zones', text: 'Your own landing zones are listed in this table.', attachTo: '#sodar-lz-zone-list-own top', advanceOn: '.docs-link click', @@ -232,8 +231,9 @@

Landing Zones

if ($('.sodar-lz-table').length) { tour.addStep('zone_title', { title: 'Zone Title', - text: 'The title of each stone is shown in this column. This ' + - 'takes the form of a timestamp and an arbitrary suffix.', + text: 'The title of each stone is shown in the leftmost column. ' + + 'The title is presented in the form of a time stamp of the ' + + 'creation date and an optional text idenfitier.', attachTo: '.sodar-lz-list-header-title top', advanceOn: '.docs-link click', showCancelLink: true @@ -241,24 +241,48 @@

Landing Zones

tour.addStep('zone_assay', { title: 'Zone Assay', - text: 'Each landing zone is specific to one assay within the ' + - 'project studies.', - attachTo: '.sodar-lz-list-header-assay top', + text: 'Each landing zone is specific to an assay within the ' + + 'project studies. This assay icon links to the assay in ' + + 'the Sample Sheets app.', + attachTo: '.sodar-lz-zone-assay-icon right', advanceOn: '.docs-link click', showCancelLink: true }); + if ($('.sodar-lz-zone-description-link').length) { + tour.addStep('zone_description', { + title: 'Zone Description', + text: 'Clicking on this icon will display an optional ' + + 'description for the landing zone.', + attachTo: '.sodar-lz-zone-description-link right', + advanceOn: '.docs-link click', + showCancelLink: true + }); + } + tour.addStep('zone_status', { title: 'Zone Status', text: 'The status of each landing zone can be seen in this ' + 'column. Available actions depend on the current status. ' + '"ACTIVE" zones are ones in which you can freely upload ' + - 'and modify files.', + 'and modify files. "FAILED" zones have experienced ' + + 'problems in validation or transfer, which you can now ' + + 'correct.', attachTo: '.sodar-lz-list-header-status top', advanceOn: '.docs-link click', showCancelLink: true }); + tour.addStep('zone_status_info', { + title: 'Zone Status Information', + text: 'Detailed information about the landing zone status can be ' + + 'found here along with current zone file size and file ' + + 'count.', + attachTo: '.sodar-lz-list-header-info top', + advanceOn: '.docs-link click', + showCancelLink: true + }); + tour.addStep('zone_links', { title: 'iRODS Links for Zone', text: 'Links for iRODS access for available zone are presented ' + @@ -268,16 +292,28 @@

Landing Zones

showCancelLink: true }); - tour.addStep('zone_edit', { - title: 'Zone Specific Operations', - text: 'In this column, you can trigger the data validation and ' + - 'moving operation for moving your landing zone content ' + - 'into the project sample repository. Here you can also ' + - 'delete unwanted landing zones.', + tour.addStep('zone_dropdown', { + title: 'Zone Dropdown', + text: 'From the zone dropdown, you can trigger the data ' + + 'validation and moving operation for moving your landing ' + + 'zone content into the project sample repository. Here you ' + + 'can also delete unwanted landing zones.', attachTo: '.sodar-lz-zone-edit left', advanceOn: '.docs-link click', showCancelLink: true }); } + + // Create zone + if ($('#sodar-lz-btn-create-zone').length) { + tour.addStep('zone_create', { + title: 'Create Zone', + text: 'This button takes you to the landing zone creation form ' + + 'in which you can set up a new zone.', + attachTo: '#sodar-lz-btn-create-zone left', + advanceOn: '.docs-link click', + showCancelLink: true + }); + } {% endblock javascript %} diff --git a/samplesheets/templates/samplesheets/irods_requests.html b/samplesheets/templates/samplesheets/irods_requests.html index a3deb045..351aaa54 100644 --- a/samplesheets/templates/samplesheets/irods_requests.html +++ b/samplesheets/templates/samplesheets/irods_requests.html @@ -12,7 +12,6 @@ {% block css %} {{ block.super }}