diff --git a/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/FCDocWriter.java b/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/FCDocWriter.java index 439694e..60a33f6 100644 --- a/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/FCDocWriter.java +++ b/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/FCDocWriter.java @@ -130,7 +130,7 @@ public class FCDocWriter { doc.setFrameNavPrintParentParent(true); doc.setGroupTypeName("summary", "Summary",1); doc.setGroupTypeName("overview", "Overview",2); - //doc.setMetaStyleSheetThema("jdk6"); + doc.setMetaStyleSheetThema("jdk6"); doc.addTreeNodeClassExclude(TDocCakeWord.class); doc.setFrameNavConceptClass(TDocCakeSlice.class); diff --git a/nx01-x4o-maisdoc/src/main/java/org/x4o/maisdoc/flake/MaisDocGenerator.java b/nx01-x4o-maisdoc/src/main/java/org/x4o/maisdoc/flake/MaisDocGenerator.java index 32fa18f..4d56ca2 100644 --- a/nx01-x4o-maisdoc/src/main/java/org/x4o/maisdoc/flake/MaisDocGenerator.java +++ b/nx01-x4o-maisdoc/src/main/java/org/x4o/maisdoc/flake/MaisDocGenerator.java @@ -560,9 +560,6 @@ public class MaisDocGenerator implements MaisDocContentPrinter { return; } String thema = doc.getMetaStyleSheetThema(); - if (thema==null) { - thema = "jdk7"; - } List cssResources = new ArrayList(10); cssResources.add("org/x4o/maisdoc/theme/base/api-theme.css"); cssResources.add("org/x4o/maisdoc/theme/base/api-html.css"); @@ -1023,7 +1020,7 @@ public class MaisDocGenerator implements MaisDocContentPrinter { } writer.printTagEnd(Tag.ul); - if (isTop) { + if (isTop && "jdk7".equals(doc.getMetaStyleSheetThema()) && doc.getMetaStyleSheet()==null) { writer.printTagStart(Tag.ul,MaisDocContentCss.navList); writer.printTagStart(Tag.li); writer.printTagStart(Tag.div); diff --git a/nx01-x4o-maisdoc/src/main/java/org/x4o/maisdoc/model/MaisDoc.java b/nx01-x4o-maisdoc/src/main/java/org/x4o/maisdoc/model/MaisDoc.java index 96a2840..c15ae77 100644 --- a/nx01-x4o-maisdoc/src/main/java/org/x4o/maisdoc/model/MaisDoc.java +++ b/nx01-x4o-maisdoc/src/main/java/org/x4o/maisdoc/model/MaisDoc.java @@ -118,6 +118,9 @@ public class MaisDoc { setFrameNavPrintParentId(false); } + if (metaStyleSheetThema==null) { + setMetaStyleSheetThema("jdk7"); + } if (noFrameAllTopJS==null) { noFrameAllTopJS = "\nallClassesLink = document.getElementById(\"allclasses_navbar_top\");\n"+ "if(window==top) {\n\tallClassesLink.style.display = \"block\";\n} else {\n\tallClassesLink.style.display = \"none\";\n}\n";