From 4b5b51739086e31740329ff7ed18d9b0d7bb71b0 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Thu, 30 Aug 2018 22:32:16 +0200
Subject: [PATCH] Update bookmark form with proper bootstrap markup

---
 src/templates/chatroom_bookmark_form.html | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/templates/chatroom_bookmark_form.html b/src/templates/chatroom_bookmark_form.html
index 673fff3ed..c95f05fe3 100644
--- a/src/templates/chatroom_bookmark_form.html
+++ b/src/templates/chatroom_bookmark_form.html
@@ -1,13 +1,17 @@
 <div class="chatroom-form-container">
     <form class="converse-form chatroom-form">
+        <legend>{{{o.heading}}}</legend>
         <fieldset class="form-group">
-            <legend>{{{o.heading}}}</legend>
-            <label>{{{o.label_name}}}</label>
-            <input type="text" name="name" required="required"/>
-            <label>{{{o.label_autojoin}}}</label>
-            <input type="checkbox" name="autojoin"/>
-            <label>{{{o.label_nick}}}</label>
-            <input type="text" name="nick" value="{{{o.default_nick}}}"/>
+            <label for="converse_muc_bookmark_name">{{{o.label_name}}}</label>
+            <input class="form-control" type="text" name="name" required="required" id="converse_muc_bookmark_name"/>
+        </fieldset>
+        <fieldset class="form-group">
+            <label for="converse_muc_bookmark_nick">{{{o.label_nick}}}</label>
+            <input class="form-control" type="text" name="nick" value="{{{o.default_nick}}}" id="converse_muc_bookmark_nick"/>
+        </fieldset>
+        <fieldset class="form-group form-check">
+            <input class="form-check-input" id="converse_muc_bookmark_autojoin" type="checkbox" name="autojoin"/>
+            <label class="form-check-label" for="converse_muc_bookmark_autojoin">{{{o.label_autojoin}}}</label>
         </fieldset>
         <fieldset class="form-group">
             <input class="btn btn-primary" type="submit" value="{{{o.label_submit}}}"/>