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}} - {{i18n "search.search_help"}} - {{/unless}} {{/unless}} @@ -120,9 +117,6 @@ {{#if hasResults}} {{/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: | -

Tips

-

-

-

-

Options

-

- - - - - - - -
order:viewsorder:latestorder:likes@usernameuser:foo
status:openstatus:closedstatus:archivedstatus:norepliesstatus:single_user
#category-slugcategory:foogroup:foobadge:foo
in:likesin:postedin:watchingin:trackingin:private
in:bookmarksin:firstin:pinnedin:unpinnedin:wiki
posts_count:numbefore:days or dateafter:days or datetags:one,two
-

-

Examples

-

-

-

- badges: editor: name: Editor