Working on 0.8.x

- some fix for 0.8.3, and working on titles

system/templates/actors/character-sheet.html

@@ -47,25 +47,7 @@
 
         {{!-- Inventory Tab --}}
         <article class="tab inventory" data-group="primary" data-tab="inventory">
-            <fieldset class="money money-wrapper">
-                <legend class="section-header">{{localize 'l5r5e.money.title'}}</legend>
-                <label>
-                    {{localize 'l5r5e.money.koku'}}
-                    <input name="data.money.koku" type="number" value="{{data.data.money.koku}}" data-dtype="Number" min="0" placeholder="0"/>
-                </label>
-                <label>
-                    {{localize 'l5r5e.money.bu'}}
-                    <input name="data.money.bu" type="number" value="{{data.data.money.bu}}" data-dtype="Number" min="0" placeholder="0"/>
-                </label>
-                <label>
-                    {{localize 'l5r5e.money.zeni'}}
-                    <input name="data.money.zeni" type="number" value="{{data.data.money.zeni}}" data-dtype="Number" min="0" placeholder="0"/>
-                </label>
-            </fieldset>
-            <fieldset class="items-wrapper">
-                <legend>{{localize 'l5r5e.equipment'}}</legend>
-                {{> 'systems/l5r5e/templates/items/item/items.html'}}
-            </fieldset>
+            {{> 'systems/l5r5e/templates/actors/character/inventory.html'}}
         </article>
 
         {{!-- Experience Tab --}}

system/templates/actors/character/experience.html

@@ -61,7 +61,6 @@
         </tbody>
     </table>
 </fieldset>
-
 {{!-- Others progession (does not count in school xp) --}}
 <fieldset class="xp-spent xp-spent-body">
     <legend class="tools">{{localize 'l5r5e.advancements.title'}} <a data-item-type="advancement-others" class="advancement-others-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a></legend>

system/templates/actors/character/inventory.html

