From 989443a5698adf5e7a93f874048699526aa103a7 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 30 Jan 2020 15:56:33 -0800 Subject: basic poll support and patch to not call System::get_platform_name() within t() unless needed. Polls probably need refining and have not yet been fully tested after porting --- view/js/autocomplete.js | 2 +- view/js/main.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 278a0a176..c194338d6 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -372,7 +372,7 @@ function string2bb(element) { return; if(type=='bbcode') { - var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'summary', 'map', 'nobb', 'list', 'checklist', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'observer.language','embed', 'highlight', 'url', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']; + var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'summary', 'map', 'nobb', 'list', 'checklist', 'question', 'answer', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'observer.language','embed', 'highlight', 'url', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6']; var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr' ]; var elements = open_close_elements.concat(open_elements); diff --git a/view/js/main.js b/view/js/main.js index 4ec7a71aa..e735e9d6b 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1267,6 +1267,20 @@ function filestorage(event, nick, id) { }); } +function submitPoll(id) { + + $.post('vote/' + id, + $('#question-form-' + id).serialize(), + function(data) { + $.jGrowl(data.message, { sticky: false, theme: ((data.success) ? 'info' : 'notice'), life: 10000 }); + if(timer) clearTimeout(timer); + timer = setTimeout(updateInit,1500); + } + ); + +} + + function post_comment(id) { unpause(); commentBusy = true; -- cgit v1.2.3 From 1297c8d2ae248f9cbd0403cf2f361476e1f909cd Mon Sep 17 00:00:00 2001 From: "M. Dent" Date: Sun, 23 Feb 2020 14:40:18 +0100 Subject: Fix: hang on too few items --- view/js/main.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index e735e9d6b..94fd940b2 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -581,8 +581,10 @@ function contextualHelpFocus(target, openSidePanel) { function updatePageItems(mode, data) { if(mode === 'append') { + newitemcount = 0; $(data).each(function() { $('#page-end').before($(this)); + newitemcount++; }); if(loadingPage) { @@ -593,6 +595,10 @@ function updatePageItems(mode, data) { var e = document.getElementById('content-complete'); if(e) { pageHasMoreContent = false; + } else { + if (newitemcount < 1) { + pageUpdate(); + } } collapseHeight(); -- cgit v1.2.3 From 3d6fa049da953b2cd73206bbae673f599e9a50eb Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 25 Feb 2020 21:37:49 +0100 Subject: Update hstrings.php --- view/ru/hstrings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index 122cb48a5..5a7323ea8 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -2772,8 +2772,8 @@ App::$strings["My Chatrooms"] = "Мои чаты"; App::$strings["Channel Export"] = "Экспорт канала"; App::$strings["Purchase"] = "Купить"; App::$strings["Undelete"] = "Восстановить"; -App::$strings["Add to app-tray"] = "Добавить в app-tray"; -App::$strings["Remove from app-tray"] = "Удалить из app-tray"; +App::$strings["Add to app-tray"] = "Добавить в правое меню"; +App::$strings["Remove from app-tray"] = "Удалить из правого меню"; App::$strings["Pin to navbar"] = "Добавить на панель навигации"; App::$strings["Unpin from navbar"] = "Удалить с панели навигации"; App::$strings["Privacy conflict. Discretion advised."] = "Конфиликт настроек конфиденциальности."; -- cgit v1.2.3 From 47d80df81c42105b1f0deeb9fef71fecddc574f5 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Tue, 25 Feb 2020 21:38:33 +0100 Subject: Update hmessages.po --- view/ru/hmessages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index d8ddafa96..e951ee2a3 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-19 11:37+0200\n" -"PO-Revision-Date: 2020-01-19 11:43+0200\n" +"PO-Revision-Date: 2020-02-25 23:38+0200\n" "Last-Translator: Max Kostikov \n" "Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n" "MIME-Version: 1.0\n" @@ -12268,11 +12268,11 @@ msgstr "Восстановить" #: ../../Zotlabs/Lib/Apps.php:567 msgid "Add to app-tray" -msgstr "Добавить в app-tray" +msgstr "Добавить в правое меню" #: ../../Zotlabs/Lib/Apps.php:568 msgid "Remove from app-tray" -msgstr "Удалить из app-tray" +msgstr "Удалить из правого меню" #: ../../Zotlabs/Lib/Apps.php:569 msgid "Pin to navbar" -- cgit v1.2.3 From 93ad3eb6f1456ad2117b1e757f48edace3d2758f Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 26 Feb 2020 00:12:23 +0100 Subject: Update hmessages.po --- view/ru/hmessages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po index e951ee2a3..764228ad2 100644 --- a/view/ru/hmessages.po +++ b/view/ru/hmessages.po @@ -9583,11 +9583,11 @@ msgstr "Результаты поиска для: %s" #: ../../Zotlabs/Module/Notes.php:56 msgid "Notes App" -msgstr "Приложение \"Заметки\"" +msgstr "Приложение \"Записки\"" #: ../../Zotlabs/Module/Notes.php:57 msgid "A simple notes app with a widget (note: notes are not encrypted)" -msgstr "Простое приложение для заметок с виджетом (примечание: заметки не зашифрованы)" +msgstr "Простое приложение для записок с виджетом (примечание: записки не зашифрованы)" #: ../../Zotlabs/Module/Moderate.php:65 msgid "Comment approved" @@ -11015,7 +11015,7 @@ msgstr "Форумы" #: ../../Zotlabs/Widget/Notes.php:21 ../../Zotlabs/Lib/Apps.php:368 #: ../../extend/addon/hzaddons/workflow/workflow.php:2592 msgid "Notes" -msgstr "Заметки" +msgstr "Записки" #: ../../Zotlabs/Widget/Suggestions.php:53 msgid "Suggestions" -- cgit v1.2.3 From 082826ee444cb1a24306a128c64cb2e7de631291 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Wed, 26 Feb 2020 00:12:57 +0100 Subject: Update hstrings.php --- view/ru/hstrings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php index 5a7323ea8..62585df9b 100644 --- a/view/ru/hstrings.php +++ b/view/ru/hstrings.php @@ -2146,8 +2146,8 @@ App::$strings["Welcome to Hubzilla!"] = "Добро пожаловать в Hubz App::$strings["You have got no unseen posts..."] = "У вас нет непросмотренных публикаций..."; App::$strings["Items tagged with: %s"] = "Объекты помечены как: %s"; App::$strings["Search results for: %s"] = "Результаты поиска для: %s"; -App::$strings["Notes App"] = "Приложение \"Заметки\""; -App::$strings["A simple notes app with a widget (note: notes are not encrypted)"] = "Простое приложение для заметок с виджетом (примечание: заметки не зашифрованы)"; +App::$strings["Notes App"] = "Приложение \"Записки\""; +App::$strings["A simple notes app with a widget (note: notes are not encrypted)"] = "Простое приложение для записок с виджетом (примечание: записки не зашифрованы)"; App::$strings["Comment approved"] = "Комментарий одобрен"; App::$strings["Comment deleted"] = "Комментарий удалён"; App::$strings["Webpages App"] = "Приложение \"Веб-страницы\""; @@ -2480,7 +2480,7 @@ App::$strings["View your connections and/or add somebody whose address you alrea App::$strings["View your personal stream (this may be empty until you add some connections)"] = "Ваш персональный поток (может быть пуст пока вы не добавите контакты)"; App::$strings["View the public stream. Warning: this content is not moderated"] = "Просмотр публичного потока. Предупреждение: этот контент не модерируется"; App::$strings["Forums"] = "Форумы"; -App::$strings["Notes"] = "Заметки"; +App::$strings["Notes"] = "Записки"; App::$strings["Suggestions"] = "Рекомендации"; App::$strings["See more..."] = "Просмотреть больше..."; App::$strings["New Network Activity"] = "Новая сетевая активность"; -- cgit v1.2.3 From e7f25b84664c158343621c391b8653042d5be53c Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 26 Feb 2020 09:51:40 +0000 Subject: implement poll UI in jot --- view/css/conversation.css | 20 ++++++++++++-------- view/theme/redbasic/css/style.css | 4 ++++ view/tpl/jot-header.tpl | 19 +++++++++++++++++++ view/tpl/jot.tpl | 40 ++++++++++++++++++++++++++++++++++++--- 4 files changed, 72 insertions(+), 11 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index f7804f5dd..287d662ae 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -1,15 +1,18 @@ /* jot */ +.jothidden { + display:none; +} -.jothidden input[type="text"] { - border: 0px; - margin: 0px; - height: 2.5rem; - width: 100%; +.jot-poll-option { + position: relative; } -.jothidden { - display:none; +.poll-option-close { + position: absolute; + right: 0; + top: 0; + padding: 0.25rem 0 0.25rem 0.5rem; } #jot-title-wrap, @@ -18,7 +21,8 @@ border-bottom: 1px solid rgba(0, 0, 0, .2); } -#jot-attachment-wrap { +#jot-attachment-wrap, +#jot-poll-wrap { border-top: 1px solid rgba(0, 0, 0, .2); } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3bee84378..1ababecfc 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1605,6 +1605,10 @@ dl.bb-dl > dd > li { font-size: 100%; } +.bootstrap-tagsinput input { + height: 2.5rem; +} + /* Abusing theme-green is less work than makeing a new new one */ .theme-green .back-bar .selected-bar { background-color: #000000; diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 7b1f4ee05..d519fd666 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -58,6 +58,9 @@ var activeCommentText = ''; $('#id_mimetype').on('load', jotSetMime); $('#id_mimetype').on('change', jotSetMime); + $('#jot-add-option').on('click', jotAddOption); + $(document).on('click', '.poll-option-close', jotRemoveOption); + function jotSetMime() { var mtype = $('#id_mimetype').val(); if(mtype == 'text/bbcode') @@ -122,6 +125,7 @@ var activeCommentText = ''; activeCommentID = 0; }, }); + }); function deleteCheckedItems() { @@ -309,6 +313,7 @@ var activeCommentText = ''; function itemCancel() { $("#jot-title").val(''); $("#profile-jot-text").val(''); + $(".jot-poll-option input").val(''); $("#jot-category").tagsinput('removeAll'); postSaveChanges('clean'); @@ -317,6 +322,7 @@ var activeCommentText = ''; $(".jothidden").hide(); $("#profile-jot-text").removeClass('jot-expanded'); $("#profile-jot-tools").addClass('d-none'); + $("#jot-poll-wrap").addClass('d-none'); $("#jot-preview-content").html('').hide(); editor = false; {{else}} @@ -512,6 +518,19 @@ var activeCommentText = ''; } + function initPoll() { + $('#jot-poll-wrap').toggleClass('d-none'); + } + + function jotAddOption() { + var option = '
'; + $('#jot-poll-options').append(option); + } + + function jotRemoveOption(e) { + $(this).closest('.jot-poll-option').remove(); + } +