From 7c5469465b363505b9bdcf1cd0057d1c05f6b475 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 30 Aug 2017 01:16:41 +0300
Subject: www: move dialog form to js, using /post form when js unavailable

---
 juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html | 7 ++-----
 juick-www/src/main/webapp/WEB-INF/views/partial/newmessage.html | 8 --------
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 juick-www/src/main/webapp/WEB-INF/views/partial/newmessage.html

(limited to 'juick-www/src/main/webapp')

diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
index cf0f9bb7..75aab216 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
@@ -14,7 +14,7 @@
         </form>
     </div>
     <div id="headdiv">
-        {% if visitor.getUID() > 0 %}
+        {% if visitor.uid > 0 %}
         <nav id="user">
             <ul>
                 <li><a href="/?show=my">{{ i18n("messages","link.my") }}</a></li>
@@ -25,14 +25,11 @@
         </nav>
         <nav id="actions">
             <ul>
-                <li><a href="#post">{{ i18n("messages","link.postMessage") }}</a></li>
+                <li><a id="post" href="/post">{{ i18n("messages","link.postMessage") }}</a></li>
                 <li><a href="/{{ visitor.getName() }}">@{{ visitor.getName() }}</a></li>
                 <li><a href="/logout">{{ i18n("messages","link.logout") }}</a></li>
             </ul>
         </nav>
-        {% if visitor.getUid() > 0 %}
-        {% include "views/partial/newmessage" %}
-        {% endif %}
         {% else %}
         <p>{{ i18n("messages","message.loginForSending", "/login") | raw }}.</p>
         {% endif %}
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/newmessage.html b/juick-www/src/main/webapp/WEB-INF/views/partial/newmessage.html
deleted file mode 100644
index e21002b8..00000000
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/newmessage.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<form id="newmessage" action="/post" method="post" enctype="multipart/form-data">
-    <textarea name="body" placeholder="{{ i18n("messages","postForm.newMessage") }}"></textarea>
-    <div>
-        <input type="text" class="img" name="img" placeholder="{{ i18n("messages","postForm.imageLink") }} ({{ i18n("messages","postForm.imageFormats") }})"/> {{ i18n("messages","postForm.or") }} <a href="#">{{ i18n("messages","postForm.upload") }}</a><br/>
-        <input type="text" class="tags" name="tags" placeholder="{{ i18n("messages","postForm.tags") }}"/><br/>
-        <input type="submit" class="subm" value="{{ i18n("messages","postForm.submit") }}"/>
-    </div>
-</form>
\ No newline at end of file
-- 
cgit v1.2.3