fix: Item page fixed and styled, Info page broken

jonepatr · Aug 21, 2020 · 3271bdb · 3271bdb
1 parent fcf3004
commit 3271bdb
Show file tree

Hide file tree

Showing 10 changed files with 193 additions and 147 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/module/sheets/TwodsixItemSheet.ts b/src/module/sheets/TwodsixItemSheet.ts
@@ -9,7 +9,9 @@ export class TwodsixItemSheet extends ItemSheet {
     return mergeObject(super.defaultOptions, {
       classes: ["twodsix", "sheet", "item"],
       width: 520,
-      height: 321,
+      height: 377,
+      submitOnClose:true,
+      submitOnChange:true,
       tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}]
     });
   }

diff --git a/static/styles/twodsix.css b/static/styles/twodsix.css
diff --git a/static/system.json b/static/system.json
@@ -5,13 +5,8 @@
   "url": "https://github.com/xdy/twodsix-foundryvtt/",
   "manifest": "https://github.com/xdy/twodsix-foundryvtt/releases/latest/download/system.json",
   "download": "https://github.com/xdy/twodsix-foundryvtt/releases/latest/download/twodsix.zip",
-<<<<<<< HEAD
   "version": "0.3.8",
   "author": "Jonas Karlsson (xdy#3735), Kevin Maree (Ultra Kev#9816), Rob (RobCubed #9180)",
-=======
-  "version": "0.3.0",
-  "author": "Jonas Karlsson (xdy#3735), Kevin Maree (Ultra Kev#9816)",
->>>>>>> 557c1b7... chore(release): 0.3.0 [skip ci]
   "bugs": "",
   "changelog": "",
   "minimumCoreVersion": "0.6.2",

diff --git a/static/template.json b/static/template.json
@@ -7,7 +7,6 @@
       "name": "name",
       "homeworld": "",
       "species": "",
-      "description": "description",
       "age": {
         "value": 18,
         "min": 0
@@ -906,7 +905,8 @@
       },
       "contacts": "",
       "allies": "",
-      "enemies": ""
+      "enemies": "",
+      "bio":"Background Information"
     }
   },
   "Item": {
@@ -917,94 +917,60 @@
       "augment"
     ],
     "templates": {
-      "equipmentTemplate": {
-        "name": "Equipment",
+      "gearTemplate": {
+        "name": "",
         "techlevel": 0,
-        "description": "description",
+        "description": "Item Information",
         "quantity": 1,
         "weight": 0,
         "traits": [],
-        "type": "equipment",
         "equiped": {
           "weight": 0
         }
       },
+      "equipmentTemplate": {
+        "type": "equipment"
+      },
       "weaponTemplate": {
-        "name": "Weapon",
-        "techlevel": 0,
-        "description": "description",
-        "quantity": 1,
         "range": 0,
         "damage": 0,
         "damagebonus": 0,
         "magazinesize": 0,
         "magazinecost": 0,
-        "traits": [],
-        "type": "weapon",
-        "equiped": {
-          "weight": 0
-        }
+        "type": "weapon"
       },
       "armorTemplate": {
-        "name": "Armor",
-        "techlevel": 0,
-        "description": "description",
-        "quantity": 1,
         "armour": 0,
-        "traits": [],
-        "type": "armor",
-        "equiped": {
-          "weight": 0
-        }
+        "type": "armor"
       },
       "augmentTemplate": {
-        "name": "augment",
-        "techlevel": 0,
-        "description": "description",
-        "quantity": 1,
         "location": "",
-        "traits": [],
-        "type": "augment",
-        "equiped": {
-          "weight": 0
-        }
+        "type": "augment"
       }
     },
     "equipment": {
-      "templates": ["equipmentTemplate"],
-      "name": "Item Name",
-      "techlevel": 0,
-      "quantity": 1,
-      "weight": 0,
-      "type": "equipment",
-      "description": "Item Description"
+      "templates": [
+        "gearTemplate",
+        "equipmentTemplate"
+      ]
     },
     "weapon": {
-      "templates": ["weaponTemplate"],
-      "name": "Item Name",
-      "techlevel": 0,
-      "quantity": 1,
-      "weight": 0,
-      "type": "equipment",
-      "description": "Item Description"
+      "templates": [
+        "gearTemplate",
+        "weaponTemplate"
+      ]
     },
     "armor": {
-      "templates": ["armorTemplate"],
-      "name": "Item Name",
-      "techlevel": 0,
-      "quantity": 1,
-      "weight": 0,
-      "type": "equipment",
-      "description": "Item Description"
+      "templates": [
+        "gearTemplate",
+        "armorTemplate"
+      ]
     },
     "augment": {
-      "templates": ["augmentTemplate"],
-      "name": "Item Name",
-      "techlevel": 0,
-      "quantity": 1,
-      "weight": 0,
-      "type": "equipment",
-      "description": "Item Description"
+      "templates": [
+        "gearTemplate",
+        "augmentTemplate"
+      ]
     }
   }
