Unverified Commit 155f7398 authored by seb-b's avatar seb-b Committed by GitHub
Browse files

Merge pull request #64 from jkevingutierrez/patch-3

Wrap transcode HTML in transcode block
parents bde8553a 294e0d86
...@@ -42,8 +42,10 @@ ...@@ -42,8 +42,10 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<li> <li>
<input type="submit" class="button" value="{% trans 'Save' %}" /> {% if user_can_delete %} <input type="submit" class="button" value="{% trans 'Save' %}" />
<a href="{% url 'wagtailvideos:delete' video.id %}" class="button button-secondary no">{% trans "Delete video" %}</a> {% endif %} {% if user_can_delete %}
<a href="{% url 'wagtailvideos:delete' video.id %}" class="button button-secondary no">{% trans "Delete video" %}</a>
{% endif %}
</li> </li>
</ul> </ul>
</form> </form>
...@@ -76,16 +78,21 @@ ...@@ -76,16 +78,21 @@
</div> </div>
</div> </div>
<div class="row" style='margin-top: 2em;'> <div class="row" style='margin-top: 2em;'>
{% block transcode %}
{% if can_transcode %} {% if can_transcode %}
<h2 class="u-text-transform-uppercase">Transcodes</h2> <h2 class="u-text-transform-uppercase">{% trans "Transcodes" %}</h2>
<p>If you wish to generate HTML5 compliant transcodes use the form below. This may take a while depending on the length of the video.</p> <p>{% trans "If you wish to generate HTML5 compliant transcodes use the form below. This may take a while depending on the length of the video." %}</p>
{% if transcodes %} {% if transcodes %}
<h3 class="u-text-transform-uppercase">Available Transcodes</h3> <h3 class="u-text-transform-uppercase">{% trans "Available Transcodes" %}</h3>
<ul> <ul>
{% for transcode in transcodes %} {% for transcode in transcodes %}
<li> <li>
{{ transcode.media_format }} ({{ transcode.quality }} quality) {% if transcode.processing %} <span class='processing'>(Processing... hold tight) </span>{% endif %} {% if transcode.error_message %} {% blocktrans with media_format=transcode.media_format quality=transcode.quality %}{% endblocktrans %}{{ media_format }} ({{ quality }} quality){% endblocktrans %}
<span class='transcode-error'>ERROR:</span> {% if transcode.processing %}
<span class='processing'>{% trans "(Processing... hold tight)" %} </span>
{% endif %}
{% if transcode.error_message %}
<span class='transcode-error'>{% trans "ERROR:" %}</span>
<div class='transcode-error'> <div class='transcode-error'>
<pre> {{ transcode.error_message }}</pre> <pre> {{ transcode.error_message }}</pre>
</div> </div>
...@@ -94,33 +101,34 @@ ...@@ -94,33 +101,34 @@
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}
<h3 class="u-text-transform-uppercase">Create transcode</h3> <h3 class="u-text-transform-uppercase">{% trans "Create transcode" %}</h3>
<form action="{% url 'wagtailvideos:create_transcode' video.id %}" method="POST"> <form action="{% url 'wagtailvideos:create_transcode' video.id %}" method="POST">
<ul class="fields"> <ul class="fields">
{% csrf_token %} {% csrf_token %}
{% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.media_format li_classes="label-above label-uppercase" %} {% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.media_format li_classes="label-above label-uppercase" %}
{% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.quality li_classes="label-above label-uppercase" %} {% include "wagtailadmin/shared/field_as_li.html" with field=transcode_form.quality li_classes="label-above label-uppercase" %}
<li> <li>
<input class="button" type='submit' value="Start" /> <input class="button" type='submit' value="{% trans 'Start' %}" />
</li> </li>
</ul> </ul>
</form> </form>
{% else %} {% else %}
<br/><br/> <br/><br/>
<span class='transcode-error'>Ffmpeg is not found on your server. Please install if you wish to transcode videos into an HTML5 video compliant format.</span> <span class='transcode-error'>{% trans "Ffmpeg is not found on your server. Please install if you wish to transcode videos into an HTML5 video compliant format." %}</span>
{% endif %} {% endif %}
{% endblock %}
{% if tracks_action_url %} {% if tracks_action_url %}
<h2 class="u-text-transform-uppercase">Tracks</h2> <h2 class="u-text-transform-uppercase">{% trans "Tracks" %}</h2>
<p>You can add/edit subtitles or accessibility captions for this video. For information about the filetype that should be used see the mozilla docs on <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebVTT_API">WebVTT</a></p> <p>{% trans 'You can add/edit subtitles or accessibility captions for this video. For information about the filetype that should be used see the mozilla docs on <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebVTT_API">WebVTT</a>' %}</p>
{% if video.track_listing %} {% if video.track_listing %}
<ul> <ul>
{% for track in video.track_listing.tracks.all %} {% for track in video.track_listing.tracks.all %}
<li>{{ track }}</li> <li>{{ track }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
<a class='button' href="{{ tracks_action_url }}">Edit</a> <a class='button' href="{{ tracks_action_url }}">{% trans "Edit" %}</a>
{% else %} {% else %}
<a class='button' href="{{ tracks_action_url }}">Add tracks</a> <a class='button' href="{{ tracks_action_url }}">{% trans "Add tracks" %}</a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment