From 8a052feb3cfcd1d615fefcb203be6d526d02a364 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Fri, 31 Jan 2020 13:51:58 -0800
Subject: [PATCH] Dissociate default character from editor

---
 amanuensis/lexicon/manage.py               |  2 ++
 amanuensis/templates/lexicon/session.html  | 14 +++++++++++---
 amanuensis/templates/lexicon/settings.html |  6 ++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/amanuensis/lexicon/manage.py b/amanuensis/lexicon/manage.py
index f2df546..1394a12 100644
--- a/amanuensis/lexicon/manage.py
+++ b/amanuensis/lexicon/manage.py
@@ -74,6 +74,8 @@ def create_lexicon(name, editor):
 		"name": "Ersatz Scrivener",
 		"player": None,
 	})
+	with l.edit() as cfg:
+		cfg.character.default.player = None
 
 	return l
 
diff --git a/amanuensis/templates/lexicon/session.html b/amanuensis/templates/lexicon/session.html
index f7d053a..e5dcb1d 100644
--- a/amanuensis/templates/lexicon/session.html
+++ b/amanuensis/templates/lexicon/session.html
@@ -8,7 +8,16 @@
 {% block bl_editor %}
 <p>Editor actions</p>
 <ul>
-	<li><a href="{{ url_for('lexicon.settings', name=g.lexicon.name) }}">Edit lexicon settings</a></li>
+	<li>
+		<a href="{{ url_for('lexicon.settings', name=g.lexicon.name) }}">
+			Edit lexicon settings
+		</a>
+	</li>
+	<li>
+		<a href="{{ url_for('lexicon.character', name=g.lexicon.name, cid='default') }}">
+			Edit default character
+		</a>
+	</li>
 </ul>
 {% endblock %}
 {% set template_content_blocks = template_content_blocks + [self.bl_editor()] %}
@@ -19,7 +28,6 @@
 <span style="color: #ff0000">{{ message }}</span><br>
 {% endfor %}
 <p>Player actions</p>
-
 <ul>
 	{% set characters = g.lexicon.get_characters_for_player(current_user.id) %}
 	{% for char in characters %}
@@ -29,7 +37,7 @@
 		</a>
 	</li>
 	{% endfor %}
-	{% 
+	{%
 		if characters|count is lt(g.lexicon.join.chars_per_player)
 		and not g.lexicon.turn.current
 	%}
diff --git a/amanuensis/templates/lexicon/settings.html b/amanuensis/templates/lexicon/settings.html
index 4e79e62..9b6e123 100644
--- a/amanuensis/templates/lexicon/settings.html
+++ b/amanuensis/templates/lexicon/settings.html
@@ -13,11 +13,13 @@
 	{% endfor %}<br>
 	Characters:
 	{% for char in g.lexicon.character.values() %}
-	{{ char.name }} ({{ char.player|user_attr('username') }}){% if not loop.last %},{% endif %}
+	{{ char.name }}{% if char.player %}
+	({{ char.player|user_attr('username') }}){% endif %}
+	{% if not loop.last %},{% endif %}
 	{% endfor %}<br>
 </p>
 <div style="width: 100%; height: 10em; overflow-y:auto; resize: vertical;
- border: 1px solid #bbbbbb; font-size: 0.9em; padding:3px; box-sizing: border-box;">
+ border: 1px solid #bbbbbb; font-size: 0.7em; padding:3px; box-sizing: border-box;">
 	{% for log_entry in g.lexicon.log %}
 	[{{ log_entry[0]|asdate }}] {{ log_entry[1] }}<br>
 	{% endfor %}