");
- out.println("
"); // topwrapper
-
- PageTemplates.pageDialogTemplate(out, locale);
- PageTemplates.pageEnd(out);
- } finally {
- out.close();
- }
- }
-
- private String getTags(Connection sql, int cnt) {
- String ret = "";
- com.juick.Tag tags[] = new com.juick.Tag[cnt];
-
- int maxUsageCnt = 0;
- PreparedStatement stmt = null;
- ResultSet rs = null;
- try {
- stmt = sql.prepareStatement("SELECT tags.name AS name,COUNT(DISTINCT messages.user_id) AS cnt FROM (messages INNER JOIN messages_tags ON (messages.ts>TIMESTAMPADD(MONTH,-1,NOW()) AND messages.message_id=messages_tags.message_id)) INNER JOIN tags ON messages_tags.tag_id=tags.tag_id WHERE tags.tag_id NOT IN (SELECT tag_id FROM tags_ignore) GROUP BY tags.tag_id ORDER BY cnt DESC LIMIT ?");
- stmt.setInt(1, cnt);
- rs = stmt.executeQuery();
- rs.beforeFirst();
- cnt = 0;
- while (rs.next()) {
- tags[cnt] = new com.juick.Tag();
- tags[cnt].Name = rs.getString(1);
- tags[cnt].UsageCnt = rs.getInt(2);
- if (tags[cnt].UsageCnt > maxUsageCnt) {
- maxUsageCnt = tags[cnt].UsageCnt;
- }
- cnt++;
- }
- } catch (SQLException e) {
- System.err.println(e);
- } finally {
- Utils.finishSQL(rs, stmt);
- }
-
- Arrays.sort(tags, 0, cnt);
-
- for (int i = 0; i < cnt; i++) {
- String tag = Utils.encodeHTML(tags[i].Name);
- try {
- tag = "" + tag + "";
- } catch (UnsupportedEncodingException e) {
- }
-
- if (tags[i].UsageCnt > maxUsageCnt / 3 * 2) {
- ret += "" + tag + " ";
- } else if (tags[i].UsageCnt > maxUsageCnt / 3) {
- ret += "" + tag + " ";
- } else {
- ret += tag + " ";
- }
- }
-
- return ret;
- }
-}
diff --git a/src/java/com/juick/http/www/Discover.java b/src/java/com/juick/http/www/Discover.java
new file mode 100644
index 00000000..b76a1d77
--- /dev/null
+++ b/src/java/com/juick/http/www/Discover.java
@@ -0,0 +1,199 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see ");
- out.println("
"); // wrapper
-
-
- out.println("");
-
- if (place != null) {
- out.println("![\"Map\"/](\"http://maps.google.com/maps/api/staticmap?center=")
");
- }
-
- if (mids.size() > 0) {
- out.println("
");
- out.println("- ");
- PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3);
- out.println("
");
- if (visitor != null) {
- out.println("
"); - } - out.println("
"); - out.println(" "); - out.println("
");
-
- out.println("- ");
- out.println("
- " + rb.getString("My feed") + " "); - out.println("
- " + rb.getString("Private") + " "); - out.println("
- " + rb.getString("Discussions") + " "); - out.println("
- " + rb.getString("Recommended") + " "); - out.println("
"); - } - out.println("
- ");
- out.println("
- " + rb.getString("All messages") + " "); - out.println("
- " + rb.getString("Popular") + " "); - out.println("
- " + rb.getString("With photos") + " "); - out.println("
"); - out.println(" "); - out.println("
" + getTags(sql, 45) + "
"); - out.println("");
+ out.println("
"); // topwrapper
+
+ PageTemplates.pageDialogTemplate(out, locale);
+ PageTemplates.pageEnd(out);
+ } finally {
+ out.close();
+ }
+ }
+
+ private String getTags(Connection sql, int cnt) {
+ String ret = "";
+ com.juick.Tag tags[] = new com.juick.Tag[cnt];
+
+ int maxUsageCnt = 0;
+ PreparedStatement stmt = null;
+ ResultSet rs = null;
+ try {
+ stmt = sql.prepareStatement("SELECT tags.name AS name,COUNT(DISTINCT messages.user_id) AS cnt FROM (messages INNER JOIN messages_tags ON (messages.ts>TIMESTAMPADD(MONTH,-1,NOW()) AND messages.message_id=messages_tags.message_id)) INNER JOIN tags ON messages_tags.tag_id=tags.tag_id WHERE tags.tag_id NOT IN (SELECT tag_id FROM tags_ignore) GROUP BY tags.tag_id ORDER BY cnt DESC LIMIT ?");
+ stmt.setInt(1, cnt);
+ rs = stmt.executeQuery();
+ rs.beforeFirst();
+ cnt = 0;
+ while (rs.next()) {
+ tags[cnt] = new com.juick.Tag();
+ tags[cnt].Name = rs.getString(1);
+ tags[cnt].UsageCnt = rs.getInt(2);
+ if (tags[cnt].UsageCnt > maxUsageCnt) {
+ maxUsageCnt = tags[cnt].UsageCnt;
+ }
+ cnt++;
+ }
+ } catch (SQLException e) {
+ System.err.println(e);
+ } finally {
+ Utils.finishSQL(rs, stmt);
+ }
+
+ Arrays.sort(tags, 0, cnt);
+
+ for (int i = 0; i < cnt; i++) {
+ String tag = Utils.encodeHTML(tags[i].Name);
+ try {
+ tag = "" + tag + "";
+ } catch (UnsupportedEncodingException e) {
+ }
+
+ if (tags[i].UsageCnt > maxUsageCnt / 3 * 2) {
+ ret += "" + tag + " ";
+ } else if (tags[i].UsageCnt > maxUsageCnt / 3) {
+ ret += "" + tag + " ";
+ } else {
+ ret += tag + " ";
+ }
+ }
+
+ return ret;
+ }
+}
diff --git a/src/java/com/juick/http/www/Home.java b/src/java/com/juick/http/www/Home.java
new file mode 100644
index 00000000..b9009a80
--- /dev/null
+++ b/src/java/com/juick/http/www/Home.java
@@ -0,0 +1,121 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, Ugnich Anton
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see ");
+ out.println("
"); // wrapper
+
+
+ out.println("");
+
+ if (mids.size() > 0) {
+ out.println("
");
+ out.println("- ");
+ PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3);
+ out.println("
");
+ out.println("
"); + out.println("
");
+
+ out.println("- ");
+ out.println("
- " + rb.getString("All messages") + " "); + out.println("
- " + rb.getString("With photos") + " "); + out.println("
"); + out.println("
" + getTags(sql, 45) + "
"); + out.println("");
+ out.println("
"); // topwrapper
+
+ PageTemplates.pageDialogTemplate(out, locale);
+ PageTemplates.pageEnd(out);
+ } finally {
+ out.close();
+ }
+ }
+}
diff --git a/src/java/com/juick/http/www/Main.java b/src/java/com/juick/http/www/Main.java
index 4c6e310b..8b760e44 100644
--- a/src/java/com/juick/http/www/Main.java
+++ b/src/java/com/juick/http/www/Main.java
@@ -41,7 +41,8 @@ public class Main extends HttpServlet {
Connection sql;
Connection sqlSearch;
Stream xmpp;
- Blogs blogs = new Blogs();
+ Home home = new Home();
+ Discover discover = new Discover();
Login login = new Login();
Help help = new Help();
User pagesUser = new User();
@@ -111,14 +112,10 @@ public class Main extends HttpServlet {
if (uri.equals("/")) {
com.juick.User visitor = Utils.getVisitorUser(sql, request);
- if (request.getQueryString() == null) {
- if (visitor == null) {
- login.doGetLoginForm(sql, request, response);
- } else {
- blogs.doGet(sql, sqlSearch, request, response, visitor);
- }
+ if (visitor == null) {
+ login.doGetLoginForm(sql, request, response);
} else {
- blogs.doGet(sql, sqlSearch, request, response, visitor);
+ home.doGet(sql, sqlSearch, request, response, visitor);
}
} else if (uri.equals("/post")) {
com.juick.User visitor = Utils.getVisitorUser(sql, request);
@@ -147,12 +144,10 @@ public class Main extends HttpServlet {
help.doRedirectToHelpIndex(sql, request, response);
} else if (uri.startsWith("/help/")) {
help.doGetHelp(sql, request, response);
+ } else if (uri.equals("/discover")) {
+ discover.doGet(sql, sqlSearch, request, response);
} else if (uri.startsWith("/tag/")) {
- com.juick.User visitor = Utils.getVisitorUser(sql, request);
- blogs.doGet(sql, sqlSearch, request, response, visitor);
- } else if (uri.startsWith("/places/")) {
- com.juick.User visitor = Utils.getVisitorUser(sql, request);
- blogs.doGet(sql, sqlSearch, request, response, visitor);
+ discover.doGet(sql, sqlSearch, request, response);
} else if (uri.matches("^/\\d+$")) {
String strID = request.getRequestURI().substring(1);
int mid = 0;
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index fc9bb1d5..0c98f26f 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("");
out.print("");
out.print("");
- out.print("");
+ out.print("");
out.print("");
out.print("");
out.print("");
@@ -69,14 +69,19 @@ public class PageTemplates {
ResourceBundle rb = ResourceBundle.getBundle("Global", loc);
out.println("");
+ out.println("
"); // wrapper
+
+
+ out.println("");
+
+ if (mids.size() > 0) {
+ out.println("
");
+ out.println("- ");
+ PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3);
+ out.println("
");
+ out.println("
"); + out.println("
");
+
+ out.println("- ");
+ out.println("
- " + rb.getString("My feed") + " "); + out.println("
- " + rb.getString("Private") + " "); + out.println("
- " + rb.getString("Discussions") + " "); + out.println("
- " + rb.getString("Recommended") + " "); + out.println("
- " + rb.getString("Popular") + " "); + out.println("
"); + out.println("
");
out.println("
- ");
- out.println("
- "); - /* - out.print(" "); + out.println("
- "); + } else { + out.println("
- "); + } + + out.print(" "); - */ + if (user != null) { out.println("
- "); out.println("
- "); diff --git a/web/style3.css b/web/style3.css index 8a59f4ee..cd66bc20 100644 --- a/web/style3.css +++ b/web/style3.css @@ -9,7 +9,8 @@ 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: 860px; } +#header { width: 880px; } +#topwrapper { width: 860px; } #content, #footer { width: 600px; } #header, #topwrapper, #footer { margin: 0 auto; } #content { margin: 15px 0 0 260px; } @@ -18,19 +19,21 @@ pre { white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; #hwrapper { float: left; width: 100%; background: #333; padding-bottom: 2px; } #header li { float: left; line-height: 48px; } -#header .text { margin-left: 15px; width: 285px; padding: 4px; border: none; background: #EEE; } +#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: #AAA; } +#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; } + background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAS4AAAAgCAMAAACb42W1AAAAAXNSR0IArs4c6QAAAqxQTFRFMzMzMzQ0MzQ1NDQ0MzU1MzU2NTU1MzY3MzY4NjY2Mzc4Mzc5Nzc3NDg6ODg4NDk7NDk8NDo8NDo9OTk5NDs+NDs/Ojo6NDw/NT1BPDw8NT5DPT09NT9DNT9ENUBFNUFGNUFHPz8/NkJINkNJQUFBNkRKNkRLQkJCNkVMNkVNNkZNNkZOREREN0dPN0hQRUVFN0hRN0lRN0lSN0pTN0pUR0dHN0tVSEhIOExWSUlJOE1XOE1YSkpKOE5ZOE9aOE9bS0tLOFBbOFBcTExMTU1NOVJeOVJfTk5OOVNfOVNgT09POVRhOVViUFBQOVVjUVFROlZkOldlOldmUlJSOlhmOlhnOlloOllpVFRUOlppOlpqVVVVO1trVlZWO1xsO1xtO11tO11uO15vO15wWFhYO19wO19xWVlZPGByWlpaW1tbPGJ0PGJ1XFxcPGN2PGN3PGR3PGR4XV1dPWV5Xl5ePWZ6PWZ7X19fPWd7PWd8PWh9PWh+PWl+PWl/YmJiPmqAY2NjPmuBPmyCPmyDZGRkPm2EPm2FZWVlZmZmP2+HaGhoP3GJP3KLaWlpP3KMP3OMP3ONampqQHSOa2trQHWPQHaRQHeSQHeTbm5uQHiUQXmVQXqWQXqXQXuXQXuYcXFxQXyZQXyacnJyQX2aQX2bc3NzQn6cdHR0Qn+dQn+eQoCedXV1QoCfQoGgdnZ2QoKid3d3Q4OjeHh4Q4SkQ4SleXl5Q4WlQ4Wmenp6Q4anQ4aoQ4eoQ4epe3t7RIiqfHx8fX19fn5+f39/goKChISEhYWFh4eHiIiIiYmJioqKi4uLjIyMjY2Nj4+PkJCQkZGRkpKSk5OTlZWVlpaWl5eXmJiYmZmZmpqanJycnZ2dnp6eoKCgoqKio6OjpKSkpaWlp6enqKioqampqqqqfLmqnAAABlpJREFUaN7tmftfVEUUwGd9QD5JM10ti4wQFSOxLEyxMislMiNDU0uxh5JULquEZWhGamaJ+MBHZqSgKShZGbFdI9EiIEoNiYfinX+kmd0z9869d+be3ZUPnw9+PD/ImTmzM+d+PzPnnBkRuik35YaVF5SA7LyR3d8Mo94Qm+8Fs5LuuN4HMDK7e+IKzv3jMOpRsXkAw5XouN4+GDlTZCwqsv/xkycvtF9tql7ksEafwy0txRHW/lqMzwmGY4MUh+8+EzfDMczBfqsTrb4+GDlKRAtjO1531LBP+uthW1rn6ZjDlv4EFWM15rpw2bqvyVQYdFRifwTsR65roxdRb+W8Epr1b7oyz4kWbuH7lieQf8ppdylRkjxh765OkcWAa/N105LzGt5E9savqbf1Tyq+gnH7Qw60DLgKsVqXNbuNdrfN8jZgXGjC1bUBMB9wve400PU9jMyX0ZLy+oEwSguo8ZfJeXSgxR9GD7ZIZli4ePdfZQEomlqWstYIhCYx/TlqeTDv0GmFkyUIHQI1mdr7VVD19Lt3ihbcDyNfkdKS8Iq5hvFrrBF/FeNF9rTOc6E+yUJLTQhvd3Hup4D6o4sanodWBdFHMTJxCEVuUEyyUE+MfkLrqfaRW7xeGYycJKLV7vG0y3htwrhWbxVjXG1Pqw/f3QARr7HxSkCrkx3GItvwybs/31CBLYTWNqI/AHpVJEJ5ZlrKS+h+Dm0ULdFOJEuWG8x+NERAq55krZh6Ca+zGH9o2C//Bk8LeWlfq5dsuAhvK9WzpLHLlhfvfi6oq/yWtdB6m9tp+7iC9L3EWCpjJq9MQXOhbztC40vI391u5JBCj1ppdRT2pGrPwg6hw3UYp+qt/hhftaH1u5EWSqO04uEgU15Py0O9HS/e/Z18gEJ7ofUM0bNBX4vQEtEl4H3oXOnKqKJ/NwSTQl1GDy9NYa0pl0QOkxIzTW8NJSnOMnmEhNboUpoTvfxWayuPl8YuG168+yx+j6GG3j9z9dgO7dhpt6Fl/Cx7oHPp9sDfyiinFJphOYkD9fZA0Xk8g/FWvTUb4wvB0qpR/XFL6+zjj19qrQlXgSZNUl6c+9Gg+iKpIRZalT1Ig6XPCQgdAfVxbpJeleyn7KTOkeEqEVymAjnRUjeaHPYYAP2G8bEgaUEV2qh3NGLjigHdlDuLHNyfoQcoIs9CazfR72IUovRYN1J0wdZkt4RWFBvgtnyRU924FXPF5TwVq4+ZBoz+qUNIqxNx8e6/BWqe38LCVS7RnwC9hNRcoJ7iZ5lpwSW7UiWCuQyFimsTPVEq8FpOjtNZ6+zT/xPRQrXCw3itxrTcYU2aZZuLd/8z0Of7LTu4Y7UM9E/08mI7P8s77Cxms5ivrBDjYrXKllBx+WkRufhp2qx1fxKlabhg+ukdAlokF5ZbQ33p6DBCPe/+CdAn+i0sXI0j+ha9fF/PciA/yzatXmX4leMu4Xp5okQRBC5GS5NL8ca4VRx4sflFRKvzCgnO/dvZlw6ihrvZhunLlbKTEToAago/S4WG1sWG0rEC+RKs08S4phcUpIpwmWl1fDfU+Pt1cEmMEdMKXBpbc2iZmuMvU71hlamc++NZKvQbXoTWAaIP0wNcb5+eI1laRCMY2n4IrVakV2git/j4y5LV4UJ4PjHh0mipW7PO1NZXf3yPOSletrzYGKXefAlqCOcSxLvPClZlblzsmBllXNyfrAc47XKYP8Ff049NXv2ylgkoWpYKlMpBgvXGcZel4HHptDZKvsOL7XElqJY7dlIYV2ze/fsUkdCHgxWgf84VHrqMRKtAo7V8DxYBlcWC9eaA7YuQcB1zooUuYvHzKZNM6wNOVhi4DO7v4SEc5GLUN9xOS64y0dqFenwL6ho6yxpmKBtgXS9XljftD+NJB1pvUnPzxgj5h5KJG7zseTCrTg3vedDg/uDsg3AN8lXkR+v/8zNN4a+JcXkllTyudPSUwu0+/WlMdHHcK7gSCJ5/zUW+n5ecFvqbZMqcCNsv9dDDV0onLqeHMzOsx2ep+50rbJ+5IVT6hoSIi/CyobUA/7M8KD9iVNO7YHC4nN3vXPk6fWJcbGzc1F38NgwJFyqX00JfLQjWkXMY/xH6f5w5u9+p0sucHSai7iRd7X6UcTVfRrei1eXuu7m1Tu3PHdu9aHV397tU/ge3CTGrzGCrVgAAAABJRU5ErkJggg==") no-repeat; } #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; } +#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; } /********/ @@ -93,6 +96,7 @@ blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-lef #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 .margtop { margin-top: 15px; } #column p { font-size: small; line-height: 140%; } #column .inp { width: 222px; padding: 3px; border: 1px solid #CCC; border-radius: 3px; background: #F5F5E9; } #ctitle { font-size: 14pt; } @@ -130,7 +134,7 @@ blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-lef #topwrapper { margin-top: 3em; } #header li { line-height: 42px; } - #search { position: absolute; left: 42px; right: 222px; min-width: 55px; } + #search { position: absolute; left: 84px; right: 222px; min-width: 55px; } #header a { padding: 0 7px; } #header .text { width: 100%; } #header label { display: none; } @@ -153,4 +157,4 @@ blockquote { border-left: 1px dashed #CCC; margin: 10px 0 10px 10px; padding-lef .fix,.abs { position: static; } #column { clear: both; margin: 0 3%; width: 44%; float: left; } #rcol { float: left; width: 44%; margin: 20px 3% 0 3%; } -} \ No newline at end of file +} -- cgit v1.2.3