Compare commits

...

6 Commits

Author SHA1 Message Date
Stefan Zermatten
d76349b3bb Merge branch 'release-0.6.7a' 2015-07-29 09:57:06 +02:00
Stefan Zermatten
39c061f4e8 Fixed formatting of not found page, now has a toolbar and centered text 2015-07-29 09:55:22 +02:00
Stefan Zermatten
6d167ddb22 Fixed formatting of loading page, more padding 2015-07-29 09:55:01 +02:00
Stefan Zermatten
037acbd459 Added Starter Set Wizard to the front page 2015-07-29 09:54:43 +02:00
Stefan Zermatten
4d3fc3bb09 Fixed accidental back() requests when closing detail dialogs 2015-07-29 09:54:18 +02:00
Stefan Zermatten
4b984d4fac Made analytics show all characters as the same page 2015-07-29 09:53:46 +02:00
6 changed files with 32 additions and 7 deletions

View File

@@ -57,6 +57,12 @@ Router.map(function() {
document.title = name; document.title = name;
} }
}, },
//analytics
trackPageView: false,
onRun: function() {
window.ga && window.ga("send", "pageview", "/character");
this.next();
},
}); });
this.route("loading", { this.route("loading", {

View File

@@ -77,10 +77,10 @@ this.GlobalUI = (function() {
var throttleBack = _.throttle(function() { var throttleBack = _.throttle(function() {
history.back(); history.back();
}, 800, {trailing: false}); }, 100, {trailing: false});
GlobalUI.closeDetail = function() { GlobalUI.closeDetail = function() {
if (!!(window.history && window.history.pushState)) { if (window.history && history.pushState && history.state.detail === "opened") {
throttleBack(); throttleBack();
} else { } else {
Session.set("global.ui.detailShow", false); Session.set("global.ui.detailShow", false);

View File

@@ -45,6 +45,15 @@
</div> </div>
<div class="bottom text">Lawful Good Human</div> <div class="bottom text">Lawful Good Human</div>
</paper-shadow> </paper-shadow>
<paper-shadow class="card characterCard ssWizard clickable"
z="2">
<div class="top subhead deep-purple white-text">
<div class="subhead" flex>
Starter Set Wizard
</div>
</div>
<div class="bottom text">Chaotic Good High Elf</div>
</paper-shadow>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -8,6 +8,9 @@ Template.intro.events({
"tap .ssArcher": function() { "tap .ssArcher": function() {
Router.go("/character/yBWwt5XQTTHZiRQxq"); Router.go("/character/yBWwt5XQTTHZiRQxq");
}, },
"tap .ssWizard": function() {
Router.go("/character/KxHKskm22fS2Xogah");
},
"tap .guideButton": function() { "tap .guideButton": function() {
Router.go("/guide"); Router.go("/guide");
}, },

View File

@@ -4,6 +4,9 @@
</core-toolbar> </core-toolbar>
<div fit layout vertical center center-justified> <div fit layout vertical center center-justified>
<paper-spinner class="bigSpinner" active></paper-spinner> <paper-spinner class="bigSpinner" active></paper-spinner>
<div class="subhead">{{randomHint}}</div> <div class="subhead"
style="margin-left: 16px;
margin-right: 16px;
text-align: center;">{{randomHint}}</div>
</div> </div>
</template> </template>

View File

@@ -1,10 +1,14 @@
<template name="notFound"> <template name="notFound">
<div layout vertical center center-justified fit> <core-toolbar class="app-grey white-text">
<h2>The data for the page you requested could not be found.</h2> <core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
</core-toolbar>
<div layout vertical center center-justified fit
style="padding: 16px; text-align: center;">
<h2 style="margin-bottom: 12px;">The data for the page you requested could not be found.</h2>
{{#if currentUser}} {{#if currentUser}}
<h2>It might not exist, or you might not have permission to view it.</h2> <h3>It might not exist, or you might not have permission to view it.</h3>
{{else}} {{else}}
<h2>Perhaps you need to sign in first:</h2> <h3>Perhaps you need to sign in first:</h3>
{{atForm}} {{atForm}}
{{/if}} {{/if}}
</div> </div>