Merge pull request #80 from ben/vow-progress-images

Images for progress items
ben · Jul 10, 2021 · b29f03a · b29f03a
2 parents 3966dfa + fb0a5b4
commit b29f03a
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## In progress
 
 - "Burn momentum" button in chat cards ([#78](https://github.com/ben/foundry-ironsworn/pull/78))
+- Images for vows and progress items ([#80](https://github.com/ben/foundry-ironsworn/pull/80))
 
 ## 1.0.1
 

diff --git a/system/templates/actor/character.hbs b/system/templates/actor/character.hbs
@@ -14,29 +14,32 @@
 
 {{#*inline "progress"}}
 <div class="flexcol item-row" data-id="{{id}}">
-  <div class="flexcol">
-    <div class="flexrow">
-      <div class="flexrow">{{>rankHexes rank=data.data.rank id=id}}</div>
+  <div class="flexrow">
+    <img class="profile-img nogrow" src="{{img}}" title="{{name}}" height="38" style="margin-right: 5px;" />
+    <div class="flexcol">
+      <div class="flexrow">
+        <div class="flexrow">{{>rankHexes rank=data.data.rank id=id}}</div>
 
-      {{#if actor.data.flags.foundry-ironsworn.edit-mode}}
-      <div class="clickable block nogrow ironsworn__{{type}}__delete" data-item="{{id}}">
-        <i class="fas fa-trash"></i>
-      </div>
-      {{/if}}
+        {{#if actor.data.flags.foundry-ironsworn.edit-mode}}
+        <div class="clickable block nogrow ironsworn__{{type}}__delete" data-item="{{id}}">
+          <i class="fas fa-trash"></i>
+        </div>
+        {{/if}}
 
-      <div class="clickable block nogrow ironsworn__{{type}}__settings" data-item="{{id}}">
-        <i class="fas fa-edit"></i>
-      </div>
-      <div class="clickable block nogrow ironsworn__progress__mark" {{! This works for vows too }}
-        title="{{localize 'IRONSWORN.MarkProgress'}}" data-item="{{id}}">
-        <i class="fas fa-play"></i>
-      </div>
-      <div class="clickable block ironsworn__progress__fulfill" title="{{localize 'IRONSWORN.FulfillVow'}}"
-        style="flex-grow: 0;" data-item="{{id}}">
-        <i class="fas fa-check"></i>
+        <div class="clickable block nogrow ironsworn__{{type}}__settings" data-item="{{id}}">
+          <i class="fas fa-edit"></i>
+        </div>
+        <div class="clickable block nogrow ironsworn__progress__mark" {{! This works for vows too }}
+          title="{{localize 'IRONSWORN.MarkProgress'}}" data-item="{{id}}">
+          <i class="fas fa-play"></i>
+        </div>
+        <div class="clickable block ironsworn__progress__fulfill" title="{{localize 'IRONSWORN.FulfillVow'}}"
+          style="flex-grow: 0;" data-item="{{id}}">
+          <i class="fas fa-check"></i>
+        </div>
       </div>
+      <h3>{{name}}</h3>
     </div>
-    <h3>{{name}}</h3>
   </div>
   <div class="flexrow">
     <div class="flexrow track">

diff --git a/system/templates/actor/shared.hbs b/system/templates/actor/shared.hbs
@@ -1,28 +1,31 @@
 {{#*inline "progress"}}
 <div class="flexcol item-row" data-id="{{id}}">
-  <div class="flexcol">
-    <div class="flexrow">
-      <div class="flexrow">{{>rankHexes rank=data.data.rank id=id}}</div>
+  <div class="flexrow">
+    <img class="profile-img nogrow" src="{{img}}" title="{{name}}" height="38" style="margin-right: 5px;" />
+    <div class="flexcol">
+      <div class="flexrow">
+        <div class="flexrow">{{>rankHexes rank=data.data.rank id=id}}</div>
 
-      {{#if actor.data.flags.foundry-ironsworn.edit-mode}}
-      <div class="clickable block nogrow ironsworn__{{type}}__delete" data-item="{{id}}">
-        <i class="fas fa-trash"></i>
-      </div>
-      {{/if}}
+        {{#if actor.data.flags.foundry-ironsworn.edit-mode}}
+        <div class="clickable block nogrow ironsworn__{{type}}__delete" data-item="{{id}}">
+          <i class="fas fa-trash"></i>
+        </div>
+        {{/if}}
 
-      <div class="clickable block nogrow ironsworn__{{type}}__settings" data-item="{{id}}">
-        <i class="fas fa-edit"></i>
-      </div>
-      <div class="clickable block nogrow ironsworn__progress__mark" {{! This works for vows too }}
-        title="{{localize 'IRONSWORN.MarkProgress'}}" data-item="{{id}}">
-        <i class="fas fa-play"></i>
-      </div>
-      <div class="clickable block ironsworn__progress__fulfill" title="{{localize 'IRONSWORN.FulfillVow'}}"
-        style="flex-grow: 0;" data-item="{{id}}">
-        <i class="fas fa-check"></i>
+        <div class="clickable block nogrow ironsworn__{{type}}__settings" data-item="{{id}}">
+          <i class="fas fa-edit"></i>
+        </div>
+        <div class="clickable block nogrow ironsworn__progress__mark" {{! This works for vows too }}
+          title="{{localize 'IRONSWORN.MarkProgress'}}" data-item="{{id}}">
+          <i class="fas fa-play"></i>
+        </div>
+        <div class="clickable block ironsworn__progress__fulfill" title="{{localize 'IRONSWORN.FulfillVow'}}"
+          style="flex-grow: 0;" data-item="{{id}}">
+          <i class="fas fa-check"></i>
+        </div>
       </div>
+      <h3>{{name}}</h3>
     </div>
-    <h3>{{name}}</h3>
   </div>
   <div class="flexrow">
     <div class="flexrow track">

diff --git a/system/templates/item/progress.hbs b/system/templates/item/progress.hbs
@@ -1,5 +1,6 @@
 <form class="{{cssClass}} flexcol" autocomplete="off">
   <header class="sheet-header">
+    <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" height="50" width="50" />
     <h1>
       <input name="name" type="text" value="{{item.name}}" placeholder="Name" />
     </h1>