From 659bde02a0738486d86640be77b102c3ebf1ca8e Mon Sep 17 00:00:00 2001
From: Gisle Aune <dev@gisle.me>
Date: Sat, 13 Oct 2018 11:13:27 +0200
Subject: [PATCH] data, logs, logs-content, story, story-content: Fixed form
 inconsistencies.

---
 marko/components/modal/style.less             |  4 +++
 .../add-character-modal/index.marko           |  2 +-
 .../data/components/channels-page/index.marko |  1 +
 .../components/characters-page/index.marko    |  1 +
 .../remove-character-modal/index.marko        |  2 +-
 .../components/edit-log-modal/index.marko     |  3 +-
 .../components/edit-post-modal/index.marko    |  2 +-
 .../components/remove-log-modal/index.marko   |  2 +-
 .../components/remove-post-modal/index.marko  |  2 +-
 .../logs/components/add-log-modal/index.marko | 12 ++++----
 .../create-chapter-modal/index.marko          | 11 +++++--
 .../components/edit-chapter-modal/index.marko |  5 ++++
 .../story/components/story-menu/index.marko   |  2 +-
 .../story/components/tags-page/component.js   |  9 ++++++
 .../story/components/tags-page/index.marko    | 30 +++++++++++--------
 marko/page/story/tag-list.marko               |  6 +---
 16 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/marko/components/modal/style.less b/marko/components/modal/style.less
