--- a/views/Extractapp/EditTaglist.php	Fri Oct 02 12:18:34 2015 +0200
+++ b/views/Extractapp/EditTaglist.php	Mon Nov 09 12:00:24 2015 +0100
@@ -62,7 +62,8 @@
 	var row = tableMain.insertBefore(document.createElement("tr"), document.getElementById("trAddTag") );
 	row.setAttribute("height","50");
 	row.id = "tr"+largestId;
-	
+	row.setAttribute("class", "bg-warning");		
+
 	var newcolumn = document.createElement("td");
 	newcolumn.id = "tdId"+largestId;
 	newcolumn.setAttribute("width","150");
@@ -81,6 +82,8 @@
 	newcolumn.setAttribute("idnum",largestId);
 	newcolumn.setAttribute("name","tdTag");
 	row.appendChild(newcolumn).innerHTML="";
+	// ---
+
 	
 	var newcolumn = document.createElement("td");
 	newcolumn.setAttribute("width","150");
@@ -150,13 +153,20 @@
 		return 0;
 	}
 
+
 	var row = tableMain.appendChild(document.createElement("tr"));
 	row.setAttribute("height","50");
 	row.id = "tr"+id;
-	
+		
+	if (id == "ID") {
+		row.setAttribute("class", "bg-info");	
+	}
+
+
 	var newcolumn = document.createElement("td");
 	newcolumn.id = "tdId"+id;
 	newcolumn.setAttribute("width","150");
+	newcolumn.setAttribute("class","text-muted");
 	row.appendChild(newcolumn).innerHTML=id;
 	
 	var newcolumn = document.createElement("td");
@@ -164,6 +174,9 @@
 	newcolumn.id = "tdName"+id;
 	newcolumn.setAttribute("idnum",id);
 	newcolumn.setAttribute("name","tdName");
+	if (id != "ID" && id != topic_tag_id) {
+		newcolumn.setAttribute("class","editable");
+	}
 	row.appendChild(newcolumn).innerHTML=name;
 	
 	var newcolumn = document.createElement("td");
@@ -171,6 +184,9 @@
 	newcolumn.id = "tdTag"+id;
 	newcolumn.setAttribute("idnum",id);
 	newcolumn.setAttribute("name","tdTag");
+	if (id != "ID" && id != topic_tag_id) {
+		newcolumn.setAttribute("class","editable");
+	}
 	row.appendChild(newcolumn).innerHTML=tag;
 	
 	var newcolumn = document.createElement("td");
@@ -178,47 +194,44 @@
 	if ( color=="Color") {
 		row.appendChild(newcolumn).innerHTML="Color";
 	} else {
+		newcolumn.setAttribute("class","editable");
 		row.appendChild(newcolumn).innerHTML="<div id=\"colorSelector"+id+"\"><div id=\"colorSelectorB"+id+"\" style=\"background-color: "+color+"\"></div></div>";
 	}
 
 
-	if (id == topic_tag_id) {
-		// pass
-	} else {	
-
-		var newcolumn = document.createElement("td");
-		newcolumn.setAttribute("width","50");
-		if ( color=="Color") {
-			row.appendChild(newcolumn).innerHTML="Save";
-		} else {
-			row.appendChild(newcolumn).innerHTML="<button onclick=\"saveTag("+id+", 'update')\">Save</button>";
-		}
+	var newcolumn = document.createElement("td");
+	newcolumn.setAttribute("width","50");
+	if ( color=="Color") {
+		row.appendChild(newcolumn).innerHTML="Save";
+	} else {
+		row.appendChild(newcolumn).innerHTML="<button onclick=\"saveTag("+id+", 'update')\">Save</button>";
+	}
 
-		
-		var newcolumn = document.createElement("td");
-		newcolumn.setAttribute("width","50");
-		if ( color=="Color") {
-			row.appendChild(newcolumn).innerHTML="Delete";
-		} else {
-			row.appendChild(newcolumn).innerHTML="<button onclick=\"DeleteTag("+id+")\">Delete</button>";
-		}
-		
+	
+	var newcolumn = document.createElement("td");
+	newcolumn.setAttribute("width","50");
+	if ( color=="Color") {
+		row.appendChild(newcolumn).innerHTML="Delete";
+	} else {
+		row.appendChild(newcolumn).innerHTML="<button onclick=\"DeleteTag("+id+")\">Delete</button>";
+	}
 	
-		$('#colorSelector'+id).ColorPicker({
-			color: color,
-			onShow: function (colpkr) {
-				$(colpkr).fadeIn(500);
-				return false;
-			},
-			onHide: function (colpkr) {
-				$(colpkr).fadeOut(500);
-				return false;
-			},
-			onChange: function (hsb, hex, rgb) {
-				$('#colorSelector'+id+' div').css('backgroundColor', '#' + hex);
-			}
-		});
-	}
+
+	$('#colorSelector'+id).ColorPicker({
+		color: color,
+		onShow: function (colpkr) {
+			$(colpkr).fadeIn(500);
+			return false;
+		},
+		onHide: function (colpkr) {
+			$(colpkr).fadeOut(500);
+			return false;
+		},
+		onChange: function (hsb, hex, rgb) {
+			$('#colorSelector'+id+' div').css('backgroundColor', '#' + hex);
+		}
+	});
+
 
 	// insertRule works in IE9, FF, Saf, Chrome, Opera
 	var x = document.styleSheets[0];
@@ -303,11 +316,12 @@
 
 function DeleteTag( id ) {	
 	$("#tr"+id).remove();
+	var topic_id = JSON.parse('<?php echo json_encode($topic_id) ?>');
 	$.ajax({
 		url : './EditTaglist',
 		async : false,
 		type : 'POST',
-		data : 'func=DeleteTag'+'&id='+id+'&type=delete'
+		data : 'func=DeleteTag'+'&id='+id+'&type=delete&topic_id='+topic_id
 	}).done(function(result) {
 		alert("Saved!");
 	});
@@ -319,7 +333,7 @@
 		return;
 	}
 	var topic_tag_id = JSON.parse('<?php echo json_encode($topic_tag_id) ?>');
-	if (this.id == "tdName"+topic_tag_id) {
+	if (this.id == "tdName"+topic_tag_id || this.id == "tdNameID") {
 		return;
 	}
 	//var startPageValue = this.innerHTML;
@@ -339,9 +353,11 @@
 	if ( $("#input"+this.id).length > 0 ) {
 		return;
 	}
-	if (this.id == "tdTag"+topic_tag_id) {
+	
+	if (this.id == "tdTag"+topic_tag_id || this.id == "tdTagID") {
 		return;
 	}
+
 	//var startPageValue = this.innerHTML;
 	var startPageValue = this.textContent;
 	this.innerHTML="";
@@ -355,24 +371,28 @@
 	$("#input"+this.id).focus();
 } );
 
+
 $(document).on("keypress", "[name=tdName]", function () {
 	if (event.keyCode == 13) {
 		$(this).focusout();
 	}
 });
 
+
 $(document).on("keypress", "[name=tdTag]", function () {
 	if (event.keyCode == 13) {
 		$(this).focusout();
 	}
 });
 
+
 $(document).on("focusout", "[name=tdName]", function () {
 	var value=$("#input"+this.id).val();
 	$(this).html($(this).html() + value);
 	$("#input"+this.id).remove();
 });
 
+
 $(document).on("focusout", "[name=tdTag]", function () {
 	var value=$("#input"+this.id).val();
 	$(this).html($(this).html() + value);