Doc: Changes to the HTML output

Changes in css, htmlgenerator (removing redundant class names), updating html templates and updating js.

Reviewed-by: Morten Engvoldsen

2 files changed, 30 insertions, 38 deletions

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 3120473..373fa3d 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -956,7 +956,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             out() << "<tr><td  class=\"topAlign\"><tt>"
                   << protectEnc(plainCode(marker->markedUpEnumValue(atom->next()->string(),
                                                                  relative)))
-                  << "</tt></td><td class=\"centerAlign topAlign\">";
+                  << "</tt></td><td class=\" topAlign\">";
 
             QString itemValue;
             if (relative->type() == Node::Enum) {
@@ -1093,13 +1093,13 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         }
         if (!atom->string().isEmpty()) {
             if (atom->string().contains("%"))
-                out() << "<table class=\"generic centerAlign\" width=\"" << atom->string() << "\">\n ";
+                out() << "<table class=\"generic\" width=\"" << atom->string() << "\">\n ";
             else {
-                out() << "<table class=\"generic centerAlign\">\n";
+                out() << "<table class=\"generic\">\n";
             }
         }
         else {
-            out() << "<table class=\"generic centerAlign\">\n";
+            out() << "<table class=\"generic\">\n";
         }
         numTableRows = 0;
         break;
@@ -1243,8 +1243,6 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
         subtitleText << "(" << Atom(Atom::AutoLink, fullTitle) << ")"
                      << Atom(Atom::LineBreak);
 
-#if 0
-    // No longer used because the modeule name is a breadcrumb.
     QString fixedModule = inner->moduleName();
     if (fixedModule == "Qt3SupportLight")
         fixedModule = "Qt3Support";
@@ -1265,7 +1263,6 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
             subtitleText << "]";
         }
     }
-#endif    
 
     generateHeader(title, inner, marker);
     sections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 48ecd2c..1450149 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -41,16 +41,12 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "          <h2><span></span>\n" \
 			  "            API Lookup</h2>\n" \
 			  "          <div  id=\"list001\" class=\"list\">\n" \
-			  " <!-- TABLE - will be changed " \
-			  "			<table id=\"tbl001\" > \n" \
-			  "			</table> -->\n " \
-			  " <!-- TABLE - will be changed -->" \
-			  "          <ul id=\"tbl001\" >\n" \
-			  "              <li><a href=\"modules.html\">All modules</a></li>\n" \
-			  "              <li><a href=\"classes.html\">All classes</a></li>\n" \
-			  "              <li><a href=\"functions.html\">All functions</a></li>\n" \
-			  "              <li><a href=\"namespaces.html\">All namespaces</a></li>\n" \
-			  "              <li><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
+			  "          <ul id=\"ul001\" >\n" \
+			  "              <li class=\"defaultLink\"><a href=\"modules.html\">All modules</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"classes.html\">All classes</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"functions.html\">All functions</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"namespaces.html\">All namespaces</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform specifics</a></li>\n" \
 			  "            </ul> \n" \
 			  "          </div>\n" \
 			  "          <div  id=\"live001\" class=\"live\">\n" \
@@ -58,17 +54,20 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box bottombar\" id=\"topics\">\n" \
 			  "          <h2><span></span>\n" \
-			  "            Qt Topics</h2>\n" \
+			  "            API Topics</h2>\n" \
 			  "          <div id=\"list002\" class=\"list\">\n" \
-			  " <!-- TABLE - will be changed " \
-			  "			<table id=\"tbl002\" > \n" \
-			  "			</table> -->\n " \
-			  " <!-- TABLE - will be changed -->" \
-			  "            <ul id=\"tbl002\" >\n" \
-			  "              <li><a href=\"qt-basic-concepts.html\">Basic Concepts</a></li>\n" \
-			  "              <li><a href=\"qt-gui-concepts.html\">GUI Construction</a></li>\n" \
-			  "              <li><a href=\"platform-specific.html\">Platform specifics</a></li>\n" \
-			  "              <li><a href=\"declarativeui.html\">Qt Quick</a></li>\n" \
+			  "            <ul id=\"ul002\" >\n" \
+			  "              <li class=\"defaultLink\"><a href=\"object.html\">QObject model</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"signalsandslots.html\">Signals &amp; Slots</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"eventsandfilters.html\">Event handling</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"declarativeui.html\">Qt Quick</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"mainwindow.html\">The main window</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"widgets-and-layouts.html\">Widgets &amp; Layouts</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"dialogs.html\">Dialog windows</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"paintsystem.html\">The paint system</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"graphicsview.html\">Graphics views</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"model-view-programming.html\">Model&#47;View programming</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"widgets-and-layouts.html\">Widget style &amp; layout</a></li>\n" \
 			  "            </ul>  \n" \
 			  "          </div>\n" \
 			  "          <div  id=\"live002\" class=\"live\">\n" \
@@ -76,18 +75,14 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box\" id=\"examples\">\n" \
 			  "          <h2><span></span>\n" \
-			  "            Qt Examples</h2>\n" \
+			  "            API Examples</h2>\n" \
 			  "          <div id=\"list003\" class=\"list\">\n" \
-			  " <!-- TABLE - will be changed" \
-			  "			<table id=\"tbl003\"> \n"\
-			  "			</table> --> \n " \
-			  " <!-- TABLE - will be changed -->" \
-			  "        <ul id=\"tbl003\">\n" \
-			  "              <li><a href=\"examples.html\">All examples</a></li>\n" \
-			  "              <li><a href=\"tutorials.html\">All tutorials</a></li>\n" \
-			  "              <li><a href=\"examples.html\">Qt Quick examples</a></li>\n" \
-			  "              <li><a href=\"examples.html\">Desktop examples</a></li>\n" \
-			  "              <li><a href=\"examples.html\">Device examples</a></li>\n" \
+			  "        <ul id=\"ul003\">\n" \
+			  "              <li class=\"defaultLink\"><a href=\"examples.html\">All examples</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"tutorials.html\">All tutorials</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"examples.html\">Qt Quick examples</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"examples.html\">Desktop examples</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"examples.html\">Device examples</a></li>\n" \
 			  "            </ul> \n" \
 			  "          </div>\n" \
 			  "          <div id=\"live003\" class=\"live\">\n" \