From 9ff45dbcc24d65cb792bd7d67094ffb69b2f8389 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 17 Jun 2015 08:49:26 +0200
Subject: [PATCH 1/4] backgrounds now have proficiencies

---
 .../backgroundDialog/backgroundDialog.html    |  9 ++++++++
 .../backgroundDialog/backgroundDialog.js      |  8 +++++++
 .../client/views/character/persona/persona.js | 22 ++++++++++---------
 .../proficiencyView/proficiencyView.html      | 10 ++++++---
 .../proficiencyViewList.html                  |  2 +-
 .../stats/skillDialog/skillDialog.js          | 10 ++++++++-
 6 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html
 create mode 100644 rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.js

diff --git a/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html b/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html
new file mode 100644
index 00000000..4d31f38e
--- /dev/null
+++ b/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html
@@ -0,0 +1,9 @@
+<template name="backgroundDialog">
+	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
+		<div class="pre-wrap">{{evaluateString charId value}}</div>
+		{{> proficiencyViewList charId=charId parentId=charId parentGroup="background"}}
+	{{else}}
+		{{> textDialogEdit}}
+		{{> proficiencyEditList parentId=charId parentCollection="Characters" charId=charId parentGroup="background"}}
+	{{/baseDialog}}
+</template>
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.js b/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.js
new file mode 100644
index 00000000..2ec4e486
--- /dev/null
+++ b/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.js
@@ -0,0 +1,8 @@
+Template.backgroundDialog.helpers({
+	value: function(){
+		var fieldSelector = {fields: {}};
+		fieldSelector.fields[this.field] = 1;
+		var char = Characters.findOne(this.charId, fieldSelector);
+		return char[this.field];
+	}
+});
diff --git a/rpg-docs/client/views/character/persona/persona.js b/rpg-docs/client/views/character/persona/persona.js
index f3df7e3f..46063f25 100644
--- a/rpg-docs/client/views/character/persona/persona.js
+++ b/rpg-docs/client/views/character/persona/persona.js
@@ -40,11 +40,20 @@ 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",
+				data:     this,
+				heroId:   this._id + this.field,
+			});
+		} else {
+			var template = "textDialog";
+			if (this.field === "backstory") template = "backgroundDialog";
 			var charId = Template.parentData()._id;
 			GlobalUI.setDetail({
-				template: "textDialog",
-				data:     {
+				template: template,
+				data: {
 					charId: charId,
 					field: this.field,
 					title: this.title,
@@ -52,13 +61,6 @@ Template.persona.events({
 				},
 				heroId:   this._id + this.field,
 			});
-		} else {
-			this.charId = Template.parentData()._id;
-			GlobalUI.setDetail({
-				template: "personaDetailsDialog",
-				data:     this,
-				heroId:   this._id + this.field,
-			});
 		}
 	}
 });
diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.html b/rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.html
index d9a27836..5d79e37f 100644
--- a/rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.html
+++ b/rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.html
@@ -1,6 +1,10 @@
 <template name="proficiencyView">
-	<div class="proficiencyView" layout horizontal center>
-		<core-icon icon="{{profIcon}}"></core-icon>
-		<div class="sideMargin">{{getName}}</div>
+	<div class="proficiencyView item small"
+		 style="padding: 0;"
+		 layout horizontal center>
+		<core-icon icon="{{profIcon}}" style="margin-right: 16px;"></core-icon>
+		<div>{{getName}}</div>
 	</div>
 </template>
