Item first iteration style, added item infos and value

system/lang/en-en.json

@@ -58,6 +58,12 @@
         "passions": "Passions",
         "passionstip": "After performing a check related to your passion, remove 3 strife.",
         "personality": "Personality",
+        "description": "Description",
+        "bought_at_rank": "Bought at rank",
+        "book_reference": "Reference",
+        "value": "Value",
+        "rarity": "Rarity",
+        "zeni": "Zeni",
         "chatdices": {
             "successes": "Successes",
             "explosives": "Explosives",
@@ -77,14 +83,23 @@
         "current": "Current",
         "quantity": "Quantity",
         "weight": "Weight",
-        "damage": "Damage",
-        "range": "Range",
         "properties": "Properties",
-        "weapons": "Weapons",
+        "weapons": {
+            "title": "Weapons",
+            "damage": "Damage",
+            "range": "Range",
+            "stats": "Stats",
+            "sheathed": "Equipped / Sheathed",
+            "readied": "Readied",
+            "category": "Category",
+            "deadliness": "Deadliness",
+            "grips": "Grips"
+        },
         "armors": {
             "title": "Armors",
             "physical": "physical",
-            "supernatural": "supernatural"
+            "supernatural": "supernatural",
+            "equipped": "Equipped"
         },
         "add": "Add",
         "items": "Items",
@@ -217,7 +232,8 @@
             "title_new": "New advancement",
             "total": "Total",
             "spent": "Used",
-            "saved": "Saved"
+            "saved": "Saved",
+            "curriculum": "in curriculum"
         },
         "twenty_questions": {
             "title": "Twenty questions",

system/lang/es-es.json

@@ -58,6 +58,12 @@
         "passions": "Pasiones",
         "passionstip": "Después de efectuar una tirada relacionada con tu pasión, descarta tres puntos de Conflicto.",
         "personality": "Personalidad",
+        "description": "Description",
+        "bought_at_rank": "Bought at rank",
+        "book_reference": "Reference",
+        "value": "Value",
+        "rarity": "Rarity",
+        "zeni": "Zeni",
         "chatdices": {
             "successes": "Successes",
             "explosives": "Explosives",
@@ -77,14 +83,24 @@
         "current": "Actuales",
         "quantity": "Cantidad",
         "weight": "Peso",
-        "damage": "Daño",
-        "range": "Rango",
         "properties": "Propiedades",
-        "weapons": "Armas",
+        "weapons": {
+            "title": "Armas",
+            "damage": "Daño",
+            "range": "Rango",
+            "stats": "Stats",
+            "sheathed": "Equipped / Sheathed",
+            "readied": "Readied",
+            "category": "Category",
+            "power": "Power",
+            "deadliness": "Deadliness",
+            "grips": "Grips"
+        },
         "armors": {
             "title": "Armors",
             "physical": "physical",
-            "supernatural": "supernatural"
+            "supernatural": "supernatural",
+            "equipped": "Equipped"
         },
         "add": "Add",
         "items": "Equipo",
@@ -216,7 +232,8 @@
             "title_new": "New advancement",
             "total": "Total",
             "spent": "Usada",
-            "saved": "Restante"
+            "saved": "Restante",
+            "curriculum": "in curriculum"
         },
         "twenty_questions": {
             "title": "Twenty questions",

system/lang/fr-fr.json

@@ -63,6 +63,12 @@
         "passions": "Passions",
         "passionstip": "Lorsque vous effectuez un test auquel s'applique une passion, éliminez 3 points de Conflit.",
         "personality": "Personnalité",
+        "description": "Description",
+        "bought_at_rank": "Acheté au rang",
+        "book_reference": "Référence",
+        "value": "Valeur",
+        "rarity": "Rareté",
+        "zeni": "Zeni",
         "chatdices": {
             "successes": "Succès",
             "explosives": "Explosifs",
@@ -82,14 +88,23 @@
         "current": "Actuel",
         "quantity": "Quantité",
         "weight": "Poids",
-        "damage": "Dommage",
-        "range": "Distance",
         "properties": "Propriétés",
-        "weapons": "Armement",
+        "weapons": {
+            "title": "Armement",
+            "damage": "Dégâts de base (DDB)",
+            "range": "Portée (PRT)",
+            "stats": "Attributs",
+            "sheathed": "Équipé / Rengainée",
+            "readied": "Apprêté",
+            "category": "Catégorie",
+            "deadliness": "Dangerosité (DGR)",
+            "grips": "Prise"
+        },
         "armors": {
             "title": "Armures",
             "physical": "Physique",
-            "supernatural": "Spirituelle"
+            "supernatural": "Spirituelle",
+            "equipped": "Équipé"
         },
         "items": "Objets",
         "feats": "Prouesses",
@@ -221,7 +236,8 @@
             "title_new": "Nouvelle progression",
             "total": "Totale",
             "spent": "Dépensée",
-            "saved": "Restante"
+            "saved": "Restante",
+            "curriculum": "Inclus dans le cursus"
         },
         "twenty_questions": {
             "title": "Vingt questions",

system/scripts/preloadTemplates.js

@@ -31,7 +31,9 @@ export const PreloadTemplates = async function () {
         "systems/l5r5e/templates/items/armor/armor-sheet.html",
         "systems/l5r5e/templates/items/item/items.html",
         "systems/l5r5e/templates/items/item/item-entry.html",
+        "systems/l5r5e/templates/items/item/item-value.html",
         "systems/l5r5e/templates/items/item/item-sheet.html",
+        "systems/l5r5e/templates/items/item/item-infos.html",
         "systems/l5r5e/templates/items/peculiarity/peculiarities.html",
         "systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html",
         "systems/l5r5e/templates/items/peculiarity/peculiarity-sheet.html",

system/styles/scss/cursors.scss

@@ -44,7 +44,8 @@ a,
 form .form-group .form-fields button,
 .sidebar-tab .action-buttons button,
 .dialog .dialog-buttons button,
-form button {
+form button,
+label {
     cursor: url("../assets/cursors/pointer.webp"), pointer !important;
 }
 .draggable {

system/styles/scss/items.scss

@@ -1,3 +1,4 @@
+// Item List
 .item-list {
     flex: 100%;
     .item {
@@ -53,3 +54,144 @@
         }
     }
 }
+// Advancement Sheet, Armor Sheet, Item Sheet, Peculiarity Sheet, Property Sheet, Technique Sheet, Weapon Sheet
+&.advancement,
+&.armor,
+&.item,
+&.peculiarity,
+&.property,
+&.technique,
+&.weapon {
+    .sheet-header {
+        img {
+            flex: 0 0 75px;
+            height: 75px;
+            width: 75px;
+            background: rgba(255, 255, 255, 0.25);
+        }
+    }
+    article {
+        display: flex;
+        flex-wrap: wrap;
+        min-height: auto;
+        label {
+            color: $l5r5e-label;
+            margin: 0.25rem;
+            line-height: 1.5rem;
+        }
+        &.attributes {
+            select[name="data.advancement_type"],
+            select[name="data.skill"],
+            select[name="data.ring"] {
+                flex: 0 0 calc(40% - 0.5rem);
+                margin: 0.25rem;
+            }
+            .attribute-value,
+            .attribute,
+            .value {
+                flex: 0 0 calc(25% - 0.5rem);
+                margin: 0.5rem 0.25rem 0.25rem;
+            }
+            select[name="data.advancement_type"],
+            select[name="data.skill"] {
+                text-transform: capitalize;
+            }
+            .type,
+            .properties {
+                flex: 0 0 calc(50% - 0.5rem);
+                margin: 0.25rem;
+            }
+            .equipped {
+                flex: 100%;
+                margin: 0;
+                text-align: right;
+            }
+            input[type="text"] {
+                width: 2rem;
+                &.grip {
+                    width: 6rem;
+                }
+            }
+            fieldset {
+                input[type="text"] {
+                    float: right;
+                }
+            }
+        }
+        &.infos {
+            display: flex;
+            .reference {
+                flex: 0 0 calc(100% - 0.5rem);
+                input[name="data.book_reference"] {
+                    float: right;
+                    width: 70%;
+                }
+            }
+        }
+    }
+}
+&.advancement {
+    article {
+        &.attributes {
+            .attribute-value,
+            .attribute,
+            .value {
+                flex: 0 0 calc(33% - 0.5rem);
+            }
+            .cursus {
+                flex: 1;
+                line-height: 0.75rem;
+                text-align: right;
+                margin: 0 0.25rem;
+                input {
+                    margin-top: 0.25rem;
+                }
+            }
+        }
+    }
+}
+&.item {
+    article {
+        &.attributes {
+            .properties {
+                flex: 100%;
+            }
+        }
+    }
+}
+&.property {
+    .sheet-header {
+        img {
+            flex: 0 0 75px;
+            height: 75px;
+            width: 75px;
+            background: rgba(255, 255, 255, 0.25);
+        }
+    }
+    article {
+        min-height: calc(100% - 5rem);
+    }
+}
+&.weapon {
+    article {
+        &.attributes {
+            .attribute-value,
+            .stats {
+                flex: 0 0 calc(50% - 0.5rem);
+                margin: 0.25rem;
+            }
+            .value {
+                flex: 0 0 calc(25% - 0.5rem);
+            }
+            .category,
+            .skillType {
+                flex: 0 0 calc(50% - 0.5rem);
+                input,
+                .attribute-dtype {
+                    width: 100%;
+                    margin: 0.25rem;
+                }
+            }
+        }
+    }
+}

system/styles/scss/npc.scss

@@ -2,8 +2,7 @@
     .sheet-header {
         h1 {
             &:before {
-                top: -50%;
+                top: -3.75rem;
-                left: -0.5rem;
             }
         }
         img {

system/styles/scss/sheets.scss

@@ -69,7 +69,7 @@
                 height: 225px;
                 width: 100%;
                 z-index: -1;
-                top: -1.5rem;
+                top: -1rem;
                 left: -0.25rem;
             }
         }

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

@@ -1,71 +1,52 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
         <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-        <div class="header-fields">
+        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-        </div>
     </header>
     {{!-- Sheet Body --}}
     <section class="sheet-body">
-        {{!-- Sheet Tab Navigation --}}
-        <nav class="sheet-tabs tabs" data-group="primary">
-            <a class="item" data-tab="description">Description</a>
-            <a class="item" data-tab="attributes">Attributes</a>
-        </nav>
-        {{!-- Description Tab --}}
-        <article class="tab flexcol" data-group="primary" data-tab="description">
-            {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-            <div class="resource">
-                <label>{{ localize 'l5r5e.book_reference' }}</label>
-                <input type="text" name="data.book_reference" value="{{item.data.book_reference}}" />
-            </div>
-        </article>
         {{!-- Attributes Tab --}}
-        <article class="tab attributes" data-group="primary" data-tab="attributes">
+        <article class="attributes" data-group="primary" data-tab="attributes">
             <!-- TODO j'ai mis tous les attributs en vrac, à réorganiser -->
-
+            <select name="data.advancement_type">
-            <div>
+                {{#select item.data.advancement_type}}
-                <select name="data.advancement_type">
-                    {{#select item.data.advancement_type}}
                     {{#each item.data.subTypesList as |type|}}
-                    <option value="{{type}}">{{type}}</option>
+                        <option value="{{type}}">{{type}}</option>
                     {{/each}}
-                    {{/select}}
+                {{/select}}
-                </select>
+            </select>
 
-                {{#ifCond item.data.advancement_type '==' 'advantage' }}
+            {{#ifCond item.data.advancement_type '==' 'advantage' }}
                 <!-- TODO zone de drag n drop de l'item sélectionné ? -->
-                {{/ifCond}}
+            {{/ifCond}}
 
-                {{#ifCond item.data.advancement_type '==' 'ring' }}
+            {{#ifCond item.data.advancement_type '==' 'ring' }}
-                <select name="data.ring">
+            <select name="data.ring">
-                    {{#select item.data.ring}}
+                {{#select item.data.ring}}
                     {{#each item.data.ringsList as |obj|}}
-                    <option value="{{obj.id}}">{{obj.label}}</option>
+                        <option value="{{obj.id}}">{{obj.label}}</option>
                     {{/each}}
-                    {{/select}}
+                {{/select}}
-                </select>
+            </select>
-                {{/ifCond}}
+            {{/ifCond}}
 
-                {{#ifCond item.data.advancement_type '==' 'skill' }}
+            {{#ifCond item.data.advancement_type '==' 'skill' }}
                 <select name="data.skill">
                     <option value="none">{{localize 'l5r5e.twenty_questions.choosef'}}</option>
                     {{#select item.data.skill}}
-                    {{#each item.data.skillsList as |skills catId|}}
+                        {{#each item.data.skillsList as |skills catId|}}
-                    <optgroup label="{{localizeSkill catId 'title'}}">
+                        <optgroup label="{{localizeSkill catId 'title'}}">
-                        {{#each skills as |obj|}}
+                            {{#each skills as |obj|}}
-                        <option value="{{obj.id}}">{{obj.label}}</option>
+                            <option value="{{obj.id}}">{{obj.label}}</option>
+                            {{/each}}
+                        </optgroup>
                         {{/each}}
-                    </optgroup>
-                    {{/each}}
                     {{/select}}
                 </select>
-                {{/ifCond}}
+            {{/ifCond}}
-            </div>
+            <label class="cursus attribute-value checkbox">
-
-            <label class="attribute-value checkbox">
                 <input type="checkbox" name="data.in_curriculum" {{checked item.data.in_curriculum}} />
-                in curriculum
+                {{ localize 'l5r5e.advancements.curriculum' }}
             </label>
             <label class="attribute">
                 {{ localize 'l5r5e.advancements.spent' }}
@@ -80,5 +61,6 @@
                 <input type="text" name="data.bought_at_rank" value="{{data.bought_at_rank}}" data-dtype="Number" placeholder="0"/>
             </label>
         </article>
+        {{> 'systems/l5r5e/templates/items/item/item-infos.html' }}
     </section>
 </form>

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

@@ -1,67 +1,30 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
         <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-        <div class="header-fields">
+        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-            <div class="resource">
-            	<label>{{ localize 'l5r5e.quantity' }}</label>
-                <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
-            </div>
-            <div class="resource">
-            	<label>{{ localize 'l5r5e.weight' }}</label>
-                <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
-            </div>
-        </div>
-
-        <div class="header-fields">
-            <div class="resource">
-                <label>{{ localize 'l5r5e.rarity' }}</label>
-                <input type="text" name="data.rarity" value="{{data.rarity}}" data-dtype="Number"/>
-            </div>
-            <div class="resource">
-                <label>{{ localize 'l5r5e.zeni' }}</label>
-                <input type="text" name="data.zeni" value="{{data.zeni}}" data-dtype="Number"/>
-            </div>
-            <label class="attribute-value checkbox">
-                <input type="checkbox" name="data.equipped" {{checked item.data.equipped}} />
-                equipped
-            </label>
-        </div>
-
     </header>
     {{!-- Sheet Body --}}
     <section class="sheet-body">
-        {{!-- Sheet Tab Navigation --}}
+        {{!-- attributes --}}
-        <nav class="sheet-tabs tabs" data-group="primary">
+        <article class="attributes" data-group="primary" data-tab="description">
-            <a class="item" data-tab="description">Description</a>
+            <label class="equipped checkbox">
-        </nav>
+                <input type="checkbox" name="data.equipped" {{checked item.data.equipped}} />
-        {{!-- Description Tab --}}
+                {{ localize 'l5r5e.armors.equipped' }}
-        <article class="tab" data-group="primary" data-tab="description">
+            </label>
-            <fieldset>
+            {{> 'systems/l5r5e/templates/items/item/item-value.html' }}
-                <legend class="text-block-header">{{ localize 'l5r5e.description' }}</legend>
+            <fieldset class="attribute type">
-                {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-                <div class="resource">
-                    <label>{{ localize 'l5r5e.book_reference' }}</label>
-                    <input type="text" name="data.book_reference" value="{{data.book_reference}}" />
-                </div>
-            </fieldset>
-
-            <fieldset class="weapon-stats-content">
                 <legend class="text-header">{{ localize 'l5r5e.armors.title' }}</legend>
-                <label class="attribute-label">
+                <label>
                     {{ localize 'l5r5e.armors.physical' }}
                     <input type="text" name="data.armor.physical" value="{{data.armor.physical}}" data-dtype="Number" placeholder="0"/>
                 </label>
-                <label class="attribute-label">
+                <label>
                     {{ localize 'l5r5e.armors.supernatural' }}
                     <input type="text" name="data.armor.supernatural" value="{{data.armor.supernatural}}" data-dtype="Number" placeholder="0"/>
                 </label>
             </fieldset>
-
+            {{> 'systems/l5r5e/templates/items/property/properties.html' properties=data.propertiesList }}
-            <fieldset>
-                <legend class="text-block-header">{{ localize 'l5r5e.properties' }}</legend>
-                {{> 'systems/l5r5e/templates/items/property/properties.html' properties=data.propertiesList }}
-            </fieldset>
         </article>
+        {{> 'systems/l5r5e/templates/items/item/item-infos.html' }}
     </section>
 </form>

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

@@ -0,0 +1,11 @@
+{{!-- infos --}}
+<article class="infos" data-group="primary" data-tab="description">
+    <fieldset>
+        <legend class="text-block-header">{{ localize  'l5r5e.description' }}</legend>
+        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+    </fieldset>
+    <label class="reference">
+        {{ localize 'l5r5e.book_reference' }}
+        <input type="text" name="data.book_reference" value="{{data.book_reference}}" />
+    </label>
+</article>

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

@@ -1,54 +1,19 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
         <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-        <div class="header-fields">
+        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-            <div class="resource">
-            	<label>Quantity</label>
-                <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
-            </div>
-            <div class="resource">
-            	<label>Weight</label>
-                <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
-            </div>
-        </div>
-
-        <div class="header-fields">
-            <div class="resource">
-                <label>{{ localize 'l5r5e.rarity' }}</label>
-                <input type="text" name="data.rarity" value="{{data.rarity}}" data-dtype="Number"/>
-            </div>
-            <div class="resource">
-                <label>{{ localize 'l5r5e.zeni' }}</label>
-                <input type="text" name="data.zeni" value="{{data.zeni}}" data-dtype="Number"/>
-            </div>
-        </div>
-        <label class="attribute-value checkbox">
-            <input type="checkbox" name="data.equipped" {{checked item.data.equipped}} />
-            equipped
-        </label>
     </header>
     {{!-- Sheet Body --}}
     <section class="sheet-body">
-        {{!-- Sheet Tab Navigation --}}
-        <nav class="sheet-tabs tabs" data-group="primary">
-            <a class="item" data-tab="description">Description</a>
-            <a class="item" data-tab="properties">Properties</a>
-        </nav>
-        {{!-- Description Tab --}}
-        <article class="tab flexcol" data-group="primary" data-tab="description">
-            {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-            <div class="resource">
-                <label>{{ localize 'l5r5e.book_reference' }}</label>
-                <input type="text" name="data.book_reference" value="{{data.book_reference}}" />
-            </div>
-        </article>
         {{!-- properties Tab --}}
-        <article class="tab properties" data-group="primary" data-tab="properties">
+        <article class="attributes" data-group="primary" data-tab="properties">
-            <fieldset>
+            <label class="equipped checkbox">
-                <legend class="text-block-header">{{ localize 'l5r5e.properties' }}</legend>
+                <input type="checkbox" name="data.equipped" {{checked item.data.equipped}} />
-                {{> 'systems/l5r5e/templates/items/property/properties.html' properties=data.propertiesList }}
+                {{ localize 'l5r5e.armors.equipped' }}
-            </fieldset>
+            </label>
+            {{> 'systems/l5r5e/templates/items/item/item-value.html' }}
+            {{> 'systems/l5r5e/templates/items/property/properties.html' properties=data.propertiesList }}
         </article>
+        {{> 'systems/l5r5e/templates/items/item/item-infos.html' }}
     </section>
 </form>

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

@@ -0,0 +1,16 @@
+<label class="value">
+    {{ localize 'l5r5e.quantity' }}
+    <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
+</label>
+<label class="value">
+    {{ localize 'l5r5e.weight' }}
+    <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
+</label>
+<label class="value">
+    {{ localize 'l5r5e.rarity' }}
+    <input type="text" name="data.rarity" value="{{data.rarity}}" data-dtype="Number"/>
+</label>
+<label class="value">
+        {{ localize 'l5r5e.zeni' }}
+    <input type="text" name="data.zeni" value="{{data.zeni}}" data-dtype="Number"/>
+</label>

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

@@ -1,55 +1,35 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
         <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <div class="header-fields">
+        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-        </div>
     </header>
-
     {{!-- Sheet Body --}}
     <section class="sheet-body">
-        {{!-- Sheet Tab Navigation --}}
-        <nav class="sheet-tabs tabs" data-group="primary">
-            <a class="item" data-tab="description">Description</a>
-            <a class="item" data-tab="attributes">Attributes</a>
-        </nav>
-        {{!-- Description Tab --}}
-        <article class="tab flexcol" data-group="primary" data-tab="description">
-            {{editor content=item.data.description target="item.data.description" button=true owner=owner editable=editable}}
-            <div class="resource">
-                <label>{{ localize 'l5r5e.book_reference' }}</label>
-                <input type="text" name="data.book_reference" value="{{item.data.book_reference}}" />
-            </div>
-        </article>
         {{!-- Attributes Tab --}}
         <article class="tab attributes" data-group="primary" data-tab="attributes">
             <label class="attribute-value checkbox">
                 <input type="checkbox" name="data.in_curriculum" {{checked item.data.in_curriculum}} />
                 in curriculum
             </label>
-
             <!-- TODO j'ai mis tous les attributs en vrac, à réorganiser -->
             <select name="data.ring">
                 {{#select item.data.ring}}
-                {{#each item.data.ringsList as |obj|}}
+                    {{#each item.data.ringsList as |obj|}}
-                <option value="{{obj.id}}">{{obj.label}}</option>
+                        <option value="{{obj.id}}">{{obj.label}}</option>
-                {{/each}}
+                    {{/each}}
                 {{/select}}
             </select>
-
             <select class="attribute" name="data.peculiarity_type">
                 {{#select item.data.peculiarity_type}}
-                {{#each item.data.subTypesList as |type|}}
+                    {{#each item.data.subTypesList as |type|}}
-                <option value="{{type}}">{{type}}</option>
+                        <option value="{{type}}">{{type}}</option>
-                {{/each}}
+                    {{/each}}
                 {{/select}}
             </select>
-
             <label class="attribute">
                 {{ localize 'l5r5e.data.types' }}
                 <input type="text" name="data.types" value="{{item.data.types}}" />
             </label>
-
             <label class="attribute">
                 {{ localize 'l5r5e.advancements.spent' }}
                 <input type="text" name="data.xp_used" value="{{item.data.xp_used}}" data-dtype="Number" placeholder="0" />
@@ -60,9 +40,9 @@
             </label>
             <label class="attribute">
                 {{ localize 'l5r5e.bought_at_rank' }}
-                <input type="text" name="data.bought_at_rank" value="{{data.bought_at_rank}}" data-dtype="Number"
+                <input type="text" name="data.bought_at_rank" value="{{data.bought_at_rank}}" data-dtype="Number" placeholder="0" />
-                       placeholder="0" />
             </label>
         </article>
+        {{> 'systems/l5r5e/templates/items/item/item-infos.html' }}
     </section>
 </form>

system/templates/items/property/properties.html

@@ -1,5 +1,5 @@
-<!--<fieldset class="properties-content">-->
+<fieldset class="properties">
-<!--    <legend class="section-header">{{ localize 'l5r5e.properties' }}</legend>-->
+    <legend class="section-header">{{ localize 'l5r5e.properties' }}</legend>
     <ul class="item-list">
         {{#each properties as |item id|}}
 <!--            {{#ifCond item.type '==' 'property'}}-->
@@ -7,4 +7,4 @@
 <!--            {{/ifCond}}-->
         {{/each}}
     </ul>
-<!--</fieldset>-->
+</fieldset>

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

@@ -1,26 +1,10 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
         <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-        <div class="header-fields">
+        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-        </div>
     </header>
     {{!-- Sheet Body --}}
     <section class="sheet-body">
-        {{!-- Sheet Tab Navigation --}}
+        {{> 'systems/l5r5e/templates/items/item/item-infos.html' }}
-        <nav class="sheet-tabs tabs" data-group="primary">
-            <a class="item" data-tab="description">Description</a>
-        </nav>
-        {{!-- Description Tab --}}
-        <article class="tab" data-group="primary" data-tab="description">
-            <fieldset>
-                <legend class="text-block-header">{{ localize 'l5r5e.description' }}</legend>
-                {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-            </fieldset>
-            <div class="resource">
-                <label>{{ localize 'l5r5e.book_reference' }}</label>
-                <input type="text" name="data.book_reference" value="{{data.book_reference}}" />
-            </div>
-        </article>
     </section>
 </form>

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

@@ -1,50 +1,31 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
         <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-        <div class="header-fields">
+        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-        </div>
     </header>
     {{!-- Sheet Body --}}
     <section class="sheet-body">
-        {{!-- Sheet Tab Navigation --}}
-        <nav class="sheet-tabs tabs" data-group="primary">
-            <a class="item" data-tab="description">Description</a>
-            <a class="item" data-tab="attributes">Attributes</a>
-        </nav>
-        {{!-- Description Tab --}}
-        <article class="tab flexcol" data-group="primary" data-tab="description">
-            {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-        </article>
-        <div class="resource">
-            <label>{{ localize 'l5r5e.book_reference' }}</label>
-            <input type="text" name="data.book_reference" value="{{item.data.book_reference}}" />
-        </div>
-
         {{!-- Attributes Tab --}}
-        <article class="tab attributes" data-group="primary" data-tab="attributes">
+        <article class="attributes" data-group="primary" data-tab="attributes">
             <!-- TODO j'ai mis tous les attributs en vrac, à réorganiser -->
             <select name="data.ring">
                 {{#select item.data.ring}}
-                {{#each item.data.ringsList as |obj|}}
+                    {{#each item.data.ringsList as |obj|}}
-                <option value="{{obj.id}}">{{obj.label}}</option>
+                        <option value="{{obj.id}}">{{obj.label}}</option>
-                {{/each}}
+                    {{/each}}
                 {{/select}}
             </select>
             <select name="data.technique_type">
                 {{#select item.data.technique_type}}
-                {{#each item.data.techniquesList as |obj|}}
+                    {{#each item.data.techniquesList as |obj|}}
-                <option value="{{obj.id}}">{{obj.label}}</option>
+                        <option value="{{obj.id}}">{{obj.label}}</option>
-                {{/each}}
+                    {{/each}}
                 {{/select}}
             </select>
-
             <label class="attribute-value checkbox">
                 <input type="checkbox" name="data.in_curriculum" {{checked item.data.in_curriculum}} />
                 in curriculum
             </label>
-
-
             <label class="attribute">
                 {{ localize 'l5r5e.advancements.spent' }}
                 <input type="text" name="data.xp_used" value="{{item.data.xp_used}}" data-dtype="Number" placeholder="0"/>
@@ -62,7 +43,7 @@
                 {{ localize 'l5r5e.effects' }}
                 <input type="text" name="data.effects" value="{{item.data.effects}}"/>
             </label>
-
         </article>
+        {{> 'systems/l5r5e/templates/items/item/item-infos.html' }}
     </section>
 </form>

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

@@ -1,95 +1,57 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
         <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-        <div class="header-fields">
+        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
-            <div class="resource">
-            	<label>{{ localize 'l5r5e.quantity' }}</label>
-                <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
-            </div>
-            <div class="resource">
-            	<label>{{ localize 'l5r5e.weight' }}</label>
-                <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
-            </div>
-        </div>
-
-        <div class="header-fields">
-            <div class="resource">
-                <label>{{ localize 'l5r5e.category' }}</label>
-                <input type="text" name="data.category" value="{{data.category}}" />
-            </div>
-            <div class="resource">
-                <label>{{ localize 'l5r5e.skill' }}</label>
-                <select class="attribute-dtype" name="data.skill">
-                    {{#select data.skill}}
-                    {{#each data.skills as |id cat|}}
-                    <option value="{{id}}">{{localizeSkillId id}}</option>
-                    {{/each}}
-                    {{/select}}
-                </select>
-            </div>
-            <label class="attribute-value checkbox">
-                <input type="checkbox" name="data.equipped" {{checked item.data.equipped}} />
-                equipped / sheathed (rengainée)
-            </label>
-            <label class="attribute-value checkbox">
-                <input type="checkbox" name="data.readied" {{checked item.data.readied}} />
-                readied (apprêté)
-            </label>
-        </div>
-
-        <div class="header-fields">
-            <div class="resource">
-                <label>{{ localize 'l5r5e.rarity' }}</label>
-                <input type="text" name="data.rarity" value="{{data.rarity}}" data-dtype="Number"/>
-            </div>
-            <div class="resource">
-                <label>{{ localize 'l5r5e.zeni' }}</label>
-                <input type="text" name="data.zeni" value="{{data.zeni}}" data-dtype="Number"/>
-            </div>
-        </div>
     </header>
     {{!-- Sheet Body --}}
     <section class="sheet-body">
-        {{!-- Sheet Tab Navigation --}}
+        {{!-- attributes--}}
-        <nav class="sheet-tabs tabs" data-group="primary">
+        <article class="attributes" data-group="primary" data-tab="description">
-            <a class="item" data-tab="description">Description</a>
+            <label class="attribute-value checkbox">
-        </nav>
+                <input type="checkbox" name="data.equipped" {{checked item.data.equipped}} />
-        {{!-- Description Tab --}}
+                {{ localize 'l5r5e.weapons.sheathed' }}
-        <article class="tab" data-group="primary" data-tab="description">
+            </label>
-            <fieldset class="weapon-stats-content">
+            <label class="attribute-value checkbox">
-                <label class="attribute-label">
+                <input type="checkbox" name="data.readied" {{checked item.data.readied}} />
-                    {{ localize 'l5r5e.damage' }}
+                {{ localize 'l5r5e.weapons.readied' }}
+            </label>
+            {{> 'systems/l5r5e/templates/items/item/item-value.html' }}
+            <label class="category">
+                {{ localize 'l5r5e.weapons.category' }}
+                <input type="text" name="data.category" value="{{data.category}}" />
+            </label>
+            <label class="skillType">
+                {{ localize 'l5r5e.skill' }}
+                <select class="attribute-dtype" name="data.skill">
+                    {{#select data.skill}}
+                        {{#each data.skills as |id cat|}}
+                            <option value="{{id}}">{{localizeSkillId id}}</option>
+                        {{/each}}
+                    {{/select}}
+                </select>
+            </label>
+            <fieldset class="stats">
+                <legend class="text-block-header">{{ localize  'l5r5e.weapons.stats' }}</legend>
+                <label>
+                    {{ localize 'l5r5e.weapons.damage' }}
                     <input type="text" name="data.damage" value="{{data.damage}}" data-dtype="Number" placeholder="0"/>
                 </label>
-                <label class="attribute-label">
+                <label>
-                    {{ localize 'l5r5e.range' }}
+                    {{ localize 'l5r5e.weapons.range' }}
                     <input type="text" name="data.range" value="{{data.range}}" data-dtype="Number" placeholder="0"/>
                 </label>
-            </fieldset>
+                <label>
-            <fieldset class="weapon-stats-content">
+                    {{ localize 'l5r5e.weapons.deadliness' }}
-                <label class="attribute-label">
-                    {{ localize 'l5r5e.deadliness' }}
                     <input type="text" name="data.deadliness" value="{{data.deadliness}}" data-dtype="Number" placeholder="0"/>
                 </label>
-                <label class="attribute-label">
+                <label>
-                    {{ localize 'l5r5e.grips' }}
+                    {{ localize 'l5r5e.weapons.grips' }}
-                    <input type="text" name="data.grip_1" value="{{data.grip_1}}" />
+                    <input class="grip" type="text" name="data.grip_1" value="{{data.grip_1}}" />
-                    <input type="text" name="data.grip_2" value="{{data.grip_2}}" />
+                    <input class="grip" type="text" name="data.grip_2" value="{{data.grip_2}}" />
                 </label>
             </fieldset>
-            <fieldset>
+            {{> 'systems/l5r5e/templates/items/property/properties.html' properties=data.propertiesList }}
-                <legend class="text-block-header">{{ localize  'l5r5e.properties' }}</legend>
-                {{> 'systems/l5r5e/templates/items/property/properties.html' properties=data.propertiesList }}
-            </fieldset>
-            <fieldset>
-                <legend class="text-block-header">{{ localize  'l5r5e.description' }}</legend>
-                {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-            </fieldset>
-            <div class="resource">
-                <label>{{ localize 'l5r5e.book_reference' }}</label>
-                <input type="text" name="data.book_reference" value="{{data.book_reference}}" />
-            </div>
         </article>
+        {{> 'systems/l5r5e/templates/items/item/item-infos.html' }}
     </section>
 </form>