modify the css and js

ae1cd751 · yong.you · d5de0ff5 · ae1cd751 · ae1cd751 · ae1cd751
48 changed file
--- a/cat-home/src/main/webapp/WEB-INF/tags/body.tag
+++ b/cat-home/src/main/webapp/WEB-INF/tags/body.tag
@@ -12,6 +12,10 @@
 <res:cssSlot id="head-css" />
 <res:jsSlot id="head-js" />
 <res:useCss value='${res.css.local.body_css}' target="head-css" />
+<res:useCss value='${res.css.local.report_css}' target="head-css" />
+<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
+<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
+<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js" />
 </head>
 <body>
 	<table id="login" width="100%">

--- a/cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag
+++ b/cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag
@@ -10,9 +10,6 @@

 <a:body>

-<res:useCss value='${res.css.local.report_css}' target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
-
 <div class="report">
 	<table class="header">
 		<tr>

--- a/cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag
+++ b/cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag
@@ -10,9 +10,6 @@

 <a:body>

-<res:useCss value='${res.css.local.report_css}' target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
-
 <div class="report">
 	<table class="header">
 		<tr>

--- a/cat-home/src/main/webapp/WEB-INF/tags/noSwitchReport.tag
+++ b/cat-home/src/main/webapp/WEB-INF/tags/noSwitchReport.tag
@@ -10,7 +10,6 @@
 <a:body>

 	<res:useCss value='${res.css.local.report_css}' target="head-css" />
-
 	<div class="report">
 		<table class="header">
 			<tr>

--- a/cat-home/src/main/webapp/css/dtree.css
+++ b/cat-home/src/main/webapp/css/dtree.css
-.dtree {
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 13px;
-	color: #666;
-	white-space: nowrap;
-}
-
-.dtree img {
-	border: 0px;
-	vertical-align: middle;
-}
-
-.dtree a {
-	color: #333;
-	text-decoration: none;
-}
-
-.dtree a.node,.dtree a.nodeSel {
-	white-space: nowrap;
-	padding: 1px 2px 1px 2px;
-}
-
-.dtree a.node:hover,.dtree a.nodeSel:hover {
-	color: #333;
-	text-decoration: underline;
-}
-
-.dtree a.nodeSel {
-	background-color: #c0d2ec;
-}
-
-.dtree .clip {
-	overflow: hidden;
-}
\ No newline at end of file
--- a/cat-home/src/main/webapp/css/heatmap.css
+++ b/cat-home/src/main/webapp/css/heatmap.css
-html {
-	height: 100%
-}
-
-body {
-	height: 100%;
-	margin: 0;
-	padding: 0;
-	font-size: 12px
-}
-
-#map {
-	height: 100%;
-}
-
-#wait_logo {
-	position: absolute;
-	top: 300px;
-	left: 450px;
-	z-index: 10;
-	display: inline;
-}
-
-.wrapper {
-	margin: 10px;
-}
-
-.searchbox {
-	padding: 5px 0;
-}
-
-.hotcities a {
-	margin: 0 5px
-}
-
-#map {
-	width: 99%;
-	height: 700px;
-	margin: 0;
-	padding: 0;
-	border: 1px solid #ccc;
-	margin: 0 auto
-}
\ No newline at end of file
--- a/cat-home/src/main/webapp/css/ip.css
+++ b/cat-home/src/main/webapp/css/ip.css
-.ip-table {
-	width: auto;
-	font-size: small;
-}
-
-.ip-table .odd td {
-	background-color: #eee;
-	font-size: small;
-	text-align: center;
-}
-
-.ip-table .even td {
-	background-color: white;
-	font-size: small;
-	text-align: center;
-}
--- a/cat-home/src/main/webapp/js/dtree.js
+++ b/cat-home/src/main/webapp/js/dtree.js
-function Node(id, pid, name, url, title, target, icon, iconOpen, open) {

	this.id = id;

	this.pid = pid;

	this.name = name;

	this.url = url;

	this.title = title;

	this.target = target;

	this.icon = icon;

	this.iconOpen = iconOpen;

	this._io = open || false;

	this._is = false;

	this._ls = false;

	this._hc = false;

	this._ai = 0;

	this._p;
};
// Tree object

function dTree(objName) {

	this.config = {

		target : null,

		folderLinks : true,

		useSelection : true,

		useCookies : true,

		useLines : true,

		useIcons : true,

		useStatusText : false,

		closeSameLevel : false,

		inOrder : false

	};

	this.icon = {

		root : '/cat/img/base.gif',

		folder : '/cat/img/folder.gif',

		folderOpen : '/cat/img/folderopen.gif',

		node : '/cat/img/page.gif',

		empty : '/cat/img/empty.gif',

		line : '/cat/img/line.gif',

		join : '/cat/img/join.gif',

		joinBottom : '/cat/img/joinbottom.gif',

		plus : '/cat/img/plus.gif',

		plusBottom : '/cat/img/plusbottom.gif',

		minus : '/cat/img/minus.gif',

		minusBottom : '/cat/img/minusbottom.gif',

		nlPlus : '/cat/img/nolines_plus.gif',

		nlMinus : '/cat/img/nolines_minus.gif'

	};

	this.obj = objName;

	this.aNodes = [];

	this.aIndent = [];

	this.root = new Node(-1);

	this.selectedNode = null;

	this.selectedFound = false;

	this.completed = false;

};

// Adds a new node to the node array

dTree.prototype.add = function(id, pid, name, url, title, target, icon,
		iconOpen, open) {

	this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, title,
			target, icon, iconOpen, open);

};

// Open/close all nodes

dTree.prototype.openAll = function() {

	this.oAll(true);

};

dTree.prototype.closeAll = function() {

	this.oAll(false);

};

// Outputs the tree to the page

dTree.prototype.toString = function() {

	var str = '<div class="dtree">\n';

	if (document.getElementById) {

		if (this.config.useCookies)
			this.selectedNode = this.getSelected();

		str += this.addNode(this.root);

	} else
		str += 'Browser not supported.';

	str += '</div>';

	if (!this.selectedFound)
		this.selectedNode = null;

	this.completed = true;

	return str;

};

// Creates the tree structure

dTree.prototype.addNode = function(pNode) {

	var str = '';

	var n = 0;

	if (this.config.inOrder)
		n = pNode._ai;

	for (n; n < this.aNodes.length; n++) {

		if (this.aNodes[n].pid == pNode.id) {

			var cn = this.aNodes[n];

			cn._p = pNode;

			cn._ai = n;

			this.setCS(cn);

			if (!cn.target && this.config.target)
				cn.target = this.config.target;

			if (cn._hc && !cn._io && this.config.useCookies)
				cn._io = this.isOpen(cn.id);

			if (!this.config.folderLinks && cn._hc)
				cn.url = null;

			if (this.config.useSelection && cn.id == this.selectedNode
					&& !this.selectedFound) {

				cn._is = true;

				this.selectedNode = n;

				this.selectedFound = true;

			}

			str += this.node(cn, n);

			if (cn._ls)
				break;

		}

	}

	return str;

};

// Creates the node icon, url and text

dTree.prototype.node = function(node, nodeId) {

	var str = '<div class="dTreeNode">' + this.indent(node, nodeId);

	if (this.config.useIcons) {

		if (!node.icon)
			node.icon = (this.root.id == node.pid) ? this.icon.root
					: ((node._hc) ? this.icon.folder : this.icon.node);

		if (!node.iconOpen)
			node.iconOpen = (node._hc) ? this.icon.folderOpen : this.icon.node;

		if (this.root.id == node.pid) {

			node.icon = this.icon.root;

			node.iconOpen = this.icon.root;

		}

		str += '<img id="i' + this.obj + nodeId + '" src="'
				+ ((node._io) ? node.iconOpen : node.icon) + '" alt="" />';

	}

	if (node.url) {

		str += '<a id="s'
				+ this.obj
				+ nodeId
				+ '" class="'
				+ ((this.config.useSelection) ? ((node._is ? 'nodeSel' : 'node'))
						: 'node') + '" href="' + node.url + '"';

		if (node.title)
			str += ' title="' + node.title + '"';

		if (node.target)
			str += ' target="' + node.target + '"';

		if (this.config.useStatusText)
			str += ' onmouseover="window.status=\''
					+ node.name
					+ '\';return true;" onmouseout="window.status=\'\';return true;" ';

		if (this.config.useSelection
				&& ((node._hc && this.config.folderLinks) || !node._hc))

			str += ' onclick="javascript: ' + this.obj + '.s(' + nodeId + ');"';

		str += '>';

	}

	else if ((!this.config.folderLinks || !node.url) && node._hc
			&& node.pid != this.root.id)

		str += '<a href="javascript: ' + this.obj + '.o(' + nodeId
				+ ');" class="node">';

	str += node.name;

	if (node.url || ((!this.config.folderLinks || !node.url) && node._hc))
		str += '</a>';

	str += '</div>';

	if (node._hc) {

		str += '<div id="d' + this.obj + nodeId
				+ '" class="clip" style="display:'
				+ ((this.root.id == node.pid || node._io) ? 'block' : 'none')
				+ ';">';

		str += this.addNode(node);

		str += '</div>';

	}

	this.aIndent.pop();

	return str;

};

// Adds the empty and line icons

dTree.prototype.indent = function(node, nodeId) {

	var str = '';

	if (this.root.id != node.pid) {

		for ( var n = 0; n < this.aIndent.length; n++)

			str += '<img src="'
					+ ((this.aIndent[n] == 1 && this.config.useLines) ? this.icon.line
							: this.icon.empty) + '" alt="" />';

		(node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);

		if (node._hc) {

			str += '<a href="javascript: ' + this.obj + '.o(' + nodeId
					+ ');"><img id="j' + this.obj + nodeId + '" src="';

			if (!this.config.useLines)
				str += (node._io) ? this.icon.nlMinus : this.icon.nlPlus;

			else
				str += ((node._io) ? ((node._ls && this.config.useLines) ? this.icon.minusBottom
						: this.icon.minus)
						: ((node._ls && this.config.useLines) ? this.icon.plusBottom
								: this.icon.plus));

			str += '" alt="" /></a>';

		} else
			str += '<img src="'
					+ ((this.config.useLines) ? ((node._ls) ? this.icon.joinBottom
							: this.icon.join)
							: this.icon.empty) + '" alt="" />';

	}

	return str;

};

// Checks if a node has any children and if it is the last sibling

dTree.prototype.setCS = function(node) {

	var lastId;

	for ( var n = 0; n < this.aNodes.length; n++) {

		if (this.aNodes[n].pid == node.id)
			node._hc = true;

		if (this.aNodes[n].pid == node.pid)
			lastId = this.aNodes[n].id;

	}

	if (lastId == node.id)
		node._ls = true;

};

// Returns the selected node

dTree.prototype.getSelected = function() {

	var sn = this.getCookie('cs' + this.obj);

	return (sn) ? sn : null;

};

// Highlights the selected node

dTree.prototype.s = function(id) {

	if (!this.config.useSelection)
		return;

	var cn = this.aNodes[id];

	if (cn._hc && !this.config.folderLinks)
		return;

	if (this.selectedNode != id) {

		if (this.selectedNode || this.selectedNode == 0) {

			eOld = document.getElementById("s" + this.obj + this.selectedNode);

			eOld.className = "node";

		}

		eNew = document.getElementById("s" + this.obj + id);

		eNew.className = "nodeSel";

		this.selectedNode = id;

		if (this.config.useCookies)
			this.setCookie('cs' + this.obj, cn.id);

	}

};

// Toggle Open or close

dTree.prototype.o = function(id) {

	var cn = this.aNodes[id];

	this.nodeStatus(!cn._io, id, cn._ls);

	cn._io = !cn._io;

	if (this.config.closeSameLevel)
		this.closeLevel(cn);

	if (this.config.useCookies)
		this.updateCookie();

};

// Open or close all nodes

dTree.prototype.oAll = function(status) {

	for ( var n = 0; n < this.aNodes.length; n++) {

		if (this.aNodes[n]._hc && this.aNodes[n].pid != this.root.id) {

			this.nodeStatus(status, n, this.aNodes[n]._ls);

			this.aNodes[n]._io = status;

		}

	}

	if (this.config.useCookies)
		this.updateCookie();

};

// Opens the tree to a specific node

dTree.prototype.openTo = function(nId, bSelect, bFirst) {

	if (!bFirst) {

		for ( var n = 0; n < this.aNodes.length; n++) {

			if (this.aNodes[n].id == nId) {

				nId = n;

				break;

			}

		}

	}

	var cn = this.aNodes[nId];

	if (cn.pid == this.root.id || !cn._p)
		return;

	cn._io = true;

	cn._is = bSelect;

	if (this.completed && cn._hc)
		this.nodeStatus(true, cn._ai, cn._ls);

	if (this.completed && bSelect)
		this.s(cn._ai);

	else if (bSelect)
		this._sn = cn._ai;

	this.openTo(cn._p._ai, false, true);

};

// Closes all nodes on the same level as certain node

dTree.prototype.closeLevel = function(node) {

	for ( var n = 0; n < this.aNodes.length; n++) {

		if (this.aNodes[n].pid == node.pid && this.aNodes[n].id != node.id
				&& this.aNodes[n]._hc) {

			this.nodeStatus(false, n, this.aNodes[n]._ls);

			this.aNodes[n]._io = false;

			this.closeAllChildren(this.aNodes[n]);

		}

	}

};

// Closes all children of a node

dTree.prototype.closeAllChildren = function(node) {

	for ( var n = 0; n < this.aNodes.length; n++) {

		if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {

			if (this.aNodes[n]._io)
				this.nodeStatus(false, n, this.aNodes[n]._ls);

			this.aNodes[n]._io = false;

			this.closeAllChildren(this.aNodes[n]);

		}

	}

};

// Change the status of a node(open or closed)

dTree.prototype.nodeStatus = function(status, id, bottom) {

	eDiv = document.getElementById('d' + this.obj + id);

	eJoin = document.getElementById('j' + this.obj + id);

	if (this.config.useIcons) {

		eIcon = document.getElementById('i' + this.obj + id);

		eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;

	}

	eJoin.src = (this.config.useLines) ?

	((status) ? ((bottom) ? this.icon.minusBottom : this.icon.minus)
			: ((bottom) ? this.icon.plusBottom : this.icon.plus)) :

	((status) ? this.icon.nlMinus : this.icon.nlPlus);

	eDiv.style.display = (status) ? 'block' : 'none';

};

// [Cookie] Clears a cookie

dTree.prototype.clearCookie = function() {

	var now = new Date();

	var yesterday = new Date(now.getTime() - 1000 * 60 * 60 * 24);

	this.setCookie('co' + this.obj, 'cookieValue', yesterday);

	this.setCookie('cs' + this.obj, 'cookieValue', yesterday);

};

// [Cookie] Sets value in a cookie

dTree.prototype.setCookie = function(cookieName, cookieValue, expires, path,
		domain, secure) {

	document.cookie =

	escape(cookieName) + '=' + escape(cookieValue)

	+ (expires ? '; expires=' + expires.toGMTString() : '')

	+ (path ? '; path=' + path : '')

	+ (domain ? '; domain=' + domain : '')

	+ (secure ? '; secure' : '');

};

// [Cookie] Gets a value from a cookie

dTree.prototype.getCookie = function(cookieName) {

	var cookieValue = '';

	var posName = document.cookie.indexOf(escape(cookieName) + '=');

	if (posName != -1) {

		var posValue = posName + (escape(cookieName) + '=').length;

		var endPos = document.cookie.indexOf(';', posValue);

		if (endPos != -1)
			cookieValue = unescape(document.cookie.substring(posValue, endPos));

		else
			cookieValue = unescape(document.cookie.substring(posValue));

	}

	return (cookieValue);

};

// [Cookie] Returns ids of open nodes as a string

dTree.prototype.updateCookie = function() {

	var str = '';

	for ( var n = 0; n < this.aNodes.length; n++) {

		if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {

			if (str)
				str += '.';

			str += this.aNodes[n].id;
		}
	}
	this.setCookie('co' + this.obj, str);
};

// [Cookie] Checks if a node id is in a cookie
dTree.prototype.isOpen = function(id) {

	var aOpen = this.getCookie('co' + this.obj).split('.');

	for ( var n = 0; n < aOpen.length; n++)

		if (aOpen[n] == id)
			return true;

	return false;

};

// If Push and pop is not implemented by the browser
if (!Array.prototype.push) {

	Array.prototype.push = function array_push() {

		for ( var i = 0; i < arguments.length; i++)

			this[this.length] = arguments[i];

		return this.length;
	};
};

if (!Array.prototype.pop) {

	Array.prototype.pop = function array_pop() {

		lastElement = this[this.length - 1];

		this.length = Math.max(this.length - 1, 0);

		return lastElement;

	};

};
\ No newline at end of file
--- a/cat-home/src/main/webapp/js/jquery-1.3.2.js
+++ b/cat-home/src/main/webapp/js/jquery-1.3.2.js
--- a/cat-home/src/main/webapp/js/paginate.js
+++ b/cat-home/src/main/webapp/js/paginate.js
-$(function() {
-		
-			$("#demo3").paginate({
-				count 		: 10,
-				start 		: 1,
-				display     : 10,
-				border					: true,
-				border_color			: '#BEF8B8',
-				text_color  			: '#68BA64',
-				background_color    	: '#E3F2E1',	
-				border_hover_color		: '#68BA64',
-				text_hover_color  		: 'black',
-				background_hover_color	: '#CAE6C6', 
-				rotate      : false,
-				images		: false,
-				mouse		: 'press',
-				onChange: function(currentPage) {
-				//点击页码时,执行的函数(作ajax异步请求数据)
-					alert(currentPage);
-				//取得分页数据
-				//getPaginateData(pageSize, currentPage);
-			}
-			});
-});
\ No newline at end of file
--- a/cat-home/src/main/webapp/jsp/report/cache.jsp
+++ b/cat-home/src/main/webapp/jsp/report/cache.jsp
@@ -17,7 +17,6 @@
 <jsp:body>

 <res:useCss value="${res.css.local.cache_css}" target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
 </br>
 <table class="machines">
 	<tr style="text-align:left">

