From 26d689e005ccd1a5df29a5a98d9d2a2680b26d06 Mon Sep 17 00:00:00 2001
From: luqiong <605601787@qq.com>
Date: Tue, 2 Sep 2014 16:39:42 +0800
Subject: [PATCH] edit filter dialog

edit filter dialog
---
 Bench4Q-Web/src/main/webapp/test.jsp | 120 +++++++++++----------------
 1 file changed, 50 insertions(+), 70 deletions(-)

diff --git a/Bench4Q-Web/src/main/webapp/test.jsp b/Bench4Q-Web/src/main/webapp/test.jsp
index 19543fea..72605c0a 100644
--- a/Bench4Q-Web/src/main/webapp/test.jsp
+++ b/Bench4Q-Web/src/main/webapp/test.jsp
@@ -26,7 +26,9 @@ body {
 }
 
 .modal{
-	position:relative;
+	position:absolute;
+	left:617px;
+	top:850px
 }
 </style>
 <link href="lib/chrisma/css/charisma-app.css" rel="stylesheet">
@@ -82,7 +84,6 @@ body {
 					<div id="loadTestExecutionPlan" class="content-frame row-fluid">
 						<div class="span4">
 							<table id="loadConfig" class="table-margin-top">
-
 								<tr>
 									<td><fmt:message key="test-load" /></td>
 									<td><input id="RequireLoad" class="load-config-input"
@@ -134,13 +135,11 @@ body {
 						</p>
 					</div>
 					<div id="userScenarios" class="content-frame">
-
 						<table id="userConfig" class="table-margin-top .table-config">
 							<thead>
 								<tr>
 									<th><fmt:message key="allocation" /> %</th>
 									<th><fmt:message key="scriptname" /></th>
-									<th><fmt:message key="filterStatic" /></th>
 									<th><fmt:message key="filterTime" /></th>
 									<th><fmt:message key="actions" /></th>
 
@@ -148,21 +147,13 @@ body {
 							</thead>
 							<tbody>
 								<tr>
-
 									<td><input class="allocation-input " value="100"
 										type="text" onblur="changeTotal();checkUserScenarios()" /> %</td>
-									<td><select name="select">
-
-									</select></td>
-
-								<!-- 	<td><input type="checkbox" name="staticResources"
-										value="false" data-toggle="tooltip" data-placement="left"
-										title=<fmt:message key="staticTip" />> <fmt:message
-											key="filterStatic" /></td>
+									<td><select name="select"></select></td>
 									<td><input type="checkbox" name="timer" value="false"
 										data-toggle="tooltip" data-placement="left"
 										title=<fmt:message key="timeTip" />> <fmt:message
-											key="filterTime" /><br></td> -->
+											key="filterTime" /><br></td> 
 									<td><a href="#" class="button" onClick="viewScript(this)"><img
 											src="images/script_edit.png" alt="Add"> <fmt:message
 												key="test-editScript" /></a></td>
@@ -177,66 +168,55 @@ body {
 						</table>
 						<div id="alertMessage" class="hide">The total allocation
 							needs to be 100%</div>
-						<button type="submit" class="btn btn-primary"
-							id="userScenariosButton"
-							onClick="addScenario();checkUserScenarios()">
-							<fmt:message key="addScript" />
-						</button>
-
-						<button type="submit" class="btn btn-primary" id="createNewScript"
-							onClick="createNewScript()">
-							<fmt:message key="test_jsp_makeNewScript" />
-						</button>
-						
-						<button type="submit" class="btn btn-primary" id="createFilter"
-							onClick="createFilter()">
-							<fmt:message key="plugin_jsp_filter" />
-						</button>
-						<div class="modal hide" id="selectFilter">
-						<!-- 	<div class="modal-header">
-								<h3><fmt:message key="plugin_jsp_addNewPlugin" /></h3>
-							</div> -->
-							<div class="modal-body">
-								<div class="inset scroll" id="filterList"></div>
+							<button type="submit" class="btn btn-primary"
+								id="userScenariosButton"
+								onClick="addScenario();checkUserScenarios()">
+								<fmt:message key="addScript" />
+							</button>
+							<button type="submit" class="btn btn-primary" id="createNewScript"
+								onClick="createNewScript()">
+								<fmt:message key="test_jsp_makeNewScript" />
+							</button>
+							<button type="submit" class="btn btn-primary" id="createFilter"
+								onClick="createFilter()">
+								<fmt:message key="plugin_jsp_filter" />
+							</button>
+							<div class="modal hide" id="selectFilter">
+								<div class="modal-body">
+									<div class="inset scroll" id="filterList"></div>
+								</div>
+								<div class="modal-footer">
+									<button type="button" class="btn btn-primary btn-width" id="ok">
+										<fmt:message key="plugin_jsp_finish" />
+									</button>
+								</div>
 							</div>
-							<div class="modal-footer">
-								<button type="button" class="btn btn-primary btn-width" id="ok">
-									<fmt:message key="plugin_jsp_finish" />
-								</button>
+							<div id="userConfigMessage" class="hide">all input can not
+								be empty and must be greater than zero!</div>
+						</div>
+
+						<div class="title-frame">
+							<a href="#"><i class="icon-plus float-left" id="icon-ip"
+								onClick="toggleIpConfig()"></i></a>
+							<p class="title">
+								<fmt:message key="sutIp" />
+							</p>
+						</div>
+						<div id="ipConfig" class="content-frame hide">
+							<table id="ipConfigTable" class="table-margin-top"></table>
+							<button type="submit" class="btn btn-primary add-button"
+								onClick="addIP();checkIP()">
+								<fmt:message key="addIp" />
+							</button>
+							<div id="ipConfigMessage" class="hide">
+								<fmt:message key="test-iptip" />
 							</div>
 						</div>
-						<div id="userConfigMessage" class="hide">all input can not
-							be empty and must be greater than zero!</div>
-					</div>
-
-					<div class="title-frame">
-						<a href="#"><i class="icon-plus float-left" id="icon-ip"
-							onClick="toggleIpConfig()"></i></a>
-						<p class="title">
-							<fmt:message key="sutIp" />
-						</p>
-					</div>
-					<div id="ipConfig" class="content-frame hide">
-						<table id="ipConfigTable" class="table-margin-top">
-							<!-- 	<tr>
-								<th>IP:</th>
-								<th><input type="text" class="ip-input" onblur="checkIP()" /></th>
-							</tr> -->
-						</table>
-						<button type="submit" class="btn btn-primary add-button"
-							onClick="addIP();checkIP()">
-							<fmt:message key="addIp" />
-						</button>
-						<div id="ipConfigMessage" class="hide">
-							<fmt:message key="test-iptip" />
+						<div class="span12 center">
+							<button class="btn btn-large btn-primary" onClick="startTest()">
+								<fmt:message key="startTest" />
+							</button>
 						</div>
-					</div>
-					<div class="span12 center">
-						<button class="btn btn-large btn-primary" onClick="startTest()">
-							<fmt:message key="startTest" />
-						</button>
-					</div>
-
 				</div>
 			</div>
 			<hr>