From 0eea6f238690794237edf5948fab7b52aaf1c5d4 Mon Sep 17 00:00:00 2001
From: Jacob <handsjacob@gmail.com>
Date: Sun, 30 Jul 2017 21:20:27 +0100
Subject: [PATCH] Cantrips now display as "<school> cantrip" rather than "Level
 0 <school>"

Also fixed spacing if "(ritual)" tag was not present
---
 .../views/character/spells/spellDialog/spellDialog.html    | 2 +-
 .../views/character/spells/spellDialog/spellDialog.js      | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
index aa23a17e..6fa32952 100644
--- a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
+++ b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
@@ -12,7 +12,7 @@
 
 <template name="spellDetails">
 	<div class="paper-font-body2">
-        Level {{level}} {{school}} {{#if ritual}}ritual{{/if}}, {{preparedString}}
+        {{schoolAndLevel}}{{#if ritual}} (ritual){{/if}}, {{preparedString}}
 	</div>
 	<div style="margin: 16px 0 16px 0;">
 		{{#if castingTime}}
diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js
index 601b67a2..b7b65861 100644
--- a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js
+++ b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js
@@ -29,6 +29,13 @@ Template.spellDialog.events({
 });
 
 Template.spellDetails.helpers({
+	schoolAndLevel: function(){
+		if (this.level == 0) {
+			return this.school + " cantrip";
+		} else {
+			return "Level " + this.level + " " + this.school;
+		}
+	},
 	getComponents: function(){
 		var components = "";
 		if (this.components.concentration) components += "C";