Merge remote-tracking branch 'origin/master' into hunternif

# Conflicts:
#	client/css/post-content-control.styl
#	client/css/post-list-view.styl
#	client/html/post_edit_sidebar.tpl
#	client/js/controllers/post_list_controller.js
#	client/js/controllers/post_main_controller.js
#	client/js/controllers/post_upload_controller.js
#	client/js/controllers/tag_controller.js
#	client/js/controllers/user_list_controller.js
#	client/js/controls/expander_control.js
#	client/js/controls/post_content_control.js
#	client/js/controls/post_edit_sidebar_control.js
#	client/js/controls/post_readonly_sidebar_control.js
#	client/js/controls/tag_input_control.js
#	client/js/main.js
#	client/js/models/abstract_list.js
#	client/js/models/post.js
#	client/js/models/post_list.js
#	client/js/models/settings.js
#	client/js/models/tag.js
#	client/js/models/tag_list.js
#	client/js/tags.js
#	client/js/util/search.js
#	client/js/util/touch.js
#	client/js/util/uri.js
#	client/js/util/views.js
#	client/js/views/post_main_view.js
#	client/js/views/post_upload_view.js
#	client/js/views/posts_header_view.js
#	client/js/views/posts_page_view.js
#	client/js/views/settings_view.js
#	client/js/views/tag_view.js
#	client/package-lock.json
#	client/package.json
#	server/config.yaml.dist
#	server/szurubooru/api/__init__.py
#	server/szurubooru/api/post_api.py
#	server/szurubooru/api/tag_api.py
#	server/szurubooru/func/posts.py
#	server/szurubooru/func/tags.py
#	server/szurubooru/model/__init__.py
#	server/szurubooru/model/post.py
#	server/szurubooru/model/tag.py
#	server/szurubooru/search/configs/__init__.py
#	server/szurubooru/search/configs/post_search_config.py
#	server/szurubooru/search/executor.py
#	server/szurubooru/tests/api/test_post_retrieving.py
#	server/szurubooru/tests/api/test_post_updating.py
#	server/szurubooru/tests/api/test_tag_updating.py
#	server/szurubooru/tests/conftest.py
#	server/szurubooru/tests/func/test_posts.py
#	server/szurubooru/tests/func/test_tags.py
#	server/szurubooru/tests/search/configs/test_post_search_config.py

1 files changed, 44 insertions, 35 deletions

diff --git a/client/js/views/help_view.js b/client/js/views/help_view.js
index 11f6a39..a88b016 100644
--- a/client/js/views/help_view.js
+++ b/client/js/views/help_view.js
@@ -1,72 +1,81 @@
-'use strict';
+"use strict";
 
-const api = require('../api.js');
-const views = require('../util/views.js');
+const api = require("../api.js");
+const views = require("../util/views.js");
 
-const template = views.getTemplate('help');
+const template = views.getTemplate("help");
 const sectionTemplates = {
-    'about': views.getTemplate('help-about'),
-    'keyboard': views.getTemplate('help-keyboard'),
-    'search': views.getTemplate('help-search'),
-    'comments': views.getTemplate('help-comments'),
-    'tos': views.getTemplate('help-tos'),
+    about: views.getTemplate("help-about"),
+    keyboard: views.getTemplate("help-keyboard"),
+    search: views.getTemplate("help-search"),
+    comments: views.getTemplate("help-comments"),
+    tos: views.getTemplate("help-tos"),
 };
 const subsectionTemplates = {
-    'search': {
-        'default': views.getTemplate('help-search-general'),
-        'posts': views.getTemplate('help-search-posts'),
-        'users': views.getTemplate('help-search-users'),
-        'tags': views.getTemplate('help-search-tags'),
+    search: {
+        default: views.getTemplate("help-search-general"),
+        posts: views.getTemplate("help-search-posts"),
+        users: views.getTemplate("help-search-users"),
+        tags: views.getTemplate("help-search-tags"),
+        pools: views.getTemplate("help-search-pools"),
     },
 };
 
 class HelpView {
     constructor(section, subsection) {
-        this._hostNode = document.getElementById('content-holder');
+        this._hostNode = document.getElementById("content-holder");
 
         const sourceNode = template();
         const ctx = {
             name: api.getName(),
         };
 
-        section = section || 'about';
+        section = section || "about";
         if (section in sectionTemplates) {
             views.replaceContent(
-                sourceNode.querySelector('.content'),
-                sectionTemplates[section](ctx));
+                sourceNode.querySelector(".content"),
+                sectionTemplates[section](ctx)
+            );
         }
 
-        subsection = subsection || 'default';
-        if (section in subsectionTemplates &&
-                subsection in subsectionTemplates[section]) {
+        subsection = subsection || "default";
+        if (
+            section in subsectionTemplates &&
+            subsection in subsectionTemplates[section]
+        ) {
             views.replaceContent(
-                sourceNode.querySelector('.subcontent'),
-                subsectionTemplates[section][subsection](ctx));
+                sourceNode.querySelector(".subcontent"),
+                subsectionTemplates[section][subsection](ctx)
+            );
         }
 
         views.replaceContent(this._hostNode, sourceNode);
 
-        for (let itemNode of
-                sourceNode.querySelectorAll('.primary [data-name]')) {
+        for (let itemNode of sourceNode.querySelectorAll(
+            ".primary [data-name]"
+        )) {
             itemNode.classList.toggle(
-                'active',
-                itemNode.getAttribute('data-name') === section);
-            if (itemNode.getAttribute('data-name') === section) {
+                "active",
+                itemNode.getAttribute("data-name") === section
+            );
+            if (itemNode.getAttribute("data-name") === section) {
                 itemNode.parentNode.scrollLeft =
                     itemNode.getBoundingClientRect().left -
-                    itemNode.parentNode.getBoundingClientRect().left
+                    itemNode.parentNode.getBoundingClientRect().left;
             }
         }
 
-        for (let itemNode of
-                sourceNode.querySelectorAll('.secondary [data-name]')) {
+        for (let itemNode of sourceNode.querySelectorAll(
+            ".secondary [data-name]"
+        )) {
             itemNode.classList.toggle(
-                'active',
-                itemNode.getAttribute('data-name') === subsection);
-            if (itemNode.getAttribute('data-name') === subsection) {
+                "active",
+                itemNode.getAttribute("data-name") === subsection
+            );
+            if (itemNode.getAttribute("data-name") === subsection) {
                 itemNode.parentNode.scrollLeft =
                     itemNode.getBoundingClientRect().left -
-                    itemNode.parentNode.getBoundingClientRect().left
+                    itemNode.parentNode.getBoundingClientRect().left;
             }
         }