diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo index c12a6c55533df7018671405c402cf3bed9696033..8569cd574d7fdfd25d6fb62cde055cfc29165a5c GIT binary patch literal 9948 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 diff --git a/boards/locale/ru/LC_MESSAGES/django.po b/boards/locale/ru/LC_MESSAGES/django.po --- a/boards/locale/ru/LC_MESSAGES/django.po +++ b/boards/locale/ru/LC_MESSAGES/django.po @@ -533,3 +533,6 @@ msgstr "Монохромный" msgid "Subsections: " msgstr "Подразделы: " + +msgid "Change file source" +msgstr "Изменить источник файла" diff --git a/boards/static/css/base.css b/boards/static/css/base.css --- a/boards/static/css/base.css +++ b/boards/static/css/base.css @@ -153,3 +153,4 @@ textarea, input { filter: grayscale(100%); -webkit-filter: grayscale(100%); } + diff --git a/boards/static/js/form.js b/boards/static/js/form.js --- a/boards/static/js/form.js +++ b/boards/static/js/form.js @@ -1,3 +1,5 @@ +var ITEM_FILE_SOURCE = 'fileSource'; + $('input[name=image]').wrap($('
')); $('body').on('change', 'input[name=image]', function(event) { @@ -60,6 +62,27 @@ function addHiddenInput(form, name, valu form.find('input[name=' + name + ']').val(value); } +function selectFileChoice() { + var file_input = $('#id_file'); + var url_input = $('#id_file_url'); + + var file_input_row = file_input.parent().parent(); + var url_input_row = url_input.parent().parent(); + + file_input_row.toggle(); + url_input_row.toggle(); + url_input.val(''); + file_input.val(''); + + var source; + if (file_input_row.is(':visible')) { + source = 'file'; + } else { + source = 'url'; + } + localStorage.setItem(ITEM_FILE_SOURCE, source); +} + $(document).ready(function() { var powDifficulty = parseInt($('body').attr('data-pow-difficulty')); if (powDifficulty > 0) { @@ -92,4 +115,18 @@ function addHiddenInput(form, name, valu return false; }); } + + var source = localStorage.getItem(ITEM_FILE_SOURCE); + if (source == null) { + source = 'file'; + } + if (source == 'file') { + $('#id_file_url').parent().parent().hide(); + } else { + $('#id_file').parent().parent().hide(); + } + + $('#file-source-button').click(function() { + selectFileChoice(); + }); }); diff --git a/boards/templates/boards/all_threads.html b/boards/templates/boards/all_threads.html --- a/boards/templates/boards/all_threads.html +++ b/boards/templates/boards/all_threads.html @@ -163,6 +163,7 @@
+
diff --git a/boards/templates/boards/thread_normal.html b/boards/templates/boards/thread_normal.html --- a/boards/templates/boards/thread_normal.html +++ b/boards/templates/boards/thread_normal.html @@ -51,6 +51,7 @@
+