X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Flayouts%2FMixedLayout.java;fp=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Flayouts%2FMixedLayout.java;h=8ae10026eb4e340a5999f4e39b316419a4b85c62;hb=4d5a88dcfde63a2250b0a9f430ef07744df99720;hp=915c7c8a4b1f173121e031aaa498f281d3020d95;hpb=10e63289bea94532c36c15d8bd23d164869972bb;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 915c7c8..8ae1002 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@ -39,24 +39,10 @@ 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("\n");
- }
- }
-
@Override
public void enlistDirectory(final AbstractFile directory) {
dirHtml.append("
");
@@ -69,21 +55,16 @@ public class MixedLayout implements Layout {
@Override
public void enlistFile(final AbstractFile file) {
- finishRow();
final String fullFileName = file.fileName;
- filesHtml.append("
\n");
- filesHtml.append(" " + fullFileName + "\n");
filesHtml.append(" ("
+ FilePathParser.getFileSizeDescription(file.getFileLength())
- + ") | \n");
- filesHtml.append("
\n");
+ + ")
\n");
}
@@ -98,7 +79,7 @@ public class MixedLayout implements Layout {
final List 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 +88,8 @@ public class MixedLayout implements Layout {
final String listingThumbnailUrl = indexer.getThumbnailUrl(picture,
listingDimension, indexingContext);
- startcolumn();
-
- filesHtml.append("");
+ filesHtml.append("\n");
@@ -133,9 +113,8 @@ public class MixedLayout implements Layout {
filesHtml.append("");
}
- filesHtml.append(") | \n");
-
- columnAdded();
+ filesHtml.append(")\n");
+ filesHtml.append("");
} catch (final Exception e) {
logger.error(
@@ -154,14 +133,8 @@ public class MixedLayout implements Layout {
final GeneralFile file = (GeneralFile) abstractFile;
- finishRow();
-
filesHtml
- .append("\n");
- filesHtml.append("\n");
-
- filesHtml.append(" |
\n");
-
- }
-
- public void finishRow() {
+ + file.fileName) + "\">download as OGV\n");
- if (currentColumn == 0)
- return;
+ filesHtml.append("\n");
- while (currentColumn <= horizontalColumnsLimit) {
- filesHtml.append(" | ");
- currentColumn++;
- }
- filesHtml.append("\n");
- currentColumn = 0;
}
/** {@inheritDoc} */
@@ -232,32 +192,11 @@ public class MixedLayout implements Layout {
finalHtml
.append("" + galleryTitle + "
\n");
- finalHtml.append("");
- for (final String p : path)
- finalHtml.append(" / " + p);
- finalHtml.append("
\n");
-
- // append directory listing
- finalHtml.append("\n");
-
- if (path.size() > 0) {
- finalHtml.append("");
- finalHtml.append(" <== parent directory | ");
- finalHtml.append("
\n");
- }
-
- finalHtml.append(dirHtml.toString());
- finalHtml.append("\n
|
\n");
- finalHtml.append("
\n");
+ showCurrentPath(finalHtml);
- // append file listing
+ listDirectories(finalHtml);
- finishRow();
- finalHtml.append("\n");
finalHtml.append(filesHtml.toString());
- finalHtml.append("\n
\n");
if (doHtmlHeaderAndFooter)
finalHtml.append("