X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FLoginPage.java;h=486d8fba252f8dbbbef6bcc231dd603947341f9e;hb=6eaf09d4900d0287e07f77f9db3cd507864e251a;hp=39c3cdca6b45c90b65b2345cccf560f53492db1a;hpb=fcd011a16b119966906b3137513e9432ab86c3a8;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/LoginPage.java b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
index 39c3cdc..486d8fb 100644
--- a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@ -17,9 +17,13 @@
 
 package net.pterodactylus.sone.web;
 
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.sone.web.page.Page.Request.Method;
 import net.pterodactylus.util.template.Template;
 import freenet.clients.http.ToadletContext;
@@ -40,7 +44,7 @@ public class LoginPage extends SoneTemplatePage {
 	 *            The Sone web interface
 	 */
 	public LoginPage(Template template, WebInterface webInterface) {
-		super("login.html", template, "Page.Login.Title", webInterface);
+		super("login.html", template, "Page.Login.Title", webInterface, false);
 	}
 
 	//
@@ -53,7 +57,19 @@ public class LoginPage extends SoneTemplatePage {
 	@Override
 	protected void processTemplate(Request request, Template template) throws RedirectException {
 		super.processTemplate(request, template);
-		Set<Sone> localSones = webInterface.core().getSones();
+		List<Sone> localSones = new ArrayList<Sone>(webInterface.core().getSones());
+		Collections.sort(localSones, new Comparator<Sone>() {
+
+			@Override
+			public int compare(Sone leftSone, Sone rightSone) {
+				int diff = SoneAccessor.getNiceName(leftSone).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone));
+				if (diff != 0) {
+					return diff;
+				}
+				return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightSone.getTime() - leftSone.getTime()));
+			}
+
+		});
 		template.set("sones", localSones);
 		if (request.getMethod() == Method.POST) {
 			String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone-id", 100);
@@ -71,6 +87,10 @@ public class LoginPage extends SoneTemplatePage {
 		}
 	}
 
+	//
+	// SONETEMPLATEPAGE METHODS
+	//
+
 	/**
 	 * {@inheritDoc}
 	 */