diff --git a/rpg-docs/client/style/main.scss b/rpg-docs/client/style/main.scss
index 2a6ce72b..4d570b23 100644
--- a/rpg-docs/client/style/main.scss
+++ b/rpg-docs/client/style/main.scss
@@ -146,3 +146,15 @@ paper-button {
.clickable, core-item, paper-tab {
cursor: pointer;
}
+
+.pre-wrap, .prewrap{
+ white-space: pre-wrap;
+}
+
+.padded {
+ padding: 8px;
+}
+
+.fullwidth {
+ width: 100%;
+}
diff --git a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
index b4923a47..1ee51cd8 100644
--- a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
+++ b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
@@ -32,7 +32,7 @@
{{/if}}
{{#if description}}
-
{{description}}
+ {{evaluateString charId description}}
{{/if}}
{{> effectsViewList charId=charId parentId=_id}}
diff --git a/rpg-docs/client/views/character/features/features.html b/rpg-docs/client/views/character/features/features.html
index 9dbf5a84..52043f27 100644
--- a/rpg-docs/client/views/character/features/features.html
+++ b/rpg-docs/client/views/character/features/features.html
@@ -34,7 +34,7 @@
{{name}}
- {{damageDice}} {{{evaluateSignedSpaced ../_id damageBonus}}} {{damageType}}
+ {{evaluateString ../_id damage}} {{damageType}}
{{#if details}}
@@ -102,7 +102,7 @@
{{#if description}}
{{description}}
+ >{{evaluateString charId description}}
{{/if}}
{{#if hasUses}}
diff --git a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html
index bd0e23c6..7624418f 100644
--- a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html
+++ b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html
@@ -41,6 +41,6 @@
{{#if description}}
- {{description}}
+ {{evaluateString charId description}}
{{/if}}
diff --git a/rpg-docs/client/views/character/journal/classDialog/classDialog.js b/rpg-docs/client/views/character/journal/classDialog/classDialog.js
index b234e318..09bf7afb 100644
--- a/rpg-docs/client/views/character/journal/classDialog/classDialog.js
+++ b/rpg-docs/client/views/character/journal/classDialog/classDialog.js
@@ -3,6 +3,9 @@ Template.classDialog.onRendered(function(){
});
Template.classDialog.events({
+ "color-change": function(event, instance){
+ Classes.update(instance.data.classId, {$set: {color: event.color}});
+ },
"tap #deleteButton": function(event, instance){
Classes.softRemoveNode(instance.data.classId);
GlobalUI.deletedToast(instance.data.classId, "Classes", "Class");
diff --git a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
index 82e00e7b..577b7243 100644
--- a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
+++ b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
@@ -1,12 +1,12 @@
{{#with experience}}
- {{#baseDialog title=name class=colorClass hideColor="true" startEditing=../startEditing}}
+ {{#baseDialog title=name class=color hideColor="true" startEditing=../startEditing}}
{{value}}
{{#if description}}
- {{description}}
+ {{description}}
{{/if}}
{{else}}
diff --git a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js
index be5f7f67..c6913505 100644
--- a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js
+++ b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js
@@ -1,6 +1,11 @@
Template.experienceDialog.helpers({
- feature: function(){
- return Features.findOne(this.featureId);
+ experience: function(){
+ Experiences.findOne(this.experienceId);
+ return Experiences.findOne(this.experienceId);
+ },
+ color: function() {
+ var char = Characters.findOne(this.charId, {fields: {color: 1}});
+ if (char) return getColorClass(char.color);
},
});
@@ -27,10 +32,3 @@ Template.experienceDialog.events({
Experiences.update(this._id, {$set: {description: value}});
},
});
-
-Template.experienceDialog.helpers({
- experience: function(){
- Experiences.findOne(this.experienceId);
- return Experiences.findOne(this.experienceId);
- }
-});
diff --git a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html b/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html
index 18ba7a12..754a9a7b 100644
--- a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html
+++ b/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html
@@ -1,7 +1,7 @@
{{#with note}}
{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
- {{description}}
+ {{description}}
{{else}}
{{> noteDialogEdit}}
{{/baseDialog}}
diff --git a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html
index e4c0d857..aa90ee68 100644
--- a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html
+++ b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html
@@ -1,5 +1,5 @@
- {{#baseDialog title="Race" class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
+ {{#baseDialog title="Race" class=color hideColor="true" hideDelete="true" startEditing=startEditing}}
{{race}}
diff --git a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js
index 6b157a7d..abf9eaca 100644
--- a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js
+++ b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js
@@ -13,5 +13,9 @@ Template.raceDialog.helpers({
race: function(){
var char = Characters.findOne(this.charId, {fields: {race: 1}});
return char && char.race;
- }
+ },
+ color: function() {
+ var char = Characters.findOne(this.charId, {fields: {color: 1}});
+ if (char) return getColorClass(char.color);
+ },
});
diff --git a/rpg-docs/client/views/character/persona/persona.html b/rpg-docs/client/views/character/persona/persona.html
index 8b5b696c..e23e1bcc 100644
--- a/rpg-docs/client/views/character/persona/persona.html
+++ b/rpg-docs/client/views/character/persona/persona.html
@@ -27,7 +27,7 @@
- {{#containerCardHelper this}}{{body}}{{/containerCardHelper}}
+ {{#containerCardHelper this}}{{evaluateString _id body}}{{/containerCardHelper}}
diff --git a/rpg-docs/client/views/character/persona/textDialog/textDialog.html b/rpg-docs/client/views/character/persona/textDialog/textDialog.html
index 76ab49d8..e64162f2 100644
--- a/rpg-docs/client/views/character/persona/textDialog/textDialog.html
+++ b/rpg-docs/client/views/character/persona/textDialog/textDialog.html
@@ -1,6 +1,6 @@
{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
- {{value}}
+ {{evaluateString charId value}}
{{else}}
{{> textDialogEdit}}
{{/baseDialog}}
diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
index 0bccae65..155184db 100644
--- a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
+++ b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
@@ -26,7 +26,7 @@
Duration: {{duration}}
- {{description}}
+ {{evaluateString charId description}}
diff --git a/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html b/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html
index af755652..f5f7cbfb 100644
--- a/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html
+++ b/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html
@@ -20,7 +20,7 @@
{{/if}}
- {{description}}
+ {{evaluateString charId description}}
{{else}}