X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Flayouts%2FMixedLayout.java;h=f7eee2cbd8e2dfb2c3f15b5685d4891210676d7c;hb=1d9057cc722b349a0bc370c0860344f59c42fd0f;hp=96f498e72e2128b3d88c1341d5b442b8b6e70c2e;hpb=9a4e163a8758563c04d36a72ee60669496530100;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
index 96f498e..f7eee2c 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@ -1,7 +1,7 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
  * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public License
  * as published by the Free Software Foundation.
@@ -39,66 +39,45 @@ public class MixedLayout implements Layout {
 
 	public static final String encoding = "UTF-8";
 
-	int currentColumn = 0;
-
-	int horizontalColumnsLimit = 2;
-
 	private AbstractIndexer indexer;
 
 	private IndexingContext indexingContext;
 
-	public void columnAdded() {
-		currentColumn++;
-		if (currentColumn > horizontalColumnsLimit) {
-
-			currentColumn = 0;
-
-			filesHtml.append("</TR>\n");
-		}
-	}
-
 	@Override
 	public void enlistDirectory(final AbstractFile directory) {
 		dirHtml.append("<TR>");
 		dirHtml.append("<TD><b><a href=\""
 				+ indexer.getDirectoryUrl(directory, indexingContext)
-				+ "\"> ==&gt; " + directory.fileName + "</a></b></TD>");
+				+ "\"><h2> ==&gt; " + directory.fileName + "</h2></a></b></TD>");
 		dirHtml.append("</TR>\n");
 
 	}
 
 	@Override
 	public void enlistFile(final AbstractFile file) {
-		finishRow();
 
 		final String fullFileName = file.fileName;
 
-		filesHtml.append("<TR>\n");
-		filesHtml.append("    <TD colspan=\""
-				+ String.valueOf(horizontalColumnsLimit)
-				+ "\"><a href=\""
+		filesHtml.append("<div style=\"clear: both;\"><a href=\""
 				+ indexingContext.getGlobalUrl()
-				+ UrlParamEncoder.encode(indexingContext.getLocalUrl()
+				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
 						+ fullFileName) + "\">" + fullFileName + "</a>\n");
 		filesHtml.append("&nbsp;&nbsp;("
 				+ FilePathParser.getFileSizeDescription(file.getFileLength())
-				+ ")</TD>\n");
-		filesHtml.append("</TR>\n");
+				+ ")</div><br/>\n");
 
 	}
 
 	@Override
