New header design

11 files changed, 137 insertions, 284 deletions

diff --git a/src/java/com/juick/http/www/Discover.java b/src/java/com/juick/http/www/Discover.java
index 98f46656..ca6415ff 100644
--- a/src/java/com/juick/http/www/Discover.java
+++ b/src/java/com/juick/http/www/Discover.java
@@ -74,9 +74,9 @@ public class Discover {
             PageTemplates.pageHead(out, title, null);
             PageTemplates.pageNavigation(out, locale, visitor, null);
 
-            out.println("<div id=\"topwrapper\">");
-            out.println("<div id=\"wrapper\">");
-            out.println("<div id=\"content\">");
+            PageTemplates.pageHomeColumn(out, sql, visitor, locale);
+
+            out.println("<section id=\"content\">");
 
             if (mids.size() > 0) {
                 out.println("<ul>");
@@ -88,14 +88,10 @@ public class Discover {
                 String nextpage = "?before=" + mids.get(mids.size() - 1);
                 out.println("<p class=\"page\"><a href=\"" + nextpage + "\">Older →</a></p>");
             }
-            PageTemplates.pageFooter(request, out, locale, visitor, true);
-            out.println("</div>");
-            out.println("</div>"); // wrapper
 
-            PageTemplates.pageHomeColumn(out, sql, visitor, locale);
-
-            out.println("</div>"); // topwrapper
+            out.println("</section>");
 
+            PageTemplates.pageFooter(request, out, locale, visitor, true);
             PageTemplates.pageDialogTemplate(out, locale);
             PageTemplates.pageEnd(out);
         } finally {
diff --git a/src/java/com/juick/http/www/Help.java b/src/java/com/juick/http/www/Help.java
index 028539df..c6a64622 100644
--- a/src/java/com/juick/http/www/Help.java
+++ b/src/java/com/juick/http/www/Help.java
@@ -77,21 +77,17 @@ public class Help {
             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\">");
+            out.println("<aside id=\"column\">");
             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("</aside>");
 
-            out.println("</div>");
+            out.println("<section id=\"content\">");
+            printFile(out, f);
+            out.println("</section>");
+
+            PageTemplates.pageFooter(request, out, locale, visitor, false);
             PageTemplates.pageEnd(out);
         } finally {
             out.close();
diff --git a/src/java/com/juick/http/www/Home.java b/src/java/com/juick/http/www/Home.java
index 5ef43858..ae82633f 100644
--- a/src/java/com/juick/http/www/Home.java
+++ b/src/java/com/juick/http/www/Home.java
@@ -94,9 +94,9 @@ public class Home {
             PageTemplates.pageHead(out, title, null);
             PageTemplates.pageNavigation(out, locale, visitor, null);
 
-            out.println("<div id=\"topwrapper\">");
-            out.println("<div id=\"wrapper\">");
-            out.println("<div id=\"content\">");
+            PageTemplates.pageHomeColumn(out, sql, visitor, locale);
+
+            out.println("<section id=\"content\">");
 
             if (paramShow == null && paramBefore == 0) {
                 out.println("<!--noindex-->");
@@ -136,14 +136,9 @@ public class Home {
                 out.println("<!--/noindex-->");
             }
 
-            PageTemplates.pageFooter(request, out, locale, visitor, true);
-            out.println("</div>");
-            out.println("</div>"); // wrapper
-
-            PageTemplates.pageHomeColumn(out, sql, visitor, locale);
-
-            out.println("</div>"); // topwrapper
+            out.println("</section>");
 
+            PageTemplates.pageFooter(request, out, locale, visitor, true);
             PageTemplates.pageDialogTemplate(out, locale);
             PageTemplates.pageEnd(out);
         } finally {
diff --git a/src/java/com/juick/http/www/NewMessage.java b/src/java/com/juick/http/www/NewMessage.java
index 20e1102c..7ab93e1d 100644
--- a/src/java/com/juick/http/www/NewMessage.java
+++ b/src/java/com/juick/http/www/NewMessage.java
@@ -50,7 +50,7 @@ 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=\"topwrapper\"><div id=\"wrapper\"><div id=\"content\" class=\"pagetext\">");
+            out.println("<section 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\">&mdash; <a href=\"#\" onclick=\"clearLocation()\">" + rbnm.getString("Clear") + "</a></span></p>");
             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>");
@@ -71,11 +71,9 @@ public class NewMessage {
             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>");
+            out.println("</section>");
 
+            PageTemplates.pageFooter(request, out, locale, visitor, false);
             PageTemplates.pageEnd(out);
         } finally {
             out.close();
diff --git a/src/java/com/juick/http/www/PM.java b/src/java/com/juick/http/www/PM.java
index 5a07cd5a..ec51d44c 100644
--- a/src/java/com/juick/http/www/PM.java
+++ b/src/java/com/juick/http/www/PM.java
@@ -64,9 +64,9 @@ public class PM {
             PageTemplates.pageHead(out, title, null);
             PageTemplates.pageNavigation(out, locale, visitor, null);
 
-            out.println("<div id=\"topwrapper\">");
-            out.println("<div id=\"wrapper\">");
-            out.println("<div id=\"content\">");
+            PageTemplates.pageHomeColumn(out, sql, visitor, locale);
+
+            out.println("<section id=\"content\">");
 
             if (!msgs.isEmpty()) {
                 out.println("<ul>");
@@ -99,14 +99,9 @@ public class PM {
             }
              */
 
-            PageTemplates.pageFooter(request, out, locale, visitor, true);
-            out.println("</div>");
-            out.println("</div>"); // wrapper
-
-            PageTemplates.pageHomeColumn(out, sql, visitor, locale);
-
-            out.println("</div>"); // topwrapper
+            out.println("</section>");
 
+            PageTemplates.pageFooter(request, out, locale, visitor, true);
             PageTemplates.pageDialogTemplate(out, locale);
             PageTemplates.pageEnd(out);
         } finally {
@@ -144,9 +139,9 @@ public class PM {
             PageTemplates.pageHead(out, title, null);
             PageTemplates.pageNavigation(out, locale, visitor, null);
 
-            out.println("<div id=\"topwrapper\">");
-            out.println("<div id=\"wrapper\">");
-            out.println("<div id=\"content\">");
+            PageTemplates.pageHomeColumn(out, sql, visitor, locale);
+
+            out.println("<section id=\"content\">");
 
             out.println("<form action=\"/pm/send\" method=\"POST\" enctype=\"multipart/form-data\">");
             out.println("<div class=\"newpm\">");
@@ -182,14 +177,9 @@ public class PM {
             }
              */
 
-            PageTemplates.pageFooter(request, out, locale, visitor, true);
-            out.println("</div>");
-            out.println("</div>"); // wrapper
-
-            PageTemplates.pageHomeColumn(out, sql, visitor, locale);
-
-            out.println("</div>"); // topwrapper
+            out.println("</section>");
 
+            PageTemplates.pageFooter(request, out, locale, visitor, true);
             PageTemplates.pageDialogTemplate(out, locale);
             PageTemplates.pageEnd(out);
         } finally {
@@ -199,6 +189,9 @@ public class PM {
 
     public void doPostPM(Connection sql, HttpServletRequest request, HttpServletResponse response, Stream xmpp, com.juick.User visitor) throws ServletException, IOException {
         String uname = request.getParameter("uname");
+        if (uname.startsWith("@")) {
+            uname = uname.substring(1);
+        }
         int uid = 0;
         if (UserQueries.checkUserNameValid(uname)) {
             uid = UserQueries.getUIDbyName(sql, uname);
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index 16a00d24..462fdf31 100644
--- a/src/java/com/juick/http/www/PageTemplates.java
+++ b/src/java/com/juick/http/www/PageTemplates.java
@@ -55,9 +55,9 @@ public class PageTemplates {
         out.println("<!DOCTYPE html>");
         out.print("<html>");
         out.print("<head>");
-        out.print("<link rel=\"stylesheet\" href=\"/style.2014012700.css\"/>");
+        out.print("<link rel=\"stylesheet\" href=\"/style.2014013002.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=\"/scripts.2014012700.js\" defer=\"defer\"></script>");
+        out.print("<script type=\"text/javascript\" src=\"/scripts.2014013000.js\" defer=\"defer\"></script>");
         if (headers != null) {
             out.print(headers);
         }
@@ -69,75 +69,43 @@ public class PageTemplates {
         out.println("<body>");
     }
 
-    public static void pageNavigation(PrintWriter out, Locale loc, com.juick.User user, String search) {
-        ResourceBundle rb = ResourceBundle.getBundle("Global", loc);
-        out.println("<div id=\"hwrapper\">");
-        out.println("<ul id=\"header\">");
-        if (user != null) {
-            out.println("  <li><a href=\"/?show=my\"><div class=\"head-ico\" id=\"hi-home\"></div><label>" + rb.getString("Home") + "</label></a></li>");
-        } else {
-            out.println("  <li><a href=\"/\"><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") + "\"");
+    public static void pageNavigation(PrintWriter out, Locale loc, com.juick.User visitor, String search) {
+        out.println("<header>");
+        out.println("  <div id=\"logo\"><a href=\"/\">Juick</a></div>");
+        out.println("  <nav id=\"global\"><ul>");
+        out.println("    <li><a href=\"/\">Популярные</a></li>");
+        out.println("    <li>/</li>");
+        out.println("    <li><a href=\"/?show=all\">Все сообщения</a></li>");
+        out.println("  </ul></nav>");
+        out.print("  <div id=\"search\"><form action=\"/\"><input type=\"text\" name=\"search\" class=\"text\" placeholder=\"Поиск\"");
         if (search != null) {
             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>");
-            out.println("  <li class=\"right\"><a href=\"/" + user.UName + "\" class=\"wide\"><img src=\"//i.juick.com/as/" + user.UID + ".png\" alt=\"" + user.UName + "\"/><label>" + user.UName + "</label></a></li>");
-            out.println("  <li class=\"right\"><a href=\"/post\" class=\"wide\"><div class=\"head-ico\" id=\"hi-post\"></div><label>" + rb.getString("Post") + "</label></a></li>");
+        out.println("/></form></div>");
+        out.println("  <section id=\"headdiv\">");
+        if (visitor != null) {
+            out.println("    <nav id=\"user\"><ul>");
+            out.println("      <li><a href=\"/?show=my\">Моя лента</a></li>");
+            out.println("      <li>/</li>");
+            out.println("      <li><a href=\"/pm/inbox\">Приватные</a></li>");
+            out.println("      <li>/</li>");
+            out.println("      <li><a href=\"/?show=discuss\">Обсуждения</a></li>");
+            out.println("      <li>/</li>");
+            out.println("      <li><a href=\"/?show=recommended\">Рекомендации</a></li>");
+            out.println("    </ul></nav>");
+            out.println("    <nav id=\"actions\"><ul>");
+            out.println("      <li><a href=\"/post\">Написать</a></li>");
+            out.println("      <li>/</li>");
+            out.println("      <li><a href=\"/" + visitor.UName + "\">@" + visitor.UName + "</a></li>");
+            out.println("      <li>/</li>");
+            out.println("      <li><a href=\"/logout\">Выйти</a></li>");
+            out.println("    </ul></nav>");
         } else {
-            out.println("  <li class=\"right\"><a href=\"/login\" class=\"wide\" rel=\"nofollow\">" + rb.getString("Login") + "</a></li>");
+            out.println("<p>Чтобы добавлять сообщения и комментарии, <a href=\"/login\">представьтесь</a>.</p>");
         }
-        out.println("</ul>");
-        out.println("</div>");
-    }
-    /*
-    public static void pageUserTitle(PrintWriter out, Connection sql, Locale loc, com.juick.User user, com.juick.User visitor) {
-    ResourceBundle rb = ResourceBundle.getBundle("User", loc);
-    
-    // Full name and description
-    String fullname = null;
-    String description = null;
-    PreparedStatement stmt = null;
-    ResultSet rs = null;
-    try {
-    stmt = sql.prepareStatement("SELECT fullname,descr FROM usersinfo WHERE user_id=?");
-    stmt.setInt(1, user.UID);
-    rs = stmt.executeQuery();
-    if (rs.first()) {
-    fullname = rs.getString(1) + " (" + user.UName + ")";
-    description = rs.getString(2);
+        out.println("  </section>");
+        out.println("</header>");
     }
-    } catch (SQLException e) {
-    System.err.println(e);
-    } finally {
-    Utils.finishSQL(rs, stmt);
-    }
-    if (fullname == null) {
-    fullname = user.UName;
-    }
-    if (description == null) {
-    description = "";
-    }
-    
-    out.println("<div id=\"title\">");
-    out.println("  <div id=\"title-av\"><a href=\"/" + user.UName + "/\"><img src=\"//i.juick.com/a/" + user.UID + ".png\" width=\"96\" height=\"96\" alt=\"" + user.UName + "\"/></a></div>");
-    out.println("  <div id=\"title-stats\"><ul>");
-    out.println("    <li><a href=\"/" + user.UName + "/friends\">" + rb.getString("(Stats) I read") + ": " + UserQueries.getStatsIRead(sql, user.UID) + "</a></li>");
-    out.println("    <li><a href=\"/" + user.UName + "/readers\">" + rb.getString("(Stats) My readers") + ": " + UserQueries.getStatsMyReaders(sql, user.UID) + "</a></li>");
-    out.println("    <li>" + rb.getString("(Stats) Messages") + ": " + UserQueries.getStatsMessages(sql, user.UID) + "</li>");
-    out.println("    <li>" + rb.getString("(Stats) Replies") + ": " + UserQueries.getStatsReplies(sql, user.UID) + "</li>");
-    out.println("  </ul></div>");
-    out.println("  <div id=\"title-username\"><h1>" + fullname + "</h1><p>" + description + "</p></div>");
-    out.println("</div>");
-    out.println();
-    }
-     */
 
     public static void pageYandexAd(PrintWriter out, int stat_id) {
         out.println("<div id=\"yandex_ad\"></div>");
@@ -171,26 +139,13 @@ public class PageTemplates {
     }
 
     public static void pageHomeColumn(PrintWriter out, Connection sql, com.juick.User visitor, Locale locale) {
-        ResourceBundle rb = ResourceBundle.getBundle("Blogs", locale);
-
         if (tagsHTML == null) {
             tagsHTML = PageTemplates.getPopularTags(sql, 60);
         }
 
-        out.println("<div id=\"column\" class=\"abs\">");
-        out.println("  <ul>");
-        if (visitor != null) {
-            out.println("    <li><a href=\"/?show=my\">" + rb.getString("My feed") + "</a></li>");
-            out.println("    <li><a href=\"/pm/inbox\">" + rb.getString("Private") + "</a> · <a href=\"/pm/sent\">" + rb.getString("Private sent") + "</a></li>");
-            out.println("    <li><a href=\"/?show=discuss\">" + rb.getString("Discussions") + "</a></li>");
-            out.println("    <li><a href=\"/?show=recommended\">" + rb.getString("Recommended") + "</a></li>");
-        }
-        out.println("    <li class=\"margtop\"><a href=\"/\">" + rb.getString("Popular") + "</a></li>");
-        out.println("    <li><a href=\"/?show=all\">" + rb.getString("All messages") + "</a></li>");
-        out.println("  </ul>");
-        out.println("  <hr/>");
+        out.println("<aside id=\"column\">");
         out.println("  <p>" + tagsHTML + "</p>");
-        out.println("</div>");
+        out.println("</aside>");
     }
 
     public static String getPopularTags(Connection sql, int cnt) {
@@ -260,14 +215,13 @@ public class PageTemplates {
     }
 
     public static void pageFooter(HttpServletRequest request, PrintWriter out, Locale loc, com.juick.User visitor, boolean sapeon) {
-        ResourceBundle rb = ResourceBundle.getBundle("Global", loc);
         out.println("<div id=\"fwrapper\"><div id=\"footer\">");
-        out.println("  <div id=\"footer-right\"><a href=\"/help/ru/contacts\" rel=\"nofollow\">" + rb.getString("Contacts") + "</a> &#183; <a href=\"/help/\" rel=\"nofollow\">" + rb.getString("Help") + "</a> &#183; <a href=\"/help/ru/adv\" rel=\"nofollow\">" + rb.getString("Advertising") + "</a></div>");
-        out.print("  <div id=\"footer-left\">juick.com &copy; 2008-2013");
+        out.println("  <div id=\"footer-right\"><a href=\"/settings\" rel=\"nofollow\">Настройки</a> &#183; <a href=\"/help/ru/contacts\" rel=\"nofollow\">Контакты</a> &#183; <a href=\"/help/\" rel=\"nofollow\">Справка</a> &#183; <a href=\"/help/ru/adv\" rel=\"nofollow\">Реклама</a></div>");
+        out.print("  <div id=\"footer-left\">juick.com &copy; 2008-2014");
         if (sapeon && sape != null && (visitor == null || visitor.UID == 1) && request.getQueryString() == null) {
             String links = sape.getPageLinks(request.getRequestURI(), request.getCookies()).render();
             if (links != null && !links.isEmpty()) {
-                out.print("<br/>" + rb.getString("Sponsored by") + ": " + links);
+                out.print("<br/>Спонсоры: " + links);
             }
         }
         out.println("</div>");
diff --git a/src/java/com/juick/http/www/SignUp.java b/src/java/com/juick/http/www/SignUp.java
index b5780676..f6212e3d 100644
--- a/src/java/com/juick/http/www/SignUp.java
+++ b/src/java/com/juick/http/www/SignUp.java
@@ -67,9 +67,8 @@ public class SignUp {
         try {
             PageTemplates.pageHead(out, rb.getString("Unknown account"), "");
             PageTemplates.pageNavigation(out, locale, visitor, null);
-            out.println("<div id=\"topwrapper\">");
-            out.println("<div id=\"wrapper\">");
-            out.println("<div id=\"content\">");
+
+            out.println("<section id=\"content\">");
 
             out.print("<h1 class=\"signup-h1\">");
             if (type.charAt(0) == 'f') {
@@ -114,9 +113,7 @@ public class SignUp {
             out.println("<p><input type=\"submit\" value=\"    OK    \"/></p>");
             out.println("</form>");
 
-            out.println("</div>");
-            out.println("</div>");
-            out.println("</div>"); // topwrapper
+            out.println("</section>");
 
             PageTemplates.pageFooter(request, out, locale, visitor, false);
             PageTemplates.pageEnd(out);
diff --git a/src/java/com/juick/http/www/User.java b/src/java/com/juick/http/www/User.java
index 2af66275..51a282d2 100644
--- a/src/java/com/juick/http/www/User.java
+++ b/src/java/com/juick/http/www/User.java
@@ -108,11 +108,10 @@ public class User {
         try {
             PageTemplates.pageHead(out, title, "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"@" + user.UName + "\" href=\"//rss.juick.com/" + user.UName + "/blog\"/>");
             PageTemplates.pageNavigation(out, locale, visitor, null);
-            //PageTemplates.pageUserTitle(out, sql, locale, user, visitor);
 
-            out.println("<div id=\"topwrapper\">");
-            out.println("<div id=\"wrapper\">");
-            out.println("<div id=\"content\">");
+            pageUserColumn(out, sql, user, visitor, locale);
+
+            out.println("<section id=\"content\">");
             out.println("<ul>");
             if (mids.size() > 0) {
                 PageTemplates.printMessages(out, sql, user, mids, visitor, locale, visitor == null ? 4 : 5, 0);
@@ -132,18 +131,10 @@ public class User {
                 }
                 out.println("<p class=\"page\"><a href=\"" + nextpage + "\">Older →</a></p>");
             }
-            PageTemplates.pageFooter(request, out, locale, visitor, true);
-            out.println("</div>");
-
-            pageUserColumn(out, sql, user, visitor, locale);
-            out.println("</div>");
-
-            //out.println("<div id=\"rcol\" class=\"abs\">");
-            //PageTemplates.pageYandexAd(out, visitor == null ? 4 : 5); // разный ID для залогиненых и нет
-            //out.println("</div>");
 
-            out.println("</div>"); // topwrapper
+            out.println("</section>");
 
+            PageTemplates.pageFooter(request, out, locale, visitor, true);
             PageTemplates.pageDialogTemplate(out, locale);
             PageTemplates.pageEnd(out);
         } finally {
@@ -164,18 +155,14 @@ public class User {
         try {
             PageTemplates.pageHead(out, "@" + user.UName + ": " + rb.getString("(Menu) Tags"), null);
             PageTemplates.pageNavigation(out, locale, visitor, null);
-            //PageTemplates.pageUserTitle(out, sql, locale, user, visitor);
 
-            out.println("<div id=\"topwrapper\">");
-            out.println("<div id=\"wrapper\">");
-            out.println("<div id=\"content\">");
-            out.println("<p>" + pageUserTags(sql, user, visitor, 0) + "</p>");
-            PageTemplates.pageFooter(request, out, locale, visitor, false);
-            out.println("</div>");
             pageUserColumn(out, sql, user, visitor, locale);
-            out.println("</div>");
-            out.println("</div>");
 
+            out.println("<section id=\"content\">");
+            out.println("<p>" + pageUserTags(sql, user, visitor, 0) + "</p>");
+            out.println("</section>");
+
+            PageTemplates.pageFooter(request, out, locale, visitor, false);
             PageTemplates.pageDialogTemplate(out, locale);
             PageTemplates.pageEnd(out);
         } finally {
@@ -193,11 +180,10 @@ public class User {
         try {
             PageTemplates.pageHead(out, "@" + user.UName + ": " + rb.getString("(Stats) I read"), null);
             PageTemplates.pageNavigation(out, locale, visitor, null);
-            //PageTemplates.pageUserTitle(out, sql, locale, user, visitor);
 
-            out.println("<div id=\"topwrapper\">");
-            out.println("<div id=\"wrapper\">");
-            out.println("<div id=\"content\">");
+            pageUserColumn(out, sql, user, visitor, locale);
+
+            out.println("<section id=\"content\">");
             out.println("<table class=\"users\"><tr>");
 
             PreparedStatement stmt = null;
@@ -222,12 +208,9 @@ public class User {
             }
 
             out.println("</tr></table>");
-            PageTemplates.pageFooter(request, out, locale, visitor, false);
-            out.println("</div>");
-            pageUserColumn(out, sql, user, visitor, locale);
-            out.println("</div>");
-            out.println("</div>");
+            out.println("</section>");
 
+            PageTemplates.pageFooter(request, out, locale, visitor, false);
             PageTemplates.pageDialogTemplate(out, locale);
             PageTemplates.pageEnd(out);
         } finally {
@@ -245,11 +228,10 @@ public class User {
         try {
             PageTemplates.pageHead(out, "@" + user.UName + ": " + rb.getString("(Stats) My readers"), null);
             PageTemplates.pageNavigation(out, locale, visitor, null);
-            //PageTemplates.pageUserTitle(out, sql, locale, user, visitor);
 
-            out.println("<div id=\"topwrapper\">");
-            out.println("<div id=\"wrapper\">");
-            out.println("<div id=\"content\">");
+            pageUserColumn(out, sql, user, visitor, locale);
+
+            out.println("<section id=\"content\">");
             out.println("<table class=\"users\"><tr>");
 
             PreparedStatement stmt = null;
@@ -274,12 +256,9 @@ public class User {
             }
 
             out.println("</tr></table>");
-            PageTemplates.pageFooter(request, out, locale, visitor, false);
-            out.println("</div>");
-            pageUserColumn(out, sql, user, visitor, locale);
-            out.println("</div>");
-            out.println("</div>");
+            out.println("</section>");
 
+            PageTemplates.pageFooter(request, out, locale, visitor, false);
             PageTemplates.pageDialogTemplate(out, locale);
             PageTemplates.pageEnd(out);
         } finally {
@@ -290,7 +269,7 @@ public class User {
     public static void pageUserColumn(PrintWriter out, Connection sql, com.juick.User user, com.juick.User visitor, Locale locale) {
         ResourceBundle rb = ResourceBundle.getBundle("User", locale);
 
-        out.println("<div id=\"column\" class=\"abs\">");
+        out.println("<aside id=\"column\">");
         out.println("  <div id=\"ctitle\"><a href=\"./\"><img src=\"//i.juick.com/as/" + user.UID + ".png\" alt=\"\"/>" + user.UName + "</a></div>");
         if (visitor != null && visitor.UID > 0 && visitor.UID != user.UID) {
             out.println("  <ul id=\"ctoolbar\">");
@@ -328,7 +307,7 @@ public class User {
         out.println("    <li>" + rb.getString("(Stats) Messages") + ": " + UserQueries.getStatsMessages(sql, user.UID) + "</li>");
         out.println("    <li>" + rb.getString("(Stats) Replies") + ": " + UserQueries.getStatsReplies(sql, user.UID) + "</li>");
         out.println("  </ul></div>");
-        out.println("</div>");
+        out.println("</aside>");
     }
 
     public static String pageUserTags(Connection sql, com.juick.User user, com.juick.User visitor, int cnt) {
diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java
index c37ead00..ff05cf4b 100644
--- a/src/java/com/juick/http/www/UserThread.java
+++ b/src/java/com/juick/http/www/UserThread.java
@@ -66,18 +66,11 @@ public class UserThread {
         try {
             PageTemplates.pageHead(out, title, "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"@" + user.UName + "\" href=\"//rss.juick.com/" + user.UName + "/blog\"/>");
             PageTemplates.pageNavigation(out, locale, visitor, null);
-            //PageTemplates.pageUserTitle(out, sql, locale, user, visitor);
-
-            out.println("<div id=\"topwrapper\">");
-            out.println("<div id=\"wrapper\">");
-            out.println("<div id=\"content\" style=\"margin-left: 0; width: 100%\">");
 
+            out.println("<section id=\"content\" style=\"margin-left: 0; width: 100%\">");
             com.juick.Message msg = printMessage(out, sql, user, MID, visitor, locale);
             printReplies(out, sql, msg, visitor, locale, listview);
-
-            out.println("</div>");
-            out.println("</div>");
-            out.println("</div>"); // topwrapper
+            out.println("</section>");
 
             PageTemplates.pageDialogTemplate(out, locale);
             PageTemplates.pageFooter(request, out, locale, visitor, false);
diff --git a/web/scripts3.js b/web/scripts3.js
index b71eef16..723e3d76 100644
--- a/web/scripts3.js
+++ b/web/scripts3.js
@@ -833,28 +833,6 @@ $(document).ready(function() {
         $(this).off('click');
     });
     
-    if(!!$('#column').offset()) {
-        var stickyTop = $('#column').offset().top;
-        $(window).scroll(function() {
-            var windowTop = $(window).scrollTop();
-            var column=$('#column');
-            var rcol=$('#rcol');
-            if (stickyTop < windowTop) {
-                if(column.hasClass('fix')==false) {
-                    column.removeClass('abs');
-                    column.addClass('fix');
-                    rcol.removeClass('abs');
-                    rcol.addClass('fix');
-                }
-            } else if(column.hasClass('fix')==true) {
-                column.removeClass('fix');
-                column.addClass('abs');
-                rcol.removeClass('fix');
-                rcol.addClass('abs');
-            }
-        });
-    }
-    
     unfoldReply();
     $(window).bind('hashchange',unfoldReply);
 
diff --git a/web/style3.css b/web/style3.css
index 888c7313..706ae32c 100644
--- a/web/style3.css
+++ b/web/style3.css
@@ -1,6 +1,7 @@
 html,body,div,h1,h2,ul,li,form,input,textarea,pre { margin: 0; padding: 0; }
 html,input { font-family: sans-serif; font-size: 12pt; }
 html { background: #EEEEE5; color: #000; }
+body { width: 1010px; margin: 0 auto; }
 h1,h2 { font-weight: normal; }
 ul { list-style-type: none; }
 a { text-decoration: none; color: #069; }
@@ -9,47 +10,37 @@ 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 { width: 890px; }
-#topwrapper { width: 870px; }
-#content, #footer { width: 600px; }
-#header, #topwrapper, #footer { margin: 0 auto; }
-#content { margin: 15px 0 0 270px; }
+#content, #footer { width: 700px; margin: 15px 0 0 290px; }
+#topwrapper { position: relative; clear: both; }
 
 /********/
 
-#hwrapper { float: left; width: 100%; background: #333; padding-bottom: 2px; }
-#header li { float: left; line-height: 48px; }
-#header .text { margin-left: 15px; width: 185px; padding: 4px; border: none; background: #EEE; }
-#header>.right { float: right; }
-#header a { display: block; font-size: 18px; padding: 0 10px; color: #999;  }
-#header .wide { padding: 0 20px; }
-#header img { max-width: 32px; max-height: 32px; vertical-align: middle; margin-right: 4px; }
-#header label { cursor: pointer; }
-
-.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 50px; }
-#hi-home { background-position: -142px 0; }
-#hi-discover { background-position: -174px 0; }
-#hi-post { background-position: -206px 0; margin: 0 5px 0 -5px; }
-#hi-settings { background-position: -238px 0; }
-#hi-logout { background-position: -270px 0; }
+header { width: 1010px; color: #AAA; }
+header a { color: #000; border-bottom: 1px dotted #666; font-size: 13pt; }
 
-/********/
+#logo { float: left; width: 110px; height: 36px; margin: 7px 25px 0 20px; }
+#logo a { display: block; width: 110px; height: 36px; text-indent: 100%; white-space: nowrap; overflow: hidden; border: 0; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG4AAAAkCAYAAABomA/xAAAAAXNSR0IArs4c6QAABPZJREFUaN7tml1sFUUUx3+UFhEROyBFURERFT+qrV8xxqgvSBBjSBMnii+aGKMmmBg1E60alYRk1JjwRIz4ojHq0qi88EI0EGN4QFopYERaxCraRMJYRFErvT50istme2dm9257Q/afNPfunbNztuc/Z87HLJQoUaJEiRIlStQRpuSdQKjoSWBdFZEdRsubJ/ofEyraDCyvIrLWaNlZkO52oNsh9qzR8o2sOhpq8Jw3Osa/mqRFeYNjfEeBug96yHydR8FpSZxQ0QKgZRKJO6euiRMqmglcUYce51pMvxgtDxWov9UxfshoeTiPgsY8NxstjwFT6y1wGy0/rkX8zoH2Ir2tVltliUkgLrPHCRU1AkPAjCpinxgtO6z8i8CrjmmvMVruTehZA7zguG+x0bLfyi8HNjvkHzNavpXQswx4CLgFOB84I9AkrxgtX7bf20KJEyo6G/gJmJUY+gvYAKwzWvblJs5o+a9Q0QCwpIpYPCX+2THlceDbtHjkuO8ocCBAD0BPzGAzgPeAjpxO8LedrxlYGEKcUFGDJSdJWhfwjNHyh5rGOGCOYzxO3GyH7B6j5YmU35tdRjBaVgL0nAB2x6431IC0k8R5eNvvQH+MtNnAu8CKuF8Ajxotu4rYKucBcwOIu9LXCxK4KnDbcenZZ7Q8HiuUH3DIvwN8CPw2jv3mAUut5/sQ1zu20ISKbgfeBy5M2KHDaHmwqKzyJo+UezAevzISd13gfSF67nXVekbLRzxssSkgMdklVDQVeAnoTMnKv3eRljervN7X22wi0xroOQgVTXfE0DTi2gPkXYvvswx2cXncEWCrJS6tlLpHqGhOkcS1+xJnjT+9iuwI0DtOIVttV/gH+CYR5K8NIK6mabtQ0TSPrboTuK3K+DRgVV14nIeB9hkt/8ywOPYaLYdj15c7ypOTZAgVtQDzM27f4+FqoMkh49MYeLgQ4mwmtCCAuLaMK7st0LAuogeMlkc8ZY8BfTXehbznESpqLcLjXN522Gg5kDHukOO+EKJdc/caLUdqHN8qwHqb/ufyuqzE1dqgaYlJaLwKfa6siykPcc8bLZ/wJO5Bm9RNKHHxjHI+IDJslUsc8aoC7MqxQGqdmEzxKF2+sJ9bAdfpQAtw90RvlfH4dqlDdtho+WvK70sd9/XZ04kxw13g0RDoiZUZix2yBwIySYBFKS2r5ELbDWA7RJ/m2S6DC3ChorOAywKIm+WQbRIqegr40pYFjTY7dL1WsDNx7TqDi8fdMz2yu9VCRcQ6Iqc8s+123AXsB14DXK9n7DdaxufqAlzF/QqhorlpCztL56TN4alDxHpxwKDHnG9meI49ies7fOWNlkao6EfgoiryK+2fC2MHyXcGPu/njPYkq4WRJuBxUk5VsmyVztiQaPr2pMQiH/Q7xgcT8WWlr7zF04w2nPOg22j5nVBRE+722Smea+vPTR46VgsViYkgrjvxgCPAMpsG9/N/F328ODBk938XEfHYeR9wSYA8RsuNwK2MNpAHgOEMtvjAfq4CznPILkz5baOHjnMZPcEIruKTMa6X6n3H+42WH1GiUDQkSGl2kHYx1bvvFWBbadbikUxOdgoVrbcx6WgsBjTYQP6cw0u3JY5yShRNnK1HFgGv55hvbWnSife4mTnmqQBrjJZbSpPWN3EV4A9G30raDrxttNxemrNEiRKnJ/4DSe9ztdhLwS4AAAAASUVORK5CYII=") no-repeat; }
+nav#global { float: left; }
+nav#global li { display: inline-block; margin: 14px 8px 0 0; }
+#search { float: right; margin: 12px 20px 12px 0; }
+#search input { background: #FFF; border: 1px solid #DDDDD5; padding: 4px; }
 
-#topwrapper { position: relative; clear: both; }
-#wrapper { width: 100%; float: left; }
+#headdiv { clear: both; margin: 0 0 5px 0; padding: 0 20px; background: #DDDDD5; border-top: 1px solid #D5D5D0; border-bottom: 1px solid #D5D5D0; position: relative; }
+#headdiv li { display: inline-block; margin: 12px 8px 12px 0; }
+nav#actions { top: 0; right: 12px; position: absolute; }
+
+header p { color: #000; font-size: 13pt; margin: 12px 0; text-align: center; }
 
 /********/
 
-#geomap { width: 600px; height: 300px; margin-top: 1em; overflow: hidden; }
+#geomap { width: 700px; height: 300px; margin-top: 1em; overflow: hidden; }
 
 .msg { margin: 10px 0 20px 0; }
 .ads { padding: 13px 10px 5px 10px; margin: 8px 0 16px 58px; background: #FFF; }
 .msgthread { margin-bottom: 0; }
 .msg-avatar { float: left; width: 48px; height: 48px; }
 .msg-avatar img { width: 48px; height: 48px; vertical-align: top; }
-.msg-cont { background: #FFF; margin-left: 58px; padding: 12px 15px; width: 512px; }
+.msg-cont { background: #FFF; margin-left: 58px; padding: 12px 15px; width: 610px; }
 .msg-menu { float: right; width: 16px; height: 16px; }
 .msg-menu>a { display: block; width: 16px; height: 16px; vertical-align: top; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAALRQTFRFAAAAldX/ncT/ksj/ltL/nMb/lMn/mcz/l9H/lcr/mZmZmcz/m83/mJiYmZmZmcz/mM7/mpqamsr/l8v/m83/mJiYmM7/l8v/mZmZmcz/mpqamMv/mcz/mM3/ms3/msv/mMv/mMz/mcz/msz/mc3/mMz/mcz/msz/mc3/mcv/mc3/mcv/mcz/mcz/mcz/mcz/mZmZmZmZmcz/mcz/mcz/mcz/mcz/mcz/mcz/mcz/mcz/mZmZiZsGCAAAADx0Uk5TAAwNDhESExQWGC0tLi8yMjQ1NTY4OTk7PDxESktNUVNUd3h5eoGCg4mKmMvMzc7P29zd3uLj7O3u8vT2+A5wCAAAAJFJREFUGBkFwQlCgkAAAMDRxEySkryyzDxSAc+gkvX//2oGAAB42J5COG46AJ+/+SiKxvl1DsyqJyCtZnBXxgDxdxPrHQDZCvvUNIFkalAgtCSXHr1LIqpRt+ifu91zn6hG8YLh7TbEoMAyg8kEsgWaZQzwWDbgvXoG0p83YH7Nx+32a/73AdDZHEIovu4BAMA/t6QMuyHliCkAAAAASUVORK5CYII=") no-repeat; }
 .msg-header { overflow: hidden; }
@@ -63,21 +54,21 @@ pre { white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap;
 .msg-comments { overflow: hidden; font-size: small; color: #AAA; text-indent: 10px; margin-top: 10px; }
 .msg-comment { margin: 5px 0; }
 .ta-wrapper { display: inline-block; border: 1px solid #DDD; }
-.msg-comment textarea { width: 506px; padding: 2px; resize: vertical; vertical-align: top; min-height: 12pt; height: 12pt; border: 0; }
-.msg-comment .narrow { width: 425px; }
-.msg-comment .narrowpm { width: 450px; }
+.msg-comment textarea { width: 604px; padding: 2px; resize: vertical; vertical-align: top; min-height: 12pt; height: 12pt; border: 0; }
+.msg-comment .narrow { width: 524px; }
+.msg-comment .narrowpm { width: 550px; }
 .attach-photo { display: inline-block; padding: 2px 4px; cursor: pointer; width: 16px; height: 13px; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAQAAAAKsiavAAAAAXNSR0IArs4c6QAAAKRJREFUGNNjZICC6Q5M+xlQwD/HzAMMDEwwLnM9AxqAiDDO/M+AFzCh8B4zhrDwsfAxBjHcggkhm/CY2SDlHYQ5TZD5EoMMmgmMhSnvZnrPfDLzyQyvrPf/CzGs+L2TgYFhBoM0gzTjDAaGX7uwuQG/I1ldGRj+pzM8YXjMmMrAwOGK6cibfy2z3sMdeYpBBTMcHjMU/9zJzsjo8r8DIk1yQGEBAFzpL+AuTCqZAAAAAElFTkSuQmCC") no-repeat 3px 4px; }
 .attach-photo-active { display: inline-block; padding: 2px 4px; cursor: pointer; width: 16px; height: 13px; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAMAAACXZR4WAAAAAXNSR0IArs4c6QAAAEVQTFRFAAAAAJUAAJ0AAJIAAJkAAJYAAJwAAJcAAJoAAJgAAJkAAJoAAJoAAJgAAJkAAJoAAJkAAJkAAJkAAJkAAJkAAJkAAJkA9z3GXQAAABZ0Uk5TAAwNDg8REkBHSktRU1RVv9jZ2+Lj5OeV7PgAAABSSURBVAhbdcjBFkAgFADRIUlE9Or9/6daUC0cs5pzAXD65niKFSJQv/aChHHcrg4yA9jcILCW4tkbDGRVwfzDhs+yEBqcFsCmBiqHmULSDr0P3JdgDbuscEckAAAAAElFTkSuQmCC") no-repeat 3px 4px; }
 .msg-comment input { width: 50px; margin-left: 6px; vertical-align: top; border: 1px solid #CCC; background: #EEE; color: #999; }
 .msg-recomms { margin-top: 10px; overflow: hidden; font-size: small; color: #AAA; text-indent: 10px; }
 blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-left: 10px; }
 
-#mtoolbar { width: 542px; margin-left: 58px; background: #E5E5DD; border-top: 1px solid #CCC; }
+#mtoolbar { width: 640px; margin-left: 58px; background: #E5E5DD; border-top: 1px solid #CCC; }
 #mtoolbar ul, #mtoolbar a { padding: 5px; }
 #mtoolbar li { display: inline; }
 #mtoolbar div { display: inline-block; width: 16px; height: 16px; background: url(//static.juick.com/toolbar-icons.png) no-repeat; vertical-align: middle; margin: 5px; }
 
-.newmessage { width: 570px; padding: 2px; resize: vertical; border: 1px solid #DDD; } /* textarea */
+.newmessage { width: 695px; padding: 2px; resize: vertical; border: 1px solid #DDD; } /* textarea */
 
 .users { width: 100%; margin: 10px 0; } /* table */
 .users td { width: 33%; padding: 6px 0; overflow: hidden; } /* table */
@@ -97,21 +88,13 @@ blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-lef
 
 /********/
 
-.pm-in,.pm-out { border: 1px solid #E0E0E0; margin: 10px 0; padding: 10px; }
-.pm-in { width: 85%; background: #FFF; }
-.pm-out { margin-left: 15%; background: #DFD; }
-
-#pmreplyform { margin-top: 20px; background: #DDDDD5; padding: 5px 0; text-align: center; }
-#pmreplytext { border: 1px solid #999; padding: 4px 5px; width: 515px; margin: 15px 5px 15px 0; }
-#pmreplybutton { border: 1px solid #999; padding: 3px 0; width: 35px; background: #CCCCC5}
-
 .newpm { margin: 20px 60px 30px 60px; }
 .newpm textarea { width: 100%; resize: vertical; }
 .newpm-send input { width: 100px; }
 
 /********/
 
-#column { width: 230px; top: 0; padding-top: 10px; overflow: hidden; }
+#column { width: 230px; padding-top: 10px; overflow: hidden; float: left; margin-left: 20px; }
 #column ul, #column p, #column hr { margin: 10px 0; }
 #column li { margin: 6px 0; }
 #column .margtop { margin-top: 15px; }
@@ -124,11 +107,6 @@ blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-lef
 #ctoolbar a { padding: 5px 10px;}
 #ctoolbar div { display: inline-block; width: 16px; height: 16px; background: url(//static.juick.com/toolbar-icons.png) no-repeat; vertical-align: middle; margin: 5px 0; }
 #ustats li { margin: 3px 0; font-size: smaller; }
-.abs { position: absolute; }
-.fix { position: fixed; }
-
-#pmulist img { width: 32px; height: 32px; margin-right: 5px; vertical-align: middle; }
-#pmulist .unreadcnt { float: right; margin-top: 4px; background: #CCC; padding: 2px 4px;  }
 
 /********/
 
@@ -149,22 +127,20 @@ blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-lef
 /******************************************************************************/
 
 @media screen and (max-width: 850px) {
-    #header,#topwrapper,#content,#footer,#mtoolbar { width: auto; min-width: 310px; margin: 0 auto; }
-
-    #hwrapper { position: fixed; top: 0; z-index: 100; }
-    #topwrapper { margin-top: 3em; }
-
-    #header li { line-height: 42px; }
-    #search { position: absolute; left: 84px; right: 222px; min-width: 32px; }
-    #header a { padding: 0 7px; }
-    #header .text { width: 100%; }
-    #header label { display: none; }
-    #header img { margin: 0; }
-    #header .wide { padding: 0 10px; }
-
-    #hi-logo { width: 32px; background-position: -110px 0; margin: 0; }
-    #hi-post { margin: 0; }
-
+    body,header,#topwrapper,#content,#footer,#mtoolbar { width: auto; min-width: 310px; margin: 0 auto; }
+
+    header { margin-bottom: 15px; }
+    header a { font-size: 12pt; }
+    #logo { display: none; }
+    nav#global { margin-left: 10px; }
+    nav#global li { margin-right: 10px; }
+    #search { float: none; display: inline-block; margin: 10px 10px; }
+    #headdiv { padding: 0 10px; }
+    #headdiv li { margin-right: 10px; }
+    nav#actions { position: relative; right: auto; }
+
+    #column { float: none; padding-top: 0; width: auto; margin: 0 10px; }
+    
     .msg,.msg-cont { width: auto; min-width: 280px; }
     .msg-cont,.ads { margin-left: 0; }
     .msg-avatar { margin: 10px 10px 0 10px; width: 40px; height: 40px; }
@@ -175,7 +151,5 @@ blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-lef
 
     .title2 h2 { font-size: large; }
 
-    .fix,.abs { position: static; }
-    #column { clear: both; margin: 0 3%; width: 44%; float: left; }
-    #rcol { float: left; width: 44%; margin: 20px 3% 0 3%; }
+    #footer { margin: 0 10px; }
 }