-}
+}
diff --git a/static/templates/actors/actor-sheet.html b/static/templates/actors/actor-sheet.html
@@ -82,7 +82,7 @@
         </div>
 
         {{!-- Biography Tab --}}
-        <div class="tab skills" data-group="primary" data-tab="info">
+        <div class="tab info" data-group="primary" data-tab="info"></div>
         {{> "systems/twodsix/templates/actors/parts/actor-info.html"}}
         </div>
 

diff --git a/static/templates/actors/parts/actor-info.html b/static/templates/actors/parts/actor-info.html
@@ -1,21 +1,21 @@
   <div class="grid-container">
     <div class="contacts">
-      contacts:
+      Contacts:
       {{{editor content=data.contacts target="data.contacts" button=true owner=owner editable=editable}}}
 
     </div>
     <div class="allies">
-      allies:
+      Allies:
       {{{editor content=data.allies target="data.allies" button=true owner=owner editable=editable}}}
 
     </div>
     <div class="enemies">
-      enemies:
+      Enemies:
       {{{editor content=data.enemies target="data.enemies" button=true owner=owner editable=editable}}}
 
     </div>
     <div class="description">
       Description:
-      {{{editor content=data.description target="data.description" button=true owner=owner editable=editable}}}
+      {{{editor content=data.bio target="data.bio" button=true owner=owner editable=editable}}}
     </div>
   </div>
diff --git a/static/templates/actors/parts/actor-items.html b/static/templates/actors/parts/actor-items.html
@@ -1,27 +1,31 @@
-<div class="general-items">
-  <ol class="items-list">
-      <li class="item flexrow item-header">
-        <div class="item-image"></div>
+<div class="item-container items-list">
         <div class="item-name">Name</div>
-        <div class="item-controls">
-          <a class="item-control item-create" title="Create item" data-type="equipment"><i class="fas fa-plus"></i> Add item</a>
+        <div class="item-name centre">TL</div>
+        <div class="item-name centre">Qty</div>
+        <div class="item-name centre">Weight</div>
+        <div class="item-name centre">Type</div>
+        <div class="item-controls centre">
+          <a class="item-control item-create" title="Create item" data-type="equipment"><i class="fas fa-plus"></i></a>
         </div>
-      </li>
-
+</div>
+
+
   {{#each actor.gear as |item id|}}
+  <div class="item">
       <li class="item flexrow" data-item-id="{{item._id}}">
-        <div class="item-grid">  
+        <div class="item-container">  
         <h4 class="item-name">{{item.name}}</h4>
-        <h4 class="item-name">{{item.techlevel}}</h4>
-        <h4 class="item-name">{{item.quantity}}</h4>
-        <h4 class="item-name">{{item.weight}}</h4>
-        <h4 class="item-type">{{item.type}}</h4>
-          <div class="item-controls">
+        <h4 class="item-name centre">{{data.techlevel}}</h4>
+        <h4 class="item-name centre">{{data.quantity}}</h4>
+        <h4 class="item-name centre">{{data.weight}}</h4>
+        <h4 class="item-type centre">{{item.type}}</h4>
+          <div class="item-controls centre">
               <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </div>
       </li>
+    </div>
   {{/each}}