Home + Discover

7 files changed, 166 insertions, 116 deletions

diff --git a/src/java/Global.properties b/src/java/Global.properties
index 706e258f..f823d7d2 100644
--- a/src/java/Global.properties
+++ b/src/java/Global.properties
@@ -1,6 +1,8 @@
 # To change this template, choose Tools | Templates
 # and open the template in the editor.
 
+Home=Home
+Discover=Discover
 Search=Search
 Blogs=Blogs
 Chats=Chats
diff --git a/src/java/Global_ru.properties b/src/java/Global_ru.properties
index a7c7e9d5..2df1f883 100644
--- a/src/java/Global_ru.properties
+++ b/src/java/Global_ru.properties
@@ -1,6 +1,8 @@
 # To change this template, choose Tools | Templates
 # and open the template in the editor.
 
+Home=\u0414\u043e\u043c\u043e\u0439
+Discover=\u041e\u0431\u0437\u043e\u0440
 Search=\u041f\u043e\u0438\u0441\u043a
 Blogs=\u0411\u043b\u043e\u0433\u0438
 Chats=\u0427\u0430\u0442\u044b
diff --git a/src/java/com/juick/http/www/Blogs.java b/src/java/com/juick/http/www/Discover.java
index cf58ed4f..b76a1d77 100644
--- a/src/java/com/juick/http/www/Blogs.java
+++ b/src/java/com/juick/http/www/Discover.java
@@ -40,27 +40,13 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @author Ugnich Anton
  */
