basically complete but needs error handling and tidying

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@905668 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 21 insertions, 17 deletions

diff --git a/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html b/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
index a26049f958..2b33988c00 100644
--- a/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
+++ b/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
@@ -36,7 +36,10 @@
 		}
 		ms = plan.milestone.list;
 		var mscontent = "<table border=\"1\" align=\"left\">";
-		var mschoice = '<select name="mschoice">';
+
+		 
+
+		var mschoice = 'Add new Work Item for JIRA: <input type="text" name="JIRA" value="TUSCANY-">in Milestone<select name="mschoice">';
 		for(var i=0; i<ms.length; i++) {
 			mscontent += "<tr><th colspan=\"6\" align=\"left\">Milestone " + ms[i].ID + "</th></tr>";
 			mschoice+='<option>'+ms[i].ID+'</option>';
@@ -68,23 +71,12 @@
 
 		}
 		mscontent += "</table><P>";
-		mschoice += '</select>';
+		mschoice += '</select><input type="button" onClick="addWorkItem()" value="Add Work Item">';
 		
 		document.getElementById('milestones').innerHTML='<h2>' + mscontent;
 
-		
-
-		var newmscontent =
-			'<form name="newWorkItemForm">'+
-	   	      '<div id="addWorkItem">'+
-	   	    	'Add new Work Item for JIRA: <input type="text" name="JIRA" value="TUSCANY-">'+ 'in Milestone '+mschoice+ 
-	   	    				    '<input type="button" onClick="addWorkItem()" value="Add"></div>'+
-	   	    	'<br/><div id="addMilestone>">Add New Milestone <input name="newmsname" type=text/><input type="button" onClick="addMilestone()" value="Add Milestone">'+
-	   	  	   	    	'</td></tr></div>'+
-	   	  	   	'<tr><td><input type="button" name="refresh" value="Refresh Jira Data" onclick="refreshJiraData"/></td></tr>'
-	   	    '</form>';
 	   	 
-	   	document.getElementById('addPlanData').innerHTML=newmscontent;
+	   	document.getElementById('mschoice').innerHTML=mschoice;
 		return;
 		
 	}
@@ -106,7 +98,6 @@
 
 	function plan_postNewWorkItem_response()
 	{
-		// refresh
 		planView.getLite().addCallback(plan_getResponse);
 	}
 
@@ -136,8 +127,21 @@
 
 	<table>
 	  <tr><td><div id="milestones"></div></td></tr>
-	  <tr><td><div id="addPlanData"></div></td></tr>
-	  
+	  <tr><td>
+	  	<form name="newWorkItemForm">
+	  	  <table>
+	  	  <tr><td>
+	   	   <div id=mschoice></div>
+	   	   </td></tr>
+	   	   <tr><td>
+	   	   Add New Milestone <input name="newmsname" type=text/><input type="button" onClick="addMilestone()" value="Add Milestone">
+	   	  </td></tr>
+	   	  <tr><td>
+	   	  <input type="button" value="Refresh Jira Data" onclick="refreshJiraData()"/>
+	  	  </td></tr>
+	  	  </table>
+	  	</form>
+	 </td></tr>
 	</table>
 	</body>
 </html>
\ No newline at end of file