From 1e452f3ab889a60ec981cce9c75c81a4e43d25b1 Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Mon, 3 Feb 2014 02:14:41 +0700
Subject: Popular tags fix
---
src/java/com/juick/http/www/Home.java | 2 +-
src/java/com/juick/http/www/PageTemplates.java | 6 +++---
src/java/com/juick/http/www/User.java | 2 +-
web/style3.css | 5 +++--
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/java/com/juick/http/www/Home.java b/src/java/com/juick/http/www/Home.java
index 204c35b3..eb40be61 100644
--- a/src/java/com/juick/http/www/Home.java
+++ b/src/java/com/juick/http/www/Home.java
@@ -87,7 +87,7 @@ public class Home {
PrintWriter out = response.getWriter();
try {
PageTemplates.pageHead(out, title, null);
- PageTemplates.pageNavigation(out, visitor, null);
+ PageTemplates.pageNavigation(out, visitor, paramSearch);
PageTemplates.pageHomeColumn(out, sql, visitor);
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index c8d47245..23f2b007 100644
--- a/src/java/com/juick/http/www/PageTemplates.java
+++ b/src/java/com/juick/http/www/PageTemplates.java
@@ -53,7 +53,7 @@ public class PageTemplates {
out.println("");
out.print("");
out.print("");
- out.print("");
+ out.print("");
out.print("");
out.print("");
if (headers != null) {
@@ -138,11 +138,11 @@ public class PageTemplates {
public static void pageHomeColumn(PrintWriter out, Connection sql, com.juick.User visitor) {
if (tagsHTML == null) {
- tagsHTML = PageTemplates.getPopularTags(sql, 60);
+ tagsHTML = PageTemplates.getPopularTags(sql, 80);
}
out.println("");
}
diff --git a/src/java/com/juick/http/www/User.java b/src/java/com/juick/http/www/User.java
index 6fb3dfc0..1c6d1d3e 100644
--- a/src/java/com/juick/http/www/User.java
+++ b/src/java/com/juick/http/www/User.java
@@ -287,7 +287,7 @@ public class User {
out.println(" ");
- out.println(" " + pageUserTags(sql, user, visitor, 15) + "...
");
+ out.println(" " + pageUserTags(sql, user, visitor, 20) + "...
");
out.println("
");
out.println(" ");
out.println(" - Я читаю: " + UserQueries.getStatsIRead(sql, user.UID) + "
");
diff --git a/web/style3.css b/web/style3.css
index 706ae32c..e44627a5 100644
--- a/web/style3.css
+++ b/web/style3.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; }
.u { text-decoration: underline; }
-#content, #footer { width: 700px; margin: 15px 0 0 290px; }
+#content, #footer { width: 700px; margin: 15px 0 0 300px; }
#topwrapper { position: relative; clear: both; }
/********/
@@ -94,11 +94,12 @@ blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-lef
/********/
-#column { width: 230px; padding-top: 10px; overflow: hidden; float: left; margin-left: 20px; }
+#column { width: 250px; padding-top: 10px; overflow: hidden; float: left; margin-left: 15px; }
#column ul, #column p, #column hr { margin: 10px 0; }
#column li { margin: 6px 0; }
#column .margtop { margin-top: 15px; }
#column p { font-size: small; line-height: 140%; }
+#column .tags { text-align: justify; }
#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; }
--
cgit v1.2.3