Merge branch 'bugfix-0.6.8'

rpg-docs/Model/Character/Proficiencies.js

@@ -30,7 +30,7 @@ Schemas.Proficiency = new SimpleSchema({
 Proficiencies.attachSchema(Schemas.Proficiency);
 
 Proficiencies.attachBehaviour("softRemovable");
-makeChild(Proficiencies);
+makeChild(Proficiencies, ["enabled"]);
 
 Proficiencies.allow(CHARACTER_SUBSCHEMA_ALLOW);
 Proficiencies.deny(CHARACTER_SUBSCHEMA_DENY);

rpg-docs/Model/Character/TemporaryHitPoints.js

@@ -3,8 +3,8 @@ TemporaryHitPoints = new Mongo.Collection("temporaryHitPoints");
 Schemas.TemporaryHitPoints = new SimpleSchema({
 	charId:      {type: String, regEx: SimpleSchema.RegEx.Id},
 	name:        {type: String, optional: true},
-	maximum:     {type: Number, defaultValue: 0},
-	used:        {type: Number, defaultValue: 0},
+	maximum:     {type: Number, defaultValue: 0, min: 0, max: 500},
+	used:        {type: Number, defaultValue: 0, min: 0, max: 500},
 	deleteOnZero:{type: Boolean, defaultValue: false},
 	dateAdded:   {
 		type: Date,

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", {

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);

rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.js

@@ -1,9 +1,11 @@
 Template.addTHPDialog.events({
 	"tap #addButton": function(event, instance){
+		var max = +instance.find("#quantityInput").value;
+		if (!max || max < 0) max = 0;
 		TemporaryHitPoints.insert({
 			charId: this.charId,
 			name: instance.find("#nameInput").value,
-			maximum: +instance.find("#quantityInput").value,
+			maximum: max,
 			deleteOnZero: !!instance.find("#deleteWhenZeroCheckbox").checked,
 		});
 	}

rpg-docs/client/views/character/stats/healthCard/healthCard.html

@@ -1,14 +1,14 @@
 <template name="healthCard">
-	<paper-shadow class="card container healthCard" 
-				  hero-id="main" {{detailHero "hitPoints" _id}} 
+	<paper-shadow class="card container healthCard"
+				  hero-id="main" {{detailHero "hitPoints" _id}}
 				  layout horizontal wrap>
-		<div class="green white-text subhead left" 
+		<div class="green white-text subhead left"
 			 hero-id="toolbar" {{detailHero "hitPoints" _id}}
 			 layout vertical center center-justified>
 			<div class="hitPointTitle clickable">Hit Points</div>
-			<paper-icon-button class="white54" 
-							   id="addTempHP" 
-							   icon="add" 
+			<paper-icon-button class="white54"
+							   id="addTempHP"
+							   icon="add"
 							   disabled={{#unless canEditCharacter _id}}true{{/unless}}>
 			</paper-icon-button>
 		</div>
@@ -33,14 +33,14 @@
 							  role="slider"
 							  flex
 							  ></paper-diff-slider>
-					{{#unless left}}{{#unless deleteOnZero}}
+					{{#unless left}}
 						<paper-icon-button class="deleteTHP" icon="delete"></paper-icon-button>
-					{{/unless}}{{/unless}}
+					{{/unless}}
 				</div>
 			</div>
 			{{/each}}
 			<div class="caption">
-				{{#if multipliers.immunities.length}} 
+				{{#if multipliers.immunities.length}}
 					<div>
 						Immune:     {{#each multipliers.immunities}}  {{name}} {{/each}}
 					</div>

rpg-docs/client/views/home/intro/intro.html

@@ -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>

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");
 	},

rpg-docs/client/views/loading/loading.html

@@ -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>

rpg-docs/client/views/notFound/notFound.html

@@ -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>

rpg-docs/lib/functions/shareCharacter.js

@@ -1,8 +1,13 @@
 Meteor.methods({
 	"getUserId": function(username){
 		if (!username) return;
+		regex = new RegExp("^" + username + "$", "i")
 		var user = Meteor.users.findOne(
-			{$or: [{username: username}, {"emails.address": username}]}
+			{$or: [
+				{username: username},
+				{"emails.address": regex},
+				{"services.google.email": regex},
+				]}
 		);
 		return user && user._id;
 	}