From 8c11299197dec38fc733c0a87b5373bf907ed550 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Tue, 4 Mar 2014 14:56:05 -0500 Subject: [PATCH 1/3] template language fix --- app.js | 4 ++-- public/src/forum/admin/index.js | 1 + public/templates/accountposts.tpl | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app.js b/app.js index 877b08c79c..ec15115694 100644 --- a/app.js +++ b/app.js @@ -80,7 +80,7 @@ if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf reset(); } else { displayHelp(); -}; +} function loadConfig() { nconf.file({ @@ -153,7 +153,7 @@ function start() { winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:'); winston.warn(' node app --upgrade'); winston.warn('To ignore this error (not recommended):'); - winston.warn(' node app --no-check-schema') + winston.warn(' node app --no-check-schema'); process.exit(); } }); diff --git a/public/src/forum/admin/index.js b/public/src/forum/admin/index.js index 7c9f6db3bd..aa63a15568 100644 --- a/public/src/forum/admin/index.js +++ b/public/src/forum/admin/index.js @@ -45,6 +45,7 @@ define(function() { for(var key in data) { uniqueVisitors.find('#' + key).text(data[key]); } + }); }; diff --git a/public/templates/accountposts.tpl b/public/templates/accountposts.tpl index 19744217d1..710b693ba6 100644 --- a/public/templates/accountposts.tpl +++ b/public/templates/accountposts.tpl @@ -5,7 +5,7 @@
-
[[topic:favourites.has_no_favourites]]
+
[[user:has_no_posts]]
@@ -25,8 +25,8 @@
- posted - in + [[global:posted]] + [[global:in]] {posts.categoryName} From d100a41ce7ec0db89ad25d6d64ffe9b769636e10 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Tue, 4 Mar 2014 15:23:26 -0500 Subject: [PATCH 2/3] fixes topic follow --- public/src/forum/topic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index a74c3d18fe..a5bdc4f6c1 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -286,7 +286,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { set_follow_state(state, false); }); - $('.posts .follow').on('click', function() { + $('.posts').on('click', '.follow', function() { socket.emit('topics.follow', tid, function(err, state) { if(err) { return app.alert({ From 76d8d09f9b1ebe00d1c3220ed1e1ca813492ea95 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Tue, 4 Mar 2014 16:48:07 -0500 Subject: [PATCH 3/3] closes #1141 --- public/src/forum/topic.js | 12 ++++++------ public/templates/header.tpl | 22 +++++++++++++--------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index a5bdc4f6c1..6383cac823 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -12,8 +12,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { $(window).on('action:ajaxify.start', function(ev, data) { if(data.url.indexOf('topic') !== 0) { - $('.pagination-block').addClass('hide'); - $('#header-topic-title').html('').hide(); + $('.pagination-block').addClass('hidden'); + $('.header-topic-title').find('span').text('').hide(); app.removeAlert('bookmark'); } }); @@ -342,7 +342,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { function enableInfiniteLoading() { if(!config.usePagination) { - $('.pagination-block').removeClass('hide'); + $('.pagination-block').removeClass('hidden'); app.enableInfiniteLoading(function(direction) { @@ -372,7 +372,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { } }); } else { - $('.pagination-block').addClass('hide'); + $('.pagination-block').addClass('hidden'); pagination.init(currentPage, pageCount); } @@ -1026,9 +1026,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { }); if($(window).scrollTop() > 50) { - $('#header-topic-title').text(templates.get('topic_name')).show(); + $('.header-topic-title').find('span').text(templates.get('topic_name')).show(); } else { - $('#header-topic-title').text('').hide(); + $('.header-topic-title').find('span').text('').hide(); } $($('.posts > .post-row').get().reverse()).each(function() { diff --git a/public/templates/header.tpl b/public/templates/header.tpl index decbae43da..9682271b8a 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -60,11 +60,16 @@

{title}

 + +
+ +
+
-