-
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/healthBar/healthBar.css b/rpg-docs/client/views/character/healthBar/healthBar.css
index 91db0c5b..b32cbd5d 100644
--- a/rpg-docs/client/views/character/healthBar/healthBar.css
+++ b/rpg-docs/client/views/character/healthBar/healthBar.css
@@ -44,7 +44,7 @@
top: 0px;
left: -1px;
height: 0px;
- width: 228px;
+ width: 302px;
border-width: 15px 37px 16px 37px;
border-image: url('/png/bar-border.png') 46 112 48 112 stretch;
display: flex;
diff --git a/rpg-docs/client/views/character/healthBar/healthBar.js b/rpg-docs/client/views/character/healthBar/healthBar.js
index 8ecaf172..4a5466f2 100644
--- a/rpg-docs/client/views/character/healthBar/healthBar.js
+++ b/rpg-docs/client/views/character/healthBar/healthBar.js
@@ -160,7 +160,7 @@ Template.deathSaves.events({
Characters.update(this._id, {$set: {"deathSave.pass": 0}});
},
"click .heal": function(){
- Characters.update(this._id, {$inc: {"attributes.hitPoints.base": 1}});
+ Characters.update(this._id, {$inc: {"hitPoints.base": 1}});
},
"click .untickedDeathFail" : function(){
Characters.update(this._id, {$inc: {"deathSave.fail": 1}});
diff --git a/rpg-docs/client/views/inventory/containerTable/containerTable.html b/rpg-docs/client/views/character/inventory/containerTable/containerTable.html
similarity index 100%
rename from rpg-docs/client/views/inventory/containerTable/containerTable.html
rename to rpg-docs/client/views/character/inventory/containerTable/containerTable.html
diff --git a/rpg-docs/client/views/inventory/containerTable/containerTable.js b/rpg-docs/client/views/character/inventory/containerTable/containerTable.js
similarity index 100%
rename from rpg-docs/client/views/inventory/containerTable/containerTable.js
rename to rpg-docs/client/views/character/inventory/containerTable/containerTable.js
diff --git a/rpg-docs/client/views/character/inventory/inventory.html b/rpg-docs/client/views/character/inventory/inventory.html
new file mode 100644
index 00000000..962aeca5
--- /dev/null
+++ b/rpg-docs/client/views/character/inventory/inventory.html
@@ -0,0 +1,6 @@
+
+
+
Inventory
+ {{> inventoryTables}}
+
+
\ No newline at end of file
diff --git a/rpg-docs/client/views/inventory/inventoryTables/inventoryTables.html b/rpg-docs/client/views/character/inventory/inventoryTables/inventoryTables.html
similarity index 100%
rename from rpg-docs/client/views/inventory/inventoryTables/inventoryTables.html
rename to rpg-docs/client/views/character/inventory/inventoryTables/inventoryTables.html
diff --git a/rpg-docs/client/views/inventory/inventoryTables/inventoryTables.js b/rpg-docs/client/views/character/inventory/inventoryTables/inventoryTables.js
similarity index 100%
rename from rpg-docs/client/views/inventory/inventoryTables/inventoryTables.js
rename to rpg-docs/client/views/character/inventory/inventoryTables/inventoryTables.js
diff --git a/rpg-docs/client/views/inventory/itemRow/itemRow.css b/rpg-docs/client/views/character/inventory/itemRow/itemRow.css
similarity index 100%
rename from rpg-docs/client/views/inventory/itemRow/itemRow.css
rename to rpg-docs/client/views/character/inventory/itemRow/itemRow.css
diff --git a/rpg-docs/client/views/inventory/itemRow/itemRow.html b/rpg-docs/client/views/character/inventory/itemRow/itemRow.html
similarity index 100%
rename from rpg-docs/client/views/inventory/itemRow/itemRow.html
rename to rpg-docs/client/views/character/inventory/itemRow/itemRow.html
diff --git a/rpg-docs/client/views/inventory/itemRow/itemRow.js b/rpg-docs/client/views/character/inventory/itemRow/itemRow.js
similarity index 100%
rename from rpg-docs/client/views/inventory/itemRow/itemRow.js
rename to rpg-docs/client/views/character/inventory/itemRow/itemRow.js
diff --git a/rpg-docs/client/views/character/persona/persona.html b/rpg-docs/client/views/character/persona/persona.html
new file mode 100644
index 00000000..97934fd0
--- /dev/null
+++ b/rpg-docs/client/views/character/persona/persona.html
@@ -0,0 +1,24 @@
+
+
+
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/skills/skills.html b/rpg-docs/client/views/character/skills/skills.html
deleted file mode 100644
index 0fccfb2b..00000000
--- a/rpg-docs/client/views/character/skills/skills.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
Saving Throws
-
- {{#each saveList}}
-
-
- {{#if failSkill}}
-
fail
- {{else}}
-
{{../skillMod skill}}
- {{/if}}
-
{{name}}
-
- {{/each}}
-
-
Skills
-
- {{#each skillList}}
-
-
- {{#if failSkill}}
-
fail
- {{else}}
-
{{../skillMod skill}}
- {{/if}}
-
{{name}}
-
- {{/each}}
-
-
\ No newline at end of file
diff --git a/rpg-docs/client/views/general.css b/rpg-docs/client/views/general.css
index d7a91ec0..3b527843 100644
--- a/rpg-docs/client/views/general.css
+++ b/rpg-docs/client/views/general.css
@@ -1,13 +1,24 @@
root {
- display: block;
+ display: block;
}
body {
font-family: sans-serif;
background: #201500;
+ overflow-x: hidden;
+ margin: 0px;
+ box-sizing: border-box;
}
.calculatedValue {
color: #021C33;
font-weight: bold;
+}
+
+* {
+ box-sizing: border-box;
+}
+
+h2 {
+ margin: 0;
}
\ No newline at end of file
diff --git a/rpg-docs/client/views/index.html b/rpg-docs/client/views/index.html
index b6554729..0a0b08ac 100644
--- a/rpg-docs/client/views/index.html
+++ b/rpg-docs/client/views/index.html
@@ -1,4 +1,4 @@
RPG Docs
-
+
\ No newline at end of file
diff --git a/rpg-docs/nohup.out b/rpg-docs/nohup.out
new file mode 100644
index 00000000..b659aa0b
--- /dev/null
+++ b/rpg-docs/nohup.out
@@ -0,0 +1,19 @@
+[[[[[ ~/workspace/rpg-docs ]]]]]
+
+=> Started proxy.
+=> Started MongoDB.
+[34mI20141122-15:44:13.239(0)? [39m** You've set up some data subscriptions with Meteor.publish(), but
+[34mI20141122-15:44:13.351(0)? [39m** you still have autopublish turned on. Because autopublish is still
+[34mI20141122-15:44:13.352(0)? [39m** on, your Meteor.publish() calls won't have much effect. All data
+[34mI20141122-15:44:13.352(0)? [39m** will still be sent to all clients.
+[34mI20141122-15:44:13.352(0)? [39m**
+[34mI20141122-15:44:13.352(0)? [39m** Turn off autopublish by removing the autopublish package:
+[34mI20141122-15:44:13.353(0)? [39m**
+[34mI20141122-15:44:13.353(0)? [39m** $ meteor remove autopublish
+[34mI20141122-15:44:13.353(0)? [39m**
+[34mI20141122-15:44:13.353(0)? [39m** .. and make sure you have Meteor.publish() and Meteor.subscribe() calls
+[34mI20141122-15:44:13.353(0)? [39m** for each collection that you want clients to see.
+[34mI20141122-15:44:13.353(0)? [39m
+=> Started your app.
+
+=> App running at: http://localhost:3000/
diff --git a/rpg-docs/tests/mocha/client/sampleClientTest.js b/rpg-docs/tests/mocha/client/sampleClientTest.js
new file mode 100644
index 00000000..8122e829
--- /dev/null
+++ b/rpg-docs/tests/mocha/client/sampleClientTest.js
@@ -0,0 +1,9 @@
+if (!(typeof MochaWeb === 'undefined')){
+ MochaWeb.testOnly(function(){
+ describe("a group of tests", function(){
+ it("should respect equality", function(){
+ chai.assert.equal(5,5);
+ });
+ });
+ });
+}
diff --git a/rpg-docs/tests/mocha/server/sampleServerTest.js b/rpg-docs/tests/mocha/server/sampleServerTest.js
new file mode 100644
index 00000000..bb220ccd
--- /dev/null
+++ b/rpg-docs/tests/mocha/server/sampleServerTest.js
@@ -0,0 +1,9 @@
+if (!(typeof MochaWeb === 'undefined')){
+ MochaWeb.testOnly(function(){
+ describe("Server initialization", function(){
+ it("should have a Meteor version defined", function(){
+ chai.assert(Meteor.release);
+ });
+ });
+ });
+}