Style tweaks

3 files changed, 35 insertions, 40 deletions

diff --git a/webgui/data/index.html b/webgui/data/index.html
index af780bd..79e7bc2 100644
--- a/webgui/data/index.html
+++ b/webgui/data/index.html
@@ -17,54 +17,45 @@
     <div class="tabs">
       <ul class="tab-links">
         <li class="active"><a href="#editor">Editor</a></li>
+        <li><a href="#drafts">Drafts</a></li>
         <li><a href="#queue">Queue</a></li>
         <li id="errors-tab" style="display:none;"><a href="#errors">Errors</a></li>
       </ul>
 
       <div class="tab-content">
         <div class="tab active" id="editor">
-          <div class="table" style="width:100%">
+          <!-- <label id="titleLabel" for="editorTitle">Title</label> -->
+          <input id="editorTitle" />
+          <textarea id="editorText"></textarea>
+          <span id="bbcodeStatus"></span>
+          <span id="editorStatus">Not connected to server</span>
+          <div class="table">
             <div class="tr">
-              <h1 class="tc">Current Draft</h1>
-              <h1 class="tc">Saved Drafts</h1>
-            </div>
-            <div class="tr">
-              <div id="currentDraft" class="tc">
-                <!-- <label id="titleLabel" for="editorTitle">Title</label> -->
-                <input id="editorTitle" />
-                <textarea id="editorText"></textarea>
-                <span id="bbcodeStatus"></span>
-                <span id="editorStatus">Not connected to server</span>
-                <div class="table">
-                  <div class="tr">
-                    <div class="editorButtonContainer tc">
-                      <button class="editorButton" id="saveButton">Save</button>
-                    </div>
-                    <div class="editorButtonContainer tc">
-                      <button class="editorButton" id="printButton">Print</button>
-                    </div>
-                    <div class="editorButtonContainer tc">
-                      <button class="editorButton" id="discardButton">Discard</button>
-                    </div>
-                  </div>
-                </div>
+              <div class="editorButtonContainer tc">
+                <button class="editorButton" id="saveButton">Save</button>
               </div>
-              <div class="tc" style="text-align:center;">
-                <input id="allowDeletion" type="checkbox" /><label for="allowDeletion">Allow Deletion</label>
-                <table id="draftList">
-                  <thead>
-                    <tr>
-                      <td>Id</td>
-                      <td>Title</td>
-                      <td>Actions</td>
-                    </tr>
-                  </thead>
-                  <tbody id="draftListBody"></tbody>
-                </table>
+              <div class="editorButtonContainer tc">
+                <button class="editorButton" id="printButton">Print</button>
+              </div>
+              <div class="editorButtonContainer tc">
+                <button class="editorButton" id="discardButton">Discard</button>
               </div>
             </div>
           </div>
         </div>
+        <div class="tab" id="drafts" style="text-align:center;">
+          <table style="width:100%;" id="draftList">
+            <thead>
+              <tr>
+                <td style="width:5em;">Id</td>
+                <td>Title</td>
+                <td style="width:12em;">Actions</td>
+              </tr>
+            </thead>
+            <tbody id="draftListBody"></tbody>
+          </table>
+          <input id="allowDeletion" type="checkbox" /><label for="allowDeletion">Allow Deletion</label>
+        </div>
 
         <div class="tab" id="queue">
           Blub.
diff --git a/webgui/data/style.css b/webgui/data/style.css
index 53ddb7a..7520e42 100644
--- a/webgui/data/style.css
+++ b/webgui/data/style.css
@@ -30,10 +30,10 @@ thead td {
     text-align:center;
 }
 
-thead tr:last-child {
+thead tr:last-child td {
+    margin:0 0 0.125em 0;
     padding-bottom:0.125em;
     border-bottom:1px solid #ddd;
-    margin-bottom:0.125em;
 }
 
 .editorButtonContainer {
@@ -79,6 +79,10 @@ thead tr:last-child {
     color:#c00000;
 }
 
+#draftListBody button {
+    width:6em;
+}
+
 /*----- Tabs -----*/
 .tabs {
     display:block;
diff --git a/webgui/src/Main.hs b/webgui/src/Main.hs
index 44bcb88..537dcf1 100644
--- a/webgui/src/Main.hs
+++ b/webgui/src/Main.hs
@@ -154,7 +154,7 @@ setup Config{..} window (split -> (socketErr, dataUpdate)) = void $ do
       on UI.valueChange text $ \str -> modifyStatus (\x -> x { ePrintout = bbcode $ T.pack str })
 
       return title # sink UI.value (fromMaybe "" . eTitle <$> editorStatus)
-      return text # sink UI.text (eText <$> editorStatus)
+      return text # sink UI.value (eText <$> editorStatus)
       return status # sink TP.text (toStatusString <$> editorStatus)
       return bbcodeStatus # sink TP.text (toStatusString' . ePrintout <$> editorStatus)
 
@@ -209,7 +209,7 @@ setup Config{..} window (split -> (socketErr, dataUpdate)) = void $ do
         toTable :: Map DraftId (Maybe DraftTitle) -> UI [Element]
         toTable = mapM toLine . Map.toList 
   
-        toLine (id@(show -> tId), fromMaybe "" . fmap T.unpack -> title) = do
+        toLine (id@(DraftId (show -> tId)), fromMaybe "" . fmap T.unpack -> title) = do
           id' <- UI.td # set TP.text tId
           title' <- UI.td # set TP.text title
           delete <- UI.button