Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hub
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
thomasDOTwtf
hub
Commits
d58ee9e6
Commit
d58ee9e6
authored
4 months ago
by
Roang
Browse files
Options
Downloads
Plain Diff
Merge branch 'feat-room-view' into 'develop'
Gleiche Room View dem Design an See merge request
hub/hub!1165
parents
b8287a7f
8ef73575
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/plainui/jinja2/plainui/room.html.j2
+24
-22
24 additions, 22 deletions
src/plainui/jinja2/plainui/room.html.j2
with
24 additions
and
22 deletions
src/plainui/jinja2/plainui/room.html.j2
+
24
−
22
View file @
d58ee9e6
...
@@ -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 %}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment