diff --git a/Bench4Q-Web/src/main/java/org/bench4q/web/exception/GlobalExceptionController.java b/Bench4Q-Web/src/main/java/org/bench4q/web/exception/GlobalExceptionController.java index de43e19b..6d3d7750 100644 --- a/Bench4Q-Web/src/main/java/org/bench4q/web/exception/GlobalExceptionController.java +++ b/Bench4Q-Web/src/main/java/org/bench4q/web/exception/GlobalExceptionController.java @@ -5,11 +5,9 @@ import javax.xml.bind.JAXBException; import org.apache.log4j.Logger; import org.bench4q.share.helper.ExceptionLog; import org.bench4q.web.model.BaseResponseModel; -import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.ResponseStatus; @ControllerAdvice public class GlobalExceptionController { diff --git a/Bench4Q-Web/src/main/webapp/bench4q-css/bench4q.css b/Bench4Q-Web/src/main/webapp/bench4q-css/bench4q.css index f8edcd45..e602aff1 100644 --- a/Bench4Q-Web/src/main/webapp/bench4q-css/bench4q.css +++ b/Bench4Q-Web/src/main/webapp/bench4q-css/bench4q.css @@ -37,12 +37,12 @@ display:none; padding-right:5px; } -.div-left{ +.left{ float:left; } -.div-right{ +.right{ float:right; } diff --git a/Bench4Q-Web/src/main/webapp/bench4q-css/plugin.css b/Bench4Q-Web/src/main/webapp/bench4q-css/plugin.css index 52b88c4d..40adc4c3 100644 --- a/Bench4Q-Web/src/main/webapp/bench4q-css/plugin.css +++ b/Bench4Q-Web/src/main/webapp/bench4q-css/plugin.css @@ -1,76 +1,73 @@ - -.inset{ - width:85% ; - height:80%; - align:center; - margin: 5px; +.inset { + width: 85%; + height: 80%; + align: center; + margin: 5px; } -.scroll{ +.scroll { overflow-x: hidden; - overflow-y: auto; + overflow-y: auto; } a:hover { - color:#ECE9D8; + color: #ECE9D8; +} + +.button-div { + margin-top: 50px; + padding-left: 20px; +} + +.button-div div { + margin-top: 10px; +} + +.behavior_box { + border: 1px inset; + width: 200px; + height: 300px; + margin-right: 0px; + margin-left: 0px; +} + +.sample_frame { + margin-bottom: 0px; + border: #3689BB solid thin; +} + +.sample_sub_frame { + border: #F0ECE0 solid thin; + margin-top: 5px; + margin-bottom: 5px; + margin-left: 10px; + margin-right: 10px; +} + +.listArea { + height: 340px; + margin-bottom: 15px; + outline-style: outset; + color: black; +} + +.behavior-box { + height: 400px; + border: solid 1px black; + margin-left: 5px; } -.behavior_box{ - border:1px inset; - width:200px; - height:300px; - margin-right:0px; - margin-left:0px; +#myModal_Behavior { + width: 800px; + left:40%; } - -.sample_frame{ - margin-bottom:0px; - border:#3689BB solid thin; +.listArea,#insertPluginAreaPlugins,#pluginMethod p,a { + padding-top: 10px; + padding-left: 20px; + } - -.sample_sub_frame{ - border:#F0ECE0 solid thin; - margin-top:5px; - margin-bottom:5px; - margin-left:10px; - margin-right:10px; -} - -table, th, td,thead,tbody -{ - border: 1px solid #FFE37E; - width:40px; - height:18px; - -} - -#pluginArea{ - width:280px; - height:340px; - margin-bottom:15px; - outline-style: outset; - -} - -#behaviorArea{ - width:280px; - height:340px; - margin-bottom:15px; - outline-style: inset; -} - -.behavior-box{ - width:180px; - height:200px; - border:solid thin #F0ECE0; - margin-left:5px; - outline-style:inset; -} - -.pluginChoosedList{ - border-bottom:1px solid #F0ECE0 ; - color: #4E9BCB ; - width:220px; - height:32px; + p,a{ + color: #4E9BCB; + border-bottom: 1px solid #F0ECE0; } \ No newline at end of file diff --git a/Bench4Q-Web/src/main/webapp/demo-images/.gitignore b/Bench4Q-Web/src/main/webapp/demo-images/.gitignore deleted file mode 100644 index 063775e2..00000000 --- a/Bench4Q-Web/src/main/webapp/demo-images/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Thumbs.db diff --git a/Bench4Q-Web/src/main/webapp/demo-images/agent.PNG b/Bench4Q-Web/src/main/webapp/demo-images/agent.PNG deleted file mode 100644 index 9ee02b9d..00000000 Binary files a/Bench4Q-Web/src/main/webapp/demo-images/agent.PNG and /dev/null differ diff --git a/Bench4Q-Web/src/main/webapp/demo-images/cpu.PNG b/Bench4Q-Web/src/main/webapp/demo-images/cpu.PNG deleted file mode 100644 index 2947010b..00000000 Binary files a/Bench4Q-Web/src/main/webapp/demo-images/cpu.PNG and /dev/null differ diff --git a/Bench4Q-Web/src/main/webapp/demo-images/createTest.PNG b/Bench4Q-Web/src/main/webapp/demo-images/createTest.PNG deleted file mode 100644 index 3eec45e8..00000000 Binary files a/Bench4Q-Web/src/main/webapp/demo-images/createTest.PNG and /dev/null differ diff --git a/Bench4Q-Web/src/main/webapp/demo-images/homepage.PNG b/Bench4Q-Web/src/main/webapp/demo-images/homepage.PNG deleted file mode 100644 index 3db67416..00000000 Binary files a/Bench4Q-Web/src/main/webapp/demo-images/homepage.PNG and /dev/null differ diff --git a/Bench4Q-Web/src/main/webapp/demo-images/login.PNG b/Bench4Q-Web/src/main/webapp/demo-images/login.PNG deleted file mode 100644 index fb483e6a..00000000 Binary files a/Bench4Q-Web/src/main/webapp/demo-images/login.PNG and /dev/null differ diff --git a/Bench4Q-Web/src/main/webapp/demo-images/memo.PNG b/Bench4Q-Web/src/main/webapp/demo-images/memo.PNG deleted file mode 100644 index 56193bf8..00000000 Binary files a/Bench4Q-Web/src/main/webapp/demo-images/memo.PNG and /dev/null differ diff --git a/Bench4Q-Web/src/main/webapp/demo-images/memory.PNG b/Bench4Q-Web/src/main/webapp/demo-images/memory.PNG deleted file mode 100644 index e2420bf1..00000000 Binary files a/Bench4Q-Web/src/main/webapp/demo-images/memory.PNG and /dev/null differ diff --git a/Bench4Q-Web/src/main/webapp/demo-images/port.PNG b/Bench4Q-Web/src/main/webapp/demo-images/port.PNG deleted file mode 100644 index 523ca0ae..00000000 Binary files a/Bench4Q-Web/src/main/webapp/demo-images/port.PNG and /dev/null differ diff --git a/Bench4Q-Web/src/main/webapp/demo-images/script.PNG b/Bench4Q-Web/src/main/webapp/demo-images/script.PNG deleted file mode 100644 index de4c4986..00000000 Binary files a/Bench4Q-Web/src/main/webapp/demo-images/script.PNG and /dev/null differ diff --git a/Bench4Q-Web/src/main/webapp/demo-images/scriptResult.PNG b/Bench4Q-Web/src/main/webapp/demo-images/scriptResult.PNG deleted file mode 100644 index 4da7a6fd..00000000 Binary files a/Bench4Q-Web/src/main/webapp/demo-images/scriptResult.PNG and /dev/null differ diff --git a/Bench4Q-Web/src/main/webapp/demo-images/testPlan.PNG b/Bench4Q-Web/src/main/webapp/demo-images/testPlan.PNG deleted file mode 100644 index c7c64346..00000000 Binary files a/Bench4Q-Web/src/main/webapp/demo-images/testPlan.PNG and /dev/null differ diff --git a/Bench4Q-Web/src/main/webapp/plugin.jsp b/Bench4Q-Web/src/main/webapp/plugin.jsp index 300ceeed..6ba68100 100644 --- a/Bench4Q-Web/src/main/webapp/plugin.jsp +++ b/Bench4Q-Web/src/main/webapp/plugin.jsp @@ -37,7 +37,7 @@ body { - + -
-
-
- -

- Behavior -

-
- -
-
-
-
-
-
- -
-
-
-

- -

- -

- -

-
-
- +
+
+ +

+ Behavior +

+
+
-
+
+
+
+
+ +
+
+ +
+
+
+ + +
- + +
- - + - - - -
- -