projects / meviz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: f826af1)
Possibility to disable HTML header and footer and title.
authorSvjatoslav Agejenko <n0@n0-Aspire-8920.(none)>
Sun, 3 Feb 2013 10:51:53 +0000 (12:51 +0200)
committerSvjatoslav Agejenko <n0@n0-Aspire-8920.(none)>
Sun, 3 Feb 2013 10:51:53 +0000 (12:51 +0200)
src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java patch | blob | history
src/main/java/eu/svjatoslav/meviz/htmlindexer/Layout.java patch | blob | history
src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java patch | blob | history
src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java patch | blob | history

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
index 3a48b67..4e1b2f2 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
@@ -144,7 +144,7 @@ public class FilesystemIndexer extends AbstractIndexer {
                                        indexForLayout(layout);
 
                                        IOHelper.overwriteFileIfContentDiffers(indexFile, layout
-                                                       .getHtml().getBytes());
+                                                       .getHtml(true, true).getBytes());
                                }
                        } catch (final Exception e) {
                                logger.error("Error writing index file to:" + indexFilePath, e);
diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Layout.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Layout.java
index 88de6ce..5110b3e 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Layout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Layout.java
@@ -57,7 +57,8 @@ public interface Layout {
         * After necessary files have been enlisted for particular directory, use
         * this method to retrieve generated HTML result.
         */
-       public String getHtml();
+       public String getHtml(final boolean showTitle,
+                       final boolean doHtmlHeaderAndFooter);
 
        /**
         * Initialize layout for particular directory.
diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java
index 29ceac1..d4fd7e3 100644 (file)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java
@@ -44,7 +44,7 @@ public class WebIndexer extends AbstractIndexer {
 
                compileHtml(layout, metadata);
 
-               return layout.getHtml();
+               return layout.getHtml(false, false);
        }
 
        public DirectoryMetadata getMetadataForPath(final String requestPath)
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 4c00985..c51d7fa 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@ -219,25 +219,31 @@ public class MixedLayout implements Layout {
 
        /** {@inheritDoc} */
        @Override
-       public String getHtml() {
+       public String getHtml(final boolean showTitle,
+                       final boolean doHtmlHeaderAndFooter) {
 
                // assemble final page HTML
                final StringBuffer finalHtml = new StringBuffer();
 
-               // page header
-               finalHtml.append("<HTML>\n");
-               finalHtml.append("<HEAD>\n");
-               finalHtml
-                               .append("    <meta HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\"/>\n");
-               finalHtml.append("</HEAD>\n");
-               finalHtml
-                               .append("<BODY bgcolor=\"#000000\" alink=\"#50ffff\" link=\"#50ffff\" vlink=\"#ff50ff\" text=\"#ffffff\">\n");
-               finalHtml.append("<!-- " + Constants.HTML_MAGIC_STRING + " -->\n");
-               finalHtml.append("<!-- " + Constants.HTML_MEMO + " -->\n");
-               finalHtml.append("<FONT color=\"#ffffff\">\n");
-               finalHtml.append("<CENTER><H1>" + galleryTitle + "</H1>\n");
-
-               finalHtml.append("<H2>");
+               if (doHtmlHeaderAndFooter) {
+                       // page header
+                       finalHtml.append("<HTML>\n");
+                       finalHtml.append("<HEAD>\n");
+                       finalHtml
+                                       .append("    <meta HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\"/>\n");
+                       finalHtml.append("</HEAD>\n");
+                       finalHtml
+                                       .append("<BODY bgcolor=\"#000000\" alink=\"#50ffff\" link=\"#50ffff\" vlink=\"#ff50ff\" text=\"#ffffff\">\n");
+                       finalHtml.append("<!-- " + Constants.HTML_MAGIC_STRING + " -->\n");
+                       finalHtml.append("<!-- " + Constants.HTML_MEMO + " -->\n");
+                       finalHtml.append("<font color=\"#ffffff\">\n");
+               }
+
+               if (showTitle)
+                       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");
@@ -264,7 +270,8 @@ public class MixedLayout implements Layout {
                finalHtml.append(filesHtml.toString());
                finalHtml.append("\n</TABLE>\n");
 
-               finalHtml.append("</font></BODY></HTML>\n");
+               if (doHtmlHeaderAndFooter)
+                       finalHtml.append("</font></BODY></HTML>\n");
 
                return finalHtml.toString();
        }
Unnamed repository; edit this file 'description' to name the repository.