From 97865f84b09e7a3aaa2f49dcb4f11a08f6b8cbf0 Mon Sep 17 00:00:00 2001 From: Ugnich Anton Date: Wed, 16 Oct 2013 16:12:57 +0700 Subject: NewMessage: no video, no webcam --- src/java/NewMessage.properties | 7 ++----- src/java/NewMessage_ru.properties | 8 ++------ src/java/com/juick/http/www/NewMessage.java | 11 +++++------ web/post3.js | 18 ------------------ 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/src/java/NewMessage.properties b/src/java/NewMessage.properties index 2108f861..851e3134 100644 --- a/src/java/NewMessage.properties +++ b/src/java/NewMessage.properties @@ -4,10 +4,7 @@ New\ message=New message Location=Location Clear=Clear -Attachment=Attachment -from\ webcam=from webcam -Webcam\ photo=Webcam photo +Photo=Photo Post=Post Tags=Tags -Photo_JPG=Photo: JPG, PNG, up to 10Mb. Video: MP4/3GP/MOV/WMV/AVI/M4V, up to 100Mb. -or=or +Photo_JPG=(JPG, PNG, up to 10Mb) diff --git a/src/java/NewMessage_ru.properties b/src/java/NewMessage_ru.properties index 5e674cfd..f9f9017f 100644 --- a/src/java/NewMessage_ru.properties +++ b/src/java/NewMessage_ru.properties @@ -4,11 +4,7 @@ New\ message=\u041d\u043e\u0432\u043e\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 Location=\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 Clear=\u0423\u0434\u0430\u043b\u0438\u0442\u044c -Attachment=\u0424\u0430\u0439\u043b - -from\ webcam=\u0441 \u0432\u0435\u0431\u043a\u0430\u043c\u0435\u0440\u044b -Webcam\ photo=\u0424\u043e\u0442\u043e \u0441 \u0432\u0435\u0431\u043a\u0430\u043c\u0435\u0440\u044b +Photo=\u0424\u043e\u0442\u043e Post=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c Tags=\u0422\u0435\u0433\u0438 -Photo_JPG=\u0424\u043e\u0442\u043e: JPG, PNG, \u0434\u043e 10\u041c\u0431. \u0412\u0438\u0434\u0435\u043e: MP4/3GP/MOV/WMV/AVI/M4V, \u0434\u043e 100Mb. -or=\u0438\u043b\u0438 +Photo_JPG=(JPG, PNG, \u0434\u043e 10\u041c\u0431) diff --git a/src/java/com/juick/http/www/NewMessage.java b/src/java/com/juick/http/www/NewMessage.java index 3f1c0ac0..20e1102c 100644 --- a/src/java/com/juick/http/www/NewMessage.java +++ b/src/java/com/juick/http/www/NewMessage.java @@ -50,12 +50,10 @@ public class NewMessage { + ""); PageTemplates.pageNavigation(out, locale, visitor, null); - out.println("
"); + out.println("
"); out.println("
"); out.println("

" + rbnm.getString("Location") + ": " + rbnm.getString("Clear") + "

"); - out.println("

" + rbnm.getString("Attachment") + ": " + rbnm.getString("or") + " " + rbnm.getString("from webcam") + "
"); - out.println("" + rbnm.getString("Photo_JPG") + "
" + rbnm.getString("Webcam photo") + " — " + rbnm.getString("Clear") + "

"); - out.println("
"); + out.println("

" + rbnm.getString("Photo") + ": " + rbnm.getString("Photo_JPG") + "

"); String body = request.getParameter("body"); if (body == null) { @@ -68,15 +66,16 @@ public class NewMessage { } out.println("


"); - out.println("" + "" + "

"); + out.println("" + "" + "

"); out.println("
"); out.println("
"); out.println("

" + rbnm.getString("Tags") + ":

"); printUserTags(sql, out, visitor); + PageTemplates.pageFooter(request, out, locale, visitor, false); + out.println("
"); out.println("
"); out.println("
"); - PageTemplates.pageFooter(request, out, locale, visitor, false); PageTemplates.pageEnd(out); } finally { out.close(); diff --git a/web/post3.js b/web/post3.js index 756e1b20..cde36711 100644 --- a/web/post3.js +++ b/web/post3.js @@ -34,26 +34,8 @@ function addTag(tag) { return false; } -function webcamShow() { - swfobject.embedSWF('//juick.com/_webcam.swf','webcam','320','280','9.0.115','false',null,null,null); -} - -function webcamImage(hash) { - document.getElementById("webcamwrap").innerHTML='
'; - document.getElementById("attachmentfile").style.display="none"; - document.getElementById("attachmentwebcam").style.display="inline"; - document.forms["postmsg"].webcam.value=hash; -} - -function clearAttachment() { - document.getElementById("attachmentfile").style.display="inline"; - document.getElementById("attachmentwebcam").style.display="none"; - document.forms["postmsg"].webcam.value=""; -} - $(document).ready(function() { clearLocation(); - clearAttachment(); $("textarea")[0].focus(); }); -- cgit v1.2.3