diff options
| -rwxr-xr-x | doc/src/template/scripts/functions.js | 9 | ||||
| -rwxr-xr-x | doc/src/template/style/style.css | 8 | ||||
| -rw-r--r-- | tests/auto/xmlpatternsxqts/tst_suitetest.cpp | 15 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 1 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 5 |
5 files changed, 28 insertions, 10 deletions
diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js index 108590f..2362bc4 100755 --- a/doc/src/template/scripts/functions.js +++ b/doc/src/template/scripts/functions.js @@ -50,6 +50,8 @@ function processNokiaData(response){ if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){ lookupCount++; //$('.live001').css('display','block'); + $('#ul001 .defaultLink').css('display','none'); + for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){ full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue; @@ -62,6 +64,8 @@ function processNokiaData(response){ if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){ articleCount++; //$('.live002').css('display','block'); + $('#ul002 .defaultLink').css('display','none'); + for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){ full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue; @@ -73,6 +77,8 @@ function processNokiaData(response){ if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){ exampleCount++; //$('.live003').css('display','block'); + $('#ul003 .defaultLink').css('display','none'); + for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){ full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue; @@ -114,6 +120,9 @@ function CheckEmptyAndLoadList() // Loads on doc ready $(document).ready(function () { + var pageTitle = $('title').html(); + $('#feedform').append('<input id="page" name="pageVal" value="'+pageTitle+'" style="display:none;">'); + $('#pageType').keyup(function () { var searchString = $('#pageType').val() ; if ((searchString == null) || (searchString.length < 3)) { diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index 644e56b..2e01af6 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -1026,8 +1026,8 @@ { display: inline-block; width: 49%; - /* *width:42%; - _width:42%;*/ + *width:42%; + _width:42%; padding:0 2% 0 1%; vertical-align:top; @@ -1036,8 +1036,8 @@ .indexboxcont .indexIcon { width: 11%; - /* *width:18%; - _width:18%;*/ + *width:18%; + _width:18%; overflow:hidden; } diff --git a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp index 64120c7..ec63858 100644 --- a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp +++ b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp @@ -89,10 +89,17 @@ void tst_SuiteTest::runTestSuite() const TestSuite::SuiteType suiteType; switch (m_suiteType) { - case XQuerySuite: suiteType = TestSuite::XQuerySuite; - case XsltSuite: suiteType = TestSuite::XsltSuite; - case XsdSuite: suiteType = TestSuite::XsdSuite; - default: break; + case XQuerySuite: + suiteType = TestSuite::XQuerySuite; + break; + case XsltSuite: + suiteType = TestSuite::XsltSuite; + break; + case XsdSuite: + suiteType = TestSuite::XsdSuite; + break; + default: + break; } TestSuite *const ts = TestSuite::openCatalog(catalogPath, errMsg, true, suiteType); diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 67aa6c6..638ae94 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1849,6 +1849,7 @@ void HtmlGenerator::generateFooter(const Node *node) out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version()) << QString(address).replace("\\" + COMMAND_VERSION, myTree->version()); + out() << " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n"; out() << "</body>\n"; out() << "</html>\n"; } diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index e691705..e5d73c7 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -126,8 +126,9 @@ HTML.footer = " <!-- /div -->\n" \ " <div id=\"feedcloseX\">\n" \ " <a href=\"#\" onclick=\"\$(\'#feedbackBox\').hide();\$(\'#blurpage\').hide()\">X</a>\n" \ " </div>\n" \ - " <form action=\"#\">\n" \ - " <p><textarea id=\"feedbox\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea></p>\n" \ + " <form id=\"feedform\" action=\"feedback.php\" method=\"get\">\n" \ + " <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea></p>\n" \ + " <input id=\"page\" name=\"pageVal\" value=\"\$(\'title\').html();\" style=\"display:none;\">\n" \ " <p><input id=\"feedsubmit\" type=\"submit\" onclick=\"\$(\'#feedbackBox\').hide();\$(\'#blurpage\').hide()\"\n" \ " name=\"feedback\" /></p>\n" \ " </form>\n" \ |