diff options
| author | czaks <marcin@6irc.net> | 2013-08-13 14:46:16 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-13 14:46:16 -0400 |
| commit | 4f855cf3b30d0b141f3a4c4f4477d7d27069c895 (patch) | |
| tree | a56d18dcbf2ca12034ccfa8943cc3674f3b37f5b /templates/post_form.html | |
| parent | b5bba48edfe26a7bbb23aad3eb8b3c8d163489a3 (diff) | |
| parent | 07b825c6d2abd3312747fafe49c0a1d3011242ae (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
inc/config.php
inc/display.php
inc/functions.php
Diffstat (limited to 'templates/post_form.html')
| -rw-r--r-- | templates/post_form.html | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/templates/post_form.html b/templates/post_form.html index 92aa325a..93ca821e 100644 --- a/templates/post_form.html +++ b/templates/post_form.html @@ -85,6 +85,13 @@ </th> <td> <input type="file" name="file"> + {% if config.allow_upload_by_url %} + <br> + <div style="float:none;text-align:left"> + <label for="file_url">{% trans %}Or URL{% endtrans %}</label>: + <input style="display:inline" type="text" id="file_url" name="file_url" size="35"> + </div> + {% endif %} {{ antibot.html() }} </td> </tr> |