Skip to content

Commit

Permalink
Merge pull request #481 from galaxyproject/revert-407-removing_duplic…
Browse files Browse the repository at this point in the history 
…ate_meta

Revert "removed duplicates from tutorials"
  • Loading branch information
@bgruening
bgruening authored Aug 30, 2017
2 parents 86814c7 + d492dc0 commit 2d1e5c0
Show file tree
Hide file tree
Showing 65 changed files with 2,695 additions and 1,567 deletions.
2 changes: 1 addition & 1 deletion _layouts/base_slides.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# {{ title }}

{% if topic.requirements %}
---
---

## Requirements

Expand Down
5 changes: 1 addition & 4 deletions _layouts/introduction_slides.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

## Tutorials


{% for material in topic.material %}
{% if material.type == "tutorial" %}
{% if material.hands_on == "yes" %}
Expand All @@ -21,7 +22,3 @@
{% endif %}
{% endif %}
{% endfor %}

---

## Thank you
238 changes: 120 additions & 118 deletions _layouts/topic.html
View file
Original file line number Diff line number Diff line change
@@ -1,126 +1,127 @@
---
layout: base
---
{% include main_header.html %}
{% assign topic = site.data[page.topic_name] %}

<section>
<h1>{{ topic.title }}</h1>
{% include default-header.html %}

<p>{{ topic.summary }}</p>
{% assign topic = site.data[page.topic_name] %}

{% if topic.requirements %}
<a name="requirements"></a>
<h2>Requirements</h2>
<div class="container main-content">
<section>
<h1>{{ topic.title }}</h1>
<p>{{ topic.summary }}</p>

{% if topic.requirements %}
<h2 id="requirements">Requirements</h2>
<p>Before diving into this topic, we recommend you to have a look at:</p>

<ul>
{% for requirement in topic.requirements %}
<li>
{% if requirement.type == "internal" %}
<a href="{{ site.url }}/topics/{{ requirement.link }}">{{ requirement.title }}</a>
<a href="{{ site.url }}/topics{{ requirement.link }}">{{ requirement.title }}</a>
{% elsif material.type == "external" %}
<a href="{{ requirement.link }}">{{ requirement.title }}</a>
{% endif %}
</li>
{% endfor %}
</ul>
{% endif %}

<a name="material"></a>
<h2>Material</h2>

<table class="table table-striped">
<tr>
<td class="bold">Lesson</td>
<td class="bold">Hands-on</td>
<td class="bold">Slides</td>

{% if topic.type != "admin-dev" %}
<td class="bold">Input dataset</td>
<td class="bold">Galaxy tour</td>
{% endif %}
</tr>

{% for material in topic.material %}
{% if material.enable != "false" %}
<tr>
<td>{{ material.title }}</td>

{% if material.type == "introduction" %}
<td></td>
<td>
{% if material.slides == "yes" %}
<a href="{{ site.url }}/{{ page.url }}slides">:mortar_board:</a>
{% endif %}
</td>
{% if topic.type != "admin-dev" %}
{% endif %}

<h2 id="material">Material</h2>
<table class="table table-responsive table-striped">
<tr>
<th>Lesson</th>
<th>Hands-on</th>
<th>Slides</th>

{% if topic.type != "admin-dev" %}
<th>Input dataset</th>
<th>Galaxy tour</th>
{% endif %}
</tr>

{% for material in topic.material %}
{% if material.enable != "false" %}
<tr>
<td>{{ material.title }}</td>

{% if material.type == "introduction" %}
<td></td>
<td></td>
{% endif %}

{% elsif material.type == "tutorial" %}
<td>
{% if material.hands_on == "external" %}
<a href="{{ material.hands_on_url }}">:link:</a>
{% elsif material.hands_on == "yes" %}
<a href="{{ site.url }}{{ page.url }}tutorials/{{ material.name }}/tutorial.html">:book:</a>
{% elsif material.hands_on == "github" %}
<a href="{{ site.github_repository }}/tree/master/topics/{{ topic.name }}/tutorials/{{ material.name }}/tutorial.md">:book:</a>
{% endif %}
</td>

<td>
{% if material.slides == "yes" %}
<a href="{{ site.url }}{{ page.url }}tutorials/{{ material.name }}/slides.html">:mortar_board:</a>
<td>
{% if material.slides == "yes" %}
<a href="{{ site.url }}/{{ page.url }}/slides">
{% icon slides %}
</a>
{% endif %}
</td>
{% if topic.type != "admin-dev" %}
<td></td>
<td></td>
{% endif %}
</td>

{% if topic.type != "admin-dev" %}
{% elsif material.type == "tutorial" %}
<td>
{% if material.zenodo_link != "" %}
<a href="{{ material.zenodo_link }}">:open_file_folder:</a>
{% if material.hands_on == "external" %}
<a href="{{ material.hands_on_url }}">
{% icon tutorial %}
</a>
{% elsif material.hands_on == "yes" %}
<a href="{{ site.url }}{{ page.url }}tutorials/{{ material.name }}/tutorial.html">
{% icon tutorial %}
</a>
{% elsif material.hands_on == "github" %}
<a href="{{ site.github_repository }}/tree/master/topics/{{ topic.name }}/tutorials/{{ material.name }}/tutorial.md">
{% icon tutorial %}
</a>
{% endif %}
</td>

<td>
{% if material.galaxy_tour != "" %}
<a href="https://github.com/galaxyproject/galaxy-tours">:eyes:</a>
{% if material.slides == "yes" %}
<a href="{{ site.url }}{{ page.url }}tutorials/{{ material.name }}/slides.html">
{% icon slides %}
</a>
{% endif %}
</td>
{% endif %}
{% endif %}
</tr>
{% endif %}
{% endfor %}
</table>