-	public void enlistImage(final AbstractFile abstractFile) {
+	public void enlistImage(final Picture picture) {
 		try {
 
-			final Picture picture = (Picture) abstractFile;
-
 			final Dimension imageSize = picture.getDimensions();
 
 			final List<Dimension> recommendedDimensions = Picture
 					.getThumbnailDimensions(imageSize);
 
-			Dimension listingDimension = new Dimension(500, 500);
+			Dimension listingDimension = new Dimension(1500, 450);
 
 			if (listingDimension.width > imageSize.width)
 				if (listingDimension.height > imageSize.height)
@@ -107,9 +86,8 @@ public class MixedLayout implements Layout {
 			final String listingThumbnailUrl = indexer.getThumbnailUrl(picture,
 					listingDimension, indexingContext);
 
-			startcolumn();
-
-			filesHtml.append("<TD><center><a href=\""
+			filesHtml.append("<div style=\"float:left; margin: 10px;\">");
+			filesHtml.append("<a href=\""
 					+ indexingContext.getGlobalUrl()
 					+ UrlParamEncoder.encode(indexingContext.getLocalUrl()
 							+ "/" + picture.fileName) + "\">\n");
@@ -133,9 +111,8 @@ public class MixedLayout implements Layout {
 				filesHtml.append("</a>");
 			}
 
-			filesHtml.append(")</TD>\n");
-
-			columnAdded();
+			filesHtml.append(")\n");
+			filesHtml.append("</div>");
 
 		} catch (final Exception e) {
 			logger.error(
@@ -143,7 +120,7 @@ public class MixedLayout implements Layout {
 							+ e.toString()
 							+ ", thumbnail generation skipped, enlisting as ordinary file instead.",
 					e);
-			enlistFile(abstractFile);
+			enlistFile(picture);
 		}
 	}
 
@@ -154,14 +131,9 @@ public class MixedLayout implements Layout {
 
 		final GeneralFile file = (GeneralFile) abstractFile;
 
-		finishRow();
-
 		filesHtml
-				.append("<TR style=\"background-color: #404040; text-align: center\">\n");
-		filesHtml.append("<TD style=\"text-align: center\" colspan=\""
-				+ String.valueOf(horizontalColumnsLimit) + "\">\n");
-
-		filesHtml.append("<video controls=\"controls\" tabindex=\"0\">\n");
+				.append("<div style=\"margin: 30px; clear: both;\">"
+						+ "<video preload=\"metadata\" controls=\"controls\" tabindex=\"0\">\n");
 		filesHtml
 				.append("<source type=\"video/ogg\" codecs=\"theora, vorbis\" src=\""
 						+ indexingContext.getGlobalUrl()
@@ -169,17 +141,6 @@ public class MixedLayout implements Layout {
 								+ "/" + file.fileName) + "\">\n");
 		filesHtml.append("</source>\n");
 
-		// if browser cannot play video directry, fall back to java Applet
-		filesHtml
-				.append("<applet code=\"com.fluendo.player.Cortado.class\" archive=\"http://theora.org/cortado.jar\" width=\"800\" height=\"600\">\n");
-		filesHtml.append("    <param name=\"url\" value=\""
-				+ indexingContext.getGlobalUrl()
-				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
-						+ file.fileName) + "\"/>\n");
-		filesHtml.append("    <param name=\"keepAspect\" value=\"true\"/>\n");
-		filesHtml.append("    <param name=\"autoPlay\" value=\"false\"/>\n");
-		filesHtml.append("</applet>\n");
-
 		filesHtml.append("</video>\n");
 
 		filesHtml.append("<br/>\n");
@@ -192,23 +153,10 @@ public class MixedLayout implements Layout {
 		filesHtml.append("<a href=\""
 				+ indexingContext.getGlobalUrl()
 				+ UrlParamEncoder.encode(indexingContext.getLocalUrl() + "/"
-						+ file.fileName) + "\">download as OGV</a>\n");
-
-		filesHtml.append("</TD></TR>\n");
-
-	}
-
-	public void finishRow() {
+						+ file.fileName) + "\">download as OGV</a></div>\n");
 
-		if (currentColumn == 0)
-			return;
+		filesHtml.append("\n");
 
-		while (currentColumn <= horizontalColumnsLimit) {
-			filesHtml.append("<TD></TD>");
-			currentColumn++;
-		}
-		filesHtml.append("</TR>\n");
-		currentColumn = 0;
 	}
 
 	/** {@inheritDoc} */
@@ -243,32 +191,11 @@ public class MixedLayout implements Layout {
 			finalHtml
 					.append("<CENTER><H1>" + galleryTitle + "</H1></CENTER>\n");
 
-		finalHtml.append("<CENTER><H2>");
-		for (final String p : path)
-			finalHtml.append(" / " + p);
-		finalHtml.append("</H2></CENTER>\n");
-
-		// append directory listing
-		finalHtml.append("<TABLE>\n");
-
-		if (path.size() > 0) {
-			finalHtml.append("<TR>");
-			finalHtml.append("<TD><b><a href=\""
-					+ indexer.getParentDirectoryUrl(indexingContext)
-					+ "\"> &lt;== ..</a></b></TD>");
-			finalHtml.append("</TR>\n");
-		}
-
-		finalHtml.append(dirHtml.toString());
-		finalHtml.append("\n<TR><TD><br></TD></TR>\n");
-		finalHtml.append("</TABLE>\n");
+		showCurrentPath(finalHtml);
 
-		// append file listing
+		listDirectories(finalHtml);
 
-		finishRow();
-		finalHtml.append("<TABLE width=\"1100\">\n");
 		finalHtml.append(filesHtml.toString());
-		finalHtml.append("\n</TABLE>\n");
 
 		if (doHtmlHeaderAndFooter)
 			finalHtml.append("</font></BODY></HTML>\n");
@@ -289,11 +216,27 @@ public class MixedLayout implements Layout {
 		filesHtml = new StringBuffer();
 	}
 
-	public void startcolumn() {
-		if (currentColumn == 0) {
-			filesHtml.append("<TR>");
-			currentColumn = 1;
+	private void listDirectories(final StringBuffer finalHtml) {
+		finalHtml.append("<TABLE>\n");
+
+		if (path.size() > 0) {
+			finalHtml.append("<TR>");
+			finalHtml.append("<TD><b><a href=\""
+					+ indexer.getParentDirectoryUrl(indexingContext)
+					+ "\"><h2> &lt;== parent directory</h2></a></b></TD>");
+			finalHtml.append("</TR>\n");
 		}
+
+		finalHtml.append(dirHtml.toString());
+		finalHtml.append("\n<TR><TD><br></TD></TR>\n");
+		finalHtml.append("</TABLE>\n");
+	}
+
+	private void showCurrentPath(final StringBuffer finalHtml) {
+		finalHtml.append("<CENTER><H2>");
+		for (final String p : path)
+			finalHtml.append(" / " + p);
+		finalHtml.append("</H2></CENTER>\n");
 	}
 
 }