From c51992cf5e0bc9a636ae4c7a9f8c3bd11186e936 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Tue, 11 Oct 2016 14:01:16 -0700
Subject: [PATCH] remove old search help in favor of advanced search

---
 .../controllers/full-page-search.js.es6       |  5 ----
 .../discourse/routes/application.js.es6       |  6 ----
 .../discourse/templates/full-page-search.hbs  |  6 ----
 .../discourse/views/search-help.js.es6        |  7 -----
 config/locales/client.en.yml                  |  4 ---
 config/locales/server.en.yml                  | 30 -------------------
 6 files changed, 58 deletions(-)
 delete mode 100644 app/assets/javascripts/discourse/views/search-help.js.es6

diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index 8487a63a3ce..7719ce08502 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -206,11 +206,6 @@ export default Ember.Controller.extend({
       this.get('selected').clear();
     },
 
-    showSearchHelp() {
-      // TODO: dupe code should be centralized
-      ajax("/static/search_help.html", { dataType: 'html' }).then(model => showModal('searchHelp', { model }));
-    },
-
     search() {
       this._search();
     }
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index f34b5ffcde8..df074f01d3c 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -28,12 +28,6 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
 
   actions: {
 
-    showSearchHelp() {
-      ajax("/static/search_help.html", { dataType: 'html' }).then(model => {
-        showModal('searchHelp', { model });
-      });
-    },
-
     toggleAnonymous() {
       ajax("/users/toggle-anon", {method: 'POST'}).then(() => {
         window.location.reload();
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 08154200f21..443579e814b 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -42,9 +42,6 @@
       {{#if searchActive}}
         {{i18n "search.no_results"}}
       {{/if}}
-      {{#unless isExpanded}}
-        <a href class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n "search.search_help"}}</a>
-      {{/unless}}
     </h3>
   {{/unless}}
 
@@ -120,9 +117,6 @@
   {{#if hasResults}}
     <h3 class="search-footer">
       {{i18n "search.no_more_results"}}
-      {{#unless isExpanded}}
-        <a href class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n "search.search_help"}}</a>
-      {{/unless}}
     </h3>
   {{/if}}
 
diff --git a/app/assets/javascripts/discourse/views/search-help.js.es6 b/app/assets/javascripts/discourse/views/search-help.js.es6
deleted file mode 100644
index d16b2fc79f0..00000000000
--- a/app/assets/javascripts/discourse/views/search-help.js.es6
+++ /dev/null
@@ -1,7 +0,0 @@
-import ModalBodyView from "discourse/views/modal-body";
-
-export default ModalBodyView.extend({
-  templateName: 'modal/search_help',
-  title: I18n.t('search_help.title'),
-  focusInput: false
-});
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 49547abec9b..3f5c4ee299a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1210,7 +1210,6 @@ en:
       title: "search topics, posts, users, or categories"
       no_results: "No results found."
       no_more_results: "No more results found."
-      search_help: Search help
       searching: "Searching ..."
       post_format: "#{{post_number}} by {{username}}"
 
@@ -2111,9 +2110,6 @@ en:
     lightbox:
       download: "download"
 
-    search_help:
-      title: 'Search Help'
-
     keyboard_shortcuts_help:
       title: 'Keyboard Shortcuts'
       jump_to:
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e6acba16bc3..16cde366843 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2950,36 +2950,6 @@ en:
 
       This document is CC-BY-SA. It was last updated May 31, 2013.
 
-  static:
-    search_help: |
-      <h3>Tips</h3>
-      <p>
-      <ul>
-        <li>Title matches are prioritized &ndash; when in doubt, search for titles</li>
-        <li>Unique, uncommon words will produce the best results</li>
-        <li>Try searching within a particular category, topic, or user</li>
-      </ul>
-      </p>
-      <h3>Options</h3>
-      <p>
-        <table>
-        <tr><td><code>order:views</code></td><td><code>order:latest</code></td><td><code>order:likes</code></td><td><code>@username</code></td><td><code>user:foo</code></td></tr>
-        <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:single_user</code></td></tr>
-        <tr><td><code>#category-slug</code></td><td><code>category:foo</code></td><td><code>group:foo</code></td><td><code>badge:foo</code></td><td></td></tr>
-        <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td><code>in:private</code></td></tr>
-        <tr><td><code>in:bookmarks</code></td><td><code>in:first</code></td><td><code>in:pinned</code></td><td><code>in:unpinned</code></td><td><code>in:wiki</code></td></tr>
-        <tr><td><code>posts_count:num</code></td><td><code>before:days or date</code></td><td><code>after:days or date</code></td><td><code>tags:one,two</code></td><td></td></tr>
-        </table>
-      </p>
-      <h3>Examples</h3>
-      <p>
-        <ul>
-          <li><code>rainbows #parks</code> will search for topics containing the word "rainbows" in the category "parks".</li>
-          <li><code>rainbows category:parks status:open order:latest</code> will search for topics containing the word "rainbows" in the category "parks" that are not closed or archived, ordered by date of last post.</li>
-          <li><code>rainbows category:"parks and gardens" in:bookmarks</code> will search for topics containing the word "rainbows" in the category "parks and gardens" that are bookmarked by you.</li>
-        </ul>
-      </p>
-
   badges:
     editor:
       name: Editor