@@ -0,0 +1,36 @@
+<fieldset class="money money-wrapper">
+    <legend class="section-header">{{localize 'l5r5e.money.title'}}</legend>
+    <label>
+        {{localize 'l5r5e.money.koku'}}
+        <input name="data.money.koku" type="number" value="{{data.data.money.koku}}" data-dtype="Number" min="0" placeholder="0"/>
+    </label>
+    <label>
+        {{localize 'l5r5e.money.bu'}}
+        <input name="data.money.bu" type="number" value="{{data.data.money.bu}}" data-dtype="Number" min="0" placeholder="0"/>
+    </label>
+    <label>
+        {{localize 'l5r5e.money.zeni'}}
+        <input name="data.money.zeni" type="number" value="{{data.data.money.zeni}}" data-dtype="Number" min="0" placeholder="0"/>
+    </label>
+</fieldset>
+{{!-- items list --}}
+<fieldset class="items-wrapper">
+    <legend>{{localize 'l5r5e.equipment'}}</legend>
+    {{> 'systems/l5r5e/templates/items/item/items.html'}}
+</fieldset>
+{{!-- item patterns list --}}
+<fieldset>
+    <legend class="text-block-header">
+        {{localize 'l5r5e.advancements.item_pattern'}}
+        {{#if options.editable}}
+            <a data-item-type="item_pattern" class="item-pattern-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
+        {{/if}}
+    </legend>
+    <ul class="item-list">
+        {{#each actor.items as |pattern id|}}
+            {{#ifCond pattern.data.type '==' 'item_pattern'}}
+                {{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-entry.html' pattern=pattern id=id editable=../options.editable}}
+            {{/ifCond}}
+        {{/each}}
+    </ul>
+</fieldset>

system/templates/actors/character/narrative.html

@@ -41,38 +41,6 @@
             {{/each}}
         </ul>
     </fieldset>
-    {{!-- item-pattern --}}
-    <fieldset>
-        <legend class="text-block-header">
-            {{localize 'l5r5e.advancements.item_pattern' }}
-            {{#if options.editable}}
-                <a data-item-type="item_pattern" class="item-pattern-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
-            {{/if}}
-        </legend>
-        <ul class="item-list">
-            {{#each actor.items as |pattern id|}}
-                {{#ifCond pattern.data.type '==' 'item_pattern'}}
-                    {{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-entry.html' pattern=pattern id=id editable=../options.editable}}
-                {{/ifCond}}
-            {{/each}}
-        </ul>
-    </fieldset>
-    {{!-- signature-scroll --}}
-    <fieldset>
-        <legend class="text-block-header">
-            {{localize 'l5r5e.advancements.signature_scroll' }}
-            {{#if options.editable}}
-                <a data-item-type="signature_scroll" class="signature-scroll-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
-            {{/if}}
-        </legend>
-        <ul class="item-list">
-            {{#each actor.items as |scroll id|}}
-                {{#ifCond scroll.data.type '==' 'signature_scroll'}}
-                    {{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-entry.html' scroll=scroll id=id editable=../options.editable}}
-                {{/ifCond}}
-            {{/each}}
-        </ul>
-    </fieldset>
     {{!-- bonds --}}
     <fieldset>
         <legend class="text-block-header">

system/templates/actors/character/techniques.html

@@ -1,4 +1,5 @@
 <div class="techniques-wrapper">
+    {{!-- technique types --}}
     <div class="checklist">
         <i>{{localize 'l5r5e.techniques.type'}}</i>
         {{#each data.techniquesList as |technique|}}
@@ -8,6 +9,7 @@
             </label>
         {{/each}}
     </div>
+    {{!-- technique list --}}
     {{#each data.splitTechniquesList as |list technique|}}
         <fieldset class="section-header flexrow">
             <legend class="technique-controls">
@@ -23,4 +25,20 @@
             </ul>
         </fieldset>
     {{/each}}
+    {{!-- signature scroll list --}}
+    <fieldset class="section-header flexrow">
+        <legend class="text-block-header">
+            {{localize 'l5r5e.advancements.signature_scroll' }}
+            {{#if options.editable}}
+                <a data-item-type="signature_scroll" class="signature-scroll-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
+            {{/if}}
+        </legend>
+        <ul class="item-list">
+            {{#each actor.items as |scroll id|}}
+                {{#ifCond scroll.data.type '==' 'signature_scroll'}}
+                    {{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-entry.html' scroll=scroll id=id editable=../options.editable}}
+                {{/ifCond}}
+            {{/each}}
+        </ul>
+    </fieldset>
 </div>

system/templates/actors/npc-sheet.html

@@ -50,10 +50,7 @@
 
         {{!-- Inventory Tab --}}
         <article class="tab inventory" data-group="primary" data-tab="inventory">
-            <fieldset class="items-wrapper">
-                <legend>{{localize 'l5r5e.equipment'}}</legend>
-                {{> 'systems/l5r5e/templates/items/item/items.html'}}
-            </fieldset>
+            {{> 'systems/l5r5e/templates/actors/npc/inventory.html'}}
         </article>
     </section>
 </form>

system/templates/actors/npc/inventory.html

@@ -0,0 +1,20 @@
+<fieldset class="items-wrapper">
+    <legend>{{localize 'l5r5e.equipment'}}</legend>
+    {{> 'systems/l5r5e/templates/items/item/items.html'}}
+</fieldset>
+{{!-- item patterns list --}}
+<fieldset>
+    <legend class="text-block-header">
+        {{localize 'l5r5e.advancements.item_pattern' }}
+        {{#if options.editable}}
+            <a data-item-type="item_pattern" class="item-pattern-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
+        {{/if}}
+    </legend>
+    <ul class="item-list">
+        {{#each actor.items as |pattern id|}}
+            {{#ifCond pattern.data.type '==' 'item_pattern'}}
+                {{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-entry.html' pattern=pattern id=id editable=../options.editable}}
+            {{/ifCond}}
+        {{/each}}
+    </ul>
+</fieldset>

system/templates/actors/npc/narrative.html

@@ -28,38 +28,6 @@
         {{/each}}
     </ul>
 </fieldset>
-{{!-- item-pattern --}}
-<fieldset>
-    <legend class="text-block-header">
-        {{localize 'l5r5e.advancements.item_pattern' }}
-        {{#if options.editable}}
-            <a data-item-type="item_pattern" class="item-pattern-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
-        {{/if}}
-    </legend>
-    <ul class="item-list">
-        {{#each actor.items as |pattern id|}}
-            {{#ifCond pattern.data.type '==' 'item_pattern'}}
-                {{> 'systems/l5r5e/templates/items/item-pattern/item-pattern-entry.html' pattern=pattern id=id editable=../options.editable}}
-            {{/ifCond}}
-        {{/each}}
-    </ul>
-</fieldset>
-{{!-- signature-scroll --}}
-<fieldset>
-    <legend class="text-block-header">
-        {{localize 'l5r5e.advancements.signature_scroll' }}
-        {{#if options.editable}}
-            <a data-item-type="signature_scroll" class="signature-scroll-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
-        {{/if}}
-    </legend>
-    <ul class="item-list">
-        {{#each actor.items as |scroll id|}}
-            {{#ifCond scroll.data.type '==' 'signature_scroll'}}
-                {{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-entry.html' scroll=scroll id=id editable=../options.editable}}
-            {{/ifCond}}
-        {{/each}}
-    </ul>
-</fieldset>
 {{!-- bonds --}}
 <fieldset>
     <legend class="text-block-header">

system/templates/actors/npc/techniques.html

@@ -2,6 +2,7 @@
     <legend class="technique-controls">
         {{localize 'l5r5e.techniques.title'}}
     </legend>
+    {{!-- technique types --}}
     <div class="checklist">
         <i>{{localize 'l5r5e.techniques.type'}}</i>
         {{#each data.techniquesList as |technique|}}
@@ -11,6 +12,7 @@
             </label>
         {{/each}}
     </div>
+    {{!-- technique list --}}
     {{#each data.splitTechniquesList as |list technique|}}
         <fieldset class="section-header flexrow">
             <legend class="technique-controls">
@@ -26,4 +28,20 @@
             </ul>
         </fieldset>
     {{/each}}
+    {{!-- signature scroll list --}}
+    <fieldset class="section-header flexrow">
+        <legend class="text-block-header">
+            {{localize 'l5r5e.advancements.signature_scroll' }}
+            {{#if options.editable}}
+                <a data-item-type="signature_scroll" class="signature-scroll-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a>
+            {{/if}}
+        </legend>
+        <ul class="item-list">
+            {{#each actor.items as |scroll id|}}
+                {{#ifCond scroll.data.type '==' 'signature_scroll'}}
+                    {{> 'systems/l5r5e/templates/items/signature-scroll/signature-scroll-entry.html' scroll=scroll id=id editable=../options.editable}}
+                {{/ifCond}}
+            {{/each}}
+        </ul>
+    </fieldset>
 </fieldset>

system/templates/items/advancement/advancement-entry.html

@@ -1,4 +1,4 @@
-<li class="item advancement flexcol toggle-on-click" data-toggle="item-description-{{advancement._id}}">
+<li class="item advancement flexcol toggle-on-click" data-toggle="item-description-{{advancement._id}}" data-item-id="{{advancement._id}}">
     <ul class="item-header advancement-controls">
         <li class="item-img"><img src="{{advancement.img}}" title="{{advancement.name}}" width="32px" height="32px"/></li>
         <li class="item-name">{{advancement.name}}</li>

system/templates/items/armor/armor-entry.html

@@ -1,4 +1,4 @@
-<li class="item armor flexcol toggle-on-click" data-toggle="item-description-{{armor.id}}">
+<li class="item armor flexcol toggle-on-click" data-toggle="item-description-{{armor.id}}" data-item-id="{{armor.id}}">
     <ul class="item-header item-control">
         <li class="item-img"><img src="{{armor.img}}" title="{{armor.name}}" width="32px" height="32px"/></li>
         <li class="item-name">{{armor.name}}</li>

system/templates/items/bond/bond-entry.html

@@ -1,4 +1,4 @@
-<li class="item bond flexcol toggle-on-click" data-toggle="item-description-{{bond.id}}">
+<li class="item bond flexcol toggle-on-click" data-toggle="item-description-{{bond.id}}" data-item-id="{{bond.id}}">
     <ul class="item-header bond-controls">
         <li class="item-img"><img src="{{bond.img}}" title="{{bond.name}}" width="32px" height="32px"/></li>
         <li class="item-name">{{bond.name}}</li>

system/templates/items/item-pattern/item-pattern-entry.html

@@ -1,4 +1,4 @@
-<li class="item item-pattern flexcol toggle-on-click" data-toggle="item-description-{{pattern.id}}">
+<li class="item item-pattern flexcol toggle-on-click" data-toggle="item-description-{{pattern.id}}" data-item-id="{{pattern.id}}">
     <ul class="item-header pattern-controls">
         <li class="item-img"><img src="{{pattern.img}}" title="{{pattern.name}}" width="24px" height="24px"/></li>
         <li class="item-name">{{pattern.name}}</li>

system/templates/items/item/item-entry.html

@@ -1,4 +1,4 @@
-<li class="item flexcol toggle-on-click" data-toggle="item-description-{{item._id}}">
+<li class="item flexcol toggle-on-click" data-toggle="item-description-{{item._id}}" data-item-id="{{item._id}}">
     <ul class="item-header item-control">
         <li class="item-img"><img src="{{item.img}}" title="{{item.name}}" width="32px" height="32px"/></li>
         <li class="item-name">{{ item.name }} <sub>x{{item.data.quantity}}</sub></li>

system/templates/items/peculiarity/peculiarity-entry.html

@@ -1,4 +1,4 @@
-<li class="item peculiarity flexcol toggle-on-click" data-toggle="item-description-{{peculiarity.id}}">
+<li class="item peculiarity flexcol toggle-on-click" data-toggle="item-description-{{peculiarity.id}}" data-item-id="{{peculiarity.id}}">
     <ul class="item-header peculiarity-controls">
         <li class="item-img"><img src="{{peculiarity.img}}" title="{{peculiarity.name}}" width="32px" height="32px"/></li>
         <li class="item-name">{{peculiarity.name}}</li>

system/templates/items/signature-scroll/signature-scroll-entry.html

@@ -1,4 +1,4 @@
-<li class="item signature-scroll flexcol toggle-on-click" data-toggle="item-description-{{scroll.id}}">
+<li class="item signature-scroll flexcol toggle-on-click" data-toggle="item-description-{{scroll.id}}" data-item-id="{{scroll.id}}">
     <ul class="item-header signature-scroll-controls">
         <li class="item-img"><img src="{{scroll.img}}" title="{{scroll.name}}" width="24px" height="24px"/></li>
         <li class="item-name">{{scroll.name}}</li>

system/templates/items/technique/technique-entry.html

@@ -1,4 +1,4 @@
-<li class="item technique flexcol toggle-on-click" data-toggle="item-description-{{technique._id}}">
+<li class="item technique flexcol toggle-on-click" data-toggle="item-description-{{technique._id}}" data-item-id="{{technique._id}}">
     <ul class="item-header technique-controls">
         <li class="item-img"><img src="{{technique.img}}" title="{{technique.name}}" width="32px" height="32px"/></li>
         <li class="item-name">{{technique.name}}</li>

system/templates/items/title/title-entry.html

@@ -1,4 +1,4 @@
-<li class="item title flexcol toggle-on-click" data-toggle="item-description-{{title._id}}">
+<li class="item title flexcol toggle-on-click" data-toggle="item-description-{{title._id}}" data-item-id="{{title._id}}">
     <ul class="item-header title-controls">
         <li class="item-img"><img src="{{title.img}}" title="{{title.name}}" width="24px" height="24px"/></li>
         <li class="item-name"><i class="i_{{title.data.ring}}" title="{{localizeRing title.data.ring}}"></i> {{title.name}}</li>

system/templates/items/title/title-sheet.html

@@ -3,10 +3,15 @@
         <img class="profile-img" src="{{document.img}}" data-edit="img" title="{{document.name}}"/>
         <h1 class="charname"><input name="name" type="text" value="{{document.name}}" placeholder="Name"/></h1>
     </header>
+    {{!-- Sheet Navigation --}}
+    <nav class="sheet-tabs tabs" data-group="primary">
+        <a class="item active" data-tab="attributes">{{ localize "l5r5e.description" }}</a>
+        <a class="item" data-tab="experience">{{ localize "l5r5e.advancements.title" }}</a>
+    </nav>
     {{!-- Sheet Body --}}
     <section class="sheet-body">
         {{!-- Attributes Tab --}}
-        <article class="attributes" data-group="primary" data-tab="attributes">
+        <article class="tab attributes" data-group="primary" data-tab="attributes">
             <label class="attribute">
                 {{ localize 'l5r5e.advancements.cost' }}
                 <input class="select-on-focus" type="number" name="data.xp_cost" value="{{document.data.data.xp_cost}}" data-dtype="Number" min="0" placeholder="0"/>
@@ -26,7 +31,30 @@
         </article>
 
         {{!-- Embbed advancements --}}
-        {{!-- TODO --}}
+        <article class="tab experience" data-group="primary" data-tab="experience">
+            {{!-- TODO --}}
+            {{!-- Others progession (does not count in school xp) --}}
+            <fieldset class="xp-spent xp-spent-body">
+                <legend class="tools">{{localize 'l5r5e.advancements.title'}} <a data-item-type="advancement-others" class="advancement-others-control item-add" title="{{localize 'l5r5e.global.add'}}"><i class="fas fa-plus"></i></a></legend>
+                <table>
+                    <thead class="flex">
+                    <tr class="flexrow row">
+                        <th class="name">{{localize 'l5r5e.name'}}</th>
+                        <th class="xp">{{localize 'l5r5e.advancements.spent'}}</th>
+                        <th class="rank">{{localize 'l5r5e.rank'}}</th>
+                        {{#if editable}}
+                            <th class="actions"></th>
+                        {{/if}}
+                    </tr>
+                    </thead>
+                    <tbody class="flex">
+                    {{#each data.advancementsOthers as |advancement advancementId|}}
+                        {{> 'systems/l5r5e/templates/actors/character/advancement-others.html' advancement=advancement editable=../options.editable}}
+                    {{/each}}
+                    </tbody>
+                </table>
+            </fieldset>
+        </article>
 
         {{!-- Descr + Page ref --}}
         {{> 'systems/l5r5e/templates/items/item/item-infos.html'}}