merged

uniker · May 19, 2014 · 6a57adf · 6a57adf
2 parents 1b3053c + f229a12
commit 6a57adf
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 15 deletions.
diff --git a/WebContent/stat/css/rap.template.css b/WebContent/stat/css/rap.template.css
@@ -377,12 +377,15 @@ div#tipDiv {
 }
 
 .messages-container .msgs {
+	max-height: 360px;
+	overflow-y: auto;
 }
 
 .messages-container .close {
-	margin-right: 2px;
+	position: absolute;
+	right: 5px;
+	top: 6px;
 	outline: none;
-	margin-top: -2px;
 }
 
 .messages-dropdown {
@@ -395,9 +398,11 @@ div#tipDiv {
 }
 
 .messages-container ul li {
-	padding: 10px;
+	padding: 10px 20px 10px;
 	cursor: pointer;
 	border-bottom: 1px solid #EEE;
+	font-size: 12px;
+	position: relative;
 }
 
 .messages-container ul li:last-child {
@@ -428,4 +433,8 @@ border-radius: 0 0 4px 4px;
 }
 .messages-container .btns .close-btn, .messages-container .btns .clear-btn {
 	margin-left: 10px;
+}
+
+.label {
+	padding: .2em .3em .2em;
 }
diff --git a/WebContent/stat/js/base.js b/WebContent/stat/js/base.js
diff --git a/WebContent/stat/js/util/mock.plugin.js b/WebContent/stat/js/util/mock.plugin.js
@@ -223,9 +223,9 @@
     }
 
     if (window.define && window.define.cmd) {
-    	var data = seajs.data;
+    	var data = seajs.config().data;
     	data.alias = data.alias || {};
-    	var path = window.location.protocol + '//' + window.location.host + '/stat/js/util/jquery-rapped.js';
+    	var path = 'http://' + ROOT + '/stat/js/util/jquery-rapped.js';
     	data.alias.jquery = data.alias.jQuery = data.alias.jq = data.alias.jQ = data.alias.$ = path;
     }