diff --git a/rpg-docs/Model/Character/Characters.js b/rpg-docs/Model/Character/Characters.js index 65295462..3003dc16 100644 --- a/rpg-docs/Model/Character/Characters.js +++ b/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}, diff --git a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html index 372528e8..93900df5 100644 --- a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html +++ b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html @@ -1,18 +1,36 @@ diff --git a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js index 11407540..063eaea6 100644 --- a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js +++ b/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}}); }, }); diff --git a/rpg-docs/client/views/character/persona/persona.html b/rpg-docs/client/views/character/persona/persona.html index e23e1bcc..b8a8cb52 100644 --- a/rpg-docs/client/views/character/persona/persona.html +++ b/rpg-docs/client/views/character/persona/persona.html @@ -3,7 +3,35 @@
{{#with characterDetails}} - {{#containerCardHelper this}}{{alignment}} {{gender}} {{race}}{{/containerCardHelper}} + + {{#unless picture}} +
+
+ {{name}} +
+
+ {{else}} + + {{/unless}} +
+ {{#if picture}} +
+ {{name}} +
+ {{/if}} +
+ {{alignment}} {{gender}} {{race}} +
+
+
{{/with}} {{> containerCard characterField "description" "Description"}} {{> containerCard characterField "personality" "Personality Traits"}} diff --git a/rpg-docs/client/views/character/persona/persona.js b/rpg-docs/client/views/character/persona/persona.js index 46063f25..6ef1e6a3 100644 --- a/rpg-docs/client/views/character/persona/persona.js +++ b/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, });