Merged with main

templates/dialogs/actionSelect.hbs

@@ -5,8 +5,8 @@
     <ul class="actions-list">
     {{#each actions}}
         <li class="action-item">
-            <input type="radio" name="actionId" value="{{_id}}" {{#if (eq @index 0)}}checked{{/if}}>
-            <span class="label">{{ name }}</span>
+            <input type="radio" id="action-{{_id}}" name="actionId" value="{{_id}}" {{#if (eq @index 0)}}checked{{/if}}>
+            <label class="label" for="action-{{_id}}">{{ name }}</label>
         </li>
     {{/each}}
     </ul>

templates/sheets-settings/adversary-settings/details.hbs

@@ -20,19 +20,19 @@
     <div class="fieldsets-section">
         <fieldset class="flex">
             <legend>{{localize "DAGGERHEART.GENERAL.hitPoints"}}</legend>
-            {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document.system.resources.hitPoints.value}}
+            {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document.system.resources.hitPoints.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.hitPoints.value.label")}}
             {{formGroup systemFields.resources.fields.hitPoints.fields.max value=document.system.resources.hitPoints.max}}
         </fieldset>
         <fieldset class="flex">
             <legend>{{localize "DAGGERHEART.GENERAL.stress"}}</legend>
-            {{formGroup systemFields.resources.fields.stress.fields.value value=document.system.resources.stress.value}}
+            {{formGroup systemFields.resources.fields.stress.fields.value value=document.system.resources.stress.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.stress.value.label")}}
             {{formGroup systemFields.resources.fields.stress.fields.max value=document.system.resources.stress.max}}
         </fieldset>
     </div>
 
     <fieldset class="flex">
         <legend>{{localize "DAGGERHEART.GENERAL.DamageThresholds.title"}}</legend>
-        {{formGroup systemFields.damageThresholds.fields.major value=document.system.damageThresholds.major}}
-        {{formGroup systemFields.damageThresholds.fields.severe value=document.system.damageThresholds.severe}}
+        {{formGroup systemFields.damageThresholds.fields.major value=document.system.damageThresholds.major label=(localize "DAGGERHEART.GENERAL.DamageThresholds.majorThreshold")}}
+        {{formGroup systemFields.damageThresholds.fields.severe value=document.system.damageThresholds.severe label=(localize "DAGGERHEART.GENERAL.DamageThresholds.severeThreshold")}}
     </fieldset>
 </section>

templates/sheets-settings/companion-settings/details.hbs

@@ -11,13 +11,13 @@
             {{formGroup systemFields.resources.fields.stress.fields.max value=document.system.resources.stress.max label='Max Stress'}}
         </div>
         <div class="form-group">
-        <div class="form-fields">
-            <label>{{localize "DAGGERHEART.ACTORS.Companion.FIELDS.partner.label"}}</label>
-            <select class="partner-value" name="system.partner">
-                {{selectOptions playerCharacters selected=document.system.partner.uuid labelAttr="name" valueAttr="key" blank=""}}
-            </select>
+            <div class="form-fields">
+                <label>{{localize "DAGGERHEART.ACTORS.Companion.FIELDS.partner.label"}}</label>
+                <select class="partner-value" name="system.partner">
+                    {{selectOptions playerCharacters selected=document.system.partner.uuid labelAttr="name" valueAttr="key" blank=""}}
+                </select>
+            </div>
         </div>
-    </div>
     </fieldset>
     <button type="button" data-action="levelUp" {{#if (not document.system.levelData.canLevelUp)}}disabled{{/if}}>Level Up</button>
 </section>

templates/sheets/activeEffect/changes.hbs

@@ -11,12 +11,7 @@
         {{#with ../fields.changes.element.fields as |changeFields|}}
             <li data-index="{{i}}">
                 <div class="key">
-                    <input type="text" name="{{concat "changes." i ".key"}}" value="{{change.key}}" list="change-fields" />
-                    <datalist id="change-fields">
-                        {{#each @root.fieldPaths}}
-                            <option value="{{this}}">{{this}}</option>
-                        {{/each}}
-                    </datalist>
+                    <input type="text" class="effect-change-input" name="{{concat "changes." i ".key"}}" value="{{change.key}}" />
                 </div>
                 <div class="mode">
                     {{formInput changeFields.mode name=(concat "changes." i ".mode") value=change.mode choices=@root.modes}}

templates/sheets/actors/character/sidebar.hbs

@@ -48,18 +48,32 @@
                 </div>
             </div>
 
-            <div class="status-number">
-                <div class='status-value armor-slots'>
-                    {{#if document.system.armor.system.marks}}
-                        <p>{{document.system.armor.system.marks.value}}/{{document.system.armorScore}}</p>
-                    {{else}}
+            {{#if document.system.armor.system.marks}}
+                <div class="status-bar armor-slots">
+                    <div class='status-value'>
+                        <p><input class="bar-input armor-marks-input" value="{{document.system.armor.system.marks.value}}" type="number"></p>
+                        <p>/</p>
+                        <p class="bar-label">{{document.system.armorScore}}</p>
+                    </div>
+                    <progress
+                        class='progress-bar stress-color'
+                        value='{{document.system.armor.system.marks.value}}'
+                        max='{{document.system.armorScore}}'
+                    ></progress>
+                    <div class="status-label">
+                        <h4>{{localize "DAGGERHEART.GENERAL.armorSlots"}}</h4>
+                    </div>
+                </div>
+            {{else}}
+                <div class="status-number armor-slots">
+                    <div class='status-value'>
                         <p>-</p>
-                    {{/if}}
+                    </div>
+                    <div class="status-label">
+                        <h4>{{localize "DAGGERHEART.GENERAL.armorSlots"}}</h4>
+                    </div>
                 </div>
-                <div class="status-label">
-                    <h4>Armor Slots</h4>
-                </div>
-            </div>
+            {{/if}}
 
             <div class="status-number">
                 <div class='status-value'>

templates/sheets/actors/companion/details.hbs

@@ -6,7 +6,7 @@
     <div class="partner-section">
         <div class="title">
             <side-line-div  class="invert"></side-line-div>
-            <h3>Partner</h3>
+            <h3>{{localize "DAGGERHEART.GENERAL.partner"}}</h3>
             <side-line-div></side-line-div>
         </div>
         {{#if document.system.partner}}
@@ -20,7 +20,7 @@
     <div class="attack-section">
         <div class="title">
             <side-line-div  class="invert"></side-line-div>
-            <h3>Attack</h3>
+            <h3>{{localize "DAGGERHEART.GENERAL.attack"}}</h3>
             <side-line-div></side-line-div>
         </div>
         <ul class="item-list">
@@ -28,6 +28,11 @@
         </ul>
     </div>
     <div class="experience-list">
+        <div class="title">
+            <side-line-div  class="invert"></side-line-div>
+            <h3>{{localize "DAGGERHEART.GENERAL.experience.plural"}}</h3>
+            <side-line-div></side-line-div>
+        </div>
         {{#each source.system.experiences as |experience id|}}
             <div class="experience-row">
                 <div class="experience-value">