From 80750f83ac5e35686a152123a48786acf3a95884 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Sat, 2 May 2015 11:45:25 +0900
Subject: [PATCH] UI.registerHelper -> Template.registerHelper; fix logo

---
 .../telescope-core/lib/client/handlebars.js   | 34 +++++++++----------
 .../lib/client/templates/nav/logo.html        |  6 ++--
 .../lib/client/templates/nav/logo.js          |  3 --
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/packages/telescope-core/lib/client/handlebars.js b/packages/telescope-core/lib/client/handlebars.js
index b5f2eb528..455422ba0 100644
--- a/packages/telescope-core/lib/client/handlebars.js
+++ b/packages/telescope-core/lib/client/handlebars.js
@@ -1,6 +1,6 @@
 // ** Handlebars helpers **
 
-UI.registerHelper('eachWithRank', function(items, options) {
+Template.registerHelper('eachWithRank', function(items, options) {
   // not used, forces multiple renders
   // note: cannot use this because it would delete and recreate all nodes
   items.rewind();
@@ -13,19 +13,19 @@ UI.registerHelper('eachWithRank', function(items, options) {
   });
   return out;
 });
-UI.registerHelper('isLoggedIn', function() {
+Template.registerHelper('isLoggedIn', function() {
   return !!Meteor.user();
 });
-UI.registerHelper('canView', function() {
+Template.registerHelper('canView', function() {
   return Users.can.view(Meteor.user());
 });
-UI.registerHelper('canPost', function() {
+Template.registerHelper('canPost', function() {
   return Users.can.post(Meteor.user());
 });
-UI.registerHelper('canComment', function() {
+Template.registerHelper('canComment', function() {
   return Users.can.comment(Meteor.user());
 });
-UI.registerHelper('isAdmin', function(showError) {
+Template.registerHelper('isAdmin', function(showError) {
   if (Users.is.admin(Meteor.user())) {
     return true;
   }
@@ -34,56 +34,56 @@ UI.registerHelper('isAdmin', function(showError) {
   }
   return false;
 });
-UI.registerHelper('canEdit', function(item) {
+Template.registerHelper('canEdit', function(item) {
   return Users.can.edit(Meteor.user(), item, false);
 });
 
-UI.registerHelper('log', function(context){
+Template.registerHelper('log', function(context){
   console.log(context);
 });
 
-UI.registerHelper('formatDate', function(datetime, format) {
+Template.registerHelper('formatDate', function(datetime, format) {
   Session.get('momentLocale'); // depend on session variable to reactively rerun the helper
   return moment(datetime).format(format);
 });
 
-UI.registerHelper('timeAgo', function(datetime) {
+Template.registerHelper('timeAgo', function(datetime) {
   Session.get('momentLocale'); // depend on session variable to reactively rerun the helper
   return moment(datetime).fromNow();
 });
 
-UI.registerHelper('sanitize', function(content) {
+Template.registerHelper('sanitize', function(content) {
   console.log('cleaning up…');
   console.log(content);
   return Telescope.utils.cleanUp(content);
 });
 
-UI.registerHelper('pluralize', function(count, string) {
+Template.registerHelper('pluralize', function(count, string) {
   string = count === 1 ? string : string + 's';
   return i18n.t(string);
 });
 
-UI.registerHelper('profileUrl', function(userOrUserId) {
+Template.registerHelper('profileUrl', function(userOrUserId) {
   var user = (typeof userOrUserId === 'string') ? Meteor.users.findOne(userOrUserId) :  userOrUserId;
   if (!!user) {
     return Users.getProfileUrl(user);
   }
 });
 
-UI.registerHelper('userName', function(userOrUserId) {
+Template.registerHelper('userName', function(userOrUserId) {
   var user = (typeof userOrUserId === 'string') ? Meteor.users.findOne(userOrUserId) :  userOrUserId;
   if (!!user) {
     return Users.getUserName(user);
   }
 });
 
-UI.registerHelper('displayName', function(userOrUserId) {
+Template.registerHelper('displayName', function(userOrUserId) {
   var user = (typeof userOrUserId === 'string') ? Meteor.users.findOne(userOrUserId) :  userOrUserId;
   if (!!user) {
     return Users.getDisplayName(user);
   }
 });
 
-UI.registerHelper('icon', function(iconName, iconClass) {
+Template.registerHelper('icon', function(iconName, iconClass) {
   return Telescope.utils.getIcon(iconName, iconClass);
-});
\ No newline at end of file
+});
diff --git a/packages/telescope-core/lib/client/templates/nav/logo.html b/packages/telescope-core/lib/client/templates/nav/logo.html
index 41e34e8a9..f5104eda6 100644
--- a/packages/telescope-core/lib/client/templates/nav/logo.html
+++ b/packages/telescope-core/lib/client/templates/nav/logo.html
@@ -1,11 +1,11 @@
 <template name="logo">
-  {{#if logo_url}}
+  {{#if logoUrl}}
     <h1 class="logo logo-image header-module">
       <a href="/">
-        <img src="{{logoUrl}}" alt="{{siteTitle}}"/>
+        <img src="{{logoUrl}}" alt="{{getSetting "title" "Telescope"}}"/>
       </a>
     </h1>
   {{else}}
-    <h1 class="logo header-module"><a href="/">{{siteTitle}}</a></h1>
+    <h1 class="logo header-module"><a href="/">{{getSetting "title" "Telescope"}}</a></h1>
   {{/if}}
 </template>
diff --git a/packages/telescope-core/lib/client/templates/nav/logo.js b/packages/telescope-core/lib/client/templates/nav/logo.js
index 6a6534711..c713c0711 100644
--- a/packages/telescope-core/lib/client/templates/nav/logo.js
+++ b/packages/telescope-core/lib/client/templates/nav/logo.js
@@ -1,7 +1,4 @@
 Template.logo.helpers({
-  siteTitle: function(){
-    return Settings.get('title', "Telescope");
-  },
   logoUrl: function(){
     return Settings.get('logoUrl');
   }