Skip to content
Snippets Groups Projects
Commit d58ee9e6 authored by Roang's avatar Roang
Browse files

Merge branch 'feat-room-view' into 'develop'

Gleiche Room View dem Design an

See merge request hub/hub!1165
parents b8287a7f 8ef73575
Branches
No related tags found
No related merge requests found
...@@ -35,35 +35,37 @@ ...@@ -35,35 +35,37 @@
</ol> </ol>
</nav> </nav>
<div class="hub-vlayout-l"> <div class="hub-vlayout">
<div class="hub-card hub-vlayout"> <div>
<h2 class="hub-head-main">{{ room.name }}</h2> <div class="hub-card hub-vlayout">
{% if room.description %}{{ markdownMacro.markdown(markdown=room.description_html | safe, border=false) }}{% endif %} <h1 class="hub-head-main">{{ room.name }}</h1>
{% if room.description %}{{ markdownMacro.markdown(markdown=room.description_html | safe, border=false) }}{% endif %}
{% if links %} {% if links %}
<div class="hub-tags" role="list"> <div class="hub-tags" role="list">
{% for link in links %} {% for link in links %}
{{ tagMacros.tag(link.name, {{ tagMacros.tag(link.name,
link=link.resolved_url, link=link.resolved_url,
icon=link_icon(link) , icon=link_icon(link) ,
style='secondary', style='secondary',
target=('_self' if link.resolved_url_internal else '_blank'), target=('_self' if link.resolved_url_internal else '_blank'),
rel=('' if link.resolved_url_internal else 'external, noreferrer') rel=('' if link.resolved_url_internal else 'external, noreferrer')
) }} ) }}
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
</div>
</div> </div>
{% if voc_stream and not archive_mode %} {% if voc_stream and not archive_mode %}
<div class="hub-card"> <div>
<h2 class="hub-section-title mb-0">{{ _("Currently Streaming") }}</h2> <h2 class="hub-section-title">{{ _("Currently Streaming") }}</h2>
{{ integrations.vocPlayer() }} <div class="hub-card">{{ integrations.vocPlayer() }}</div>
</div> </div>
{% endif %} {% endif %}
<div class="hub-vlayout"> <div>
<h2 class="hub-section-title mb-0">{{ _("Events") }}</h2> <h2 class="hub-section-title">{{ _("Events") }}</h2>
{% if events %} {% if events %}
{{ list_events.list(events, my_favorite_events) }} {{ list_events.list(events, my_favorite_events) }}
{% else %} {% else %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment