From 6b52b41c71300ea3424385986391485058fc1fa5 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Fri, 21 May 2010 13:29:58 +0200
Subject: Doc: design changes Fixing menus and js

---
 doc/src/template/scripts/functions.js       |  9 +++++++--
 doc/src/template/style/style.css            | 13 +++++++++----
 tools/qdoc3/test/qt-html-templates.qdocconf |  7 -------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 7ae2421..58a0248 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -117,7 +117,14 @@ function processNokiaData(response){
 var blankRE=/^\s*$/;
 function CheckEmptyAndLoadList()
 {
+	var pageUrl = window.location.href;
+	var pageVal = $('title').html();
+	$('#feedUrl').remove();
+	$('#pageVal').remove();
+	$('#feedform').append('<input id="feedUrl" name="feedUrl" value="'+pageUrl+'" style="display:none;">');
+	$('#feedform').append('<input id="pageVal" name="pageVal" value="'+pageVal+'" style="display:none;">');
 	$('.liveResult').remove();
+    $('.defaultLink').css('display','block');
 	var value = document.getElementById('pageType').value; 
 	if((blankRE.test(value)) || (value.length < 3))
 	{
@@ -140,11 +147,9 @@ else
 	*/
 // Loads on doc ready
 	$(document).ready(function () {
-	var pageUrl = window.location.href;
 	//alert(pageUrl);
 	//$('#pageUrl').attr('foo',pageUrl);
 	var pageTitle = $('title').html();
-		$('#feedform').append('<input id="page" name="pageVal" value="'+pageTitle+'" style="display:none;">');
           var currentString = $('#pageType').val() ;
 		  if(currentString.length < 1){
 			$('.defaultLink').css('display','block');
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 82acd3e..ebc1607 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -844,7 +844,7 @@
         background-color: #e6e7e8;
         z-index: 4;
     }
-    #feedcloseX a
+    #feedcloseX 
     {
         display: inline;
         padding: 5px 5px 0 0;
@@ -998,17 +998,17 @@
 	
 	.rightAlign
 	{
-	/*text-align:right;	*/
+	text-align:right;	
 	}
 
 	
 	.leftAlign
 	{
-	/*text-align:left;	*/
+	text-align:left;	
 	}
 
 	.topAlign{
-	/*vertical-align:top*/
+	vertical-align:top
 	}
 	
 	.functionIndex a{
@@ -1150,6 +1150,11 @@ padding:0px;
 .wrap .content .flowList p{
 padding:0px;
 }
+pre.highlightedCode {
+	display: block;
+	overflow:hidden;
+}
+
 }
 /* end of screen media */
 
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 09f0c96..b72a1eb 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -54,8 +54,6 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
 			  "            </ul> \n" \
 			  "          </div>\n" \
-			  "          <div  id=\"live001\" class=\"live\">\n" \
-			  "          </div>\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box bottombar\" id=\"topics\">\n" \
 			  "          <h2><span></span>\n" \
@@ -68,8 +66,6 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "              <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li>\n" \
 			  "            </ul>  \n" \
 			  "          </div>\n" \
-			  "          <div  id=\"live002\" class=\"live\">\n" \
-			  "          </div>\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box\" id=\"examples\">\n" \
 			  "          <h2><span></span>\n" \
@@ -83,8 +79,6 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
 			  "            </ul> \n" \
 			  "          </div>\n" \
-			  "          <div id=\"live003\" class=\"live\">\n" \
-			  "          </div>\n" \
 			  "        </div>\n" \
 			  "      </div>\n" \
 			  "      <div class=\"wrap\">\n" \
@@ -130,7 +124,6 @@ HTML.footer             = "        <!-- /div -->\n" \
 			  "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
 			  "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
 			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea></p>\n" \
-			  "      <input id=\"pageVal\" name=\"pageVal\" value=\"\$(\'title\').html();\" style=\"display:none;\">\n" \
 			  "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
 			  "    </form>\n" \
 			  "  </div>\n" \
-- 
cgit v0.12