From c13ebb0b7689276f32000f607c815a26f8f5731a Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sat, 23 Jan 2021 23:44:49 +0100 Subject: [PATCH 1/7] add buttons in overviews now on bottom --- src/templates/actor/partials/items-overview.hbs | 7 +++---- .../partials/special-creature-abilites-overview.hbs | 5 +++-- src/templates/actor/partials/spells-overview.hbs | 6 ++++-- .../actor/partials/talents-abilities-overview.hbs | 13 ++++++------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/templates/actor/partials/items-overview.hbs b/src/templates/actor/partials/items-overview.hbs index 55b3441..b51a97c 100644 --- a/src/templates/actor/partials/items-overview.hbs +++ b/src/templates/actor/partials/items-overview.hbs @@ -15,9 +15,8 @@ {{#*inline "ifHasItemOfType"}} {{#if (and (ne itemsArray undefined) (gt itemsArray.length 0))}} {{> @partial-block}} -{{else}} -{{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType=dataType }} {{/if}} +{{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType=dataType }} {{/inline}} @@ -48,8 +47,8 @@ {{> @partial-block }} {{!-- description --}}
{{localize 'DS4.Description'}}
- {{!-- add button --}} - {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType=dataType }} + {{!-- control buttons placeholder --}} +
{{/inline}} diff --git a/src/templates/actor/partials/special-creature-abilites-overview.hbs b/src/templates/actor/partials/special-creature-abilites-overview.hbs index 2863714..078fa28 100644 --- a/src/templates/actor/partials/special-creature-abilites-overview.hbs +++ b/src/templates/actor/partials/special-creature-abilites-overview.hbs @@ -42,8 +42,8 @@
{{localize 'DS4.ItemName'}}
{{!-- description --}}
{{localize 'DS4.Description'}}
- {{!-- add button --}} - {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType=dataType }} + {{!-- control buttons placeholder --}} +
{{/inline}} @@ -58,4 +58,5 @@ {{> baseItemListEntry item=item}} {{/each}} + {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='specialCreatureAbility' }} \ No newline at end of file diff --git a/src/templates/actor/partials/spells-overview.hbs b/src/templates/actor/partials/spells-overview.hbs index 8bcd33e..e19e863 100644 --- a/src/templates/actor/partials/spells-overview.hbs +++ b/src/templates/actor/partials/spells-overview.hbs @@ -55,8 +55,8 @@
{{!-- description --}} {{!--
{{localize 'DS4.Description'}}
--}} - {{!-- add button --}} - {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='spell' }} + {{!-- control buttons placeholder --}} +
{{#each itemsByType.spell as |item id|}}
  • @@ -90,4 +90,6 @@
    • {{/each}} + {{!-- add button --}} + {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='spell' }} \ No newline at end of file diff --git a/src/templates/actor/partials/talents-abilities-overview.hbs b/src/templates/actor/partials/talents-abilities-overview.hbs index e40b2aa..19bac51 100644 --- a/src/templates/actor/partials/talents-abilities-overview.hbs +++ b/src/templates/actor/partials/talents-abilities-overview.hbs @@ -15,9 +15,8 @@ {{#*inline "ifHasItemOfType"}} {{#if (and (ne itemsArray undefined) (gt itemsArray.length 0))}} {{> @partial-block}} -{{else}} - {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType=dataType }} {{/if}} +{{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType=dataType }} {{/inline}} @@ -98,7 +97,7 @@ {{/inline}} {{!-- -!-- Render a list header for a base item list entries from a given item. +!-- Render a list header for a base item list entry from a given item. !-- The partial assumes a variable dataType to be given in the context. !-- !-- @param dataType: the string item type for the list @@ -111,8 +110,8 @@
    {{localize 'DS4.ItemName'}}
    {{!-- description --}}
    {{localize 'DS4.Description'}}
    - {{!-- add button --}} - {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType=dataType }} + {{!-- control buttons placeholder --}} +
    {{/inline}} @@ -133,8 +132,8 @@
    {{localize 'DS4.TalentRank'}}
    {{!-- description --}}
    {{localize 'DS4.Description'}}
    - {{!-- add button --}} - {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='talent' }} + {{!-- control buttons placeholder --}} +
    {{#each itemsByType.talent as |item id|}} {{> talentListEntry item=item}} From 4c8bd29e2e068b08ee96266d7f9972e9e96eecc0 Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sat, 23 Jan 2021 23:49:45 +0100 Subject: [PATCH 2/7] added unit to char height & weigt title --- src/lang/de.json | 4 ++-- src/lang/en.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lang/de.json b/src/lang/de.json index f81a5f2..a2ce52d 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -144,9 +144,9 @@ "DS4.CharacterProfileBirthday": "Geburtstag", "DS4.CharacterProfileBirthplace": "Geburtsort", "DS4.CharacterProfileAge": "Alter", - "DS4.CharacterProfileHeight": "Größe", + "DS4.CharacterProfileHeight": "Größe [cm]", "DS4.CharacterProfileHairColor": "Haarfarbe", - "DS4.CharacterProfileWeight": "Gewicht", + "DS4.CharacterProfileWeight": "Gewicht [kg]", "DS4.CharacterProfileEyeColor": "Augenfarbe", "DS4.CharacterProfileSpecialCharacteristics": "Besondere Eigenschaften", "DS4.CharacterCurrencyGold": "Gold", diff --git a/src/lang/en.json b/src/lang/en.json index ee1927e..8c754fb 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -144,9 +144,9 @@ "DS4.CharacterProfileBirthday": "Birthday", "DS4.CharacterProfileBirthplace": "Birthplace", "DS4.CharacterProfileAge": "Age", - "DS4.CharacterProfileHeight": "Height", + "DS4.CharacterProfileHeight": "Height [m]", "DS4.CharacterProfileHairColor": "Hair Color", - "DS4.CharacterProfileWeight": "Weight", + "DS4.CharacterProfileWeight": "Weight [kg]", "DS4.CharacterProfileEyeColor": "Eye Color", "DS4.CharacterProfileSpecialCharacteristics": "Special Characteristics", "DS4.CharacterCurrencyGold": "Gold", From b1e7f61ed57bd48761d58ecf38be97a2972b8bea Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sun, 24 Jan 2021 01:20:55 +0100 Subject: [PATCH 3/7] changed char special characteristics to textarea --- src/templates/actor/character-sheet.hbs | 32 ++++++++++++------------ src/templates/actor/partials/profile.hbs | 8 +++++- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/templates/actor/character-sheet.hbs b/src/templates/actor/character-sheet.hbs index 0fb538f..d425326 100644 --- a/src/templates/actor/character-sheet.hbs +++ b/src/templates/actor/character-sheet.hbs @@ -84,24 +84,24 @@ {{localize 'DS4.HeadingBiography'}} - {{!-- Sheet Body --}} -
    - {{!-- Items Tab --}} - {{> systems/ds4/templates/actor/partials/character-inventory.hbs}} +{{!-- Sheet Body (remove indentation to avoid annoying Handlebars auto-indent) --}} +
    +{{!-- Items Tab --}} +{{> systems/ds4/templates/actor/partials/character-inventory.hbs}} - {{!-- Spells Tab --}} - {{> systems/ds4/templates/actor/partials/spells-overview.hbs}} +{{!-- Spells Tab --}} +{{> systems/ds4/templates/actor/partials/spells-overview.hbs}} - {{!-- Talents Tab --}} - {{> systems/ds4/templates/actor/partials/talents-abilities-overview.hbs}} +{{!-- Talents Tab --}} +{{> systems/ds4/templates/actor/partials/talents-abilities-overview.hbs}} - {{! Profile Tab --}} - {{> systems/ds4/templates/actor/partials/profile.hbs}} +{{! Profile Tab --}} +{{> systems/ds4/templates/actor/partials/profile.hbs owner=owner}} - {{!-- Biography Tab --}} -
    - {{editor content=data.profile.biography target="data.profile.biography" button=true owner=owner - editable=editable}} -
    -
    +{{!-- Biography Tab --}} +
    +{{editor content=data.profile.biography target="data.profile.biography" button=true owner=owner +editable=editable}} +
    +
    diff --git a/src/templates/actor/partials/profile.hbs b/src/templates/actor/partials/profile.hbs index be95eeb..2359d8f 100644 --- a/src/templates/actor/partials/profile.hbs +++ b/src/templates/actor/partials/profile.hbs @@ -1,7 +1,7 @@
    {{#each data.profile as |profile-data-value profile-data-key|}} - {{#if (ne profile-data-key 'biography')}} + {{#if (and (ne profile-data-key 'biography') (ne profile-data-key 'specialCharacteristics'))}}
    {{/if}} {{/each}} +
    + + +
    From a8158894ddda1e4886e4dc8dc3cc58a848f03b57 Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sun, 24 Jan 2021 11:06:07 +0100 Subject: [PATCH 4/7] added thin space between value and unit in spells --- src/templates/actor/partials/spells-overview.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/actor/partials/spells-overview.hbs b/src/templates/actor/partials/spells-overview.hbs index e19e863..356ef30 100644 --- a/src/templates/actor/partials/spells-overview.hbs +++ b/src/templates/actor/partials/spells-overview.hbs @@ -13,7 +13,7 @@
    {{#if unitDatum.value }} - {{unitDatum.value}}{{lookup unitAbbrs unitDatum.unit}} + {{unitDatum.value}} {{lookup unitAbbrs unitDatum.unit}} {{else}}-{{/if}}
    {{/inline}} From 0b1c342ecfc0302306aa753a09c71f1cb0a4d1b2 Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sun, 24 Jan 2021 13:11:08 +0100 Subject: [PATCH 5/7] select text of input fields when focused - the content of input fields of relevant sheets and dialogs are now selected upon focus - autofocus the Gamemaster roll modifier in the roll dialog --- src/module/ds4.ts | 18 ++++++++++++++++++ src/templates/roll/roll-options.hbs | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/module/ds4.ts b/src/module/ds4.ts index 81115a4..a20f18e 100644 --- a/src/module/ds4.ts +++ b/src/module/ds4.ts @@ -133,3 +133,21 @@ Hooks.once("setup", function () { Hooks.once("ready", function () { migration.migrate(); }); + +/** + * Select the text of input elements in given sheets via onfocus listener. + * The hook names are of the form "render"+sheet_superclassname and are called within + * the render() method of the foundry Application class. + * Note: The render hooks of all classes in the class hierarchy are called, + * so e.g. for a Dialog, both "renderDialog" and "renderApplication" are called + * (in this order). + */ +["renderApplication", "renderActorSheet", "renderItemSheet"].forEach((hookName: string) => { + Hooks.on(hookName, (app: Dialog, html: JQueryStatic, data: any) => { + $(html) + .find("input") + .on("focus", (ev: JQuery.FocusEvent) => { + ev.currentTarget.select(); + }); + }); +}); diff --git a/src/templates/roll/roll-options.hbs b/src/templates/roll/roll-options.hbs index 8c3e7dc..153d463 100644 --- a/src/templates/roll/roll-options.hbs +++ b/src/templates/roll/roll-options.hbs @@ -2,7 +2,7 @@ - + From 867c417737c0f415b973ff9e0c3ad059307f42f5 Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sun, 24 Jan 2021 16:11:59 +0100 Subject: [PATCH 6/7] removed unnecessary partial arg in char sheet The argument was accidentally introduced before. --- src/templates/actor/character-sheet.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/actor/character-sheet.hbs b/src/templates/actor/character-sheet.hbs index d425326..75be93f 100644 --- a/src/templates/actor/character-sheet.hbs +++ b/src/templates/actor/character-sheet.hbs @@ -96,7 +96,7 @@ {{> systems/ds4/templates/actor/partials/talents-abilities-overview.hbs}} {{! Profile Tab --}} -{{> systems/ds4/templates/actor/partials/profile.hbs owner=owner}} +{{> systems/ds4/templates/actor/partials/profile.hbs}} {{!-- Biography Tab --}}
    From f5117623658f4e38bd1f739c3747f8ebed8db801 Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Tue, 26 Jan 2021 20:30:53 +0100 Subject: [PATCH 7/7] Apply 1 suggestion(s) to 1 file(s) --- src/templates/actor/character-sheet.hbs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/templates/actor/character-sheet.hbs b/src/templates/actor/character-sheet.hbs index 75be93f..0d0382c 100644 --- a/src/templates/actor/character-sheet.hbs +++ b/src/templates/actor/character-sheet.hbs @@ -84,6 +84,8 @@ {{localize 'DS4.HeadingBiography'}} + + {{!-- Sheet Body (remove indentation to avoid annoying Handlebars auto-indent) --}}
    {{!-- Items Tab --}} @@ -104,4 +106,6 @@ editable=editable}}
    + +