Merge branch 'release-0.6.7a'
This commit is contained in:
@@ -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", {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -45,6 +45,15 @@
|
||||
</div>
|
||||
<div class="bottom text">Lawful Good Human</div>
|
||||
</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>
|
||||
|
||||
@@ -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");
|
||||
},
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
</core-toolbar>
|
||||
<div fit layout vertical center center-justified>
|
||||
<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>
|
||||
</template>
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
<template name="notFound">
|
||||
<div layout vertical center center-justified fit>
|
||||
<h2>The data for the page you requested could not be found.</h2>
|
||||
<core-toolbar class="app-grey white-text">
|
||||
<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}}
|
||||
<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}}
|
||||
<h2>Perhaps you need to sign in first:</h2>
|
||||
<h3>Perhaps you need to sign in first:</h3>
|
||||
{{atForm}}
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user