From 1c6202bede5fd13ec2feeac42bf671af95cecb92 Mon Sep 17 00:00:00 2001
From: Professor Bunbury <69010799+professorbunbury@users.noreply.github.com>
Date: Tue, 19 Jan 2021 10:08:49 -0500
Subject: [PATCH] New Character Sheet Fine Tuning (Resources & Traits Tab)

Rearranged Resources/Counters and Traits on Resources & Traits tab to avoid pushing vital information down the sheet.
---
 .../actors/newActor/parts/swalt-core.html     |   2 +-
 .../actors/newActor/parts/swalt-traits.html   | 119 +++++++++---------
 2 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/templates/actors/newActor/parts/swalt-core.html b/templates/actors/newActor/parts/swalt-core.html
index 6ab9d404..dcf42dbf 100644
--- a/templates/actors/newActor/parts/swalt-core.html
+++ b/templates/actors/newActor/parts/swalt-core.html
@@ -44,7 +44,7 @@
 </section>
 <section class="panel traits-resources">
     <nav class="core-tabs tab-list" data-subgroup-selection>
-        <button type="button" class="item active" data-subgroup="coreattributes" data-target="traits">Traits & Resources</button>
+        <button type="button" class="item active" data-subgroup="coreattributes" data-target="traits">Resources & Traits</button>
         <button type="button" class="item" data-subgroup="coreattributes" data-target="resources">Favorites & Notes</button>
     </nav>
     <div class="tab core-traits active" data-subgroup="coreattributes" data-target="traits">
diff --git a/templates/actors/newActor/parts/swalt-traits.html b/templates/actors/newActor/parts/swalt-traits.html
index 2cadc4f5..eacc294e 100644
--- a/templates/actors/newActor/parts/swalt-traits.html
+++ b/templates/actors/newActor/parts/swalt-traits.html
@@ -1,3 +1,63 @@
+<section class="resources">
+<section class="resource-items">
+    {{#each resources as |res|}}
+	<div class="resource">
+		<h1>
+			<input name="data.resources.{{res.name}}.label" type="text" value="{{res.label}}"
+				placeholder="{{res.placeholder}}" />
+		</h1>
+		<div class="attribute-value">
+			<input name="data.resources.{{res.name}}.value" type="text" value="{{res.value}}" data-dtype="Number"
+				placeholder="0" class="value-number" />
+			<span class="value-separator">/</span>
+			<input name="data.resources.{{res.name}}.max" type="text" value="{{res.max}}" data-dtype="Number"
+				placeholder="0" class="value-number" />
+		</div>
+		<footer class="attribute-footer">
+			<label class="recharge checkbox">
+				{{ localize "SW5E.AbbreviationSR" }} <input name="data.resources.{{res.name}}.sr" type="checkbox"
+					{{checked res.sr}} />
+			</label>
+			<label class="recharge checkbox">
+				{{ localize "SW5E.AbbreviationLR" }} <input name="data.resources.{{res.name}}.lr" type="checkbox"
+					{{checked res.lr}} />
+			</label>
+		</footer>
+	</div>
+	{{/each}}
+
+</section>
+<section class="counters">
+	<div class="counter">
+		<h4 class="death-save rollable">{{ localize "SW5E.DeathSave" }}</h4>
+		<div class="counter-value">
+			<div class="death-success">
+				<i class="fas fa-check"></i>
+				<input type="text" name="data.attributes.death.success" data-dtype="Number" placeholder="0"
+					value="{{data.attributes.death.success}}" />
+			</div>
+			<div class="death-fail">
+				<i class="fas fa-times"></i>
+				<input type="text" name="data.attributes.death.failure" data-dtype="Number" placeholder="0"
+					value="{{data.attributes.death.failure}}" />
+			</div>
+		</div>
+	</div>
+	<div class="counter">
+		<h4>{{ localize "SW5E.Exhaustion" }}</h4>
+		<div class="counter-value">
+			<input type="text" name="data.attributes.exhaustion" data-dtype="Number" placeholder="0"
+				value="{{data.attributes.exhaustion}}" />
+		</div>
+	</div>
+	<div class="counter">
+		<h4>{{ localize "SW5E.Inspiration" }}</h4>
+		<div class="counter-value">
+			<input type="checkbox" name="data.attributes.inspiration" data-dtype="Boolean"
+				{{checked data.attributes.inspiration}} />
+		</div>
+	</div>
+</section>
 <section class="traits">
     <label>
         {{localize "SW5E.Size"}}
@@ -118,63 +178,4 @@
 
     {{/if}}
     <ul class="passives"></ul>
-</section>
-<section class="resources">
-<section class="resource-items">
-    {{#each resources as |res|}}
-	<div class="resource">
-		<h1>
-			<input name="data.resources.{{res.name}}.label" type="text" value="{{res.label}}"
-				placeholder="{{res.placeholder}}" />
-		</h1>
-		<div class="attribute-value">
-			<input name="data.resources.{{res.name}}.value" type="text" value="{{res.value}}" data-dtype="Number"
-				placeholder="0" class="value-number" />
-			<span class="value-separator">/</span>
-			<input name="data.resources.{{res.name}}.max" type="text" value="{{res.max}}" data-dtype="Number"
-				placeholder="0" class="value-number" />
-		</div>
-		<footer class="attribute-footer">
-			<label class="recharge checkbox">
-				{{ localize "SW5E.AbbreviationSR" }} <input name="data.resources.{{res.name}}.sr" type="checkbox"
-					{{checked res.sr}} />
-			</label>
-			<label class="recharge checkbox">
-				{{ localize "SW5E.AbbreviationLR" }} <input name="data.resources.{{res.name}}.lr" type="checkbox"
-					{{checked res.lr}} />
-			</label>
-		</footer>
-	</div>
-	{{/each}}
-</section>
-<section class="counters">
-	<div class="counter">
-		<h4 class="death-save rollable">{{ localize "SW5E.DeathSave" }}</h4>
-		<div class="counter-value">
-			<div class="death-success">
-				<i class="fas fa-check"></i>
-				<input type="text" name="data.attributes.death.success" data-dtype="Number" placeholder="0"
-					value="{{data.attributes.death.success}}" />
-			</div>
-			<div class="death-fail">
-				<i class="fas fa-times"></i>
-				<input type="text" name="data.attributes.death.failure" data-dtype="Number" placeholder="0"
-					value="{{data.attributes.death.failure}}" />
-			</div>
-		</div>
-	</div>
-	<div class="counter">
-		<h4>{{ localize "SW5E.Exhaustion" }}</h4>
-		<div class="counter-value">
-			<input type="text" name="data.attributes.exhaustion" data-dtype="Number" placeholder="0"
-				value="{{data.attributes.exhaustion}}" />
-		</div>
-	</div>
-	<div class="counter">
-		<h4>{{ localize "SW5E.Inspiration" }}</h4>
-		<div class="counter-value">
-			<input type="checkbox" name="data.attributes.inspiration" data-dtype="Boolean"
-				{{checked data.attributes.inspiration}} />
-		</div>
-	</div>
 </section>
\ No newline at end of file