Merge branch 'release-0.6.6'

rpg-docs/.meteor/packages

@@ -27,3 +27,4 @@ fourseven:scss@2.1.1
 wolves:bourbon
 meteorhacks:subs-manager
 meteorhacks:kadira
+chuangbo:marked

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

rpg-docs/Model/Character/Characters.js

@@ -7,6 +7,7 @@ Schemas.Character = new SimpleSchema({
 	alignment:    {type: String, defaultValue: "", trim: false, optional: true},
 	gender:       {type: String, defaultValue: "", trim: false, optional: true},
 	race:         {type: String, defaultValue: "", trim: false, optional: true},
+	picture:      {type: String, defaultValue: "", trim: true,  optional: true},
 	description:  {type: String, defaultValue: "", trim: false, optional: true},
 	personality:  {type: String, defaultValue: "", trim: false, optional: true},
 	ideals:       {type: String, defaultValue: "", trim: false, optional: true},

rpg-docs/Model/Character/TemporaryHitPoints.js

@@ -5,7 +5,7 @@ Schemas.TemporaryHitPoints = new SimpleSchema({
 	name:        {type: String, optional: true},
 	maximum:     {type: Number, defaultValue: 0},
 	used:        {type: Number, defaultValue: 0},
-	deleteOnZero:{type: Boolean, defaultValue: true},
+	deleteOnZero:{type: Boolean, defaultValue: false},
 	dateAdded:   {
 		type: Date,
 		autoValue: function() {

rpg-docs/client/globalHelpers/canEditCharacter.js

@@ -1,6 +1,10 @@
 Template.registerHelper("canEditCharacter", function(charId) {
+	return canEditCharacter(charId);
+});
+
+canEditCharacter = function(charId) {
 	var char = Characters.findOne(charId)
 	var userId = Meteor.userId();
 	return char.owner === userId ||
 		_.contains(char.writers, userId);
-});
+};

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

@@ -95,14 +95,16 @@
 								<core-tooltip label="Feature enabled"
 											  position="left">
 									<paper-checkbox class="enabledCheckbox" 
-													checked={{enabled}}>
+													checked={{enabled}}
+													disabled={{#unless canEditCharacter charId}}true{{/unless}}>
 									</paper-checkbox>
 								</core-tooltip>
 							{{/if}}
 						</div>
 						{{#if description}}
-							<div flex class="bottom text"
-								 >{{evaluateString charId description}}</div>
+							<div flex class="bottom">
+								{{#markdown}}{{evaluateString charId shortDescription}}{{/markdown}}
+							</div>
 						{{/if}}
 						{{#if hasUses}}
 							<div layout horizontal center end-justified>

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

@@ -3,14 +3,19 @@ Template.features.helpers({
 		var features = Features.find({charId: this._id}, {sort: {color: 1, name: 1}});
 		return features;
 	},
+	shortDescription: function() {
+		if (_.isString(this.description)){
+			return this.description.split(/^( *[-*_]){3,} *(?:\n+|$)/m)[0];
+		}
+	},
 	hasUses: function(){
 		return this.usesValue() > 0;
 	},
 	noUsesLeft: function(){
-		return this.usesLeft() <= 0;
+		return this.usesLeft() <= 0 || !canEditCharacter(this.charId);
 	},
 	usesFull: function(){
-		return this.usesLeft() >= this.usesValue();
+		return this.usesLeft() >= this.usesValue() || !canEditCharacter(this.charId);
 	},
 	colorClass: function(){
 		return getColorClass(this.color);
@@ -99,12 +104,12 @@ Template.resource.helpers({
 		var value = Characters.calculate.attributeValue(this.char._id, this.name);
 		var base = Characters.calculate.attributeBase(this.char._id, this.name);
 		var baseBigger = value < base;
-		return !baseBigger;
+		return !baseBigger || !canEditCharacter(this.char._id);
 	},
 	cantDecrement: function(){
 		var value = Characters.calculate.attributeValue(this.char._id, this.name);
 		var valuePositive = value > 0;
-		return !valuePositive;
+		return !valuePositive || !canEditCharacter(this.char._id);
 	},
 	getColor: function(){
 		var value = Characters.calculate.attributeValue(this.char._id, this.name);

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/inventory.html

@@ -35,8 +35,7 @@
 						<div class="item-slot">
 							<div class="item buff"
 								 hero-id="main" {{detailHero}}
-								 layout horizontal center
-								 draggable="true">
+								 layout horizontal center>
 								<div flex>
 									<core-icon icon="work"
 											   style="margin-right: 16px">
@@ -114,6 +113,7 @@
 							</div>
 							<core-tooltip label="Container carried" position="left">
 								<paper-checkbox class="carriedCheckbox"
+												disabled={{#unless canEditCharacter charId}}true{{/unless}}
 												checked={{isCarried}}>
 								</paper-checkbox>
 							</core-tooltip>
@@ -152,11 +152,11 @@
 		<div class="item {{hidden}} inventoryItem"
 					hero-id="main" {{detailHero}}
 					layout horizontal center
-					draggable="true">
+			 		draggable={{canEditCharacter charId}}>
 			<div flex class="itemName">
 				{{#if ne1 quantity}}{{quantity}}&nbsp;{{/if}}{{pluralName}}
 			</div>
-			{{#if settings.showIncrement}}
+			{{#if settings.showIncrement}}{{#if canEditCharacter charId}}
 			<div class="incrementButtons">
 				<paper-icon-button class="addItemQuantity"
 								   icon="add"
@@ -166,7 +166,7 @@
 								   icon="remove"
 								   style="margin-right: -8px"></paper-icon-button>
 			</div>
-			{{/if}}
+			{{/if}}{{/if}}
 		</div>
 	</div>
 </template>

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

@@ -44,6 +44,12 @@ Template.inventory.helpers({
 		).forEach(function(item){
 			worth += item.totalValue();
 		});
+		Containers.find(
+			{charId: this._id},
+			{fields: {value : 1}}
+		).forEach(function(container) {
+			if (container.value) worth += container.value;
+		});
 		return worth;
 	},
 	weightCarried: function(){

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">
-		<div class="pre-wrap">{{evaluateString charId description}}</div>
+		<hr style="margin: 16px 0 16px 0;">
+		<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

@@ -10,7 +10,8 @@
 						 layout horizontal center>
 						<div flex>Experience</div>
 						<div >{{characterCalculate "experience" _id}} XP</div>
-						<paper-icon-button class="black54" id="addXP" icon="add"></paper-icon-button>
+						<paper-icon-button class="black54" id="addXP" icon="add"
+										   disabled={{#unless canEditCharacter _id}}true{{/unless}}></paper-icon-button>
 					</div>
 					<div class="bottom list">
 						{{#each experiences}}
@@ -55,7 +56,8 @@
 						</div>
 						<paper-icon-button class="black54"
 										   id="addClassButton"
-										   icon="add">
+										   icon="add"
+										   disabled={{#unless canEditCharacter _id}}true{{/unless}}>
 						</paper-icon-button>
 					</div>
 					<div class="bottom list">
@@ -85,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" startEditing=startEditing}}
-		<div class="pre-wrap">{{evaluateString charId value}}</div>
+	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true"}}
+		<div>{{#markdown}}{{evaluateString charId value}}{{/markdown}}</div>
 		{{> proficiencyViewList charId=charId parentId=charId parentGroup="background"}}
 	{{else}}
 		{{> textDialogEdit}}

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

@@ -1,18 +1,36 @@
 <template name="personaDetailsDialog">
 	{{#baseDialog title=name class="deep-purple white-text" hideColor="true" hideDelete="true" startEditing=startEditing}}
-		{{alignment}} {{gender}} {{race}}
+		{{#with char}}
+			<div>{{alignment}} {{gender}} {{race}}</div>
+			<core-image style="width: 350px; height: 350px; margin-top: 8px;"
+				sizing="cover"
+				hero-id="image" hero
+				src={{picture}}></core-image>
+		{{/with}}
 	{{else}}
-		{{> personaDetailsEdit}}
+		{{#with char}}
+			{{> personaDetailsEdit}}
+		{{/with}}
 	{{/baseDialog}}
 </template>
 
 <template name="personaDetailsEdit">
-	<!--Name-->
-	<paper-input id="nameInput" label="Name" floatinglabel value={{name}}></paper-input><br>
-	<!--Alignment-->
-	<paper-input id="alignmentInput" label="Alignment" floatinglabel value={{alignment}}></paper-input><br>
-	<!--Gender-->
-	<paper-input id="genderInput" label="Gender" floatinglabel value={{gender}}></paper-input><br>
-	<!--Race-->
-	<paper-input id="raceInput" label="Race" floatinglabel value={{race}}></paper-input><br>
+	<div layout horizontal center-justified>
+		<div flex style="max-width: 350px;" layout vertical>
+			<!--Name-->
+			<paper-input id="nameInput" label="Name" floatinglabel value={{name}}></paper-input>
+			<!--Alignment-->
+			<paper-input id="alignmentInput" label="Alignment" floatinglabel value={{alignment}}></paper-input>
+			<!--Gender-->
+			<paper-input id="genderInput" label="Gender" floatinglabel value={{gender}}></paper-input>
+			<!--Race-->
+			<paper-input id="raceInput" label="Race" floatinglabel value={{race}}></paper-input>
+			<!--Picture-->
+			<paper-input id="pictureInput" label="Picture URL" floatinglabel value={{picture}}></paper-input>
+			<core-image style="height:350px; width: 100%; margin-top: 8px;"
+						sizing="cover"
+						hero-id="image" hero
+						src={{picture}}></core-image>
+		</div>
+	</div>
 </template>

rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js

@@ -2,21 +2,34 @@ Template.personaDetailsEdit.onRendered(function(){
 	updatePolymerInputs(this);
 });
 
+Template.personaDetailsDialog.helpers({
+	char: function() {
+		return Characters.findOne(
+			this._id,
+			{fields: {name: 1, alignment: 1, gender: 1, race: 1, picture: 1}}
+		);
+	}
+});
+
 Template.personaDetailsEdit.events({
 	"change #nameInput": function(event){
 		var input = event.currentTarget.value;
-		Characters.update(this.charId, {$set: {name: input}});
+		Characters.update(this._id, {$set: {name: input}});
 	},
 	"change #alignmentInput": function(event){
 		var input = event.currentTarget.value;
-		Characters.update(this.charId, {$set: {alignment: input}});
+		Characters.update(this._id, {$set: {alignment: input}});
 	},
 	"change #genderInput": function(event){
 		var input = event.currentTarget.value;
-		Characters.update(this.charId, {$set: {gender: input}});
+		Characters.update(this._id, {$set: {gender: input}});
 	},
 	"change #raceInput": function(event){
 		var input = event.currentTarget.value;
-		Characters.update(this.charId, {$set: {race: input}});
+		Characters.update(this._id, {$set: {race: input}});
+	},
+	"change #pictureInput": function(event){
+		var input = event.currentTarget.value;
+		Characters.update(this._id, {$set: {picture: input}});
 	},
 });

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

@@ -3,7 +3,35 @@
 		<div id="persona" class="scroll-y" fit>
 			<div class="column-container">
 				{{#with characterDetails}}
-					{{#containerCardHelper this}}{{alignment}} {{gender}} {{race}}{{/containerCardHelper}}
+					<paper-shadow class="card"
+								  hero-id="main" {{detailHero "details" _id}}>
+						{{#unless picture}}
+							<div class="top subhead characterField {{colorClass}}"
+								 hero-id="toolbar" {{detailHero "details" _id}}>
+								<div class="subhead" flex
+									 hero-id="title" {{detailHero "details" _id}}>
+									{{name}}
+								</div>
+							</div>
+						{{else}}
+							<core-image class="characterField clickable"
+										style="height:350px; width: 100%;
+											   background-color: #e8e8e8;"
+										sizing="cover"
+										hero-id="image" {{detailHero "details" _id}}
+										src={{picture}}></core-image>
+						{{/unless}}
+						<div class="bottom">
+							{{#if picture}}
+								<div class="title" hero-id="title" {{detailHero "details" _id}}>
+									{{name}}
+								</div>
+							{{/if}}
+							<div class="subhead">
+								{{alignment}} {{gender}} {{race}}
+							</div>
+						</div>
+					</paper-shadow>
 				{{/with}}
 				{{> containerCard characterField "description" "Description"}}
 				{{> containerCard characterField "personality" "Personality Traits"}}
@@ -40,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/persona.js

@@ -11,12 +11,12 @@ Template.persona.helpers({
 	characterDetails: function(){
 		var char = Characters.findOne(
 			this._id,
-			{fields: {name: 1, gender: 1, alignment: 1, race:1}}
+			{fields: {name: 1, gender: 1, alignment: 1, race:1, picture: 1}}
 		);
 		char.field = "details";
 		char.title = char.name;
 		char.color = "d";
-		char.topClass = "characterField";
+		char.startEditing = true;
 		return char;
 	},
 	characterField: function(field, title){
@@ -40,7 +40,7 @@ Template.persona.helpers({
 
 Template.persona.events({
 	"tap .characterField": function(event){
-		if (this.field === "details"){
+		if (this.field == "details"){
 			this.charId = Template.parentData()._id;
 			GlobalUI.setDetail({
 				template: "personaDetailsDialog",
@@ -58,6 +58,7 @@ Template.persona.events({
 					field: this.field,
 					title: this.title,
 					color: this.color,
+					startEditing: true,
 				},
 				heroId:   this._id + this.field,
 			});

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/character/spells/spells.html

@@ -72,6 +72,7 @@
 								<core-tooltip label="Change prepared spells"
 											  position="left">
 									<paper-icon-button class="prepSpells"
+													   disabled={{#unless canEditCharacter charId}}true{{/unless}}
 													   icon="book">
 									</paper-icon-button>
 								</core-tooltip>

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

@@ -112,7 +112,7 @@ Template.spells.helpers({
 		for (i = 0; i < currentSlots; i++){
 			bubbles.push({
 				icon: "radio-button-on",
-				disabled: i !== currentSlots - 1, //last full slot not disabled
+				disabled: i !== currentSlots - 1 || !canEditCharacter(char._id), //last full slot not disabled
 				attribute: "level" + this.level + "SpellSlots",
 				charId: char._id,
 			});
@@ -120,7 +120,7 @@ Template.spells.helpers({
 		for (i = 0; i < slotsUsed; i++){
 			bubbles.push({
 				icon: "radio-button-off",
-				disabled: i !== 0, //first empty slot not disabled
+				disabled: i !== 0 || !canEditCharacter(char._id), //first empty slot not disabled
 				attribute: "level" + this.level + "SpellSlots",
 				charId: char._id,
 			});

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

@@ -6,7 +6,11 @@
 			 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>
+			<paper-icon-button class="white54" 
+							   id="addTempHP" 
+							   icon="add" 
+							   disabled={{#unless canEditCharacter _id}}true{{/unless}}>
+			</paper-icon-button>
 		</div>
 		<div class="right" flex layout vertical center-justified style="min-width: 180px;">
 			<div layout horizontal>
@@ -14,6 +18,7 @@
 								   value={{characterCalculate "attributeValue" _id "hitPoints"}}
 								   max={{characterCalculate "attributeBase" _id "hitPoints"}}
 								   editable pin
+								   disabled={{#unless canEditCharacter _id}}true{{/unless}}
 								   role="slider">
 				</paper-diff-slider>
 			</div>

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

@@ -2,11 +2,11 @@ Template.hitDice.helpers({
 	cantIncrement: function(){
 		var value = Characters.calculate.attributeValue(this.char._id, this.name);
 		var base = Characters.calculate.attributeBase(this.char._id, this.name);
-		return value >= base;
+		return value >= base || !canEditCharacter(this.char._id);
 	},
 	cantDecrement: function(){
 		var value = Characters.calculate.attributeValue(this.char._id, this.name);
-		return value <= 0;
+		return value <= 0 || !canEditCharacter(this.char._id);
 	},
 	conMod: function(){
 		return signedString(

rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.js

@@ -9,20 +9,11 @@ Template.baseDialog.onRendered(function(){
 
 Template.baseDialog.helpers({
 	editing: function(){
-		return Template.instance().editing.get();
+		return Template.instance().editing.get() && canEditCharacter(Template.parentData().charId);
 	},
 	showEdit: function() {
 		if (this.hideEdit) return false;
-		var charId = Template.parentData().charId;
-		var userId = Meteor.userId();
-		if (!userId) return false;
-		if (charId){
-			var char = Characters.findOne(charId);
-			if (char)
-				return char.owner === userId ||
-					_.contains(char.writers, userId);
-		}
-		return true;
+		return canEditCharacter(Template.parentData().charId);
 	},
 });
 

rpg-docs/private/changeLogs/changeLogs.js

@@ -219,3 +219,19 @@ ChangeLogs.insert({
 		"Skills should have correct min and max effects applied again",
 	],
 });
+
+ChangeLogs.insert({
+	version: "0.6.5",
+	changes: [
+		"Net worth now takes container values into account",
+		"Added support for character pictures",
+		"Disabled edit buttons for read-only viewers",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.6.6",
+	changes: [
+		"Text fields now accept github-flavor markdown formatting",
+	],
+});