-public class Blogs {
-
-    protected void doGet(Connection sql, Connection sqlSearch, HttpServletRequest request, HttpServletResponse response, com.juick.User visitor) throws ServletException, IOException {
-        String paramTagStrQuery = request.getParameter("tag");
-        if (paramTagStrQuery != null) {
-            String url = "/tag/" + URLEncoder.encode(paramTagStrQuery, "UTF-8");
-            String paramBeforeStr = request.getParameter("before");
-            if (paramBeforeStr != null) {
-                url += "?before=" + paramBeforeStr;
-            }
-            Utils.sendPermanentRedirect(response, url);
-        }
+public class Discover {
 
+    protected void doGet(Connection sql, Connection sqlSearch, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        com.juick.User visitor = Utils.getVisitorUser(sql, request);
         Locale locale = request.getLocale();
         ResourceBundle rb = ResourceBundle.getBundle("Blogs", locale);
 
-        String title;
-        ArrayList<Integer> mids;
-
-        String paramShow = request.getParameter("show");
-
         String requesturi = request.getRequestURI();
 
         int paramTag = 0;
@@ -72,8 +58,6 @@ public class Blogs {
                 response.sendError(404);
                 return;
             }
-        } else if (requesturi.startsWith("/places/")) {
-            //TODO перенести сюда блок, который страницей ниже
         }
 
         int paramBefore = 0;
@@ -90,9 +74,12 @@ public class Blogs {
             paramSearch = null;
         }
 
-        com.juick.Place place = null;
         int visitor_uid = visitor != null ? visitor.UID : 0;
 
+        String title;
+        ArrayList<Integer> mids;
+
+        String paramShow = request.getParameter("show");
         if (paramShow == null) {
             if (paramTag > 0) {
                 title = "*" + Utils.encodeHTML(paramTagStr);
@@ -100,59 +87,10 @@ public class Blogs {
             } else if (paramSearch != null) {
                 title = rb.getString("Search") + ": " + Utils.encodeHTML(paramSearch);
                 mids = MessagesQueries.getSearch(sql, sqlSearch, Utils.encodeSphinx(paramSearch), paramBefore);
-            } else if (requesturi.matches("^\\/places\\/\\d+$")) {
-                int place_id = 0;
-                try {
-                    place_id = Integer.parseInt(requesturi.substring(8));
-                } catch (NumberFormatException e) {
-                }
-                place = com.juick.server.PlacesQueries.getPlace(sql, place_id);
-                if (place != null) {
-                    title = place.name;
-                    mids = MessagesQueries.getPlace(sql, place_id, visitor_uid, paramBefore);
-                } else {
-                    response.sendError(404);
-                    return;
-                }
             } else {
                 title = rb.getString("Last messages");
                 mids = MessagesQueries.getAll(sql, visitor_uid, paramBefore);
             }
-        } else if (paramShow.equals("my")) {
-            if (visitor != null) {
-                title = rb.getString("My feed");
-                mids = MessagesQueries.getMyFeed(sql, visitor.UID, paramBefore);
-            } else {
-                response.sendError(404);
-                return;
-            }
-        } else if (paramShow.equals("private")) {
-            if (visitor != null) {
-                title = rb.getString("Private");
-                mids = MessagesQueries.getPrivate(sql, visitor.UID, paramBefore);
-            } else {
-                response.sendError(404);
-                return;
-            }
-        } else if (paramShow.equals("discuss")) {
-            if (visitor != null) {
-                title = rb.getString("Discussions");
-                mids = MessagesQueries.getDiscussions(sql, visitor.UID, paramBefore);
-            } else {
-                response.sendError(404);
-                return;
-            }
-        } else if (paramShow.equals("recommended")) {
-            if (visitor != null) {
-                title = rb.getString("Recommended");
-                mids = MessagesQueries.getRecommended(sql, visitor.UID, paramBefore);
-            } else {
-                response.sendError(404);
-                return;
-            }
-        } else if (paramShow.equals("top")) {
-            title = rb.getString("Popular");
-            mids = MessagesQueries.getPopular(sql, paramBefore);
         } else if (paramShow.equals("photos")) {
             title = rb.getString("With photos");
             mids = MessagesQueries.getPhotos(sql, visitor_uid, paramBefore);
@@ -171,10 +109,6 @@ public class Blogs {
             out.println("<div id=\"wrapper\">");
             out.println("<div id=\"content\">");
 
-            if (place != null) {
-                out.println("<div id=\"geomap\"><img src=\"http://maps.google.com/maps/api/staticmap?center=" + place.lat + "," + place.lon + "&amp;markers=color:orange|" + place.lat + "," + place.lon + "&amp;zoom=14&amp;size=600x300&amp;maptype=hybrid&amp;sensor=false\" width=\"600\" height=\"300\" alt=\"Map\"/></div>");
-            }
-
             if (mids.size() > 0) {
                 out.println("<ul>");
                 PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3);
@@ -197,24 +131,11 @@ public class Blogs {
 
 
             out.println("<div id=\"column\" class=\"abs\">");
-            if (visitor != null) {
-                out.println("  <ul>");
-                out.println("    <li><a href=\"/?show=my\">" + rb.getString("My feed") + "</a></li>");
-                out.println("    <li><a href=\"/?show=private\">" + rb.getString("Private") + "</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("  </ul>");
-                out.println("  <hr/>");
-            }
             out.println("  <ul>");
-            out.println("    <li><a href=\"/\">" + rb.getString("All messages") + "</a></li>");
-            out.println("    <li><a href=\"/?show=top\">" + rb.getString("Popular") + "</a></li>");
-            out.println("    <li><a href=\"/?show=photos\">" + rb.getString("With photos") + "</a></li>");
+            out.println("    <li><a href=\"/discover\">" + rb.getString("All messages") + "</a></li>");
+            out.println("    <li><a href=\"/discover?show=photos\">" + rb.getString("With photos") + "</a></li>");
             out.println("  </ul>");
             out.println("  <hr/>");
-            out.println("  <form action=\"/\">");
-            out.println("  <p><input type=\"text\" name=\"search\" class=\"inp\" placeholder=\"" + rb.getString("Search") + "\"/></p>");
-            out.println("  </form>");
             out.println("  <p>" + getTags(sql, 45) + "</p>");
             out.println("</div>");
 
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 <http://www.gnu.org/licenses/>.
+ */
+package com.juick.http.www;
+
+import com.juick.server.MessagesQueries;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.Locale;
+import java.util.ResourceBundle;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class Home {
+
+    protected void doGet(Connection sql, Connection sqlSearch, HttpServletRequest request, HttpServletResponse response, com.juick.User visitor) throws ServletException, IOException {
+        Locale locale = request.getLocale();
+        ResourceBundle rb = ResourceBundle.getBundle("Blogs", locale);
+
+        int paramBefore = 0;
+        String paramBeforeStr = request.getParameter("before");
+        if (paramBeforeStr != null) {
+            try {
+                paramBefore = Integer.parseInt(paramBeforeStr);
+            } catch (NumberFormatException e) {
+            }
+        }
+
+        String title;
+        ArrayList<Integer> mids;
+
+        String paramShow = request.getParameter("show");
+        if (paramShow == null || paramShow.equals("my")) {
+            title = rb.getString("My feed");
+            mids = MessagesQueries.getMyFeed(sql, visitor.UID, paramBefore);
+        } else if (paramShow.equals("private")) {
+            title = rb.getString("Private");
+            mids = MessagesQueries.getPrivate(sql, visitor.UID, paramBefore);
+        } else if (paramShow.equals("discuss")) {
+            title = rb.getString("Discussions");
+            mids = MessagesQueries.getDiscussions(sql, visitor.UID, paramBefore);
+        } else if (paramShow.equals("recommended")) {
+            title = rb.getString("Recommended");
+            mids = MessagesQueries.getRecommended(sql, visitor.UID, paramBefore);
+        } else if (paramShow.equals("top")) {
+            title = rb.getString("Popular");
+            mids = MessagesQueries.getPopular(sql, paramBefore);
+        } else {
+            response.sendError(404);
+            return;
+        }
+
+        response.setContentType("text/html; charset=UTF-8");
+        PrintWriter out = response.getWriter();
+        try {
+            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\">");
+
+            if (mids.size() > 0) {
+                out.println("<ul>");
+                PageTemplates.printMessages(out, sql, null, mids, visitor, locale, visitor == null ? 2 : 3);
+                out.println("</ul>");
+            }
+
+            if (mids.size() == 20) {
+                String nextpage = "?before=" + mids.get(mids.size() - 1);
+                if (paramShow != null) {
+                    nextpage += "&amp;show=" + paramShow;
+                }
+                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
+
+
+            out.println("<div id=\"column\" class=\"abs\">");
+            out.println("  <ul>");
+            out.println("    <li><a href=\"/?show=my\">" + rb.getString("My feed") + "</a></li>");
+            out.println("    <li><a href=\"/?show=private\">" + rb.getString("Private") + "</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=\"/?show=top\">" + rb.getString("Popular") + "</a></li>");
+            out.println("  </ul>");
+            out.println("  <hr/>");
+            out.println("</div>");
+
+            out.println("</div>"); // 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("<!DOCTYPE html>");
         out.print("<html>");
         out.print("<head>");
-        out.print("<link rel=\"stylesheet\" href=\"/style.2013102203.css\"/>");
+        out.print("<link rel=\"stylesheet\" href=\"/style.2013102401.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=\"//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js\" defer=\"defer\" async=\"async\"></script>");
         out.print("<script type=\"text/javascript\" src=\"/scripts.2013072200.js\" defer=\"defer\"></script>");
@@ -69,14 +69,19 @@ public class PageTemplates {
         ResourceBundle rb = ResourceBundle.getBundle("Global", loc);
         out.println("<div id=\"hwrapper\">");
         out.println("<ul id=\"header\">");
-        out.println("  <li id=\"logo\"><a href=\"" + (user != null ? "/?show=my" : "/") + "\"><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") + "\"");
+        if (user != null) {
+            out.println("  <li><a href=\"/\"><div class=\"head-ico\" id=\"hi-home\"></div><label>" + rb.getString("Home") + "</label></a></li>");
+            out.println("  <li><a href=\"/discover\"><div class=\"head-ico\" id=\"hi-discover\"></div><label>" + rb.getString("Discover") + "</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=\"/discover\"><input type=\"text\" name=\"search\" class=\"text\" placeholder=\"" + rb.getString("Search") + "\"");
         if (search != null) {
-        out.print(" value=\"" + Utils.encodeHTML(search) + "\"");
+            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>");
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,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") 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
+}