--- a/server/ui.js
+++ b/server/ui.js
@@ -4,298 +4,296 @@
     elementTagName: " ",
     elementId: " ",
     flag : 0,
-    showlinks : 0,
-    showbox : 0,
-    blog_flag : false,
     testContext : function()
     {
 
-	$(document).ready(function(){$('body *').contents().filter(function() 
-{
-    try{
-	if(this.nodeType == 3)
-	    {
-		return (this.nodeType == 3) && this.nodeValue.match(/\S/);}}
-    catch(err)
-	{
-	}}).wrap('<span m4pageedittype=text/>')}); 
+ 	    $(document).ready(function(){$('body *').contents().filter(function() 
+								       {
+									   //console.log(this.nodeName);
+									   try{
+									       if(this.nodeType == 3)
+									       {
+										   return (this.nodeType == 3) && this.nodeValue.match(/\S/);}}
+									   catch(err)
+									   {
+//									       console.log(err.message);
+//									       console.log(this);
+									   }}).wrap('<span m4pageedittype=text/>')}); 
 
 
 	vimg = document.getElementsByTagName('img');
 	for(i=0; i<vimg.length; i++)
-	    {
-		vimg[i].setAttribute('m4pageedittype','image');
-	    }
+	{
+	    vimg[i].setAttribute('m4pageedittype','image');
+	}
 
+ 	var v = document.getElementsByTagName("body");
+// 	var a = document.createElement("script");
+// 	a.setAttribute("src","http://dev.a11y.in/alipi/wsgi/page_edit.js");
+// //	a.setAttribute("src","http://localhost/alipi-1/server/wsgi/page_edit.js");
+// 	a.setAttribute("type","text/javascript");
+// 	v[0].appendChild(a);
+	var alltags = document.getElementsByTagName('*');
+	for (x=0; x<alltags.length; x++) {
+	    if (alltags[x].id == 'ren_overlay' || alltags[x].id == 'overlay1' ) {
+		v[0].removeChild(document.getElementById('ren_overlay'));
+		v[0].removeChild(document.getElementById('overlay1'));
+	    }
+	}
+	v[0].removeChild(document.getElementById('overlay2'));
     },
 
     createMenu: function(menu_list) {
-	var xyz = document.getElementById("show-box");
-	xyz.innerHTML = "";
+	var xyz = document.getElementById("menu-button");
 	for(var i=0;i<menu_list.length;i++)
+	{
+	    var newel = document.createElement("option");
+	    newel.textContent = menu_list[i];
+	    newel.setAttribute("value",menu_list[i]);
+	    newel.setAttribute("onclick","a11ypi.getURL(event.target);");
+	    xyz.appendChild(newel);
+	}
+    },
+    clearMenu: function() {
+	var xyz = document.getElementById("menu-button");
+	while(null!= xyz.firstChild)
+	{
+	    xyz.removeChild(xyz.firstChild);
+	}
+    },
+    ajax: function() {
+	if(a11ypi.flag == '0')
+	{
+	    a11ypi.flag = 1;
+	    var xhr = new XMLHttpRequest();
+	    xhr.onreadystatechange = function()
 	    {
-		var para = document.createElement("p");
-		var newel = document.createElement("a");
-		newel.textContent = menu_list[i];
-		newel.setAttribute("href", "http://y.a11y.in/web?foruri="+encodeURIComponent(window.location.href)+"&lang="+menu_list[i]+"&interactive=1");
-		para.appendChild(newel);
-		xyz.appendChild(para);
+		if(xhr.readyState == 4)
+		{
+		    if(xhr.responseText == "empty")
+		    {
+			a11ypi.clearMenu();
+		    }
+		    else
+		    {
+			a11ypi.createMenu(JSON.parse(xhr.responseText));
+		    }
+		}
 	    }
+	    xhr.open("POST","http://localhost/menu",true);
+	    xhr.setRequestHeader("Content-type","application/x-www-form-urlencoded");
+	    d = window.location.search.split('?')[1];
+	    var a =[];
+	    for (var i = 0;i<d.split('&').length;i++){ 
+		a[d.split('&')[i].split('=')[0]] = d.split('&')[i].split('=')[1];
+	    }
+	    var url = a['foruri'];
+	    xhr.send('url='+url);
+	}
     },
     ajax1: function() {
-	var xhr = new XMLHttpRequest();
-	xhr.onreadystatechange = function()
+	if(a11ypi.flag == '0')
 	{
-	    if(xhr.readyState == 4)
+	    a11ypi.flag = 1;
+	    var xhr = new XMLHttpRequest();
+	    xhr.onreadystatechange = function()
+	    {
+		if(xhr.readyState == 4)
 		{
 		    if(xhr.responseText == "empty")
-			{ }
+		    {
+			a11ypi.clearMenu();
+		    }
 		    else
-			{
-			    document.getElementById("see-narration").disabled = false;
-			    document.getElementById("blog-filter").disabled = false;
-			    document.getElementById("go").disabled = false;
-			    a11ypi.showbox = JSON.parse(xhr.responseText);
-			}
+		    {
+			a11ypi.createMenuFilter(JSON.parse(xhr.responseText));
+		    }
 		}
+	    }
+	    xhr.open("POST","http://localhost/menu",true);
+	    xhr.setRequestHeader("Content-type","application/x-www-form-urlencoded");
+	    d = window.location.search.split('?')[1];
+	    var a =[];
+	    for (var i = 0;i<d.split('&').length;i++){ 
+		a[d.split('&')[i].split('=')[0]] = d.split('&')[i].split('=')[1];
+	    }
+	    var url = a['foruri'];
+	    var option = a['blog'];
+	    data = 'url='+url+'&option='+option;
+	    xhr.send(data) ;
 	}
-	xhr.open("POST","http://y.a11y.in/menu",true);
-	xhr.setRequestHeader("Content-type","application/x-www-form-urlencoded");
-	xhr.send('url='+encodeURIComponent(window.location.href)) ;
     },
-    createDomainMenu: function() {
-	var xyz = document.getElementById("show-links");
-	xyz.innerHTML = "";
-	menu_list = a11ypi.showlinks;
-	for(var i=0; i<menu_list.length;i++)
-	    {
-		var para = document.createElement("p");
-		var newel = document.createElement("a");
-		newel.textContent = menu_list[i];
-		newel.setAttribute("href", menu_list[i]);
-		para.appendChild(newel);
-		xyz.appendChild(para);
-	    }
-	$('a').hover(
-		     function() {
-			 var xhr = new XMLHttpRequest();
-			 xhr.onreadystatechange = function()
-			 {
-			     if(xhr.readyState == 4)
-				 {
-				     if(xhr.responseText == "empty")
-					 { }
-				     else
-					 {
-					     menu_list = JSON.parse(xhr.responseText);
-					     for(i=0; i<menu_list.length; i++) {
-						 x = document.createElement('span');
-						 x.setAttribute('style', 'padding:15px;');
-						 x.textContent = menu_list[i];
-						 document.getElementById('show-links').appendChild(x);
-					     }
-					     $('span').tooltip();
-					 }
-				 }
-			 }
-			 xhr.open("POST","http://y.a11y.in/menu",true);
-			 xhr.setRequestHeader("Content-type","application/x-www-form-urlencoded");
-			 xhr.send('url='+encodeURIComponent($(this).attr('href'))) ;
-		     },
-		     function () {$('#show-links').find("span").remove();}
-		     );
-    },
 
-    ajaxLinks1: function() {
+    getURL: function(e) {
+	window.location = window.location.href + "&lang=" + e.value;
+	window.reload();
+    },
+    ren: function()
+    {
 	var xhr = new XMLHttpRequest();
 	xhr.onreadystatechange = function()
 	{
 	    if(xhr.readyState == 4)
+	    {
+		if(xhr.responseText =='empty')
 		{
-		    if(xhr.responseText == "empty")
-			{ }
-		    else
-			{
-			    document.getElementById("see-links").disabled = false;
-			    a11ypi.showlinks = JSON.parse(xhr.responseText);
+		    a11ypi.clearMenu();
+		    alert("An internal server error occured, please try later.");
+		}
+		else
+		{
+		    
+		    d ={};
+		    var response=xhr.responseText.substring(3).split('###');
+		    for (var j= 0; j< response.length ; j++){
+			chunk = response[j].substring(1).split('&');
+			
+			for (var i= 0; i< chunk.length ; i++){
+			    pair =chunk[i].split("::");
+			    key = pair[0];
+			    value = pair[1];
+			    d[key] = value;
 			}
+			path = d['xpath'];
+			newContent = d['data'];
+			elementType = d['elementtype'];
+			a11ypi.evaluate(path,newContent,elementType);
+		    }
 		}
+	    }
 	}
-	xhr.open("POST","http://y.a11y.in/domain",true);
+	d = window.location.search.split('?')[1];
+	var a =[];
+	for (var i = 0;i<d.split('&').length;i++){ 
+	    a[d.split('&')[i].split('=')[0]] = d.split('&')[i].split('=')[1];
+	}
+	var url = a['foruri'];
+	var lang= a['lang'];
+	var data="url="+url+"&lang="+encodeURIComponent(lang);
+	
+	xhr.open("POST","http://localhost/replace",true);
 	xhr.setRequestHeader("Content-type","application/x-www-form-urlencoded");
-	xhr.send('url='+encodeURIComponent(window.location.hostname));
+	xhr.send(data);//
     },
-
-
-
-
-    editPage: function() {
-	a11ypi.testContext(); page_edit_nele('4seiz', '4l85060vb9', '336e2nootv6nxjsvyjov', 'VISUAL', 'false', '');
-	document.getElementById("renarrated_overlay").style.display = "none";
+    evaluate: function()
+    {
+	try{
+	var nodes = document.evaluate(path, document, null, XPathResult.ANY_TYPE,null);
+	}
+	catch(e)
+	{
+	    console.log(e);
+	}
+        try{
+            var result = nodes.iterateNext();
+            while (result)
+            {
+                if (elementType == 'image')
+		{
+                    result.setAttribute('src',newContent.split(',')[1]);  //A hack to display images properly, the size has been saved in the database.
+		    width = newContent.split(',')[0].split('x')[0];
+		    height = newContent.split(',')[0].split('x')[1];
+		    result.setAttribute('width',width);
+		    result.setAttribute('height', height);
+                }
+		else if(elementType =='audio/ogg')
+		{
+		    newContent = decodeURIComponent(newContent);
+		    audio = '<audio controls="controls" src="'+newContent+'"></audio>';
+		    $(result).before(audio);
+		}
+                else{
+                    result.textContent = newContent;
+                }
+                result=nodes.iterateNext();
+            }
+        }
+        catch (e)
+        {
+            dump( 'error: Document tree modified during iteration ' + e );
+        }
     },
-
-    showBox: function() {
-	$(function() {
-		$( "#show-box" ).dialog( "destroy" );
-		
-		$( "#show-box" ).dialog({
-			width: 300,
-			    height: 300,
-			    modal: true
-			    });
-	    });
-	a11ypi.createMenu(a11ypi.showbox);
+    close: function() {
+	document.getElementById('ren_overlay').style.display = 'none';
     },
-
-    showBox1: function() {
-	$(function() {
-		$( "#show-links" ).dialog( "destroy" );
-		
-		$( "#show-links" ).dialog({
-			width: 500,
-			    height: 300,
-			    modal: true
-			    });
-	    });
-	a11ypi.createDomainMenu();
-    },
-
-    blogFilter: function() {
-	if (a11ypi.blog_flag == false) {
-	a11ypi.blog_flag = true;
+    filter: function()
+    {
 	var xhr = new XMLHttpRequest();
 	xhr.onreadystatechange = function()
 	{
 	    if(xhr.readyState == 4)
+	    {
+		if(xhr.responseText =='empty')
 		{
-		    if(xhr.responseText == "empty")
-			{ }
+		    a11ypi.clearMenu();
+		    alert("An internal server error occured, please try later.");
+		}
 		    else
-			{
-			    var sel = document.getElementById("blog-filter");
-			    var menu_list = JSON.parse(xhr.responseText);
-			    blogArray = [];
-			    for (var i=0; i< menu_list.length; i++)
-				{
-				    blogArray[i] = menu_list[i].split("http://")[1].split(".com")[0] + ".com";
-				}
-			    blogArray.sort();
-			    for (var i=0; i < blogArray.length; i++)
-				{
-				    if ( i == 0 )
-					{
-					    opt = document.createElement("option");
-					    opt.textContent = blogArray[0];
-					    sel.appendChild(opt);
-					}
-				    else if(blogArray[i] == blogArray[i-1])
-					{ }
-				    else 
-					{
-					    opt = document.createElement("option");
-					    opt.textContent = blogArray[i];
-					    sel.appendChild(opt);
-					}
-				}
+		{
+		        
+		    d ={};
+		    var response=xhr.responseText.substring(3).split('###');
+		    for (var j= 0; j< response.length ; j++){
+			chunk = response[j].substring(1).split('&');
+			
+			for (var i= 0; i< chunk.length ; i++){
+			    pair =chunk[i].split("::");
+			    key = pair[0];
+			    value = pair[1];
+			    d[key] = value;
 			}
+			path = d['xpath'];
+			newContent = d['data'];
+			a11ypi.evaluate(path,newContent);
+		    }
 		}
+	    }
 	}
-	xhr.open("POST","http://y.a11y.in/blog",true);
+	d = window.location.search.split('?')[1];
+	var a =[];
+	for (var i = 0;i<d.split('&').length;i++){ 
+	    a[d.split('&')[i].split('=')[0]] = d.split('&')[i].split('=')[1];
+	}
+	var url = a['foruri'];
+	var lang= a['lang'];
+	var blog= a['blog'];
+	var data="url="+encodeURIComponent(url)+"&lang="+encodeURIComponent(lang)+"&blog="+encodeURIComponent(blog);
+	
+	xhr.open("POST","http://localhost/filter",true);
 	xhr.setRequestHeader("Content-type","application/x-www-form-urlencoded");
-	xhr.send('url='+encodeURIComponent(window.location.href));
+	xhr.send(data);//
+    },
+    createMenuFilter: function(menu_list) {
+	var xyz = document.getElementById("menu-button");
+	for(var i in menu_list)
+	{
+	    var newel = document.createElement("option");
+	    newel.textContent = menu_list[i];
+	    newel.setAttribute("value",menu_list[i]);
+	    newel.setAttribute("onclick","a11ypi.getURLFilter(event.target);");
+	    xyz.appendChild(newel);
 	}
     },
-    go: function() {
-	if (document.getElementById("blog-filter").value == "Choose a blog name")
-	    {    }
-	else {
-	    window.open("http://y.a11y.in/web?foruri=" + encodeURIComponent(window.location.href) + "&blog=" + document.getElementById("blog-filter").value);
+    clearMenuFilter: function() {
+	var xyz = document.getElementById("menu-button");
+	while(null!= xyz.firstChild)
+	{
+	    xyz.removeChild(xyz.firstChild);
 	}
     },
+    getURLFilter: function(e) {
+	window.location = window.location.href + "&lang=" + e.value+"&interactive=1";
+	window.reload();
+     },
 
-	loadOverlay: function() {
-
-	body = document.body;
-
-	jq = document.createElement("script");
-	jq.setAttribute("type", "text/javascript");
-	jq.setAttribute("src", "http://code.jquery.com/jquery-1.7.min.js");
-	body.appendChild(jq);
-
-	jqlink = document.createElement("link");
-	jqlink.setAttribute("rel", "stylesheet");
-	jqlink.setAttribute("type", "text/css");
-	jqlink.setAttribute("href", "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css");
-	body.appendChild(jqlink);
-
-	jscript = document.createElement("script");
-	jscript.setAttribute("type", "text/javascript");
-	jscript.setAttribute("src", "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js");
-	body.appendChild(jscript); 
-
-	overlay = document.createElement("div");
-	overlay.setAttribute("id", "renarrated_overlay");
-	overlay.setAttribute("class", "ui-widget-header ui-corner-all");
-	overlay.setAttribute("style", "position:fixed;top:0;width:80%;align:center;text-align:center;");
-	body.appendChild(overlay);
-
-	show_box = document.createElement("div");
-	show_box.setAttribute("id", "show-box");
-	show_box.title = "Please choose one of the languages";
-	body.appendChild(show_box);
-
-	show_links = document.createElement("div");
-	show_links.setAttribute("id", "show-links");
-	show_links.title = "Please choose one of the links";
-	body.appendChild(show_links);
-
-	edit_current = document.createElement("input");
-        edit_current.setAttribute("id", "edit-current");
-	edit_current.setAttribute("type", "submit");
-	edit_current.setAttribute("onclick", "a11ypi.editPage();");
-	edit_current.setAttribute("value", "Re-narrate this page");
-	overlay.appendChild(edit_current);
-
-	see_narration = document.createElement("input");
-	see_narration.setAttribute("id", "see-narration");
-	see_narration.setAttribute("type", "submit");
-	see_narration.setAttribute("onclick", "a11ypi.showBox();");
-	see_narration.setAttribute("value", "See other narrations");
-	see_narration.disabled = true;
-	overlay.appendChild(see_narration);
-	a11ypi.ajax1();
-
-	see_links = document.createElement("input");
-	see_links.setAttribute("id", "see-links");
-	see_links.setAttribute("type", "submit");
-	see_links.setAttribute("onclick", "a11ypi.showBox1();");
-	see_links.setAttribute("value", "Directory of narrations");
-	see_links.disabled = true;
-	overlay.appendChild(see_links);
-	a11ypi.ajaxLinks1();
-
-	blog_filter = document.createElement("select");
-	blog_filter.setAttribute("id", "blog-filter");
-	blog_filter.setAttribute("style", "min-width:200px;max-width:200px;");
-	blog_filter.setAttribute("onclick", "a11ypi.blogFilter();");
-	blog_option = document.createElement("option");
-	blog_option.textContent = "Choose a blog name";
-	blog_filter.appendChild(blog_option);
-	blog_filter.disabled = true;
-	overlay.appendChild(blog_filter);
-
-	go = document.createElement("input");
-	go.setAttribute("id", "go");
-	go.setAttribute("type", "submit");
-	go.setAttribute("onclick", "a11ypi.go();");
-	go.setAttribute("value", "Go");
-	go.disabled = true;
-	overlay.appendChild(go);
-},
-
+    checkbox: function() {
+	if(document.getElementById("our-check").checked == false) {
+	    document.getElementById("our-check").checked = true;
+	    document.getElementById("your-check").checked = false;
+	} else {
+	    document.getElementById("our-check").checked = false;
+	    document.getElementById("your-check").checked = true;
+	}
+    },
 };
-
-if (window.location.hostname != "y.a11y.in") {
-    $(document).load(a11ypi.loadOverlay());
-}