+
+
diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.html b/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.html
index 1a54310c..b4a08c23 100644
--- a/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.html
+++ b/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.html
@@ -2,7 +2,7 @@
 	{{#if proficiencies.count}}
 		<hr class="vertMargin">
 		<div class="proficiencies">
-			<h2 class="spaceAfter">Proficiencies</h2>
+			<h2 style="margin-bottom: 8px;">Proficiencies</h2>
 			{{#each proficiencies}}
 				{{> proficiencyView}}
 			{{/each}}
diff --git a/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js b/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js
index 8976b1aa..c2cbf6fc 100644
--- a/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js
+++ b/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js
@@ -212,7 +212,15 @@ Template.skillDialogView.helpers({
 		return Characters.findOne(this.charId, {fields:{_id: 1}});
 	},
 	sourceName: function(){
-		if (this.parent.collection === "Characters") return "inate";
+		if (this.parent.collection === "Characters"){
+			if (this.parent.group === "racial"){
+				return Characters.findOne(this.charId, {fields:{race: 1}}).race || "Race";
+			}
+			if (this.parent.group === "background"){
+				return "Background";
+			}
+			return "Innate";
+		}
 		return this.getParent().name;
 	},
 	operationName: function(){

From 314ce8541012cf4022383212ba88c8d21bfb07ad Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 17 Jun 2015 09:05:23 +0200
Subject: [PATCH 2/4] Attacks can now be added to spells

---
 rpg-docs/client/globalHelpers/openParentDialog.js            | 5 +++++
 .../views/character/spells/spellDialog/spellDialog.html      | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/rpg-docs/client/globalHelpers/openParentDialog.js b/rpg-docs/client/globalHelpers/openParentDialog.js
index 0d09dec3..7f1528a2 100644
--- a/rpg-docs/client/globalHelpers/openParentDialog.js
+++ b/rpg-docs/client/globalHelpers/openParentDialog.js
@@ -20,6 +20,11 @@ openParentDialog = function(parent, charId, heroId) {
 			template: "itemDialog",
 			data:     {itemId: parent.id},
 		};
+	} else if (parent.collection === "Spells") {
+		detail = {
+			template: "spellDialog",
+			data:     {spellId: parent.id},
+		};
 	}
 	detail.heroId = heroId;
 	detail.charId = charId;
diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
index 155184db..68552057 100644
--- a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
+++ b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
@@ -27,6 +27,7 @@
 		</div>
 	</div>
 	<div class="pre-wrap">{{evaluateString charId description}}</div>
+	{{> attacksViewList charId=charId parentId=_id}}
 </template>
 
 <template name="spellEdit">
@@ -126,4 +127,5 @@
 			<textarea id="descriptionInput" placeholder value={{description}}></textarea>
 		</paper-autogrow-textarea>
 	</paper-input-decorator>
+	{{> attackEditList  parentId=_id parentCollection="Spells" charId=charId enabled=true name=name}}
 </template>
\ No newline at end of file

From 248ab9bb6b7734001e0da9fd6b7a606d5aba8a26 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 17 Jun 2015 14:15:49 +0200
Subject: [PATCH 3/4] Added moving item dialog, that can't actually be
 triggered

---
 .../views/character/inventory/inventory.js    | 14 +++++
 .../moveItemDialog/moveItemDialog.css         |  7 +++
 .../moveItemDialog/moveItemDialog.html        | 49 ++++++++++++++++
 .../moveItemDialog/moveItemDialog.js          | 56 +++++++++++++++++++
 .../character/stats/healthCard/healthCard.css |  2 +-
 .../stats/healthCard/healthCard.html          |  8 +--
 rpg-docs/client/views/layout/imports.html     |  3 +-
 .../paper-diff-slider.css}                    |  0
 .../paper-diff-slider.html}                   | 24 ++++----
 9 files changed, 145 insertions(+), 18 deletions(-)
 create mode 100644 rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.css
 create mode 100644 rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.html
 create mode 100644 rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.js
 rename rpg-docs/public/custom_components/{paper-slider-diff/paper-slider.css => paper-diff-slider/paper-diff-slider.css} (100%)
 rename rpg-docs/public/custom_components/{paper-slider-diff/paper-slider.html => paper-diff-slider/paper-diff-slider.html} (92%)

diff --git a/rpg-docs/client/views/character/inventory/inventory.js b/rpg-docs/client/views/character/inventory/inventory.js
index 72b1fb19..58e70ea2 100644
--- a/rpg-docs/client/views/character/inventory/inventory.js
+++ b/rpg-docs/client/views/character/inventory/inventory.js
@@ -174,6 +174,20 @@ Template.inventory.events({
 			heroId:   itemId,
 		});
 	},
+	"hold .inventoryItem": function(event, instance) {
+		var itemId = this._id;
+		var charId = Template.parentData()._id;
+		var containerId = this.parent.id;
+		GlobalUI.showDialog({
+			template: "moveItemDialog",
+			data:     {
+				charId: charId,
+				itemId: itemId,
+				containerId: containerId,
+			},
+			heading:   "Move " + this.pluralName(),
+		});
+	},
 	"tap .incrementButtons": function(event) {
 		event.stopPropagation();
 	},
diff --git a/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.css b/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.css
new file mode 100644
index 00000000..5762ebbf
--- /dev/null
+++ b/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.css
@@ -0,0 +1,7 @@
+html /deep/ .moveItemDialog paper-tabs::shadow #selectionBar {
+	background-color: #D50000;
+}
+
+html /deep/ .moveItemDialog paper-tab::shadow #ink {
+	color: #D50000;
+}
diff --git a/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.html b/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.html
new file mode 100644
index 00000000..d11cfa41
--- /dev/null
+++ b/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.html
@@ -0,0 +1,49 @@
+<template name="moveItemDialog">
+	<div class="moveItemDialog">
+		<paper-tabs selected="{{selectedTab}}">
+			<paper-tab name="containers"
+					   class="clickable">
+				Containers
+			</paper-tab>
+			<paper-tab name="characters"
+					   class="clickable">
+				Characters
+			</paper-tab>
+		</paper-tabs>
+		<core-animated-pages selected="{{selectedTab}}"
+							 transitions="slide-from-right"
+							 style="width: 250px;
+									height: 200px;
+									overflow-y: auto;
+									overflow-x: hidden;">
+			<section name="containers">
+				<core-menu id="containerMenu" style="margin: 0;">
+					{{#each containers}}
+						<paper-item name={{_id}}
+									layout horizontal center>
+							<core-icon icon="image:brightness-1"
+									   style="color: {{hexColor color}};
+											  margin-right: 16px;">
+							</core-icon>
+							<div>{{name}}</div>
+						</paper-item>
+					{{/each}}
+				</core-menu>
+			</section>
+			<section name="characters">
+				<core-menu id="characterMenu"  style="margin: 0;">
+					{{#each characters}}
+					<paper-item name={{_id}}
+								layout horizontal center>
+						<div class="item small">
+							{{name}}
+						</div>
+					</paper-item>
+					{{/each}}
+				</core-menu>
+			</section>
+		</core-animated-pages>
+	</div>
+	<paper-button id="cancelButton" affirmative> Cancel </paper-button>
+	<paper-button id="moveButton" affirmative> Move </paper-button>
+</template>
diff --git a/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.js b/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.js
new file mode 100644
index 00000000..cf69a756
--- /dev/null
+++ b/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.js
@@ -0,0 +1,56 @@
+Template.moveItemDialog.onCreated(function() {
+	Session.setDefault("moveItemDialogTab", "containers");
+});
+
+Template.moveItemDialog.helpers({
+	selectedTab: function() {
+		return Session.get("moveItemDialogTab");
+	},
+	characters: function() {
+		var userId = Meteor.userId();
+		return Characters.find(
+			{
+				$or: [
+					{readers: userId},
+					{writers: userId},
+					{owner: userId},
+				],
+				_id: {$ne: this.charId},
+			},
+			{fields: {name: 1}}
+		);
+	},
+	containers: function(){
+		return Containers.find(
+			{
+				charId: this.charId,
+				_id: {$ne: this.containerId},
+			},
+			{
+				fields: {color: 1, name: 1},
+				sort: {color: 1, name: 1},
+			}
+		);
+	},
+});
+
+Template.moveItemDialog.events({
+	"tap paper-tab": function(event) {
+		Session.set("moveItemDialogTab", event.currentTarget.getAttribute("name"));
+	},
+	"tap #moveButton": function(event, instance) {
+		var tab = Session.get("moveItemDialogTab");
+		if (tab === "containers"){
+			var containerId = instance.find("#containerMenu").selected;
+			if (!containerId) throw "no menu selection";
+			Meteor.call("moveItemToContainer", this.itemId, containerId);
+		} else if (tab === "characters"){
+			var characterId = instance.find("#characterMenu").selected;
+			if (!characterId) throw "no menu selection";
+			Meteor.call("moveItemToCharacter", this.itemId, characterId);
+		} else {
+			throw "Move item dialog tab is not set to containers or character," +
+				" it is set to " + tab;
+		}
+	},
+});
diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.css b/rpg-docs/client/views/character/stats/healthCard/healthCard.css
index a170d09e..98280aaf 100644
--- a/rpg-docs/client/views/character/stats/healthCard/healthCard.css
+++ b/rpg-docs/client/views/character/stats/healthCard/healthCard.css
@@ -1,4 +1,4 @@
-.healthCard paper-slider{
+.healthCard paper-diff-slider{
 	width: 100%;
 	margin-right: 8px;
 }
diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.html b/rpg-docs/client/views/character/stats/healthCard/healthCard.html
index 20c3a788..56f035e9 100644
--- a/rpg-docs/client/views/character/stats/healthCard/healthCard.html
+++ b/rpg-docs/client/views/character/stats/healthCard/healthCard.html
@@ -10,24 +10,24 @@
 		</div>
 		<div class="right" flex layout vertical center-justified style="min-width: 180px;">
 			<div layout horizontal>
-				<paper-slider id="hitPointSlider"
+				<paper-diff-slider id="hitPointSlider"
 							  value={{attributeValue "hitPoints"}}
 							  max={{attributeBase "hitPoints"}} 
 							  editable pin
 							  role="slider"
-							  ></paper-slider>
+							  ></paper-diff-slider>
 			</div>
 			{{#each tempHitPoints}}
 				<div>
 					{{name}}
 					<div layout horizontal>
-					<paper-slider class="tempHitPointSlider"
+					<paper-diff-slider class="tempHitPointSlider"
 							  value={{left}}
 							  max={{maximum}}
 							  editable pin
 							  role="slider"
 							  flex
-							  ></paper-slider>
+							  ></paper-diff-slider>
 					{{#unless left}}{{#unless deleteOnZero}}
 						<paper-icon-button class="deleteTHP" icon="delete"></paper-icon-button>
 					{{/unless}}{{/unless}}
diff --git a/rpg-docs/client/views/layout/imports.html b/rpg-docs/client/views/layout/imports.html
index 911456ec..bedc1ce6 100644
--- a/rpg-docs/client/views/layout/imports.html
+++ b/rpg-docs/client/views/layout/imports.html
@@ -33,11 +33,12 @@
 <link rel="import" href="/components/paper-radio-group/paper-radio-group.html">
 <link rel="import" href="/components/paper-shadow/paper-shadow.html">
 <link rel="import" href="/components/paper-spinner/paper-spinner.html">
+<link rel="import" href="/components/paper-slider/paper-slider.html">
 <link rel="import" href="/components/paper-tabs/paper-tabs.html">
 <link rel="import" href="/components/paper-toast/paper-toast.html">
 <link rel="import" href="/components/paper-toggle-button/paper-toggle-button.html">
 
 <!--custom components-->
 <link rel="import" href="/custom_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="/custom_components/paper-slider-diff/paper-slider.html">
+<link rel="import" href="/custom_components/paper-diff-slider/paper-diff-slider.html">
 <link rel="import" href="/custom_components/swipe-detect/swipe-detect.html">
diff --git a/rpg-docs/public/custom_components/paper-slider-diff/paper-slider.css b/rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.css
similarity index 100%
rename from rpg-docs/public/custom_components/paper-slider-diff/paper-slider.css
rename to rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.css
diff --git a/rpg-docs/public/custom_components/paper-slider-diff/paper-slider.html b/rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.html
similarity index 92%
rename from rpg-docs/public/custom_components/paper-slider-diff/paper-slider.html
rename to rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.html
index b991e190..0a2e283b 100644
--- a/rpg-docs/public/custom_components/paper-slider-diff/paper-slider.html
+++ b/rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.html
@@ -8,55 +8,55 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 -->
 
 <!--
-`paper-slider` allows user to select a value from a range of values by
+`paper-diff-slider` allows user to select a value from a range of values by
 moving the slider thumb.  The interactive nature of the slider makes it a 
 great choice for settings that reflect intensity levels, such as volume, 
 brightness, or color saturation.
 
 Example:
 
-    <paper-slider></paper-slider>
+    <paper-diff-slider></paper-diff-slider>
 
 Use `min` and `max` to specify the slider range.  Default is 0 to 100.
 
 Example:
 
-    <paper-slider min="10" max="200" value="110"></paper-slider>
+    <paper-diff-slider min="10" max="200" value="110"></paper-diff-slider>
 
 Styling slider:
 
 To change the slider progress bar color:
 
-    paper-slider::shadow #sliderBar::shadow #activeProgress {
+    paper-diff-slider::shadow #sliderBar::shadow #activeProgress {
       background-color: #0f9d58;
     }
 
 To change the slider knob color:
 
-    paper-slider::shadow #sliderKnobInner {
+    paper-diff-slider::shadow #sliderKnobInner {
       background-color: #0f9d58;
     }
 
 To change the slider pin color:
 
-    paper-slider::shadow #sliderKnobInner::before {
+    paper-diff-slider::shadow #sliderKnobInner::before {
       background-color: #0f9d58;
     }
 
 To change the slider pin's font color:
 
-    paper-slider::shadow #sliderKnob > #sliderKnobInner::after {
+    paper-diff-slider::shadow #sliderKnob > #sliderKnobInner::after {
       color: #0f9d58
     }
 
 To change the slider secondary progress bar color:
 
-    paper-slider::shadow #sliderBar::shadow #secondaryProgress {
+    paper-diff-slider::shadow #sliderBar::shadow #secondaryProgress {
       background-color: #0f9d58;
     }
 
 @group Paper Elements
-@element paper-slider
+@element paper-diff-slider
 @extends core-range
 @homepage github.io
 -->
@@ -65,10 +65,10 @@ To change the slider secondary progress bar color:
 <link rel="import" href="../../components/paper-progress/paper-progress.html">
 <link rel="import" href="../../components/paper-input/paper-input.html">
 
-<polymer-element name="paper-slider" extends="core-range" attributes="snaps pin disabled secondaryProgress editable immediateValue" role="slider" tabindex="0" aria-valuemin="0" aria-valuemax="100">
+<polymer-element name="paper-diff-slider" extends="core-range" attributes="snaps pin disabled secondaryProgress editable immediateValue" role="slider" tabindex="0" aria-valuemin="0" aria-valuemax="100">
 <template>
 
-  <link rel="stylesheet" href="paper-slider.css">
+  <link rel="stylesheet" href="paper-diff-slider.css">
 
   <template if="{{!disabled}}">
     <core-a11y-keys target="{{}}" keys="left down pagedown home" on-keys-pressed="{{decrementKey}}"></core-a11y-keys>
@@ -109,7 +109,7 @@ To change the slider secondary progress bar color:
 </template>
 <script>
 
-  Polymer('paper-slider', {
+  Polymer('paper-diff-slider', {
 
     /**
      * Fired when the slider's value changes.

From 2b0d975ceef7595e816a298259b09c405bc9bd07 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 17 Jun 2015 14:22:12 +0200
Subject: [PATCH 4/4] change logs

---
 rpg-docs/private/changeLogs/changeLogs.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/rpg-docs/private/changeLogs/changeLogs.js b/rpg-docs/private/changeLogs/changeLogs.js
index 59f39365..8d369126 100644
--- a/rpg-docs/private/changeLogs/changeLogs.js
+++ b/rpg-docs/private/changeLogs/changeLogs.js
@@ -160,10 +160,19 @@ ChangeLogs.insert({
 });
 
 ChangeLogs.insert({
-	version: "0.5.5",
+	version: "0.5.6",
 	changes: [
 		"Changed front page",
 		"Moved to a darker style",
 		"Added support for letting characters be viewed by \"anyone with the link\"",
 	],
 });
+
+ChangeLogs.insert({
+	version: "0.5.7",
+	changes: [
+		"Added proficiencies to backgrounds",
+		"Added attacks to spells",
+		"Added a move item dialog to mobile devices, but it can't be accessed yet, because long-presses are broken",
+	],
+});