Merge branch 'release-0.6.7a'

rpg-docs/.gitignore

@@ -1,5 +1,6 @@
 .meteor/local
 .meteor/meteorite
+settings.json
 public/components
 nohup.out
 dump

rpg-docs/.meteor/packages

@@ -27,3 +27,5 @@ fourseven:scss@2.1.1
 wolves:bourbon
 meteorhacks:subs-manager
 meteorhacks:kadira
+chuangbo:marked
+reywood:iron-router-ga

rpg-docs/.meteor/versions

@@ -14,6 +14,7 @@ blaze-tools@1.0.3
 boilerplate-generator@1.0.3
 callback-hook@1.0.3
 check@1.0.5
+chuangbo:marked@0.3.5
 coffeescript@1.0.6
 dburles:collection-helpers@1.0.3
 dburles:mongo-collection-instances@0.3.3
@@ -70,6 +71,7 @@ reactive-dict@1.1.0
 reactive-var@1.0.5
 reload@1.1.3
 retry@1.0.3
+reywood:iron-router-ga@0.6.0
 routepolicy@1.0.5
 service-configuration@1.0.4
 session@1.1.0

rpg-docs/Routes/Routes.js

@@ -1,6 +1,7 @@
 Router.configure({
 	loadingTemplate: "loading",
 	layoutTemplate: "layout",
+	trackPageView: true,
 });
 
 Router.plugin("ensureSignedIn", {
@@ -56,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/style/main.scss

@@ -29,6 +29,11 @@ core-header-panel[drawer] {
 	box-shadow: 2px 0px 5px 0px rgba(0,0,0,0.2);
 }
 
+//Paragraphs
+p {
+	margin-bottom: 8px;
+}
+
 //Horizontal rule
 hr {
 	background-color: #444;
@@ -37,7 +42,7 @@ hr {
 	color: #444;
 	height: 1px;
 	line-height: 0;
-	margin: 16px -16px;
+	margin: 16px 0;
 	text-align: center;
 }
 

rpg-docs/client/style/tables.scss

@@ -1,8 +1,5 @@
 td {
 	padding: 8px;
-	&:nth-child(1) {
-		min-width: 100px;
-	}
 }
 
 .strengthTable{

rpg-docs/client/views/character/effects/effectEdit/effectEdit.html

@@ -44,7 +44,8 @@
 				 label="Value" 
 				 floatinglabel 
 				 value={{effectValue}} 
-				 flex>
+				 flex
+				 style="flex-basis: 100px;">
 	</paper-input>
 </template>
 

rpg-docs/client/views/character/features/featureDialog/featureDialog.html

@@ -32,7 +32,7 @@
 	{{/if}}
 
 	{{#if description}}
-		<div class="pre-wrap">{{evaluateString charId description}}</div>
+		<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{/if}}
 
 	{{> effectsViewList charId=charId parentId=_id}}

rpg-docs/client/views/character/features/features.html

@@ -102,8 +102,9 @@
 							{{/if}}
 						</div>
 						{{#if description}}
-							<div flex class="bottom text"
+							<div flex class="bottom">
-								 >{{evaluateString charId shortDescription}}</div>
+								{{#markdown}}{{evaluateString charId shortDescription}}{{/markdown}}
+							</div>
 						{{/if}}
 						{{#if hasUses}}
 							<div layout horizontal center end-justified>

rpg-docs/client/views/character/features/features.js

@@ -5,7 +5,7 @@ Template.features.helpers({
 	},
 	shortDescription: function() {
 		if (_.isString(this.description)){
-			return this.description.split(/[\n\r]{3,}/)[0];
+			return this.description.split(/^( *[-*_]){3,} *(?:\n+|$)/m)[0];
 		}
 	},
 	hasUses: function(){

rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html

@@ -41,6 +41,6 @@
 	</div>
 	{{#if description}}
 		<hr class="vertMargin">
-		<div class="pre-wrap">{{evaluateString charId description}}</div>
+		<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{/if}}
 </template>

rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html

@@ -18,8 +18,8 @@
 		{{#if requiresAttunement}}<div class="vertMargin">Requires Attunement</div>{{/if}}
 	</div>
 	{{#if description}}
-		<hr class="vertMargin">
+		<hr style="margin: 16px 0 16px 0;">
-		<div class="pre-wrap">{{evaluateString charId description}}</div>
+		<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{/if}}
 	{{> effectsViewList charId=charId parentId=_id}}
 	{{> attacksViewList charId=charId parentId=_id}}

rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html

@@ -6,7 +6,7 @@
 			</div>
 			{{#if description}}
 				<hr class="vertMargin">
-				<div class="pre-wrap">{{description}}</div>
+				<div>{{#markdown}}{{description}}{{/markdown}}</div>
 			{{/if}}
 		{{else}}
 			{{> experienceEdit}}

rpg-docs/client/views/character/journal/journal.html

@@ -87,7 +87,7 @@
 							 layout horizontal center>
 							{{name}}
 						</div>
-						<div class="bottom text">{{description}}</div>
+						<div class="bottom">{{#markdown}}{{description}}{{/markdown}}</div>
 					</paper-shadow>
 				{{/each}}
 			</div>

rpg-docs/client/views/character/journal/noteDialog/noteDialog.html

@@ -1,7 +1,7 @@
 <template name="noteDialog">
 	{{#with note}}
 		{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
-			<div class="pre-wrap">{{description}}</div>
+			<div>{{#markdown}}{{description}}{{/markdown}}</div>
 		{{else}}
 			{{> noteDialogEdit}}
 		{{/baseDialog}}

rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html

@@ -1,6 +1,6 @@
 <template name="backgroundDialog">
 	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true"}}
-		<div class="pre-wrap">{{evaluateString charId value}}</div>
+		<div>{{#markdown}}{{evaluateString charId value}}{{/markdown}}</div>
 		{{> proficiencyViewList charId=charId parentId=charId parentGroup="background"}}
 	{{else}}
 		{{> textDialogEdit}}

rpg-docs/client/views/character/persona/persona.html

@@ -68,6 +68,6 @@
               {{title}}
           </div>
 		</div>
-		<div class="bottom text">{{> UI.contentBlock}}</div>
+		<div class="bottom">{{#markdown}}{{> UI.contentBlock}}{{/markdown}}</div>
 	</paper-shadow>
 </template>

rpg-docs/client/views/character/persona/textDialog/textDialog.html

@@ -1,6 +1,6 @@
 <template name="textDialog">
 	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
-		<div class="pre-wrap">{{evaluateString charId value}}</div>
+		<div>{{#markdown}}{{evaluateString charId value}}{{/markdown}}</div>
 	{{else}}
 		{{> textDialogEdit}}
 	{{/baseDialog}}

rpg-docs/client/views/character/spells/spellDialog/spellDialog.html

@@ -34,7 +34,7 @@
 		</div>
 		{{/if}}
 	</div>
-	<div class="pre-wrap">{{evaluateString charId description}}</div>
+	<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{> attacksViewList charId=charId parentId=_id}}
 </template>
 

rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html

@@ -20,7 +20,7 @@
 					{{/if}}
 				</div>
 				<hr class="vertMargin">
-				<div class="pre-wrap">{{evaluateString charId description}}</div>
+				<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 			</div>
 		{{else}}
 			<!--Name-->

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>
+	<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}}
-			<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/private/changeLogs/changeLogs.js

@@ -225,6 +225,21 @@ ChangeLogs.insert({
 	changes: [
 		"Net worth now takes container values into account",
 		"Added support for character pictures",
-		"Disabled edit buttons for reada-only viewers",
+		"Disabled edit buttons for read-only viewers",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.6.6",
+	changes: [
+		"Text fields now accept github-flavor markdown formatting",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.6.7",
+	changes: [
+		"Fixed effect values not being visible on small screens",
+		"Added basic analytics",
 	],
 });