Layout: Put related videos below video when page is too small
This commit is contained in:
James Taylor
parent
102c21132a
commit
d9517a3322
@ -29,21 +29,19 @@
|
|||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
{% macro video_comments(comments_info) %}
|
{% macro video_comments(comments_info) %}
|
||||||
<section class="comments-area">
|
<div class="comment-links">
|
||||||
<div class="comment-links">
|
{% for link_text, link_url in comments_info['comment_links'] %}
|
||||||
{% for link_text, link_url in comments_info['comment_links'] %}
|
<a class="sort-button" href="{{ link_url }}">{{ link_text }}</a>
|
||||||
<a class="sort-button" href="{{ link_url }}">{{ link_text }}</a>
|
{% endfor %}
|
||||||
{% endfor %}
|
</div>
|
||||||
</div>
|
<div class="comments">
|
||||||
<div class="comments">
|
{% for comment in comments_info['comments'] %}
|
||||||
{% for comment in comments_info['comments'] %}
|
{{ render_comment(comment, comments_info['include_avatars']) }}
|
||||||
{{ render_comment(comment, comments_info['include_avatars']) }}
|
{% endfor %}
|
||||||
{% endfor %}
|
</div>
|
||||||
</div>
|
{% if 'more_comments_url' is in comments_info %}
|
||||||
{% if 'more_comments_url' is in comments_info %}
|
<a class="page-button more-comments" href="{{ comments_info['more_comments_url'] }}">More comments</a>
|
||||||
<a class="page-button more-comments" href="{{ comments_info['more_comments_url'] }}">More comments</a>
|
{% endif %}
|
||||||
{% endif %}
|
|
||||||
</section>
|
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
{% macro comment_posting_box(info) %}
|
{% macro comment_posting_box(info) %}
|
||||||
|
|||||||
@ -3,96 +3,88 @@
|
|||||||
{% import "common_elements.html" as common_elements %}
|
{% import "common_elements.html" as common_elements %}
|
||||||
{% import "comments.html" as comments %}
|
{% import "comments.html" as comments %}
|
||||||
{% block style %}
|
{% block style %}
|
||||||
main{
|
main{
|
||||||
display:grid;
|
display:grid;
|
||||||
grid-template-columns: 1fr 640px 40px 500px 1fr;
|
grid-template-columns: 1fr 640px 40px 400px 1fr;
|
||||||
background-color:#cccccc;
|
grid-template-rows: auto auto auto auto;
|
||||||
}
|
align-content: start;
|
||||||
|
background-color:#cccccc;
|
||||||
|
}
|
||||||
|
#left{
|
||||||
|
background-color:#bcbcbc;
|
||||||
|
grid-column: 1;
|
||||||
|
grid-row: 1 / span 3;
|
||||||
|
|
||||||
#left{
|
}
|
||||||
background-color:#bcbcbc;
|
video{
|
||||||
|
height: 360px;
|
||||||
|
width: 640px;
|
||||||
|
grid-column: 2;
|
||||||
|
}
|
||||||
|
.video-info{
|
||||||
|
grid-column: 2;
|
||||||
|
grid-row: 2;
|
||||||
|
display: grid;
|
||||||
|
grid-template-rows: 0fr 0fr 0fr 20px 0fr 0fr;
|
||||||
|
grid-template-columns: 1fr 1fr;
|
||||||
|
align-content: start;
|
||||||
|
background-color:#bcbcbc;
|
||||||
|
}
|
||||||
|
.video-info > .title{
|
||||||
|
grid-column: 1 / span 2;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
.video-info > .is-unlisted{
|
||||||
|
background-color: #d0d0d0;
|
||||||
|
justify-self:start;
|
||||||
|
padding-left:2px;
|
||||||
|
padding-right:2px;
|
||||||
|
}
|
||||||
|
.video-info > address{
|
||||||
grid-column: 1;
|
grid-column: 1;
|
||||||
|
grid-row: 3;
|
||||||
|
justify-self: start;
|
||||||
}
|
}
|
||||||
.full-item{
|
.video-info > .views{
|
||||||
display: grid;
|
grid-column: 2;
|
||||||
grid-column: 2;
|
grid-row: 3;
|
||||||
grid-template-rows: 0fr 0fr 0fr 0fr 20px 0fr 0fr;
|
justify-self:end;
|
||||||
grid-template-columns: 1fr 1fr;
|
}
|
||||||
align-content: start;
|
.video-info > time{
|
||||||
background-color:#bcbcbc;
|
grid-column: 1;
|
||||||
}
|
grid-row: 4;
|
||||||
.full-item > video{
|
justify-self:start;
|
||||||
grid-column: 1 / span 2;
|
}
|
||||||
grid-row: 1;
|
.video-info > .likes-dislikes{
|
||||||
}
|
grid-column: 2;
|
||||||
.full-item > .title{
|
grid-row: 4;
|
||||||
grid-column: 1 / span 2;
|
justify-self:end;
|
||||||
grid-row:2;
|
}
|
||||||
min-width: 0;
|
.video-info > .download-dropdown{
|
||||||
}
|
grid-column:1;
|
||||||
.full-item > .is-unlisted{
|
grid-row: 5;
|
||||||
background-color: #d0d0d0;
|
}
|
||||||
justify-self:start;
|
.video-info > .checkbox{
|
||||||
padding-left:2px;
|
justify-self:end;
|
||||||
padding-right:2px;
|
|
||||||
}
|
|
||||||
.full-item > address{
|
|
||||||
grid-column: 1;
|
|
||||||
grid-row: 4;
|
|
||||||
justify-self: start;
|
|
||||||
}
|
|
||||||
.full-item > .views{
|
|
||||||
grid-column: 2;
|
|
||||||
grid-row: 4;
|
|
||||||
justify-self:end;
|
|
||||||
}
|
|
||||||
.full-item > time{
|
|
||||||
grid-column: 1;
|
|
||||||
grid-row: 5;
|
|
||||||
justify-self:start;
|
|
||||||
}
|
|
||||||
.full-item > .likes-dislikes{
|
|
||||||
grid-column: 2;
|
|
||||||
grid-row: 5;
|
|
||||||
justify-self:end;
|
|
||||||
}
|
|
||||||
.full-item > .download-dropdown{
|
|
||||||
grid-column:1;
|
|
||||||
grid-row: 6;
|
|
||||||
}
|
|
||||||
.full-item > .checkbox{
|
|
||||||
justify-self:end;
|
|
||||||
|
|
||||||
grid-row: 6;
|
grid-row: 5;
|
||||||
grid-column: 2;
|
grid-column: 2;
|
||||||
}
|
}
|
||||||
.full-item > .description{
|
.video-info > .description{
|
||||||
background-color:#d0d0d0;
|
background-color:#d0d0d0;
|
||||||
margin-top:8px;
|
margin-top:8px;
|
||||||
white-space: pre-wrap;
|
white-space: pre-wrap;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
grid-column: 1 / span 2;
|
grid-column: 1 / span 2;
|
||||||
grid-row: 7;
|
grid-row: 6;
|
||||||
}
|
}
|
||||||
.full-item .music-list{
|
|
||||||
grid-row:8;
|
|
||||||
grid-column: 1 / span 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
.full-item .comments-area{
|
.music-list{
|
||||||
grid-column: 1 / span 2;
|
grid-row:7;
|
||||||
grid-row: 9;
|
grid-column: 1 / span 2;
|
||||||
margin-top:10px;
|
background-color: #d0d0d0;
|
||||||
}
|
}
|
||||||
.comment{
|
|
||||||
width:640px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.music-list{
|
|
||||||
background-color: #d0d0d0;
|
|
||||||
}
|
|
||||||
.music-list table,th,td{
|
.music-list table,th,td{
|
||||||
border: 1px solid;
|
border: 1px solid;
|
||||||
}
|
}
|
||||||
@ -105,123 +97,148 @@
|
|||||||
font-weight:bold;
|
font-weight:bold;
|
||||||
margin-bottom:5px;
|
margin-bottom:5px;
|
||||||
}
|
}
|
||||||
|
.comments-area{
|
||||||
#related{
|
grid-column: 2;
|
||||||
grid-column: 4;
|
grid-row: 3;
|
||||||
display: grid;
|
padding-top:10px;
|
||||||
grid-auto-rows: 94px;
|
background-color:#bcbcbc;
|
||||||
grid-row-gap: 10px;
|
}
|
||||||
}
|
.comment{
|
||||||
|
width:640px;
|
||||||
.download-dropdown{
|
|
||||||
z-index:1;
|
|
||||||
justify-self:start;
|
|
||||||
min-width:0px;
|
|
||||||
height:0px;
|
|
||||||
}
|
}
|
||||||
|
#related{
|
||||||
|
grid-column: 4;
|
||||||
|
grid-row: 1 /span 4;
|
||||||
|
display: grid;
|
||||||
|
grid-auto-rows: 94px;
|
||||||
|
grid-row-gap: 10px;
|
||||||
|
max-width: 640px;
|
||||||
|
}
|
||||||
|
|
||||||
.download-dropdown-label{
|
/* Put related vids below videos when window is too small */
|
||||||
background-color: #e9e9e9;
|
/* 1100px instead of 1080 because W3C is full of idiots who include scrollbar width */
|
||||||
border-style: outset;
|
@media (max-width:1100px){
|
||||||
border-width: 2px;
|
main{
|
||||||
font-weight: bold;
|
grid-template-columns: 1fr 640px 40px 1fr;
|
||||||
}
|
}
|
||||||
|
#related{
|
||||||
|
grid-column: 2;
|
||||||
|
grid-row: 3;
|
||||||
|
}
|
||||||
|
.comments-area{
|
||||||
|
grid-row: 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.download-dropdown-content{
|
|
||||||
display:none;
|
.download-dropdown{
|
||||||
background-color: #e9e9e9;
|
z-index:1;
|
||||||
}
|
justify-self:start;
|
||||||
.download-dropdown:hover .download-dropdown-content {
|
min-width:0px;
|
||||||
display: grid;
|
height:0px;
|
||||||
grid-auto-rows:30px;
|
}
|
||||||
padding-bottom: 50px;
|
|
||||||
}
|
.download-dropdown-label{
|
||||||
.download-dropdown-content a{
|
background-color: #e9e9e9;
|
||||||
white-space: nowrap;
|
border-style: outset;
|
||||||
display:grid;
|
border-width: 2px;
|
||||||
grid-template-columns: 60px 90px auto;
|
font-weight: bold;
|
||||||
max-height: 1.2em;
|
}
|
||||||
}
|
|
||||||
|
.download-dropdown-content{
|
||||||
|
display:none;
|
||||||
|
background-color: #e9e9e9;
|
||||||
|
}
|
||||||
|
.download-dropdown:hover .download-dropdown-content {
|
||||||
|
display: grid;
|
||||||
|
grid-auto-rows:30px;
|
||||||
|
padding-bottom: 50px;
|
||||||
|
}
|
||||||
|
.download-dropdown-content a{
|
||||||
|
white-space: nowrap;
|
||||||
|
display:grid;
|
||||||
|
grid-template-columns: 60px 90px auto;
|
||||||
|
max-height: 1.2em;
|
||||||
|
}
|
||||||
{% endblock style %}
|
{% endblock style %}
|
||||||
|
|
||||||
{% block main %}
|
{% block main %}
|
||||||
<div id="left">
|
<div id="left">
|
||||||
</div>
|
</div>
|
||||||
<article class="full-item">
|
|
||||||
|
|
||||||
<video width="640" height="360" controls autofocus>
|
<video controls autofocus>
|
||||||
{% for video_source in video_sources %}
|
{% for video_source in video_sources %}
|
||||||
<source src="{{ video_source['src'] }}" type="{{ video_source['type'] }}">
|
<source src="{{ video_source['src'] }}" type="{{ video_source['type'] }}">
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
{% for source in subtitle_sources %}
|
{% for source in subtitle_sources %}
|
||||||
{% if source['on'] %}
|
{% if source['on'] %}
|
||||||
<track label="{{ source['label'] }}" src="{{ source['url'] }}" kind="subtitles" srclang="{{ source['srclang'] }}" default>
|
<track label="{{ source['label'] }}" src="{{ source['url'] }}" kind="subtitles" srclang="{{ source['srclang'] }}" default>
|
||||||
{% else %}
|
{% else %}
|
||||||
<track label="{{ source['label'] }}" src="{{ source['url'] }}" kind="subtitles" srclang="{{ source['srclang'] }}">
|
<track label="{{ source['label'] }}" src="{{ source['url'] }}" kind="subtitles" srclang="{{ source['srclang'] }}">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
</video>
|
</video>
|
||||||
|
|
||||||
<h2 class="title">{{ title }}</h2>
|
<div class="video-info">
|
||||||
{% if unlisted %}
|
<h2 class="title">{{ title }}</h2>
|
||||||
<span class="is-unlisted">Unlisted</span>
|
{% if unlisted %}
|
||||||
{% endif %}
|
<span class="is-unlisted">Unlisted</span>
|
||||||
<address>Uploaded by <a href="{{ uploader_channel_url }}">{{ uploader }}</a></address>
|
{% endif %}
|
||||||
<span class="views">{{ views }} views</span>
|
<address>Uploaded by <a href="{{ uploader_channel_url }}">{{ uploader }}</a></address>
|
||||||
|
<span class="views">{{ views }} views</span>
|
||||||
|
|
||||||
|
|
||||||
<time datetime="$upload_date">Published on {{ upload_date }}</time>
|
<time datetime="$upload_date">Published on {{ upload_date }}</time>
|
||||||
<span class="likes-dislikes">{{ likes }} likes {{ dislikes }} dislikes</span>
|
<span class="likes-dislikes">{{ likes }} likes {{ dislikes }} dislikes</span>
|
||||||
<div class="download-dropdown">
|
<div class="download-dropdown">
|
||||||
<button class="download-dropdown-label">Download</button>
|
<button class="download-dropdown-label">Download</button>
|
||||||
<div class="download-dropdown-content">
|
<div class="download-dropdown-content">
|
||||||
{% for format in download_formats %}
|
{% for format in download_formats %}
|
||||||
<a href="{{ format['url'] }}">
|
<a href="{{ format['url'] }}">
|
||||||
<span>{{ format['ext'] }}</span>
|
<span>{{ format['ext'] }}</span>
|
||||||
<span>{{ format['resolution'] }}</span>
|
<span>{{ format['resolution'] }}</span>
|
||||||
<span>{{ format['note'] }}</span>
|
<span>{{ format['note'] }}</span>
|
||||||
</a>
|
</a>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<input class="checkbox" name="video_info_list" value="{{ video_info }}" form="playlist-edit" type="checkbox">
|
<input class="checkbox" name="video_info_list" value="{{ video_info }}" form="playlist-edit" type="checkbox">
|
||||||
|
|
||||||
<span class="description">{{ description }}</span>
|
|
||||||
<div class="music-list">
|
|
||||||
{% if music_list.__len__() != 0 %}
|
|
||||||
<hr>
|
|
||||||
<table>
|
|
||||||
<caption>Music</caption>
|
|
||||||
<tr>
|
|
||||||
{% for attribute in music_attributes %}
|
|
||||||
<th>{{ attribute }}</th>
|
|
||||||
{% endfor %}
|
|
||||||
</tr>
|
|
||||||
{% for track in music_list %}
|
|
||||||
<tr>
|
|
||||||
{% for attribute in music_attributes %}
|
|
||||||
<td>{{ track.get(attribute.lower(), '') }}</td>
|
|
||||||
{% endfor %}
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% if comments_info %}
|
|
||||||
{{ comments.video_comments(comments_info) }}
|
|
||||||
{% endif %}
|
|
||||||
</article>
|
|
||||||
|
|
||||||
|
|
||||||
|
<span class="description">{{ description }}</span>
|
||||||
|
<div class="music-list">
|
||||||
<nav id="related">
|
{% if music_list.__len__() != 0 %}
|
||||||
{% for info in related %}
|
<hr>
|
||||||
{{ common_elements.item(info) }}
|
<table>
|
||||||
|
<caption>Music</caption>
|
||||||
|
<tr>
|
||||||
|
{% for attribute in music_attributes %}
|
||||||
|
<th>{{ attribute }}</th>
|
||||||
|
{% endfor %}
|
||||||
|
</tr>
|
||||||
|
{% for track in music_list %}
|
||||||
|
<tr>
|
||||||
|
{% for attribute in music_attributes %}
|
||||||
|
<td>{{ track.get(attribute.lower(), '') }}</td>
|
||||||
|
{% endfor %}
|
||||||
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</nav>
|
</table>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<nav id="related">
|
||||||
|
{% for info in related %}
|
||||||
|
{{ common_elements.item(info) }}
|
||||||
|
{% endfor %}
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<section class="comments-area">
|
||||||
|
{% if comments_info %}
|
||||||
|
{{ comments.video_comments(comments_info) }}
|
||||||
|
{% endif %}
|
||||||
|
</section>
|
||||||
{% endblock main %}
|
{% endblock main %}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user