a3x
/
nyaa
mirror of https://gitlab.com/SIGBUS/nyaa.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert edit/upload form back to -md-, split flag buttons into two groups

This commit is contained in:
TheAMM 2017-05-24 11:31:29 +03:00
parent 3418cb6175
commit ea2e01ae2c
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nyaa/templates/edit.html
View File

@ -17,18 +17,18 @@
<div class="row">
<div class="col-xl-6">
<div class="col-md-6">
{{ render_field(form.display_name, class_='form-control', placeholder='Display name') }}
</div>
<div class="col-xl-4">
<div class="col-md-4">
{{ render_field(form.category, class_='form-control')}}
</div>
</div>
<div class="row">
<div class="col-xl-6">
<div class="col-md-6">
{{ render_field(form.information, class_='form-control', placeholder='Your website or IRC channel') }}
</div>
<div class="col-xl-6">
<div class="col-md-6">
<label class="control-label">Torrent flags</label><br>
<div class="btn-group" data-toggle="buttons">
{# Only allow changing anonymous status when an uploader exists #}
@ -46,6 +46,16 @@
<span class="glyphicon glyphicon-unchecked"></span>
Hidden
</label>
{% if g.user.is_moderator %}
<label class="btn btn-primary {% if torrent.deleted %}active{% endif %}">
{{ form.is_deleted }}
<span class="glyphicon glyphicon-check"></span>
<span class="glyphicon glyphicon-unchecked"></span>
Deleted
</label>
{% endif %}
</div>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-danger {% if torrent.remake %}active{% endif %}" title="This torrent is derived from another release">
{{ form.is_remake }}
<span class="glyphicon glyphicon-check"></span>
@ -66,26 +76,18 @@
Trusted
</label>
{% endif %}
{% if g.user.is_moderator %}
<label class="btn btn-primary {% if torrent.deleted %}active{% endif %}">
{{ form.is_deleted }}
<span class="glyphicon glyphicon-check"></span>
<span class="glyphicon glyphicon-unchecked"></span>
Deleted
</label>
{% endif %}
</div>
</div>
</div>
<div class="row">
<div class="col-xl-12">
<div class="col-md-12">
{{ render_markdown_editor(form.description, field_name='description') }}
</div>
</div>
<div class="row">
<div class="form-group col-xl-6">
<div class="form-group col-md-6">
<input type="submit" value="Edit" class="btn btn-primary">
</div>
</div>

19
nyaa/templates/upload.html
View File

@ -18,24 +18,24 @@
{% if config.ENFORCE_MAIN_ANNOUNCE_URL %}<p><strong>Important:</strong> Please include <kbd>{{ config.MAIN_ANNOUNCE_URL }}</kbd> in your trackers</p>{% endif %}
<div class="row">
<div class="col-xl-6">
<div class="col-md-10">
{{ render_upload(upload_form.torrent_file, accept=".torrent") }}
</div>
</div>
<div class="row">
<div class="col-xl-6">
<div class="col-md-6">
{{ render_field(upload_form.display_name, class_='form-control', placeholder='Display name') }}
</div>
<div class="col-xl-4">
<div class="col-md-4">
{{ render_field(upload_form.category, class_='form-control')}}
</div>
</div>
<div class="row"></div>
<div class="row form-group">
<div class="col-xl-6">
<div class="col-md-6">
{{ render_field(upload_form.information, class_='form-control', placeholder='Your website or IRC channel') }}
</div>
<div class="col-xl-6">
<div class="col-md-6">
<label class="control-label">Torrent flags</label><br>
<div class="btn-group" data-toggle="buttons">
@ -52,6 +52,9 @@
<span class="glyphicon glyphicon-unchecked"></span>
Hidden
</label>
</div>
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-danger" title="This torrent is derived from another release">
{{ upload_form.is_remake }}
<span class="glyphicon glyphicon-check"></span>
@ -76,14 +79,14 @@
</div>
</div>
<div class="row">
<div class="col-xl-12">
<div class="col-md-12">
{{ render_markdown_editor(upload_form.description, field_name='description') }}
</div>
</div>
{% if config.USE_RECAPTCHA and not g.user %}
<div class="row">
<div class="col-xl-4">
<div class="col-md-4">
{% for error in upload_form.recaptcha.errors %}
{{ error }}
{% endfor %}
@ -95,7 +98,7 @@
<br>
<div class="row">
<div class="form-group col-xl-6">
<div class="form-group col-md-6">
<input type="submit" value="Upload" class="btn btn-primary">
</div>
</div>