From a8253b9c2884b7530749c88362ad9f7f46fe7ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20L=2E=20=C5=A0ijanec?= <sijanecantonluka@gmail.com>
Date: Thu, 14 May 2020 21:09:15 +0200
Subject: fixed msg-compose-modal layout

---
 install                              |  2 ++
 pages-src/messaging.bvr              | 65 +---------------------------------
 pages-src/misc/msg-compose-modal.bvr | 67 ++++++++++++++++++++++++++++++++++++
 pages/messaging.html                 | 18 ++++++----
 4 files changed, 81 insertions(+), 71 deletions(-)
 create mode 100755 install
 create mode 100644 pages-src/misc/msg-compose-modal.bvr

diff --git a/install b/install
new file mode 100755
index 0000000..b2169fa
--- /dev/null
+++ b/install
@@ -0,0 +1,2 @@
+#!/bin/bash
+./compose-html pages-src/ pages/
diff --git a/pages-src/messaging.bvr b/pages-src/messaging.bvr
index 5badfda..f6e561b 100644
--- a/pages-src/messaging.bvr
+++ b/pages-src/messaging.bvr
@@ -85,69 +85,6 @@
           <i class="large material-icons">mode_edit</i>
         </a>
     </div>
-
-    <!-- Modal Structure -->
-    <div id="beziapp-new-message" class="modal modal-fixed-footer">
-
-        <div class="modal-content">
-
-            <h4><x-su>sendAMessage</x-su></h4>
-
-            <div class="input-field">
-                <i class="material-icons prefix">account_circle</i>
-                <input id="full-name" type="text" class="autocomplete-fullname validate">
-                <label for="full-name"><x-su>recipient</x-su></label>
-            </div>
-
-            <div class="row" style="display: flex;">
-
-                <div class="col s10 m11">
-                    <div class="input-field">
-                        <i class="material-icons prefix">subject</i>
-                        <input id="msg-subject" type="text" class="">
-                        <label for="msg-subject"><x-su>messageSubject</x-su></label>
-                    </div>
-                </div>
-
-                <div class="col s2 m1">
-                    <button class="btn btn-large btn-floating waves-effect waves-light" id="msg-add-photo" type="button">
-                        <i class="material-icons" style="margin: 0 auto">add_a_photo</i>
-                    </button>
-                </div>
-
-            </div>
-
-            <div class="row">
-                <div class="valign-wrapper col s6 m4">
-                    <label>
-                        <input type="checkbox" id="encrypt-checkbox" />
-                        <span><x-su>encryptMessage</x-su></span>
-                    </label>
-                </div>
-
-                <div class="col s6 m8">
-                    <div class="input-field" id="encryption-key-input" hidden>
-                        <i class="material-icons prefix">lock</i>
-                        <input id="msg-e2ee-pass-input" type="password" autocomplete="new-password" class="">
-                        <label for="msg-e2ee-pass-input"><x-su>passwordForE2EE</x-su></label>
-                    </div>
-                </div>
-            </div>
-
-            <div class="input-field">
-                <i class="material-icons prefix">mode_edit</i>
-                <textarea id="msg-body" class="materialize-textarea"></textarea>
-                <label for="msg-body"><x-su>messageBody</x-su></label>
-            </div>
-
-        </div>
-
-        <div class="modal-footer">
-            <div id="modal-footer-right">    
-                <a href="#" class="modal-close waves-effect waves-green btn-flat">Cancel <i class="material-icons right">close</i></a>
-                <a href="#" id="msg-send" class="modal-close waves-effect waves-green btn-flat" disabled>Send <i class="material-icons right">send</i></a>
-            </div>
-        </div>
-    </div>
+		<@?i msg-compose-modal@>
 </body>
 </html>
