From 4b984d4fac97c06a21fb30a0642079a1c8d1cd3a Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Wed, 29 Jul 2015 09:53:46 +0200 Subject: [PATCH 1/5] Made analytics show all characters as the same page --- rpg-docs/Routes/Routes.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rpg-docs/Routes/Routes.js b/rpg-docs/Routes/Routes.js index 6600093c..31b11fda 100644 --- a/rpg-docs/Routes/Routes.js +++ b/rpg-docs/Routes/Routes.js @@ -57,6 +57,12 @@ Router.map(function() { document.title = name; } }, + //analytics + trackPageView: false, + onRun: function() { + window.ga && window.ga("send", "pageview", "/character"); + this.next(); + }, }); this.route("loading", { From 4d3fc3bb09cba528823f06a7c03650549a83a793 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Wed, 29 Jul 2015 09:54:18 +0200 Subject: [PATCH 2/5] Fixed accidental back() requests when closing detail dialogs --- rpg-docs/client/globalHelpers/GlobalUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpg-docs/client/globalHelpers/GlobalUI.js b/rpg-docs/client/globalHelpers/GlobalUI.js index aa4dc2b2..ad50010a 100644 --- a/rpg-docs/client/globalHelpers/GlobalUI.js +++ b/rpg-docs/client/globalHelpers/GlobalUI.js @@ -77,10 +77,10 @@ this.GlobalUI = (function() { var throttleBack = _.throttle(function() { history.back(); - }, 800, {trailing: false}); + }, 100, {trailing: false}); GlobalUI.closeDetail = function() { - if (!!(window.history && window.history.pushState)) { + if (window.history && history.pushState && history.state.detail === "opened") { throttleBack(); } else { Session.set("global.ui.detailShow", false); From 037acbd45988e1fd72e63408d8d0f196b90b2100 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Wed, 29 Jul 2015 09:54:33 +0200 Subject: [PATCH 3/5] Added Starter Set Wizard to the front page --- rpg-docs/client/views/home/intro/intro.html | 9 +++++++++ rpg-docs/client/views/home/intro/intro.js | 3 +++ 2 files changed, 12 insertions(+) diff --git a/rpg-docs/client/views/home/intro/intro.html b/rpg-docs/client/views/home/intro/intro.html index 10166e47..89b762a5 100644 --- a/rpg-docs/client/views/home/intro/intro.html +++ b/rpg-docs/client/views/home/intro/intro.html @@ -45,6 +45,15 @@
Lawful Good Human
+ +
+
+ Starter Set Wizard +
+
+
Chaotic Good High Elf
+
diff --git a/rpg-docs/client/views/home/intro/intro.js b/rpg-docs/client/views/home/intro/intro.js index 75d5e01f..ecc22fa8 100644 --- a/rpg-docs/client/views/home/intro/intro.js +++ b/rpg-docs/client/views/home/intro/intro.js @@ -8,6 +8,9 @@ Template.intro.events({ "tap .ssArcher": function() { Router.go("/character/yBWwt5XQTTHZiRQxq"); }, + "tap .ssWizard": function() { + Router.go("/character/KxHKskm22fS2Xogah"); + }, "tap .guideButton": function() { Router.go("/guide"); }, From 6d167ddb22b8c0ac65a4d3dd1a540894a95e8d20 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Wed, 29 Jul 2015 09:55:01 +0200 Subject: [PATCH 4/5] Fixed formatting of loading page, more padding --- rpg-docs/client/views/loading/loading.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpg-docs/client/views/loading/loading.html b/rpg-docs/client/views/loading/loading.html index 2f75e1f7..cd3f21a2 100644 --- a/rpg-docs/client/views/loading/loading.html +++ b/rpg-docs/client/views/loading/loading.html @@ -4,6 +4,9 @@
-
{{randomHint}}
+
{{randomHint}}
From 39c061f4e8f7983ca328db0e2b13203eb65a4efd Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Wed, 29 Jul 2015 09:55:22 +0200 Subject: [PATCH 5/5] Fixed formatting of not found page, now has a toolbar and centered text --- rpg-docs/client/views/notFound/notFound.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rpg-docs/client/views/notFound/notFound.html b/rpg-docs/client/views/notFound/notFound.html index 7a996f34..17bc3d1e 100644 --- a/rpg-docs/client/views/notFound/notFound.html +++ b/rpg-docs/client/views/notFound/notFound.html @@ -1,10 +1,14 @@