fix: Miscellaneous fixes (#1509)

This update includes some minor fixes: * change item pile module integration to use financeValues.cash * improvements to actor sheet layout * refactor of settings template
xdy · Dec 11, 2023 · a793c96 · a793c96
1 parent 25e1b37
commit a793c96
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 76 deletions.
diff --git a/src/module/hooks/itemPilesIntegration.ts b/src/module/hooks/itemPilesIntegration.ts
@@ -48,7 +48,7 @@ Hooks.once("item-piles-ready", async function() {
         img: "systems/twodsix/assets/icons/id-card.svg",
         abbreviation: "Cr {#}",
         data: {
-          path: "system.finances.cash"
+          path: "system.financeValues.cash"
         },
         primary: true,
         exchangeRate: 1

diff --git a/static/styles/twodsix.css b/static/styles/twodsix.css
@@ -1218,21 +1218,19 @@ input.stat-name-table {
   appearance: textfield;
 }
 
+input.stat-name {
+  left: 0.5em;
+}
+
 input.stat-name, input.special-name {
   position: relative;
-  left: 0.7em;
-  top: -1.0em;
-  font-size: 1.2em;
+  top: -1em;
+  font-size: 1.1em;
   display: block;
-  width: 75%;
+  width: 90%;
   cursor: pointer;
   text-align: center;
-  height: 19px;
-}
-
-input.special-name {
-  left: -0.05em;
-  width: 90%;
+  height: 17px;
 }
 
 .stat img {

diff --git a/static/templates/actors/parts/actor/actor-characteristics-rotate.html b/static/templates/actors/parts/actor/actor-characteristics-rotate.html
@@ -6,7 +6,7 @@
       {{>"systems/twodsix/templates/actors/parts/actor/actor-stat-psi.html"}}
       {{#if ../system.characteristicEdit}}
         <input type = "text" name= "system.characteristics.{{key}}.displayShortLabel" data-label = "system.characteristics.{{key}}.displayShortLabel"
-          class="stat-name" value="{{char.displayShortLabel}}" maxlength="4"/>
+          class="special-name" value="{{char.displayShortLabel}}" maxlength="4"/>
       {{else}}
         <span class="special-name rollable-characteristic" data-tooltip="{{twodsix_invertSkillRollShiftClick}}" data-roll="2d6+{{char.mod}}" data-label="{{char.shortLabel}}">
           {{char.displayShortLabel}}

diff --git a/static/templates/misc/advanced-settings.html b/static/templates/misc/advanced-settings.html
@@ -10,77 +10,15 @@
       <section class="sheet-body auto-height">
         {{#each settings as |group|}}
           <div class="tab {{@key}}" data-group="primary" data-tab="{{@key}}">
-            {{#each group as |setting key|}}
-              <div class="form-group">
-                  <label>{{{localize setting.name}}}</label>
-                  <div class="form-fields">
-                      {{#iff setting.htmlType "===" "Number"}}
-                      <input type="number" name="{{key}}" value="{{setting.value}}" data-dtype="Number">
-                      {{/iff}}
-                      {{#iff setting.htmlType "===" "String"}}
-                      <input type="text" name="{{key}}" value="{{setting.value}}" data-dtype="String">
-                      {{/iff}}
-
-                      {{#iff setting.htmlType "===" "Select"}}
-                      <select name="{{key}}" id = "{{key}}" value="{{setting.value}}">
-                        {{selectOptions setting.choices selected = setting.value localize = setting.localize}}
-                      </select>
-                      {{/iff}}
-
-                      {{#iff setting.htmlType "===" "Boolean"}}
-                      <span class="advanced-settings-checkbox-wrapper">
-                          <input type="checkbox" name="{{key}}" data-dtype="Boolean" {{#if setting.value}}checked{{/if}}>
-                      </span>
-                      {{/iff}}
-
-                      {{#iff setting.htmlType "===" "Color"}}
-                      <span class = "color-select" name="{{key}}">
-                        {{colorPicker name=key value = setting.value default=setting.value}}
-                      </span>
-                      {{/iff}}
-                  </div>
-                  <p class="notes">{{{localize setting.hint}}}</p>
-              </div>
-            {{/each}}
+            {{> "systems/twodsix/templates/misc/setting-partial.html"}}
           </div>
         {{/each}}
       </section>
     {{else}}
       {{#each settings as |group|}}
         <fieldset>
           <legend>{{localize (concat "TWODSIX.Settings.menuLabels." @key)}}</legend>
-          {{#each group as |setting key|}}
-              <div class="form-group">
-                  <label>{{{localize setting.name}}}</label>
-                  <div class="form-fields">
-                      {{#iff setting.htmlType "===" "Number"}}
-                      <input type="number" name="{{key}}" value="{{setting.value}}" data-dtype="Number">
-                      {{/iff}}
-                      {{#iff setting.htmlType "===" "String"}}
-                      <input type="text" name="{{key}}" value="{{setting.value}}" data-dtype="String">
-                      {{/iff}}
-
-                      {{#iff setting.htmlType "===" "Select"}}
-                      <select name="{{key}}" id = "{{key}}" value="{{setting.value}}">
-                        {{selectOptions setting.choices selected = setting.value localize = setting.localize}}
-                      </select>
-                      {{/iff}}
-
-                      {{#iff setting.htmlType "===" "Boolean"}}
-                      <span class="advanced-settings-checkbox-wrapper">
-                          <input type="checkbox" name="{{key}}" data-dtype="Boolean" {{#if setting.value}}checked{{/if}}>
-                      </span>
-                      {{/iff}}
-
-                      {{#iff setting.htmlType "===" "Color"}}
-                      <span class = "color-select" name="{{key}}">
-                        {{colorPicker name=key value = setting.value default=setting.value}}
-                      </span>
-                      {{/iff}}
-                  </div>
-                  <p class="notes">{{{localize setting.hint}}}</p>
-              </div>
-          {{/each}}
+          {{> "systems/twodsix/templates/misc/setting-partial.html"}}
         </fieldset>
         <br>
       {{/each}}

diff --git a/static/templates/misc/setting-partial.html b/static/templates/misc/setting-partial.html
@@ -0,0 +1,32 @@
+{{#each this as |setting key|}}
+  <div class="form-group">
+    <label>{{{localize setting.name}}}</label>
+      <div class="form-fields">
+        {{#iff setting.htmlType "===" "Number"}}
+        <input type="number" name="{{key}}" value="{{setting.value}}" data-dtype="Number">
+        {{/iff}}
+        {{#iff setting.htmlType "===" "String"}}
+        <input type="text" name="{{key}}" value="{{setting.value}}" data-dtype="String">
+        {{/iff}}
+
+        {{#iff setting.htmlType "===" "Select"}}
+        <select name="{{key}}" id = "{{key}}" value="{{setting.value}}">
+          {{selectOptions setting.choices selected = setting.value localize = setting.localize}}
+        </select>
+        {{/iff}}
+
+        {{#iff setting.htmlType "===" "Boolean"}}
+        <span class="advanced-settings-checkbox-wrapper">
+            <input type="checkbox" name="{{key}}" data-dtype="Boolean" {{#if setting.value}}checked{{/if}}>
+        </span>
+        {{/iff}}
+
+        {{#iff setting.htmlType "===" "Color"}}
+        <span class = "color-select" name="{{key}}">
+          {{colorPicker name=key value = setting.value default=setting.value}}
+        </span>
+        {{/iff}}
+      </div>
+    <p class="notes">{{{localize setting.hint}}}</p>
+  </div>
+{{/each}}