From e707a8e607ec92fcf0137b75b170ff898755ecb2 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Fri, 11 Oct 2013 21:35:17 +0700
Subject: Two columns

---
 src/java/com/juick/http/www/Blogs.java         |  3 +++
 src/java/com/juick/http/www/Help.java          | 23 +++++++++++------------
 src/java/com/juick/http/www/PageTemplates.java |  6 ++++--
 src/java/com/juick/http/www/User.java          |  2 +-
 src/java/com/juick/http/www/UserThread.java    |  4 ++--
 web/style3.css                                 | 22 +++++++++-------------
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/java/com/juick/http/www/Blogs.java b/src/java/com/juick/http/www/Blogs.java
index 0f13d946..89113def 100644
--- a/src/java/com/juick/http/www/Blogs.java
+++ b/src/java/com/juick/http/www/Blogs.java
@@ -213,6 +213,9 @@ public class Blogs {
             out.println("    <li><a href=\"/?show=photos\">" + rb.getString("With photos") + "</a></li>");
             out.println("  </ul>");
             out.println("  <hr/>");
+            out.println("  <form action=\"/\">");
+            out.println("  <p><input type=\"text\" name=\"search\" class=\"inp\" placeholder=\"" + rb.getString("Search") + "\"/></p>");
+            out.println("  </form>");
             out.println("  <p>" + getTags(sql, 45) + "</p>");
             out.println("</div>");
 
diff --git a/src/java/com/juick/http/www/Help.java b/src/java/com/juick/http/www/Help.java
index 9fc21aad..7adcb920 100644
--- a/src/java/com/juick/http/www/Help.java
+++ b/src/java/com/juick/http/www/Help.java
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author Ugnich Anton
  */
 public class Help {
-    
+
     protected void doRedirectToHelpIndex(Connection sql, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String lang = request.getLocale().getLanguage();
         if (!(lang.equals("ru") || lang.equals("fr"))) {
@@ -42,19 +42,19 @@ public class Help {
         }
         Utils.sendTemporaryRedirect(response, "/help/" + lang + "/");
     }
-    
+
     protected void doGetHelp(Connection sql, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         com.juick.User visitor = Utils.getVisitorUser(sql, request);
         Locale locale = request.getLocale();
         ResourceBundle rb = ResourceBundle.getBundle("Global", locale);
-        
+
         String path[] = request.getRequestURI().split("/");
         String page;
         if (path.length < 3 || path.length > 4 || path[2].length() != 2 || !path[2].matches("^[a-z]+$")) {
             response.sendError(404);
             return;
         }
-        
+
         if (path.length == 4) {
             page = path[3];
             if (!page.matches("^[a-zA-Z0-9\\-]*$") || page.equals("navigation") || page.equals("index")) {
@@ -64,41 +64,40 @@ public class Help {
         } else {
             page = "index";
         }
-        
+
         File f = new File("/var/www/juick.com/help3/" + path[2] + "/" + page);
         if (!f.isFile()) {
             response.sendError(404);
             return;
         }
-        
+
         response.setContentType("text/html; charset=UTF-8");
         PrintWriter out = response.getWriter();
         try {
             PageTemplates.pageHead(out, rb.getString("Help"), "");
             PageTemplates.pageNavigation(out, locale, visitor, null);
-            
+
             out.println("<div id=\"topwrapper\">");
             out.println("<div id=\"wrapper\">");
             out.println("<div id=\"content\">");
             printFile(out, f);
+            PageTemplates.pageFooter(request, out, locale, visitor, false);
             out.println("</div>");
             out.println("</div>");
-            
+
             out.println("<div id=\"column\" class=\"abs\">");
             printFile(out, new File("/var/www/juick.com/help3/" + path[2] + "/navigation"));
             out.println("<hr/>");
             printFile(out, new File("/var/www/juick.com/help3/langs"));
             out.println("</div>");
-            
+
             out.println("</div>");
-            
-            PageTemplates.pageFooter(request, out, locale, visitor, false);
             PageTemplates.pageEnd(out);
         } finally {
             out.close();
         }
     }
-    
+
     private void printFile(PrintWriter out, File f) throws IOException {
         BufferedReader br = new BufferedReader(new FileReader(f));
         String str;
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index f2326b3e..ba19c40b 100644
--- a/src/java/com/juick/http/www/PageTemplates.java
+++ b/src/java/com/juick/http/www/PageTemplates.java
@@ -50,7 +50,7 @@ public class PageTemplates {
         out.println("<!DOCTYPE html>");
         out.print("<html>");
         out.print("<head>");
-        out.print("<link rel=\"stylesheet\" href=\"/style.2013072200.css\"/>");
+        out.print("<link rel=\"stylesheet\" href=\"/style.2013100900.css\"/>");
         out.print("<script type=\"text/javascript\" src=\"//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js\" defer=\"defer\"></script>");
         out.print("<script type=\"text/javascript\" src=\"//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js\" defer=\"defer\" async=\"async\"></script>");
         out.print("<script type=\"text/javascript\" src=\"/scripts.2013072200.js\" defer=\"defer\"></script>");
@@ -70,11 +70,13 @@ public class PageTemplates {
         out.println("<div id=\"hwrapper\">");
         out.println("<ul id=\"header\">");
         out.println("  <li id=\"logo\"><a href=\"" + (user != null ? "/?show=my" : "/") + "\"><div class=\"head-ico\" id=\"hi-logo\"></div></a></li>");
+        /*
         out.print("  <li id=\"search\"><form action=\"/\"><input type=\"text\" name=\"search\" class=\"text\" placeholder=\"" + rb.getString("Search") + "\"");
         if (search != null) {
-            out.print(" value=\"" + Utils.encodeHTML(search) + "\"");
+        out.print(" value=\"" + Utils.encodeHTML(search) + "\"");
         }
         out.println("/></form></li>");
+         */
         if (user != null) {
             out.println("  <li class=\"right\"><a href=\"/logout\"><div class=\"head-ico\" id=\"hi-logout\"></div></a></li>");
             out.println("  <li class=\"right\"><a href=\"/settings\"><div class=\"head-ico\" id=\"hi-settings\"></div></a></li>");
diff --git a/src/java/com/juick/http/www/User.java b/src/java/com/juick/http/www/User.java
index 3b526727..e91076e0 100644
--- a/src/java/com/juick/http/www/User.java
+++ b/src/java/com/juick/http/www/User.java
@@ -317,7 +317,7 @@ public class User {
         out.println("    <li><a href=\"./?show=photos\">" + rb.getString("(Menu) Photos") + "</a></li>");
         out.println("  </ul>");
         out.println("  <hr/>");
-        out.println("  <form action=\"./\" id=\"searchuser\">");
+        out.println("  <form action=\"./\">");
         out.println("  <p><input type=\"text\" name=\"search\" class=\"inp\" placeholder=\"" + rb.getString("Search") + "\"/></p>");
         out.println("  </form>");
         out.println("  <p>" + pageUserTags(sql, user, visitor, 15) + "<a href=\"./tags\">...</a></p>");
diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java
index 3ba5c96b..6fb63209 100644
--- a/src/java/com/juick/http/www/UserThread.java
+++ b/src/java/com/juick/http/www/UserThread.java
@@ -278,8 +278,8 @@ public class UserThread {
     public static void printTree(PrintWriter out, ArrayList<com.juick.Message> replies, int ReplyTo, int margin, boolean hidden, Locale locale) {
         ResourceBundle rb = ResourceBundle.getBundle("Global", locale);
 
-        if (margin > 420) {
-            margin = 420;
+        if (margin > 240) {
+            margin = 240;
         }
 
         for (int i = 0; i < replies.size(); i++) {
diff --git a/web/style3.css b/web/style3.css
index e240160a..5e49b6cc 100644
--- a/web/style3.css
+++ b/web/style3.css
@@ -9,8 +9,10 @@ hr { height: 1px; background: #CCC; margin: 10px 0; }
 pre { white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word; }
 .u { text-decoration: underline; }
 
-#header, #topwrapper { width: 1000px; margin: 0 auto; }
-#content, #footer { width: 600px; margin: 0 auto; }
+#header, #topwrapper { width: 850px; }
+#content, #footer { width: 600px; }
+#header, #topwrapper, #footer { margin: 0 auto; }
+#content { margin: 15px 0 0 250px; }
 
 /********/
 
@@ -25,7 +27,7 @@ pre { white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap;
 
 .head-ico { width: 32px; height: 32px; display: inline-block; vertical-align: middle; margin-bottom: 2px;
             background: url("data:image/png;base64,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") no-repeat; }
-#hi-logo { width: 110px; margin: 0 28px; }
+#hi-logo { width: 110px; margin: 0 50px; }
 #hi-post { background-position: -142px 0; margin: 0 5px 0 -5px; }
 #hi-settings { background-position: -174px 0; }
 #hi-logout { background-position: -206px 0; }
@@ -87,11 +89,11 @@ blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-lef
 
 /********/
 
-#column { width: 185px; top: 0; padding-top: 10px; overflow: hidden; }
+#column { width: 230px; top: 0; padding-top: 10px; overflow: hidden; }
 #column ul, #column p, #column hr { margin: 10px 0; }
 #column li { margin: 6px 0; }
 #column p { font-size: small; line-height: 140%; }
-#column .inp { width: 175px; padding: 3px; border: 1px solid #CCC; border-radius: 3px; background: #F5F5E9; }
+#column .inp { width: 222px; padding: 3px; border: 1px solid #CCC; border-radius: 3px; background: #F5F5E9; }
 #ctitle { font-size: 14pt; }
 #ctitle img { vertical-align: middle; margin-right: 5px; }
 #ctoolbar { margin: 10px 0; padding: 5px; line-height: 0; background: #E5E5DD; }
@@ -104,12 +106,6 @@ blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-lef
 
 /********/
 
-#rcol { width: 190px; top: 0; margin: 10px 0 0 810px; padding-top: 10px; overflow: hidden; font-size: smaller; }
-#rcol h3 { margin: 8px 0; }
-#rcol p { font-size: small; line-height: 140%; }
-
-/********/
-
 #dialogb { display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; opacity: 0.5; background: #000; z-index: 10; }
 #dialogw { display: none; position: fixed; top: 40%; left: 30%; width: 350px; padding: 20px; background: #EEEEE5; border: 1px solid #999; z-index: 11; }
 #dialogl,#dialogn { padding: 5px; margin: 3px 0 20px; border: 1px solid #DDD; background: #F5F5E9; }
@@ -126,8 +122,8 @@ blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-lef
 
 /******************************************************************************/
 
-@media screen and (max-width: 800px) {
-    #header,#topwrapper,#content,#footer,#mtoolbar { width: auto; min-width: 320px; }
+@media screen and (max-width: 850px) {
+    #header,#topwrapper,#content,#footer,#mtoolbar { width: auto; min-width: 320px; margin: 0 auto; }
 
     #hwrapper { position: fixed; top: 0; z-index: 1; }
     #topwrapper { margin-top: 3em; }
-- 
cgit v1.2.3