diff --git a/rpg-docs/Routes/Routes.js b/rpg-docs/Routes/Routes.js index f23ca251..d559f196 100644 --- a/rpg-docs/Routes/Routes.js +++ b/rpg-docs/Routes/Routes.js @@ -4,21 +4,12 @@ Router.configure({ }); Router.map(function() { - /* - this.route("home", { - path: "/", - waitOn: function(){ - return Meteor.subscribe("characterList", Meteor.userId()); - }, - data: { - characters: function(){ - return Characters.find({}, {fields: {_id: 1}}); - } - } - });*/ //add a home route and change characterList route + this.route("/", { + name: "home", + }); this.route("characterList", { - path: "/", + path: "/characterList", waitOn: function(){ return Meteor.subscribe("characterList", Meteor.userId()); }, diff --git a/rpg-docs/client/views/GeneralCSS/general.css b/rpg-docs/client/views/GeneralCSS/general.css index 0a7539f0..494bd232 100644 --- a/rpg-docs/client/views/GeneralCSS/general.css +++ b/rpg-docs/client/views/GeneralCSS/general.css @@ -63,6 +63,10 @@ paper-button { letter-spacing: 0.010; } +core-item { + cursor: pointer; +} + .listRow { height: 32px; } diff --git a/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.js b/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.js index 658916cf..5c10ade0 100644 --- a/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.js +++ b/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.js @@ -3,7 +3,7 @@ Template.effectsEditList.helpers({ var selector = { "parent.id": this.parentId, "parent.collection": this.parentCollection, - "charId": this.charId + "charId": this.charId, }; if (this.parentGroup){ selector["parent.group"] = this.parentGroup; @@ -23,10 +23,11 @@ Template.effectsEditList.events({ charId: this.charId, parent: { id: this.parentId, - collection: this.parentCollection + collection: this.parentCollection, + group: this.parentGroup, }, operation: "add", - enabled: this.enabled + enabled: this.enabled, }); }, }); diff --git a/rpg-docs/client/views/character/features/features.js b/rpg-docs/client/views/character/features/features.js index 17d5f5d0..c59c4e93 100644 --- a/rpg-docs/client/views/character/features/features.js +++ b/rpg-docs/client/views/character/features/features.js @@ -39,7 +39,12 @@ Template.features.helpers({ Template.features.events({ "tap #addFeature": function(event){ - var featureId = Features.insert({name: "New Feature", charId: this._id}); + var featureId = Features.insert({ + name: "New Feature", + charId: this._id, + enabled: true, + alwaysEnabled: true, + }); GlobalUI.setDetail({ template: "featureDialog", data: {featureId: featureId, charId: this._id, startEditing: true}, diff --git a/rpg-docs/client/views/characterList/characterSideList.css b/rpg-docs/client/views/characterList/characterSideList.css index dcc533de..30a19829 100644 --- a/rpg-docs/client/views/characterList/characterSideList.css +++ b/rpg-docs/client/views/characterList/characterSideList.css @@ -5,7 +5,7 @@ font-size: 16px; height: 40px; overflow: hidden; - padding: 12px 0 12px 0; + padding: 12px 0 12px 16px; text-overflow: ellipsis; white-space: nowrap; } \ No newline at end of file diff --git a/rpg-docs/client/views/characterList/characterSideList.html b/rpg-docs/client/views/characterList/characterSideList.html index 878d67ee..6191fa63 100644 --- a/rpg-docs/client/views/characterList/characterSideList.html +++ b/rpg-docs/client/views/characterList/characterSideList.html @@ -1,6 +1,6 @@