Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweaks to full page search

This commit is contained in:
Sam 2016-10-11 10:36:08 +11:00
parent 0f0b657182
commit b6d0d4d94d
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/full-page-search.js.es6
View File

@ -138,9 +138,9 @@ export default Ember.Controller.extend({
return this.currentUser && this.currentUser.staff && hasResults; return this.currentUser && this.currentUser.staff && hasResults;
}, },
@computed @computed('isExpanded')
canCreateTopic() { canCreateTopic() {
return this.currentUser && !this.site.mobileView; return this.currentUser && !this.site.mobileView && !this.get('isExpanded');
}, },
_search() { _search() {

6
app/assets/javascripts/discourse/templates/full-page-search.hbs
View File

@ -2,7 +2,7 @@
{{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}} {{search-text-field value=searchTerm class="full-page-search input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}}
{{d-button action="search" icon="search" class="btn-primary" disabled=searching}} {{d-button action="search" icon="search" class="btn-primary" disabled=searching}}
{{search-advanced-options searchTerm=searchTerm}} {{search-advanced-options searchTerm=searchTerm isExpanded=isExpanded}}
{{#if canCreateTopic}} {{#if canCreateTopic}}
<span class="new-topic-btn">{{d-button id="create-topic" class="btn-default" action="createTopic" actionParam=searchTerm icon="plus" label="topic.create"}}</span> <span class="new-topic-btn">{{d-button id="create-topic" class="btn-default" action="createTopic" actionParam=searchTerm icon="plus" label="topic.create"}}</span>
@ -42,7 +42,9 @@
{{#if searchActive}} {{#if searchActive}}
{{i18n "search.no_results"}} {{i18n "search.no_results"}}
{{/if}} {{/if}}
{{#unless isExpanded}}
<a href class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n "search.search_help"}}</a> <a href class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n "search.search_help"}}</a>
{{/unless}}
</h3> </h3>
{{/unless}} {{/unless}}
@ -118,7 +120,9 @@
{{#if hasResults}} {{#if hasResults}}
<h3 class="search-footer"> <h3 class="search-footer">
{{i18n "search.no_more_results"}} {{i18n "search.no_more_results"}}
{{#unless isExpanded}}
<a href class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n "search.search_help"}}</a> <a href class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n "search.search_help"}}</a>
{{/unless}}
</h3> </h3>
{{/if}} {{/if}}

5
app/assets/stylesheets/common/base/search.scss
View File

@ -101,8 +101,9 @@
margin-bottom: 15px; margin-bottom: 15px;
.panel-title { .panel-title {
background-color: dark-light-diff($primary, $secondary, 90%, -75%); background-color: dark-light-diff($primary, $secondary, 94%, -80%);
padding: 5px 10px 5px 10px; padding: 8px 10px;
cursor: pointer;
} }
.search-options { .search-options {