diff options
| -rw-r--r-- | src/java/NewMessage.properties | 7 | ||||
| -rw-r--r-- | src/java/NewMessage_ru.properties | 8 | ||||
| -rw-r--r-- | src/java/com/juick/http/www/NewMessage.java | 11 | ||||
| -rw-r--r-- | 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 { + "<script src=\"//static.juick.com/post3.js\" type=\"text/javascript\" defer=\"defer\"></script>"); PageTemplates.pageNavigation(out, locale, visitor, null); - out.println("<div id=\"wrapper\"><div id=\"content\" class=\"pagetext\">"); + out.println("<div id=\"topwrapper\"><div id=\"wrapper\"><div id=\"content\" class=\"pagetext\">"); out.println("<form action=\"/post\" method=\"post\" id=\"postmsg\" enctype=\"multipart/form-data\">"); out.println("<p style=\"text-align: left\"><b>" + rbnm.getString("Location") + ": <span id=\"location\"></span></b> <span id=\"locationclear\">— <a href=\"#\" onclick=\"clearLocation()\">" + rbnm.getString("Clear") + "</a></span></p>"); - out.println("<p style=\"text-align: left\"><b>" + rbnm.getString("Attachment") + ":</b> <span id=\"attachmentfile\"><input type=\"file\" name=\"attach\"" + (com.juick.server.UserQueries.getCanMedia(sql, visitor.UID) ? "" : " disabled=\"disabled\"") + "/> " + rbnm.getString("or") + " <a href=\"#\" onclick=\"webcamShow(); return false;\">" + rbnm.getString("from webcam") + "</a><br/>"); - out.println("<i>" + rbnm.getString("Photo_JPG") + "</i></span><span id=\"attachmentwebcam\">" + rbnm.getString("Webcam photo") + " — <a href=\"#\" onclick=\"clearAttachment(); return false;\">" + rbnm.getString("Clear") + "</a></span></p>"); - out.println("<div id=\"webcamwrap\" style=\"width: 320px; margin: 0 auto\"><div id=\"webcam\"></div></div>"); + out.println("<p style=\"text-align: left\"><b>" + rbnm.getString("Photo") + ":</b> <span id=\"attachmentfile\"><input type=\"file\" name=\"attach\"/> <i>" + rbnm.getString("Photo_JPG") + "</i></span></p>"); String body = request.getParameter("body"); if (body == null) { @@ -68,15 +66,16 @@ public class NewMessage { } out.println("<p><textarea name=\"body\" class=\"newmessage\" rows=\"7\" cols=\"10\">" + body + "</textarea><br/>"); - out.println("<input type=\"hidden\" name=\"place_id\"/><input type=\"hidden\" name=\"webcam\"/>" + "" + "<input type=\"submit\" class=\"subm\" value=\" " + rbnm.getString("Post") + " \"/></p>"); + out.println("<input type=\"hidden\" name=\"place_id\"/>" + "" + "<input type=\"submit\" class=\"subm\" value=\" " + rbnm.getString("Post") + " \"/></p>"); out.println("</form>"); out.println("<div id=\"geomap\"></div>"); out.println("<p style=\"text-align: left\"><b>" + rbnm.getString("Tags") + ":</b></p>"); printUserTags(sql, out, visitor); + PageTemplates.pageFooter(request, out, locale, visitor, false); + out.println("</div>"); out.println("</div>"); out.println("</div>"); - 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='<div id="webcam"></div>'; - 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(); }); |