diff --git a/pages-src/misc/msg-compose-modal.bvr b/pages-src/misc/msg-compose-modal.bvr
new file mode 100644
index 0000000..f7bdc7d
--- /dev/null
+++ b/pages-src/misc/msg-compose-modal.bvr
@@ -0,0 +1,67 @@
+    <!-- Modal Structure -->
+    <div id="beziapp-new-message" class="modal modal-fixed-footer">
+
+        <div class="modal-content">
+
+            <h4><x-su>sendAMessage</x-su></h4>
+
+            <div class="input-field">
+                <i class="material-icons prefix">account_circle</i>
+                <input id="full-name" type="text" class="autocomplete-fullname validate">
+                <label for="full-name"><x-su>recipient</x-su></label>
+            </div>
+
+            <div class="row" >
+
+# sorry, ampak display: flex še nisem pogruntu 100%
+
+                <div class="col s9 m10">
+                    <div class="input-field">
+                        <i class="material-icons prefix">subject</i>
+                        <input id="msg-subject" type="text" class="">
+                        <label for="msg-subject"><x-su>messageSubject</x-su></label>
+                    </div>
+                </div>
+
+                <div class="col s2 m2">
+                    <button class="btn btn-large btn-floating waves-effect waves-light" id="msg-add-photo" type="button">
+                        <i class="material-icons" style="margin: 0 auto">add_a_photo</i>
+                    </button>
+                </div>
+
+            </div>
+
+            <div class="row">
+                <div class="valign-wrapper col s10 m10">
+                    <label>
+                        <input type="checkbox" id="encrypt-checkbox" />
+                        <span><x-su>encryptMessage</x-su></span>
+                    </label>
+                </div>
+						</div>
+            <div class="row">
+                <div class="col s12 m12">
+                    <div class="input-field" id="encryption-key-input" hidden>
+                        <i class="material-icons prefix">lock</i>
+                        <input id="msg-e2ee-pass-input" type="password" autocomplete="new-password" class="">
+                        <label for="msg-e2ee-pass-input"><x-su>passwordForE2EE</x-su></label>
+                    </div>
+                </div>
+            </div>
+
+            <div class="input-field">
+                <i class="material-icons prefix">mode_edit</i>
+                <textarea id="msg-body" class="materialize-textarea"></textarea>
+                <label for="msg-body"><x-su>messageBody</x-su></label>
+            </div>
+
+        </div>
+
+        <div class="modal-footer">
+            <div id="modal-footer-right">    
+                <a href="#" class="modal-close waves-effect waves-green btn-flat">Cancel <i class="material-icons right">close</i></a>
+                <a href="#" id="msg-send" class="modal-close waves-effect waves-green btn-flat" disabled>Send <i class="material-icons right">send</i></a>
+            </div>
+        </div>
+    </div>
+
diff --git a/pages/messaging.html b/pages/messaging.html
index 844b142..7c4ae04 100644
--- a/pages/messaging.html
+++ b/pages/messaging.html
@@ -107,7 +107,7 @@
           <i class="large material-icons">mode_edit</i>
         </a>
     </div>
-
+		
     <!-- Modal Structure -->
     <div id="beziapp-new-message" class="modal modal-fixed-footer">
 
@@ -121,9 +121,10 @@
                 <label for="full-name"><x-su>recipient</x-su></label>
             </div>
 
-            <div class="row" style="display: flex;">
+            <div class="row" >
+
 
-                <div class="col s10 m11">
+                <div class="col s9 m10">
                     <div class="input-field">
                         <i class="material-icons prefix">subject</i>
                         <input id="msg-subject" type="text" class="">
@@ -131,7 +132,7 @@
                     </div>
                 </div>
 
-                <div class="col s2 m1">
+                <div class="col s2 m2">
                     <button class="btn btn-large btn-floating waves-effect waves-light" id="msg-add-photo" type="button">
                         <i class="material-icons" style="margin: 0 auto">add_a_photo</i>
                     </button>
@@ -140,14 +141,15 @@
             </div>
 
             <div class="row">
-                <div class="valign-wrapper col s6 m4">
+                <div class="valign-wrapper col s10 m10">
                     <label>
                         <input type="checkbox" id="encrypt-checkbox" />
                         <span><x-su>encryptMessage</x-su></span>
                     </label>
                 </div>
-
-                <div class="col s6 m8">
+						</div>
+            <div class="row">
+                <div class="col s12 m12">
                     <div class="input-field" id="encryption-key-input" hidden>
                         <i class="material-icons prefix">lock</i>
                         <input id="msg-e2ee-pass-input" type="password" autocomplete="new-password" class="">
@@ -171,5 +173,7 @@
             </div>
         </div>
     </div>
+
+
 </body>
 </html>
-- 
cgit v1.2.3