Fix for release 0.8.x

Limited profil img
Bond type
Html table fix
Social tab grid
This commit is contained in:
Mandar
2021-06-01 19:29:42 +02:00
parent fd672d7bad
commit 8c961f856d
9 changed files with 61 additions and 29 deletions

View File

@@ -1,6 +1,6 @@
<tr class="flexrow row advancement">
{{#if show_curriculum_toggle}}<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>{{/if}}
<td class="name" name="advancement.name"><img src="{{advancement.img}}" title="{{advancement.name}}"> {{advancement.name}}{{#if advancement.data.bond_type}} ({{advancement.data.bond_type}}){{/if}}</td>
{{#if show_curriculum_toggle}}<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>{{/if}}
<td class="xp" name="advancement.xp">{{#if advancement.data.xp_used_total}}{{advancement.data.xp_used_total}}{{else}}{{advancement.data.xp_used}}{{/if}}</td>
<td class="rank" name="advancement.rank">{{advancement.data.rank}}</td>
{{#if editable}}

View File

@@ -1,6 +1,6 @@
<tr data-group="advancements" data-tab="advancement_rank_{{rank}}" class="flexrow row advancement tab">
<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>
<td class="name" name="advancement.name"><img src="{{advancement.img}}" title="{{advancement.name}}"> {{advancement.name}}</td>
<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>
<td class="xp" name="advancement.xp">{{advancement.data.xp_used}}</td>
<td class="rank" name="advancement.rank">{{advancement.data.rank}}</td>
{{#if editable}}

View File

@@ -27,8 +27,8 @@
<table>
<thead class="flex">
<tr class="flexrow row">
<th class="curriculum"></th>
<th class="name">{{localize 'l5r5e.name'}}</th>
<th class="curriculum"><i class="fas fa-graduation-cap"></i></th>
<th class="xp">{{localize 'l5r5e.advancements.spent'}}</th>
<th class="rank">{{localize 'l5r5e.rank'}}</th>
{{#if editable}}
@@ -42,13 +42,13 @@
{{> 'systems/l5r5e/templates/actors/character/advancement-school.html' advancement=advancement rank=rankObject.rank editable=../../options.editable}}
{{/each}}
{{#ifCond rankObject.rank '>' 0}}
<tr data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}" class="flexrow row tab">
<tr class="tfoot flexrow row" data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}" class="flexrow row tab">
<th>{{localize 'l5r5e.advancements.total_xp_curriculum'}} : {{rankObject.spent.curriculum}}{{#if rankObject.goal}} / {{rankObject.goal}}{{/if}}</th>
<th>{{localize 'l5r5e.advancements.total_xp_spent'}} : {{rankObject.spent.total}}</th>
</tr>
{{#ifCond ../data.data.identity.school_rank '<' 6}}
{{#ifCond (ifCond ../data.data.identity.school_rank '==' rankObject.rank) '&&' (ifCond rankObject.spent.curriculum '>=' rankObject.goal)}}
<tr data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}" class="flexrow row tab">
<tr class="tfoot flexrow row" data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}" class="flexrow row tab">
<th>
<button type="button" name="validate-curriculum">
<i class='fas fa-check-square'></i> {{ localize 'l5r5e.advancements.curriculum_validate'}}
@@ -82,11 +82,11 @@
{{/each}}
</tbody>
<tfoot class="flex">
<tr>
<th>
{{localize 'l5r5e.advancements.total_xp_spent'}} : {{data.advancementsOthersTotalXp}}
</th>
</tr>
<tr class="tfoot flexrow">
<th>
{{localize 'l5r5e.advancements.total_xp_spent'}} : {{data.advancementsOthersTotalXp}}
</th>
</tr>
</tfoot>
</table>
</fieldset>

View File

@@ -8,6 +8,15 @@
<textarea type="text" name="data.social.giri">{{data.data.social.giri}}</textarea>
</label>
</fieldset>
{{!-- Description (npc have it on header) --}}
{{#ifCond data.type '==' "character"}}
<fieldset class="narrative-description">
<legend class="text-block-header">{{localize 'l5r5e.description' }}</legend>
{{editor content=data.data.description target="data.description" button=true editable=options.editable}}
</fieldset>
{{/ifCond}}
</div>
<div class="narrative-list">
<fieldset>
<legend class="text-block-header">
{{localize 'l5r5e.social.advantages'}}
@@ -55,13 +64,6 @@
</ul>
</fieldset>
</div>
{{!-- Description (npc have it on header) --}}
{{#ifCond data.type '==' "character"}}
<fieldset class="narrative-description">
<legend class="text-block-header">{{localize 'l5r5e.description' }}</legend>
{{editor content=data.data.description target="data.description" button=true editable=options.editable}}
</fieldset>
{{/ifCond}}
{{!-- Notes (private) --}}
<fieldset class="narrative-note">
<legend class="text-block-header">{{localize 'l5r5e.notes' }}</legend>