Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/webapp/WEB-INF/tags/sys/message.tag

@@ -2,9 +2,16 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <%@ attribute name="content" type="java.lang.String" required="true" description="消息内容"%>
 <%@ attribute name="type" type="java.lang.String" description="消息类型：info、success、warning、error、loading"%>
+<style type="text/css">
+.alert-error {
+  background-color: #f2dede;
+  border-color: #eed3d7;
+  color: #b94a48;
+}
+</style>
 <script type="text/javascript">top.$.jBox.closeTip();</script>
 <c:if test="${not empty content}">
-	<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${fn:indexOf(content,'失败') eq -1?'success':'error'}"/></c:if>
+	<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${fn:indexOf(content,'失败') eq -1 && fn:indexOf(content,'failed') eq -1?'success':'error'}"/></c:if>
 	<div id="messageBox" class="alert alert-${ctype}"><button data-dismiss="alert" class="close">×</button><spring:message code="${content}"/></div> 
 	<script type="text/javascript">if(!top.$.jBox.tip.mess) {top.$.jBox.tip.mess=1;top.$.jBox.tip("<spring:message code='${content}'/>","${ctype}",{persistent:true,opacity:0});$("#messageBox").show();}</script>
 </c:if>