From 4e04e661d639fa92b97a4774672b43a9b927478c Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 5 Apr 2017 20:18:20 +0200
Subject: Move form into root page (from separate contact page), and thanks
 page up below root.

---
 contact.mdwn        | 18 ------------------
 contact/thanks.mdwn |  3 ---
 index.mdwn          | 31 +++++++++++--------------------
 thanks.mdwn         |  3 +++
 4 files changed, 14 insertions(+), 41 deletions(-)
 delete mode 100644 contact.mdwn
 delete mode 100644 contact/thanks.mdwn
 create mode 100644 thanks.mdwn

diff --git a/contact.mdwn b/contact.mdwn
deleted file mode 100644
index e6b5923..0000000
--- a/contact.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-[[!meta script="/usr/share/javascript/jquery/jquery.min.js"]]
-[[!meta script="/usr/share/javascript/bootstrap/js/bootstrap.min.js"]]
-
-# Omni-presence contact form
-
-<tmpl_var js-head>
-
-<div class=form>
-<tmpl_var form-start>
-<tmpl_loop fields>
-<div class="<tmpl_var label escape=html>">
-<span class="fb_label<tmpl_if required> fb_required</tmpl_if>"><tmpl_var label></span>
-<tmpl_var field><tmpl_if error> <span class="fb_invalid"><tmpl_var error></span></tmpl_if><tmpl_if comment> <tmpl_var comment></tmpl_if>
-</div>
-</tmpl_loop>
-<tmpl_var form-submit>
-<tmpl_var form-end>
-</div>
diff --git a/contact/thanks.mdwn b/contact/thanks.mdwn
deleted file mode 100644
index 353b1ae..0000000
--- a/contact/thanks.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-# Omni-presence contact form
-
-Thanks for your interest in Omni-presence.
diff --git a/index.mdwn b/index.mdwn
index 831f79b..a49c356 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -73,28 +73,19 @@ QUOTE]]
 
 Partner & Head of branch, Denmark: Britt Gustafsson.
 
+<tmpl_var js-head>
+
 <div class="well bs-component">
-<form class="form-horizontal">
-<fieldset>
-<legend>Contact us</legend>
-<div class="form-group">
-<label for="inputEmail" class="col-md-2 control-label">Email</label>
-<div class="col-md-10">
-<input type="text" class="form-control" id="inputEmail" placeholder="Email">
-<div class="checkbox">
-<label>
-<input type="checkbox"> I am not a robot
-</label>
-</div>
-</div>
-</div>
-<div class="form-group">
-<div class="col-md-10 col-md-offset-2">
-<button type="reset" class="btn btn-default">Cancel</button>
-<button type="submit" class="btn btn-primary">Secure connection</button>
+<div class="form-horizontal">
+<tmpl_var form-start>
+<tmpl_loop fields>
+<div class="<tmpl_var label escape=html>">
+<span class="fb_label<tmpl_if required> fb_required</tmpl_if>"><tmpl_var label></span>
+<tmpl_var field><tmpl_if error> <span class="fb_invalid"><tmpl_var error></span></tmpl_if><tmpl_if comment> <tmpl_var comment></tmpl_if>
 </div>
+</tmpl_loop>
+<tmpl_var form-submit>
+<tmpl_var form-end>
 </div>
-</fieldset>
-</form>
 </div>
 COLUMN]]
diff --git a/thanks.mdwn b/thanks.mdwn
new file mode 100644
index 0000000..353b1ae
--- /dev/null
+++ b/thanks.mdwn
@@ -0,0 +1,3 @@
+# Omni-presence contact form
+
+Thanks for your interest in Omni-presence.
-- 
cgit v1.2.3