diff --git a/frontend/frontend/locale/en/LC_MESSAGES/django.mo b/frontend/frontend/locale/en/LC_MESSAGES/django.mo index 0727e13..d8f5dd8 100644 Binary files a/frontend/frontend/locale/en/LC_MESSAGES/django.mo and b/frontend/frontend/locale/en/LC_MESSAGES/django.mo differ diff --git a/frontend/frontend/locale/en/LC_MESSAGES/django.po b/frontend/frontend/locale/en/LC_MESSAGES/django.po index b185004..7bd9743 100644 --- a/frontend/frontend/locale/en/LC_MESSAGES/django.po +++ b/frontend/frontend/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-06 00:07+0000\n" +"POT-Creation-Date: 2017-08-24 20:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,84 +90,96 @@ msgstr "Loading..." msgid "subscribe.preview" msgstr "Preview" -#: templates/frontend/setup.html:46 +#: templates/frontend/setup.html:55 msgid "xpath.link" msgstr "http://www.zvon.org/comp/r/tut-XPath_1.html" -#: templates/frontend/setup.html:54 +#: templates/frontend/setup.html:63 msgid "setup.you_are_creating_feed_with" msgstr "You are creating feed with" -#: templates/frontend/setup.html:55 +#: templates/frontend/setup.html:64 msgid "setup.help" msgstr "" "Click on the button and move cursor to the below document and pick item you " "interested in." -#: templates/frontend/setup.html:56 +#: templates/frontend/setup.html:65 templates/frontend/setup.html.py:196 msgid "setup.title" msgstr "Title" -#: templates/frontend/setup.html:56 +#: templates/frontend/setup.html:65 msgid "setup.and" msgstr "and" -#: templates/frontend/setup.html:57 +#: templates/frontend/setup.html:66 templates/frontend/setup.html.py:200 msgid "setup.description" msgstr "Description" -#: templates/frontend/setup.html:65 +#: templates/frontend/setup.html:74 msgid "setup.item_xpath" msgstr "Post xpath" -#: templates/frontend/setup.html:67 templates/frontend/setup.html.py:78 -#: templates/frontend/setup.html:89 templates/frontend/setup.html.py:100 +#: templates/frontend/setup.html:76 templates/frontend/setup.html.py:87 +#: templates/frontend/setup.html:98 templates/frontend/setup.html.py:109 msgid "setup.skipped" msgstr "Skipped" -#: templates/frontend/setup.html:68 templates/frontend/setup.html.py:79 -#: templates/frontend/setup.html:90 templates/frontend/setup.html.py:101 +#: templates/frontend/setup.html:77 templates/frontend/setup.html.py:88 +#: templates/frontend/setup.html:99 templates/frontend/setup.html.py:110 msgid "setup.Selected" -msgstr "Selected %s items" +msgstr "Selected %s parts" -#: templates/frontend/setup.html:72 +#: templates/frontend/setup.html:81 msgid "setup.title_xpath" msgstr "Title xpath" -#: templates/frontend/setup.html:75 templates/frontend/setup.html.py:86 -#: templates/frontend/setup.html:97 +#: templates/frontend/setup.html:84 templates/frontend/setup.html.py:95 +#: templates/frontend/setup.html:106 msgid "setup.Required" msgstr "Required" -#: templates/frontend/setup.html:76 templates/frontend/setup.html.py:87 -#: templates/frontend/setup.html:98 +#: templates/frontend/setup.html:85 templates/frontend/setup.html.py:96 +#: templates/frontend/setup.html:107 msgid "setup.Optional" msgstr "Optional" -#: templates/frontend/setup.html:83 +#: templates/frontend/setup.html:92 msgid "setup.link_xpath" msgstr "Link xpath" -#: templates/frontend/setup.html:94 +#: templates/frontend/setup.html:103 msgid "setup.description_xpath" msgstr "Description xpath" -#: templates/frontend/setup.html:107 +#: templates/frontend/setup.html:116 msgid "setup.clicker_tip" msgstr "Visual constructor" -#: templates/frontend/setup.html:109 +#: templates/frontend/setup.html:118 msgid "setup.confirm_loose" msgstr "You will loose your changes. Are you shure?" -#: templates/frontend/setup.html:110 +#: templates/frontend/setup.html:119 msgid "setup.extended_tip" msgstr "Selectors editor" -#: templates/frontend/setup.html:112 +#: templates/frontend/setup.html:121 msgid "setup.check" msgstr "Check" -#: templates/frontend/setup.html:113 +#: templates/frontend/setup.html:122 msgid "setup.create" msgstr "Create" + +#: templates/frontend/setup.html:137 +msgid "setup.found_posts" +msgstr "Found posts" + +#: templates/frontend/setup.html:192 +msgid "setup.no_posts" +msgstr "No posts" + +#: templates/frontend/setup.html:198 +msgid "setup.link" +msgstr "Link" diff --git a/frontend/frontend/locale/ru/LC_MESSAGES/django.mo b/frontend/frontend/locale/ru/LC_MESSAGES/django.mo index 7e43def..f1da795 100644 Binary files a/frontend/frontend/locale/ru/LC_MESSAGES/django.mo and b/frontend/frontend/locale/ru/LC_MESSAGES/django.mo differ diff --git a/frontend/frontend/locale/ru/LC_MESSAGES/django.po b/frontend/frontend/locale/ru/LC_MESSAGES/django.po index 843793e..95906a8 100644 --- a/frontend/frontend/locale/ru/LC_MESSAGES/django.po +++ b/frontend/frontend/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-06 00:07+0000\n" +"POT-Creation-Date: 2017-08-24 20:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -91,84 +91,96 @@ msgstr "Загрузка..." msgid "subscribe.preview" msgstr "Предпросмотр" -#: templates/frontend/setup.html:46 +#: templates/frontend/setup.html:55 msgid "xpath.link" msgstr "http://zvon.org/xxl/XPathTutorial/Output_rus/examples.html" -#: templates/frontend/setup.html:54 +#: templates/frontend/setup.html:63 msgid "setup.you_are_creating_feed_with" msgstr "Вы создаете ленту содержащую" -#: templates/frontend/setup.html:55 +#: templates/frontend/setup.html:64 msgid "setup.help" msgstr "" "Нажмите на кнопку и переместите курсор на документ внизу и выберите нужный " "блок" -#: templates/frontend/setup.html:56 +#: templates/frontend/setup.html:65 templates/frontend/setup.html.py:196 msgid "setup.title" msgstr "Название" -#: templates/frontend/setup.html:56 +#: templates/frontend/setup.html:65 msgid "setup.and" msgstr "и" -#: templates/frontend/setup.html:57 +#: templates/frontend/setup.html:66 templates/frontend/setup.html.py:200 msgid "setup.description" msgstr "Описание" -#: templates/frontend/setup.html:65 +#: templates/frontend/setup.html:74 msgid "setup.item_xpath" msgstr "Xpath поста" -#: templates/frontend/setup.html:67 templates/frontend/setup.html.py:78 -#: templates/frontend/setup.html:89 templates/frontend/setup.html.py:100 +#: templates/frontend/setup.html:76 templates/frontend/setup.html.py:87 +#: templates/frontend/setup.html:98 templates/frontend/setup.html.py:109 msgid "setup.skipped" msgstr "Пропущено" -#: templates/frontend/setup.html:68 templates/frontend/setup.html.py:79 -#: templates/frontend/setup.html:90 templates/frontend/setup.html.py:101 +#: templates/frontend/setup.html:77 templates/frontend/setup.html.py:88 +#: templates/frontend/setup.html:99 templates/frontend/setup.html.py:110 msgid "setup.Selected" -msgstr "Выбрано %s элементов" +msgstr "Выбрано %s фрагментов" -#: templates/frontend/setup.html:72 +#: templates/frontend/setup.html:81 msgid "setup.title_xpath" msgstr "Xpath названия" -#: templates/frontend/setup.html:75 templates/frontend/setup.html.py:86 -#: templates/frontend/setup.html:97 +#: templates/frontend/setup.html:84 templates/frontend/setup.html.py:95 +#: templates/frontend/setup.html:106 msgid "setup.Required" msgstr "Обязательное" -#: templates/frontend/setup.html:76 templates/frontend/setup.html.py:87 -#: templates/frontend/setup.html:98 +#: templates/frontend/setup.html:85 templates/frontend/setup.html.py:96 +#: templates/frontend/setup.html:107 msgid "setup.Optional" msgstr "Опциональное" -#: templates/frontend/setup.html:83 +#: templates/frontend/setup.html:92 msgid "setup.link_xpath" msgstr "Xpath ссылки" -#: templates/frontend/setup.html:94 +#: templates/frontend/setup.html:103 msgid "setup.description_xpath" msgstr "Xpath описания" -#: templates/frontend/setup.html:107 +#: templates/frontend/setup.html:116 msgid "setup.clicker_tip" msgstr "Визуальный конструктор" -#: templates/frontend/setup.html:109 +#: templates/frontend/setup.html:118 msgid "setup.confirm_loose" msgstr "Вы потеряете изменения. Вы уверены?" -#: templates/frontend/setup.html:110 +#: templates/frontend/setup.html:119 msgid "setup.extended_tip" msgstr "Редактор селекторов" -#: templates/frontend/setup.html:112 +#: templates/frontend/setup.html:121 msgid "setup.check" msgstr "Проверить" -#: templates/frontend/setup.html:113 +#: templates/frontend/setup.html:122 msgid "setup.create" msgstr "Создать" + +#: templates/frontend/setup.html:137 +msgid "setup.found_posts" +msgstr "Найденные посты" + +#: templates/frontend/setup.html:192 +msgid "setup.no_posts" +msgstr "Посты не найдены" + +#: templates/frontend/setup.html:198 +msgid "setup.link" +msgstr "Ссылка" diff --git a/frontend/frontend/settings.py.example b/frontend/frontend/settings.py.example index 04637bf..3ac1864 100644 --- a/frontend/frontend/settings.py.example +++ b/frontend/frontend/settings.py.example @@ -140,6 +140,7 @@ PIPELINE_CSS = { 'frontend/assets/stylesheets/application.css', 'frontend/assets/stylesheets/bootstrap_and_overrides.css.less', 'frontend/assets/stylesheets/wizard.css.scss', + 'frontend/assets/stylesheets/google-code-prettify/prettify.css', ), 'output_filename': 'frontend/css/app.css', 'extra_context': { @@ -157,6 +158,7 @@ PIPELINE_JS = { 'frontend/assets/js/bootstrap.js', 'frontend/assets/js/bootstrap_and_overrides.js', 'frontend/assets/js/xregexp-all.js', + 'frontend/assets/js/google-code-prettify/prettify.js', 'frontend/assets/js/setup-tool.js', 'frontend/assets/js/setup-tool-ext.js', 'frontend/assets/js/help.js', diff --git a/frontend/frontend/static/frontend/assets/js/setup-tool-ext.js b/frontend/frontend/static/frontend/assets/js/setup-tool-ext.js index f3c80bd..fec277f 100644 --- a/frontend/frontend/static/frontend/assets/js/setup-tool-ext.js +++ b/frontend/frontend/static/frontend/assets/js/setup-tool-ext.js @@ -140,8 +140,14 @@ function showPosts(posts) { $post.appendTo($post_tpl.parent()); $post[0].style.display = null; // show }); - $('#ext-results')[0].style.display = posts.length > 0 ? 'block' : 'none'; PR.prettyPrint(); + $('#ext-results')[0].style.display = 'block'; + $('#ext-results .no-data')[0].style.display = posts.length == 0 ? 'block' : 'none'; + expandPosts(true); +} + +function expandPosts(show) { + $('#ext-results').collapse(show ? 'show' : 'hide'); } function active() { @@ -209,19 +215,22 @@ function validateSelectors() { $(document).ready(function(){ $("#st-ext-trigger").click(function(){ show_ext(true); + hide_check_show_create(false); return true; }); $("#st-clicker-trigger").click(function(){ var ch = changed(); - if (!ch || confirm($("#st-clicker-trigger").attr('confirm-text'))) { + if (!ch || confirm($("#st-clicker-trigger").attr('confirm-text'))) { // show visual constructor show_ext(false); updateUI(_config); + update_iframe_heignt(); + hide_check_show_create(true); } return true; }); $("input[id^='ste-']").keyup(function(){ - hide_check_show_create(!changed()) + hide_check_show_create(false) }); $("#check").click(function(){ loader(true); diff --git a/frontend/frontend/templates/frontend/setup.html b/frontend/frontend/templates/frontend/setup.html index a018dfb..6fb17fc 100644 --- a/frontend/frontend/templates/frontend/setup.html +++ b/frontend/frontend/templates/frontend/setup.html @@ -126,7 +126,7 @@ #ext-results { position: relative; margin: 15px 0; - padding: 19px 9px 4px; + padding: 25px 9px 4px; background-color: #fff; border: 1px solid #ddd; -webkit-border-radius: 4px; @@ -152,28 +152,68 @@ display: inline-block; margin: 0; } +.collapse-html-posts { + position: absolute; + top: -1px; + right: -1px; + padding: 3px 7px; + font-size: 12px; + font-weight: bold; + background-color: #f5f5f5; + border: 1px solid #ddd; + color: #9da0a4; + -webkit-border-radius: 0 4px 0 4px; + -moz-border-radius: 0 4px 0 4px; + border-radius: 0 4px 0 4px; + cursor: pointer; + outline: none; +} +li.ext-result { + font-size: 1.5em; +} +li.ext-result dl { + font-size: 14px; +} +#ext-results .collapse-html-posts i.icon-resize-small { + display: none; +} +#ext-results .collapse-html-posts i.icon-resize-full { + display: inline-block; +} +#ext-results.in .collapse-html-posts i.icon-resize-small { + display: inline-block; +} +#ext-results.in .collapse-html-posts i.icon-resize-full { + display: none; +} - -