aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src/main/webapp
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-08-30 01:16:41 +0300
committerGravatar Vitaly Takmazov2017-08-30 01:20:50 +0300
commit7c5469465b363505b9bdcf1cd0057d1c05f6b475 (patch)
tree2d107637b6a8fe0b7d794e5db9b1ebcec7a338c5 /juick-www/src/main/webapp
parentfe5ecea37a5974bd78712168b57e2c0b1d530f97 (diff)
www: move dialog form to js, using /post form when js unavailable
Diffstat (limited to 'juick-www/src/main/webapp')
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html7
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/partial/newmessage.html8
2 files changed, 2 insertions, 13 deletions
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