--- a/cat-home/src/main/webapp/jsp/report/cacheHistory.jsp
+++ b/cat-home/src/main/webapp/jsp/report/cacheHistory.jsp
@@ -19,7 +19,6 @@ navUrlPrefix="ip=${model.ipAddress}&queryname=${model.queryName}&domain=${model.
 <jsp:body>

 <res:useCss value="${res.css.local.cache_css}" target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
 </br>
 <table class="machines">
 	<tr style="text-align:left">

--- a/cat-home/src/main/webapp/jsp/report/crossHistoryMethod.jsp
+++ b/cat-home/src/main/webapp/jsp/report/crossHistoryMethod.jsp
@@ -14,7 +14,7 @@
 	<jsp:body>

 <res:useCss value="${res.css.local.cross_css}" target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+
 <%@ include file="crossQuery.jsp" %>
 </br>
 <table class="machines">

--- a/cat-home/src/main/webapp/jsp/report/crossMethod.jsp
+++ b/cat-home/src/main/webapp/jsp/report/crossMethod.jsp
@@ -14,7 +14,7 @@
 	<jsp:body>

 <res:useCss value="${res.css.local.cross_css}" target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+
 <%@ include file="crossQuery.jsp" %>
 </br>
 <table class="machines">

--- a/cat-home/src/main/webapp/jsp/report/crossMethodQuery.jsp
+++ b/cat-home/src/main/webapp/jsp/report/crossMethodQuery.jsp
@@ -15,7 +15,7 @@

 <res:useCss value="${res.css.local.cross_css}" target="head-css" />
 <res:useCss value='${res.css.local.table_css}' target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+
 <res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>
 <script type="text/javascript">
 	$(document).ready(function() {

--- a/cat-home/src/main/webapp/jsp/report/database.jsp
+++ b/cat-home/src/main/webapp/jsp/report/database.jsp
@@ -16,9 +16,7 @@
 <a:body>
 	<res:bean id="res" />
 	<res:useCss value='${res.css.local.body_css}' target="head-css" />
-	<res:useCss value='${res.css.local.report_css}' target="head-css" />
 	<res:useCss value="${res.css.local.database_css}" target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />

 	<div class="report">
 		<table class="header">

--- a/cat-home/src/main/webapp/jsp/report/databaseHistory.jsp
+++ b/cat-home/src/main/webapp/jsp/report/databaseHistory.jsp
@@ -13,9 +13,7 @@
 <a:body>
 	<res:bean id="res" />
 	<res:useCss value='${res.css.local.body_css}' target="head-css" />
-	<res:useCss value='${res.css.local.report_css}' target="head-css" />
 	<res:useCss value="${res.css.local.database_css}" target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />

 	<div class="report">
 		<table class="header">

--- a/cat-home/src/main/webapp/jsp/report/dependency.jsp
+++ b/cat-home/src/main/webapp/jsp/report/dependency.jsp
@@ -11,13 +11,10 @@
 	navUrlPrefix="domain=${model.domain}">
 	<jsp:attribute name="subtitle">From ${w:format(model.report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.report.endTime,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
-	<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
-	<res:useCss value='${res.css.local.report_css}' target="head-css" />
+	
+	
 	<res:useCss value='${res.css.local.table_css}' target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
-	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js" />
-	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}"
-			target="head-js" />
+	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js" />
 <div class="report">
 	<div class="row-fluid">
 	<div class="span1 text-center">

--- a/cat-home/src/main/webapp/jsp/report/event.jsp
+++ b/cat-home/src/main/webapp/jsp/report/event.jsp
@@ -22,7 +22,7 @@
 	<jsp:body>

 <res:useCss value="${res.css.local.event_css}" target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
+
 <res:useJs value="${res.js.local['flotr2_js']}" target="head-js" />

 </br>

--- a/cat-home/src/main/webapp/jsp/report/eventHistoryReport.jsp
+++ b/cat-home/src/main/webapp/jsp/report/eventHistoryReport.jsp
@@ -11,7 +11,7 @@
 	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 	<res:useCss value="${res.css.local.event_css}" target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+	
 	<res:useJs value="${res.js.local['flotr2_js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['baseTools_js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['trendGraph_js']}" target="head-js"/>

--- a/cat-home/src/main/webapp/jsp/report/healthHistory.jsp
+++ b/cat-home/src/main/webapp/jsp/report/healthHistory.jsp
@@ -11,7 +11,7 @@
 	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>	
 	<res:useCss value="${res.css.local.health_css}" target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+	
 	<res:useJs value="${res.js.local.flotr2_js}" target="head-js" />
 	<res:useJs value="${res.js.local.trendGraph_js}" target="head-js" />
 <br>

--- a/cat-home/src/main/webapp/jsp/report/heartbeat.jsp
+++ b/cat-home/src/main/webapp/jsp/report/heartbeat.jsp
@@ -18,7 +18,7 @@
 	<jsp:body>

 <res:useCss value="${res.css.local.heartbeat_css}" target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
+

 </br>
 <table class="machines">

--- a/cat-home/src/main/webapp/jsp/report/heartbeatHistoryGraph.jsp
+++ b/cat-home/src/main/webapp/jsp/report/heartbeatHistoryGraph.jsp
@@ -11,7 +11,7 @@
 	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 	<res:useCss value="${res.css.local.transaction_css}" target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+	
 	<res:useJs value="${res.js.local['flotr2_js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['baseTools_js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['trendGraph_js']}" target="head-js"/>

--- a/cat-home/src/main/webapp/jsp/report/historyState.jsp
+++ b/cat-home/src/main/webapp/jsp/report/historyState.jsp
@@ -12,7 +12,6 @@
 	<jsp:attribute name="subtitle">From ${w:format(model.report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.report.endTime,'yyyy-MM-dd HH:mm:ss')}  &nbsp;&nbsp;&nbsp;&nbsp;CAT项目指标</jsp:attribute>
 	<jsp:body>	
 	<res:useCss value="${res.css.local.matrix_css}" target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['flotr2_js']}" target="head-js"/>
 <br>


--- a/cat-home/src/main/webapp/jsp/report/home.jsp
+++ b/cat-home/src/main/webapp/jsp/report/home.jsp
@@ -16,7 +16,7 @@ ${model.content}
 Welcome to <b>Central Application Tracking (CAT)</b>.
 <br>
 <br>
-<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
+
 <res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
 <table class='table table-striped table-bordered table-condensed'>
 	<tr><td>CAT系统文档</td><td>CAT系统链接</td></tr>

--- a/cat-home/src/main/webapp/jsp/report/logview.jsp
+++ b/cat-home/src/main/webapp/jsp/report/logview.jsp
@@ -11,7 +11,7 @@

 <res:useCss value="${res.css.local.logview_css}" target="head-css"/>

-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+
 <res:useJs value="${res.js.local.logview_js}" target="head-js"/>

 <c:choose>

--- a/cat-home/src/main/webapp/jsp/report/logview_detail.jsp
+++ b/cat-home/src/main/webapp/jsp/report/logview_detail.jsp
@@ -11,7 +11,7 @@

 <res:useCss value="${res.css.local.logview_css}" target="head-css"/>

-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+
 <res:useJs value="${res.js.local.logview_js}" target="head-js"/>

 <br>

--- a/cat-home/src/main/webapp/jsp/report/metric.jsp
+++ b/cat-home/src/main/webapp/jsp/report/metric.jsp
@@ -8,11 +8,8 @@
 <jsp:useBean id="model" type="com.dianping.cat.report.page.metric.Model" scope="request"/>

 <a:body>
-<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
-<res:useCss value='${res.css.local.report_css}' target="head-css" />
+
 <res:useCss value='${res.css.local.table_css}' target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
-<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
 <res:useJs value="${res.js.local['flotr2_js']}" target="head-js"/>
 <res:useJs value="${res.js.local['metric.js']}" target="head-js"/>


--- a/cat-home/src/main/webapp/jsp/report/problemHistoryReport.jsp
+++ b/cat-home/src/main/webapp/jsp/report/problemHistoryReport.jsp
@@ -12,7 +12,7 @@
 	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 	<res:useCss value="${res.css.local.problem_css}" target="head-css"/>
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
+	
 	<res:useJs value="${res.js.local['baseTools_js']}" target="head-js"/>
 	<res:useJs value="${res.js.local.flotr2_js}" target="head-js" />
 	<res:useJs value="${res.js.local.trendGraph_js}" target="head-js" />

--- a/cat-home/src/main/webapp/jsp/report/problemStatics.jsp
+++ b/cat-home/src/main/webapp/jsp/report/problemStatics.jsp
@@ -18,7 +18,6 @@
 	<jsp:body>

 <res:useCss value="${res.css.local.problem_css}" target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
 <res:useJs value="${res.js.local['baseTools_js']}" target="head-js"/>
 <res:useJs value="${res.js.local.flotr2_js}" target="head-js" />
 <res:useJs value="${res.js.local.trendGraph_js}" target="head-js" />

--- a/cat-home/src/main/webapp/jsp/report/query.jsp
+++ b/cat-home/src/main/webapp/jsp/report/query.jsp
@@ -10,7 +10,7 @@
 <script src="http://code.jquery.com/jquery-1.8.3.js"></script>
 <script src="http://code.jquery.com/ui/1.10.0/jquery-ui.js"></script>
 <a:body>
-<res:useCss value='${res.css.local.report_css}' target="head-css" />
+
 <res:useCss value='${res.css.local.table_css}' target="head-css" />
 <res:useJs value="${res.js.local['query.js']}" target="head-js"/>
 <res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>

--- a/cat-home/src/main/webapp/jsp/report/sql.jsp
+++ b/cat-home/src/main/webapp/jsp/report/sql.jsp
@@ -19,7 +19,7 @@
 	<jsp:body>

 	<res:useCss value="${res.css.local.sql_css}" target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
+	

 </br>
 <table class="databases">

--- a/cat-home/src/main/webapp/jsp/report/sqlHistory.jsp
+++ b/cat-home/src/main/webapp/jsp/report/sqlHistory.jsp
@@ -18,7 +18,7 @@
 	<jsp:body>

 	<res:useCss value="${res.css.local.sql_css}" target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
+	

 </br>
 <table class="databases">

--- a/cat-home/src/main/webapp/jsp/report/state.jsp
+++ b/cat-home/src/main/webapp/jsp/report/state.jsp
@@ -15,7 +15,7 @@
 	<jsp:attribute name="subtitle">From ${w:format(model.report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.report.endTime,'yyyy-MM-dd HH:mm:ss')}  &nbsp;&nbsp;&nbsp;&nbsp;CAT项目指标</jsp:attribute>
 	<jsp:body>	
 	<res:useCss value="${res.css.local.matrix_css}" target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
+	
 	<res:useJs value="${res.js.local['flotr2_js']}" target="head-js" />
 	<res:useJs value="${res.js.local['trendStateGraph_js']}" target="head-js" />
 <br>

--- a/cat-home/src/main/webapp/jsp/report/stateHistory.jsp
+++ b/cat-home/src/main/webapp/jsp/report/stateHistory.jsp
@@ -12,7 +12,7 @@
 	<jsp:attribute name="subtitle">From ${w:format(model.report.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.report.endTime,'yyyy-MM-dd HH:mm:ss')}  &nbsp;&nbsp;&nbsp;&nbsp;CAT项目指标</jsp:attribute>
 	<jsp:body>	
 	<res:useCss value="${res.css.local.matrix_css}" target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+	
 	<res:useJs value="${res.js.local['flotr2_js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['trendStateGraph_js']}" target="head-js" />
 <br>

--- a/cat-home/src/main/webapp/jsp/report/top.jsp
+++ b/cat-home/src/main/webapp/jsp/report/top.jsp
@@ -17,10 +17,10 @@
 	
 </style>
 <a:body>
-<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
-<res:useCss value='${res.css.local.report_css}' target="head-css" />
+
+
 <res:useCss value='${res.css.local.table_css}' target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js" />
+
 <res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>

 <div class="report">

--- a/cat-home/src/main/webapp/jsp/report/transaction.jsp
+++ b/cat-home/src/main/webapp/jsp/report/transaction.jsp
@@ -18,7 +18,6 @@
 <jsp:body>

 <res:useCss value="${res.css.local.transaction_css}" target="head-css"/>
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
 <res:useJs value="${res.js.local['flotr2_js']}" target="head-js"/>
 </br>
 <table class="machines">

--- a/cat-home/src/main/webapp/jsp/report/transactionHistoryReport.jsp
+++ b/cat-home/src/main/webapp/jsp/report/transactionHistoryReport.jsp
@@ -11,7 +11,6 @@
 	<jsp:attribute name="subtitle">From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyDisplayEndDate,'yyyy-MM-dd HH:mm:ss')}</jsp:attribute>
 	<jsp:body>
 	<res:useCss value="${res.css.local.transaction_css}" target="head-css" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['flotr2_js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['baseTools_js']}" target="head-js"/>
 	<res:useJs value="${res.js.local['trendGraph_js']}" target="head-js"/>

--- a/cat-home/src/main/webapp/jsp/report/trend.jsp
+++ b/cat-home/src/main/webapp/jsp/report/trend.jsp
@@ -10,7 +10,7 @@
 <a:simpleReport	title="History Data Trend">

 <jsp:body>
-	<res:useCss value='${res.css.local.report_css}' target="head-css" />
+	
 	<res:useCss value='${res.css.local.trend_css}' target="head-css" />
 	<res:useCss value='${res.css.local.jqueryUI_css}' target="head-css" />
 	<res:useCss value='${res.css.local.calendar_css}' target="head-css" />

--- a/cat-home/src/main/webapp/jsp/system/alarmExceptionRules.jsp
+++ b/cat-home/src/main/webapp/jsp/system/alarmExceptionRules.jsp
@@ -9,9 +9,9 @@
 <jsp:useBean id="model" type="com.dianping.cat.system.page.alarm.Model"scope="request" />

 <a:body>
-	<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
+	
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+	
 	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
 	<res:useCss value='${res.css.local.table_css}' target="head-css" />
 	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>

--- a/cat-home/src/main/webapp/jsp/system/alarmRecordDetail.jsp
+++ b/cat-home/src/main/webapp/jsp/system/alarmRecordDetail.jsp
@@ -20,9 +20,9 @@

 <a:body>

-	<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
+	
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+	
 	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
 	<res:useCss value='${res.css.local.table_css}' target="head-css" />
 	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>

--- a/cat-home/src/main/webapp/jsp/system/alarmRecordList.jsp
+++ b/cat-home/src/main/webapp/jsp/system/alarmRecordList.jsp
@@ -10,9 +10,9 @@

 <a:body>

-	<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
+	
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+	
 	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
 	<res:useCss value='${res.css.local.table_css}' target="head-css" />
 	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>

--- a/cat-home/src/main/webapp/jsp/system/alarmRuleAdd.jsp
+++ b/cat-home/src/main/webapp/jsp/system/alarmRuleAdd.jsp
@@ -9,8 +9,8 @@
 <jsp:useBean id="model" type="com.dianping.cat.system.page.alarm.Model" scope="request" />

 <a:body>
-<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+
+
 <res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>

 	<script type="text/javascript">

--- a/cat-home/src/main/webapp/jsp/system/alarmRuleUpdate.jsp
+++ b/cat-home/src/main/webapp/jsp/system/alarmRuleUpdate.jsp
@@ -9,8 +9,8 @@
 <jsp:useBean id="model" type="com.dianping.cat.system.page.alarm.Model" scope="request" />

 <a:body>
-<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
-<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+
+
 <res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>

 	<script type="text/javascript">

--- a/cat-home/src/main/webapp/jsp/system/alarmServiceRules.jsp
+++ b/cat-home/src/main/webapp/jsp/system/alarmServiceRules.jsp
@@ -10,9 +10,9 @@

 <a:body>

-	<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
+	
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+	
 	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
 	<res:useCss value='${res.css.local.table_css}' target="head-css" />
 	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>

--- a/cat-home/src/main/webapp/jsp/system/alarmTemplateList.jsp
+++ b/cat-home/src/main/webapp/jsp/system/alarmTemplateList.jsp
@@ -11,9 +11,9 @@

 <a:body>

-	<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
+	
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+	
 	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
 	<res:useCss value='${res.css.local.table_css}' target="head-css" />
 	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>

--- a/cat-home/src/main/webapp/jsp/system/project.jsp
+++ b/cat-home/src/main/webapp/jsp/system/project.jsp
@@ -10,9 +10,9 @@

 <a:body>

-	<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
+	
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+	
 	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
 	<res:useCss value='${res.css.local.table_css}' target="head-css" />
 	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>

--- a/cat-home/src/main/webapp/jsp/system/scheduledReports.jsp
+++ b/cat-home/src/main/webapp/jsp/system/scheduledReports.jsp
@@ -10,9 +10,9 @@

 <a:body>

-	<res:useCss value="${res.css.local['bootstrap.css']}" target="head-css" />
+	
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
-	<res:useJs value="${res.js.local['jquery-1.7.1.js']}" target="head-js"/>
+	
 	<res:useJs value="${res.js.local['bootstrap.min.js']}" target="head-js"/>
 	<res:useCss value='${res.css.local.table_css}' target="head-css" />
 	<res:useJs value="${res.js.local['jquery.dataTables.min.js']}" target="head-js"/>