Merge branch 'AdmitHub-search-title-description' into devel

Conflicts:
	packages/telescope-search/lib/client/routes.js
This commit is contained in:
Sacha Greif 2015-03-26 11:18:37 +09:00
commit 3339af6cc9

View file

@ -3,6 +3,12 @@ Meteor.startup(function () {
PostsSearchController = PostsListController.extend({
view: 'search',
showViewsNav: false,
getTitle: function() {
return i18n.t("Search") + ' - ' + getSetting('title', "Telescope");
},
getDescription: function() {
return getSetting('description');
},
onBeforeAction: function() {
var query = this.params.query;
if ('q' in query) {