diff options
| -rw-r--r-- | juick-www/src/main/java/com/juick/www/Discover.java | 3 | ||||
| -rw-r--r-- | juick-www/src/main/java/com/juick/www/Home.java | 3 | ||||
| -rw-r--r-- | juick-www/src/main/java/com/juick/www/NewMessage.java | 3 | ||||
| -rw-r--r-- | juick-www/src/main/java/com/juick/www/PM.java | 3 | ||||
| -rw-r--r-- | juick-www/src/main/static/style.css | 4 |
5 files changed, 10 insertions, 6 deletions
diff --git a/juick-www/src/main/java/com/juick/www/Discover.java b/juick-www/src/main/java/com/juick/www/Discover.java index c1bcacc7..1954aac9 100644 --- a/juick-www/src/main/java/com/juick/www/Discover.java +++ b/juick-www/src/main/java/com/juick/www/Discover.java @@ -86,7 +86,6 @@ public class Discover { } PageTemplates.pageHead(out, visitor, title, head); PageTemplates.pageNavigation(out, visitor, null); - PageTemplates.pageHomeColumn(out, sql, visitor); out.println("<section id=\"content\">"); @@ -109,6 +108,8 @@ public class Discover { } out.println("</section>"); + + PageTemplates.pageHomeColumn(out, sql, visitor); PageTemplates.pageFooter(request, out, visitor, true); diff --git a/juick-www/src/main/java/com/juick/www/Home.java b/juick-www/src/main/java/com/juick/www/Home.java index 5a1aa6ab..e11ed6f4 100644 --- a/juick-www/src/main/java/com/juick/www/Home.java +++ b/juick-www/src/main/java/com/juick/www/Home.java @@ -108,7 +108,6 @@ public class Home { } PageTemplates.pageHead(out, visitor, title, head); PageTemplates.pageNavigation(out, visitor, paramSearch); - PageTemplates.pageHomeColumn(out, sql, visitor, paramShow == null && paramBefore == 0 && paramSearch == null && visitor.getUID() == 0); out.println("<section id=\"content\">"); @@ -165,6 +164,8 @@ public class Home { } out.println("</section>"); + + PageTemplates.pageHomeColumn(out, sql, visitor, paramShow == null && paramBefore == 0 && paramSearch == null && visitor.getUID() == 0); PageTemplates.pageFooter(request, out, visitor, true); PageTemplates.pageEnd(out); diff --git a/juick-www/src/main/java/com/juick/www/NewMessage.java b/juick-www/src/main/java/com/juick/www/NewMessage.java index 82de4782..56fe99cb 100644 --- a/juick-www/src/main/java/com/juick/www/NewMessage.java +++ b/juick-www/src/main/java/com/juick/www/NewMessage.java @@ -265,7 +265,6 @@ public class NewMessage { try (PrintWriter out = response.getWriter()) { PageTemplates.pageHead(out, visitor, "Сообщение опубликовано", null); PageTemplates.pageNavigation(out, visitor, null); - PageTemplates.pageHomeColumn(out, sql, visitor); String hashtags = ""; String tagscomma = ""; @@ -300,6 +299,8 @@ public class NewMessage { out.println("<p class=\"social\"><a href=\"https://plus.google.com/share?url=" + url + "\" class=\"ico32-gp sharenew\">Отправить в Google+</a></p>"); out.println("<p>Ссылка на сообщение: <a href=\"http://juick.com/" + mid + "\">http://juick.com/" + mid + "</a></p>"); out.println("</section>"); + + PageTemplates.pageHomeColumn(out, sql, visitor); PageTemplates.pageFooter(request, out, visitor, false); PageTemplates.pageEnd(out); diff --git a/juick-www/src/main/java/com/juick/www/PM.java b/juick-www/src/main/java/com/juick/www/PM.java index af5b73a4..a3d21107 100644 --- a/juick-www/src/main/java/com/juick/www/PM.java +++ b/juick-www/src/main/java/com/juick/www/PM.java @@ -60,7 +60,6 @@ public class PM { try (PrintWriter out = response.getWriter()) { PageTemplates.pageHead(out, visitor, title, null); PageTemplates.pageNavigation(out, visitor, null); - PageTemplates.pageHomeColumn(out, sql, visitor); out.println("<section id=\"content\">"); @@ -95,6 +94,8 @@ public class PM { */ out.println("</section>"); + + PageTemplates.pageHomeColumn(out, sql, visitor); PageTemplates.pageFooter(request, out, visitor, false); PageTemplates.pageEnd(out); diff --git a/juick-www/src/main/static/style.css b/juick-www/src/main/static/style.css index 0ec4b778..45da064c 100644 --- a/juick-www/src/main/static/style.css +++ b/juick-www/src/main/static/style.css @@ -10,7 +10,7 @@ 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; } span.u { text-decoration: underline; } -#content { width: 728px; margin: 15px 0 0 286px; } +#content { width: 728px; /*margin: 15px 0 0 286px;*/ margin: 25px 0 0 0; float: right; } #topwrapper { position: relative; clear: both; } /********/ @@ -227,7 +227,7 @@ q { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-left: 10px; @media screen and (max-width: 850px) { body { text-size-adjust: 100%; -webkit-text-size-adjust: 100%;} - body,body>header,#topwrapper,#content,#footer,#mtoolbar { width: auto; min-width: 310px; margin: 0 auto; } + body,body>header,#topwrapper,#content,#footer,#mtoolbar { width: auto; min-width: 310px; margin: 0 auto; float: none;} body>header { margin-bottom: 15px; } body>header a { font-size: 12pt; } |