{% if topic.docker_image %}
<a name="docker_image"></a>
<h2>Galaxy instance</h2>
{% if topic.type != "admin-dev" %}
<td>
{% if material.zenodo_link != "" %}
<a href="{{ material.zenodo_link }}">
{% icon zenodo_link %}
</a>
{% endif %}
</td>
<td>
{% if material.galaxy_tour != "" %}
<a href="https://github.com/galaxyproject/galaxy-tours">
{% icon interactive_tour %}
</a>
{% endif %}
</td>
{% endif %}
{% endif %}
</tr>
{% endif %}
{% endfor %}
</table>

{% if topic.docker_image %}
<h2 id="docker_image">Galaxy instance</h2>
<p>For these tutorials, you can use the dedicated Docker image:</p>

<pre><code>
docker run -d -p 8080:80 {{ topic.docker_image }}
</code></pre>

<pre><code>docker run -d -p 8080:80 {{ topic.docker_image }}</code></pre>
<p>It will launch a flavored Galaxy instance available on <a href="http://localhost:8080">http://localhost:8080</a>.</p>
{% endif %}
{% endif %}

{% if topic.galaxy_instance %}
{% if topic.galaxy_instance %}
<h2>Galaxy instance</h2>

<p>For these tutorials, use Galaxy instance at <a href="{{ topic.galaxy_instance }}">{{ topic.galaxy_instance }}</a>.</p>
{% endif %}
{% endif %}

<a name="contributors"></a>
<h2>Contributors</h2>

<p>This material is maintained by:</p>

<ul>
<h2 id="contributors">Contributors</h2>
<p>This material is maintained by:</p>
<ul>
{% for maintainer in topic.maintainers %}
<li>
{% if maintainer.github_username != "" %}
Expand All @@ -133,41 +134,42 @@ <h2>Contributors</h2>
{% endif %}
</li>
{% endfor %}
</ul>

<p><em>For any question related to this topic and the content, you can contact them.</em></p>

<p>The following persons have contributed to this training material:</p>
</ul>

<ul>
{% for contributor in topic.contributors %}
<li>
{% if contributor.github_username != "" %}
<a href="https://github.com/{{ contributor.github_username }}">{{ contributor.name }}</a>
{% else %}
{{ contributor.name }}
{% endif %}
{% if contributor.email != "" %}
(<a href="mailto:{{ contributor.email }}">{{ contributor.email }}</a>)
{% endif %}
</li>
{% endfor %}
</ul>
<p>
<em>For any question related to this topic and the content, you can contact them.</em>
</p>

{% if topic.references %}
<a name="references"></a>
<h2>References</h2>
<p>The following persons have contributed to this training material:</p>
<ul>
{% for contributor in topic.contributors %}
<li>
{% if contributor.github_username != "" %}
<a href="https://github.com/{{ contributor.github_username }}">{{ contributor.name }}</a>
{% else %}
{{ contributor.name }}
{% endif %}
{% if contributor.email != "" %}
(<a href="mailto:{{ contributor.email }}">{{ contributor.email }}</a>)
{% endif %}
</li>
{% endfor %}
</ul>

{% if topic.references %}
<h2 id="references">References</h2>
<ul>
{% for reference in topic.references %}
<p>
<span class="bold">{{ reference.authors }}:</span> <a href="{{ reference.link }}">{{ reference.title }}</a>

{% if reference.summary != "" %}
<br/><cite>{{ reference.summary }}</cite>
{% endif %}
</p>
<li class="citation">
<strong>{{ reference.authors }}:</strong> <a href="{{ reference.link }}">{{ reference.title }}</a>
{% if reference.summary != "" %}
<br><cite>{{ reference.summary }}</cite>
{% endif %}
</li>
{% endfor %}
{% endif %}
</section>
</ul>
{% endif %}
</section>
</div>

{% include main_footer.html %}
{% include default-footer.html %}
70 changes: 9 additions & 61 deletions templates/metadata.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,67 +7,6 @@ requirements:
title: "Galaxy introduction"
type: "internal"
link: "/Introduction/"
-
title: "tutorial1"
type: "tutorial"
name: "tutorial1"
zenodo_link: ""
galaxy_tour: ""
hands_on: "yes"
slides: "no"
questions:
- ""
- ""
objectives:
- ""
- ""
- ""
time_estimation: "1d/3h/6h"
key_points:
- ""
- ""
- ""
- "..."
contributors:
-
name: "Contributor"
github_username: "contributor"
email: "[email protected]"
-
name: "Contributor"
github_username: "contributor"
email: "[email protected]"
-
title: "tutorial2"
type: "tutorial"
name: "tutorial2"
zenodo_link: ""
galaxy_tour: ""
hands_on: "yes"
slides: "no"
questions:
- ""
- ""
objectives:
- ""
- ""
- ""
time_estimation: "1d/3h/6h"
key_points:
- ""
- ""
- ""
- "..."
contributors:
-
name: "Contributor"
github_username: "contributor"
email: "[email protected]"
-
name: "Contributor"
github_username: "contributor"
email: "[email protected]"

maintainers:
-
name: "Maintainer"
Expand All @@ -78,3 +17,12 @@ maintainers:
github_username: "maintainer"
email: "[email protected]"

contributors:
-
name: "Contributor"
github_username: "contributor"
email: "[email protected]"
-
name: "Contributor"
github_username: "contributor"
email: "[email protected]"
Loading

0 comments on commit 2d1e5c0

Please sign in to comment.