Doc: Changes to the HTMLGenerator, style and js

Replacing tables with lists in the HTML generator
Adding img to search box
Moving JS from template to script files

2 files changed, 21 insertions, 13 deletions

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index afd1ec3..7ae2421 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -54,8 +54,6 @@ var exampleCount = 0;
 var qturl = ""; // change from "http://doc.qt.nokia.com/4.6/" to 0 so we can have relative links
 
 function processNokiaData(response){
-$('.sidebar .search form input').addClass('loading');
-	// debug $('.content').prepend('<li>handling search results</li>'); // debuging
 	var propertyTags = response.getElementsByTagName('page');
 	
  	for (var i=0; i< propertyTags.length; i++) {
@@ -64,7 +62,6 @@ $('.sidebar .search form input').addClass('loading');
 		
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
 			lookupCount++;
-			//$('.live001').css('display','block');
 
 			
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -79,7 +76,6 @@ $('.sidebar .search form input').addClass('loading');
 	 
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
 			articleCount++;
-	 		//$('.live002').css('display','block');
 
 				 
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -93,7 +89,6 @@ $('.sidebar .search form input').addClass('loading');
 		}
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){
 			exampleCount++;
-	 		//$('.live003').css('display','block');
 
 
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -105,10 +100,11 @@ $('.sidebar .search form input').addClass('loading');
 
 	   		}
 		} 
+		if(i==propertyTags.length){$('#pageType').removeClass('loading');}
+
 	}	
 	 
-	if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');
-}
+	if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
     if(articleCount == 0){$('#ul002').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
 	if(exampleCount == 0){$('#ul003').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
 	// reset count variables;
@@ -117,7 +113,6 @@ $('.sidebar .search form input').addClass('loading');
      exampleCount = 0;
 	
 }
-
 //build regular expression object to find empty string or any number of blank
 var blankRE=/^\s*$/;
 function CheckEmptyAndLoadList()
@@ -147,7 +142,7 @@ else
 	$(document).ready(function () {
 	var pageUrl = window.location.href;
 	//alert(pageUrl);
-	$('#pageUrl').attr('foo',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() ;
@@ -159,6 +154,7 @@ else
         $('#pageType').keyup(function () {
           var searchString = $('#pageType').val() ;
           if ((searchString == null) || (searchString.length < 3)) {
+				$('#pageType').removeClass('loading');
 				 $('.liveResult').remove(); // replaces removeResults();
       	   		CheckEmptyAndLoadList();
 				$('.report').remove();
@@ -167,6 +163,7 @@ else
 		   }
             if (this.timer) clearTimeout(this.timer);
             this.timer = setTimeout(function () {
+				$('#pageType').addClass('loading');
 				// debug$('.content').prepend('<li>new search started </li>');// debug
 				// debug$('.content').prepend('<p class=\"report\">Search string ' +searchString +'</p>'); // debug
 
@@ -179,6 +176,8 @@ else
                 success: function (response, textStatus) {
 
 				$('.liveResult').remove(); // replaces removeResults();
+								$('#pageType').removeClass('loading');
+
                 processNokiaData(response);
 
  }     
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 3f35642..82acd3e 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -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{
@@ -1140,7 +1140,16 @@
 
     /* end of screen media */
 
-	
+.flowList{
+display:inline-block;
+width:260px;
+}	
+.flowList dl{
+padding:0px;
+}
+.wrap .content .flowList p{
+padding:0px;
+}
 }
 /* end of screen media */