New header design

1 files changed, 13 insertions, 20 deletions

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);