index 6257266..2c11ff3 100644
--- a/marko/components/modal/style.less
+++ b/marko/components/modal/style.less
@@ -47,6 +47,8 @@ div.overlay {
       background: none;
       outline: none;
       opacity: 0.5;
+
+      border-left: 0.25px dotted;
     }
     input.big {
       font-size: 1.5em;
@@ -91,6 +93,8 @@ div.overlay {
 
       resize: none;
       overflow-y: scroll;
+
+      border-left: 0.25px dotted;
     }
     textarea.tall {
       height: 24em;
diff --git a/marko/page/data/components/add-character-modal/index.marko b/marko/page/data/components/add-character-modal/index.marko
index 3b29470..b96c74f 100644
--- a/marko/page/data/components/add-character-modal/index.marko
+++ b/marko/page/data/components/add-character-modal/index.marko
@@ -18,5 +18,5 @@
   <label>Description</label>
   <textarea key="description" placeholder="Description" on-change("change", "description") value=state.values.description />
 
-  <button disabled=state.loading on-click("save")>Save character!</button>
+  <button disabled=state.loading on-click("save")>Save</button>
 </modal>
\ No newline at end of file
diff --git a/marko/page/data/components/channels-page/index.marko b/marko/page/data/components/channels-page/index.marko
index 0f6495e..3a25f0c 100644
--- a/marko/page/data/components/channels-page/index.marko
+++ b/marko/page/data/components/channels-page/index.marko
@@ -3,3 +3,4 @@
   <channel-list channels=state.channels on-edited("channelEdited") />
 </main> 
 <add-channel-modal enabled=(state.modal === "channel.add") user=input.user on-added("channelAdded") on-close("close") />
+<add-character-modal enabled=(state.modal === "character.add") user=input.user on-close("close") />
diff --git a/marko/page/data/components/characters-page/index.marko b/marko/page/data/components/characters-page/index.marko
index d20dee9..7a3e71a 100644
--- a/marko/page/data/components/characters-page/index.marko
+++ b/marko/page/data/components/characters-page/index.marko
@@ -3,3 +3,4 @@
   <character-list characters=state.characters on-removed("characterRemoved") on-edited("characterEdited") on-nicks("characterNicksChanged") />
 </main> 
 <add-character-modal enabled=(state.modal === "character.add") user=input.user on-added("characterAdded") on-close("close") />
+<add-channel-modal enabled=(state.modal === "channel.add") user=input.user on-close("close") />
diff --git a/marko/page/data/components/remove-character-modal/index.marko b/marko/page/data/components/remove-character-modal/index.marko
index 8c0752c..5793e24 100644
--- a/marko/page/data/components/remove-character-modal/index.marko
+++ b/marko/page/data/components/remove-character-modal/index.marko
@@ -5,5 +5,5 @@
   
   <p class="color-danger">This is irreversible!</p>
 
-  <button disabled=state.loading on-click("doIt")>Yes, do it!</button>
+  <button disabled=state.loading on-click("doIt")>Remove</button>
 </modal>
\ No newline at end of file
diff --git a/marko/page/logs-content/components/edit-log-modal/index.marko b/marko/page/logs-content/components/edit-log-modal/index.marko
index 38bebc8..e61fff1 100644
--- a/marko/page/logs-content/components/edit-log-modal/index.marko
+++ b/marko/page/logs-content/components/edit-log-modal/index.marko
@@ -9,11 +9,12 @@ import moment from "moment"
   <input key="title" placeholder=(input.log.channel.name + " – " + moment(input.log.date).format("MMMM D, YYYY")) class="big" on-change("change", "title") value=state.values.title />
 
   <label>Event Name</label>
-  <input key="event" placeholder="(Optional)" class="big" on-change("change", "event") value=state.values.event />
+  <input key="event" placeholder="(Optional)" on-change("change", "event") value=state.values.event />
   
   <label>Description</label>
   <textarea key="description" placeholder="(Optional)" on-change("change", "description") value=state.values.description />
 
+  <label>Options</label>
   <toggle value=state.values.open on="Open" off="Closed"
           onDesc=("New posts in "+input.log.channel.name+" will end up here.")
           offDesc="The logbot will not append to this log."
diff --git a/marko/page/logs-content/components/edit-post-modal/index.marko b/marko/page/logs-content/components/edit-post-modal/index.marko
index c7e6277..589e438 100644
--- a/marko/page/logs-content/components/edit-post-modal/index.marko
+++ b/marko/page/logs-content/components/edit-post-modal/index.marko
@@ -22,5 +22,5 @@
   <label>Text</label>
   <textarea key="text" placeholder="Text" class="tall" on-change("change", "text") value=state.values.text />
 
-  <button disabled=state.loading on-click("save")>Alter History</button>
+  <button disabled=state.loading on-click("save")>Alter history</button>
 </modal>
\ No newline at end of file
diff --git a/marko/page/logs-content/components/remove-log-modal/index.marko b/marko/page/logs-content/components/remove-log-modal/index.marko
index fc944a7..b57e897 100644
--- a/marko/page/logs-content/components/remove-log-modal/index.marko
+++ b/marko/page/logs-content/components/remove-log-modal/index.marko
@@ -5,5 +5,5 @@
   
   <p class="color-danger">Removal is final!</p>
 
-  <button disabled=state.loading on-click("doIt")>I will destroy you!</button>
+  <button disabled=state.loading on-click("doIt")>Yes, I'm really doing it!</button>
 </modal>
\ No newline at end of file
diff --git a/marko/page/logs-content/components/remove-post-modal/index.marko b/marko/page/logs-content/components/remove-post-modal/index.marko
index 1dd9bef..174dfb6 100644
--- a/marko/page/logs-content/components/remove-post-modal/index.marko
+++ b/marko/page/logs-content/components/remove-post-modal/index.marko
@@ -12,5 +12,5 @@
     <p><b>Text</b>: ${input.post.text}</p>
   </div>
 
-  <button disabled=state.loading on-click("doIt")>Yes, erase history!</button>
+  <button disabled=state.loading on-click("doIt")>Erase history</button>
 </modal>
\ No newline at end of file
diff --git a/marko/page/logs/components/add-log-modal/index.marko b/marko/page/logs/components/add-log-modal/index.marko
index 818065d..04d0e9e 100644
--- a/marko/page/logs/components/add-log-modal/index.marko
+++ b/marko/page/logs/components/add-log-modal/index.marko
@@ -5,17 +5,17 @@ import moment from "moment"
 
   <p key="error" class="color-error">${state.error}</p>
 
+  <label>Title</label>
+  <input key="title" placeholder="(Optional)" class="big" on-change("change", "title") value=state.values.title />
+
   <label>Date</label>
-  <input key="date" placeholder="(Required)" class="big" on-change("change", "date") value=state.values.date />
+  <input key="date" placeholder="(Required)" on-change("change", "date") value=state.values.date />
 
   <label>Channel</label>
-  <input key="channel" placeholder="(Required)" class="big" on-change("change", "channel") value=state.values.channel />
-
-  <label>Title</label>
-  <input key="title" placeholder="(Optional)" class="big" on-change("change", "title") value=state.values.title />
+  <input key="channel" placeholder="(Required)" on-change("change", "channel") value=state.values.channel />
 
   <label>Event Name</label>
-  <input key="event" placeholder="(Optional)" class="big" on-change("change", "event") value=state.values.event />
+  <input key="event" placeholder="(Optional)" on-change("change", "event") value=state.values.event />
   
   <label>Description</label>
   <textarea key="description" placeholder="(Optional)" on-change("change", "description") value=state.values.description />
diff --git a/marko/page/story-content/components/create-chapter-modal/index.marko b/marko/page/story-content/components/create-chapter-modal/index.marko
index 74ccc13..d816c12 100644
--- a/marko/page/story-content/components/create-chapter-modal/index.marko
+++ b/marko/page/story-content/components/create-chapter-modal/index.marko
@@ -3,9 +3,14 @@
 
   <p key="error" class="color-error">${state.error}</p>
 
-  <input key="title" placeholder="Title (Optional)" class="big" on-change("change", "title") value=state.values.title />
-  <input key="icdate" placeholder="IC Date (Optional)" on-change("change", "fictionalDate") value=state.values.fictionalDate />
-  <textarea key="source" placeholder="Content" class="tall" on-change("change", "source") value=state.values.source />
+  <label>Title</label>
+  <input key="title" placeholder="(Optional)" class="big" on-change("change", "title") value=state.values.title />
+
+  <label>IC Date</label>
+  <input key="icdate" placeholder="(Optional)" on-change("change", "fictionalDate") value=state.values.fictionalDate />
+
+  <label>Content</label>
+  <textarea key="source" placeholder="" class="tall" on-change("change", "source") value=state.values.source />
 
   <button disabled=state.loading on-click("save")>Save</button>
 </modal>
\ No newline at end of file
diff --git a/marko/page/story-content/components/edit-chapter-modal/index.marko b/marko/page/story-content/components/edit-chapter-modal/index.marko
index fdf6a39..94c286e 100644
--- a/marko/page/story-content/components/edit-chapter-modal/index.marko
+++ b/marko/page/story-content/components/edit-chapter-modal/index.marko
@@ -3,8 +3,13 @@
 
   <p key="error" class="color-error">${state.error}</p>
 
+  <label>Title</label>
   <input key="title" placeholder="Title" class="big" on-change("change", "title") value=state.values.title />
+  
+  <label>IC Date</label>
   <input key="icdate" placeholder="IC Date" on-change("change", "fictionalDate") value=state.values.fictionalDate />
+  
+  <label>Content</label>
   <textarea key="source" placeholder="Content" class="tall" on-change("change", "source") value=state.values.source />
 
   <button disabled=state.loading on-click("save")>Save</button>
diff --git a/marko/page/story/components/story-menu/index.marko b/marko/page/story/components/story-menu/index.marko
index a31d2c8..b015f3e 100644
--- a/marko/page/story/components/story-menu/index.marko
+++ b/marko/page/story/components/story-menu/index.marko
@@ -2,7 +2,7 @@
   <menu-header>Story</menu-header>
   <menu-link key="index" selected=input.selected.index icon="S" href="/story/">Stories</menu-link>
   <menu-link selected=input.selected.tags icon="T" href="/story/tag-list/">Tags</menu-link>
-  <menu-gap />
+  <menu-gap if(input.menuAuthor || input.menuMonth || input.menuTags) />
   <if(input.menuMonth != null)>
     <menu-link selected=(input.selected.special === "month") icon="M" href=("/story/by-month/"+input.menuMonth.url)>${input.menuMonth.text}</menu-link>
   </if>
diff --git a/marko/page/story/components/tags-page/component.js b/marko/page/story/components/tags-page/component.js
index c7719e2..173d6c4 100644
--- a/marko/page/story/components/tags-page/component.js
+++ b/marko/page/story/components/tags-page/component.js
@@ -8,11 +8,20 @@ module.exports = class {
     this.state = {
       tags: [],
       groups: [],
+      modal: null,
     }
 
     this.update(input.tags)
   }
 
+  open(modal) {
+    this.state.modal = modal
+  }
+
+  close() {
+    this.state.modal = null
+  }
+
   update(newTags) {
     const tags = newTags.map(t => ({
       kind: t.kind,
diff --git a/marko/page/story/components/tags-page/index.marko b/marko/page/story/components/tags-page/index.marko
index 7dadc5d..804d897 100644
--- a/marko/page/story/components/tags-page/index.marko
+++ b/marko/page/story/components/tags-page/index.marko
@@ -1,14 +1,20 @@
-<div class="tags-page">
-  <h1 class="color-primary">All Tags</h1>
-  <p>These are all distinct tags that appear in at least one listed story.</p>
-  <div class="groups">
-    <div for(group in state.groups) class=["group", group.groupClass]>
-      <h2 class=group.colorClass>${group.header}</h2>
-      <ul>
-        <li for(tag in group.tags)>
-          <a href=tag.url class=group.colorClass>${tag.name}</a>
-        </li>
-      </ul>
+<background src="/assets/images/bg.png" opacity=0.25 />
+<story-menu categories=input.categories selected=(input.selected || {}) user=input.user on-open("open") />
+<main>
+  <div class="tags-page">
+    <h1 class="color-primary">All Tags</h1>
+    <p>These are all distinct tags that appear in at least one listed story.</p>
+    <div class="groups">
+      <div for(group in state.groups) class=["group", group.groupClass]>
+        <h2 class=group.colorClass>${group.header}</h2>
+        <ul>
+          <li for(tag in group.tags)>
+            <a href=tag.url class=group.colorClass>${tag.name}</a>
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+  <add-story-modal enabled=(state.modal === "story.add") stories=input.stories categories=input.categories on-close("close") />
+</main>
+
diff --git a/marko/page/story/tag-list.marko b/marko/page/story/tag-list.marko
index 8ca6624..398efcf 100644
--- a/marko/page/story/tag-list.marko
+++ b/marko/page/story/tag-list.marko
@@ -1,9 +1,5 @@
 <include("../layout", {title: "Stories", site: "story"})>
   <@body>
-    <background src="/assets/images/bg.png" opacity=0.25 />
-    <story-menu categories=input.categories selected=(input.selected || {}) menuTags=input.menuTags user=input.user />
-    <main>
-      <tags-page tags=input.tags />
-    </main>
+    <tags-page tags=input.tags categories=input.categories selected=(input.selected || {}) menuTags=input.menuTags user=input.user />
   </@body>
 </include>