diff -r bf4420e9fa4d -r 2e16851ffecd ginebra2/chrome/bedrockchrome/historyview.superpage/historyview.js
--- a/ginebra2/chrome/bedrockchrome/historyview.superpage/historyview.js	Fri Jun 11 16:23:26 2010 +0100
+++ b/ginebra2/chrome/bedrockchrome/historyview.superpage/historyview.js	Thu Jul 22 16:30:16 2010 +0100
@@ -1,135 +1,135 @@
-var _prevExpandedUL = null;
-var _prevExpandedATag;
 
 function openHistoryElement(historyURL)
 {
     window.views.WebView.showNormalPage();
-	  window.ViewStack.switchView( "WebView","BookmarkHistoryView");
-      	  
-		// Laod a page to chrome view
-		window.views.WebView.loadUrlToCurrentPage(historyURL);
-	//	views.WebView.gesturesEnabled = true;
+    window.ViewStack.switchView( "WebView","BookmarkHistoryView");
+
+    // Laod a page to chrome view
+    window.views.WebView.loadUrlToCurrentPage(historyURL);
+  //  views.WebView.gesturesEnabled = true;
 
 }
 
 function updateHistoryList()
 {
-	var snippetId = document.getElementById('HistoryViewId'); 
-	snippetId.innerHTML = "";
-	
-	try
-		{
-				//clearHistoryList();
-				//Get historys data from database
-				var folderNamesJSN = window.bookmarksManager.getHistoryFoldersJSON();
-				var folderObjects = eval('(' + folderNamesJSN + ')');
-				var mainUL = document.createElement('ul');
-				
-				mainUL.id =  'folderMenu';
-				var subUlId;	
-				for(i=0; i < folderObjects.length; i++)
-				{
-					  subUlId = "subUlId_"+i;
-					  
-						var mainLI  = document.createElement('li');
-						var aTag  = document.createElement('a');
-						var subUL = document.createElement('ul');
+  var snippetId = document.getElementById('HistoryViewId');
+  snippetId.innerHTML = "";
+
+  try
+    {
+        //clearHistoryList();
+        //Get historys data from database
+        var folderNamesJSN = window.bookmarksManager.getHistoryFoldersJSON();
+        var folderObjects = eval('(' + folderNamesJSN + ')');
+        var mainUL = document.createElement('ul');
 
-						// Expand First Item & Hide all the other Items
-						if(i > 0)
-						{	
-								aTag.className = 'closed';
-								subUL.style.display = 'none';
-						}
-						else
-						{
-							    aTag.className = 'opened';
-								subUL.style.display = 'block';
-								_prevExpandedATag = aTag;
-								_prevExpandedUL = subUL;
-						}
+        mainUL.id =  'folderMenu';
+        var subUlId;
+        for (i=0; i < folderObjects.length; i++)
+        {
+            subUlId = "subUlId_"+i;
 
-						aTag.href = "#";
-						aTag.innerHTML = '<div></div>'+folderObjects[i];
-						aTag.onclick = eval('( function(){ toggleHistoryFolder(this, "#'+subUlId+'"); } )');
+            var mainLI  = document.createElement('li');
+            var aTag  = document.createElement('a');
+            var subUL = document.createElement('ul');
+
+       
+            aTag.className = 'closed';
+            subUL.style.display = 'none';
+
+            aTag.href = "#";
+            aTag.id = "aTagId_"+i;
+            aTag.innerHTML = '<div></div>'+folderObjects[i];
+            aTag.onclick = eval('( function(){ toggleHistoryFolder(this, "#'+subUlId+'"); } )');
 
 
-						mainLI.appendChild(aTag);
+            mainLI.appendChild(aTag);
+
+            var folderDataJSN = window.bookmarksManager.getHistoryFoldersJSON(folderObjects[i]);
+            var folderDataObject = eval('(' + folderDataJSN + ')');
+
+            subUL.id = subUlId;
 
-						var folderDataJSN = window.bookmarksManager.getHistoryFolderJSON(folderObjects[i]);
-						var folderDataObject = eval('(' + folderDataJSN + ')');
-						
-						subUL.id = subUlId;
-						
-						
-						for(j=0; j<folderDataObject.length; j++)
-						{
-							var recenturl = folderDataObject[j].urlVal;
-							
-							var recenttitle = folderDataObject[j].titleVal;
-							var recenttime = folderDataObject[j].dateVal+'<br/>'+folderDataObject[j].timeVal;
-							
-							recenturl = recenturl.replace('http://','');
-							recenturl = recenturl.replace('www.','');
-							recenturl = recenturl.replace('file:///','');
-							
-							//trim the bm title if the number of characters are more than 35.
-							if(recenttitle.length > 30)
-							{
-								recenttitle = recenttitle.substring(0, 30);
-								recenttitle += '...';
-							}
+
+            for (j=folderDataObject.length-1; j>=0; j--)
+            {
+              var recenturl = folderDataObject[j].urlVal;
+
+              var recenttitle = folderDataObject[j].titleVal;
+              var recenttime = folderDataObject[j].dateVal+'<br/>'+folderDataObject[j].timeVal;
 
-							if(recenturl.length > 35)
-							{
-								recenturl = recenturl.substring(0, 35);
-								recenturl += '...';
-							}
-							
-							//<img src="'+bmfavicon+'">
-								var subLI = document.createElement('li');
-								subLI.innerHTML = '<a href="#" onclick="openHistoryElement(\''+folderDataObject[j].urlVal+'\');">'+
-																	'<div class="HitsoryElement">'+
-																	'<span class="aTime">'+recenttime+'</span>'+
-																	'<span class="aTitle">'+recenttitle+'</span>'+
-																	'<br/>'+
-																	'<span class="aUrl">'+recenturl+'</span></div>';
-								subUL.appendChild(subLI);
-						}
-						
-						mainLI.appendChild(subUL);
-						mainUL.appendChild(mainLI);
-						
-				}
-				var snippetId = document.getElementById('HistoryViewId'); 
-				snippetId.innerHTML = "";
-				snippetId.appendChild(mainUL);
+              //<img src="'+bmfavicon+'">
+                var subLI = document.createElement('li');
+                subLI.innerHTML = '<a href="#" onclick="openHistoryElement(\''+folderDataObject[j].urlVal+'\');">'+
+                                  '<div class="HitsoryElement">'+
+                                  '<span class="aTime">'+recenttime+'</span>'+
+                                  '<span class="aTitle">'+recenttitle+'</span>'+
+                                  '<br/>'+
+                                  '<span class="aUrl">'+recenturl+'</span></div>';
+                subUL.appendChild(subLI);
+            }
+
+            mainLI.appendChild(subUL);
+            mainUL.appendChild(mainLI);
 
-		} catch(E) { alert(E); }
+        }
+        var snippetId = document.getElementById('HistoryViewId');
+        snippetId.innerHTML = "";
+        snippetId.appendChild(mainUL);
+
+        var bottomPad = document.createElement("div");
+        bottomPad.id = 'BottomPad';
+        snippetId.appendChild(bottomPad);
+        
+        var todayFolder = document.getElementById("aTagId_"+0);
+        var todaySubUl = document.getElementById("subUlId_"+0);
+     		toggleHistoryFolder(todayFolder,todaySubUl);
+        
+
+    } catch(E) { alert(E); }
 
 }
 
 function toggleHistoryFolder(aTag, subUlId){
-	try{
-	    aTag.className = (aTag.className == 'opened') ? 'closed' : 'opened';
+
+   try{
+   	   var filderList = document.getElementById('folderMenu');
+       if (filderList.childNodes.length == 0 ) {
+  	       return;
+       }
+     
+    
+      aTag.className = (aTag.className == 'opened') ? 'closed' : 'opened';
       $(subUlId).toggle();
       //$(subUlId).toggle("blind", {}, 175);
-      
-      if(_prevExpandedUL != null && _prevExpandedUL != subUlId && _prevExpandedATag.className == 'opened'){
-		    collapseFolder(_prevExpandedATag,_prevExpandedUL);
-	    }
-	    _prevExpandedUL   = subUlId;  
-	    _prevExpandedATag = aTag;
-  
-	}  catch(E) { alert(E); }
+
+      if (_prevExpandedUL != null && _prevExpandedUL != subUlId && _prevExpandedATag.className == 'opened'){
+        collapseFolder(_prevExpandedATag,_prevExpandedUL);
+      }
+      _prevExpandedUL   = subUlId;
+      _prevExpandedATag = aTag;
+
+  }  catch(E) { alert(E); }
 }
 
 function collapseFolder(aTag,subUlId)
 {
 try{
-	    aTag.className = (aTag.className == 'opened') ? 'closed' : 'opened';
+      aTag.className = (aTag.className == 'opened') ? 'closed' : 'opened';
       //$(subUlId).toggle("blind", {}, 175);
       $(subUlId).toggle();
-      
+
     }  catch(E) { alert(E); }
 }
+
+function confirmCleartHistory () {
+
+ var filderList = document.getElementById('folderMenu');
+
+ if (filderList.childNodes.length > 0 ) {
+    if (confirm("Are you sure you want to permanently delete your history?")){
+        window.bookmarksManager.clearHistory();
+        window.views.WebView.reload();
+    }
+ }
+}