[Carbon-commits] [Carbon] svn commit r68279 - branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data
ajithn at wso2.com
ajithn at wso2.com
Mon Jun 21 00:35:49 PDT 2010
Author: ajithn
Date: Mon Jun 21 00:35:49 2010
New Revision: 68279
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=68279
Log:
fixed BAM-128
Modified:
branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/get_mediation_data_ajaxprocessor.jsp
branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/mediation_data.jsp
branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/service_data.jsp
Modified: branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/get_mediation_data_ajaxprocessor.jsp
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/get_mediation_data_ajaxprocessor.jsp?rev=68279&r1=68278&r2=68279&view=diff
==============================================================================
--- branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/get_mediation_data_ajaxprocessor.jsp (original)
+++ branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/get_mediation_data_ajaxprocessor.jsp Mon Jun 21 00:35:49 2010
@@ -40,6 +40,10 @@
prefix="carbon" %>
<fmt:bundle basename="org.wso2.carbon.bam.mgt.ui.i18n.Resources">
+<div id="noDataError" style="display:none;"><fmt:message key="no.mediation.data"/></div>
+<script type="text/javascript">
+ var hasDataAnyWhere = false;
+</script>
<ul class="root-list">
<%
String serverURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
@@ -218,6 +222,9 @@
<div class="mediators levelSub<%=j%>"><fmt:message
key="endpoints"/></div>
<div class="branch-node"></div>
+ <script type="text/javascript">
+ var hasDataAnyWhere = true;
+ </script>
<%
j++;
for (Endpoint endpoint : endpointsList) {
@@ -310,6 +317,9 @@
<li class="vertical-line">
<div class="minus-icon" onclick="treeColapse(this)"></div>
<div class="mediators levelSub<%=j%>">Proxy Services</div>
+ <script type="text/javascript">
+ var hasDataAnyWhere = true;
+ </script>
<div class="branch-node"></div>
<%
j++;
@@ -402,6 +412,9 @@
<div class="minus-icon" onclick="treeColapse(this)"></div>
<div class="mediators levelSub<%=j%>">Sequences</div>
<div class="branch-node"></div>
+ <script type="text/javascript">
+ var hasDataAnyWhere = true;
+ </script>
<%
j++;
for (Sequence sequence : sequenceList) {
@@ -506,9 +519,16 @@
if (!hasData) {
%>
-<fmt:message key="no.mediation.data"/>
+
<script type="text/javascript">
- document.getElementById("report_ui").style.display = "none";
+ if(hasDataAnyWhere){
+ document.getElementById("report_ui").style.display = "";
+ document.getElementById("noDataError").style.display = "none";
+ } else{
+ document.getElementById("report_ui").style.display = "none";
+ document.getElementById("noDataError").style.display = "";
+ }
+
</script>
<%
}
Modified: branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/mediation_data.jsp
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/mediation_data.jsp?rev=68279&r1=68278&r2=68279&view=diff
==============================================================================
--- branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/mediation_data.jsp (original)
+++ branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/mediation_data.jsp Mon Jun 21 00:35:49 2010
@@ -141,36 +141,16 @@
<fmt:message key="mediation.data.summary"/>
</h2>
<div id="workArea">
-<table style="width: 100%" class="styledLeft" id="report_ui">
-<thead>
-<tr>
- <th>
- </th>
-</tr>
-<!-- report ui -->
-<%
- if(request.getSession().getAttribute("reportMediationData")!=null){
-%>
+<div id="report_ui">
<carbon:report component="org.wso2.carbon.bam.mgt"
template="mediation_data"
pdfReport="true"
htmlReport="true"
excelReport="true"
reportDataSession="reportMediationData"/>
-<%
- }
-%>
-
-</thead>
-<tbody>
-<tr>
-<td style="padding-top: 100px;">
- <div id="treeData"></div>
-</td>
-</tr>
-</tbody>
-</table>
+ </div>
+<div id="treeData"></div>
</div>
</div>
<div id="serverDataLegend" class="legendBox">
Modified: branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/service_data.jsp
URL: http://wso2.org/svn/browse/wso2/branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/service_data.jsp?rev=68279&r1=68278&r2=68279&view=diff
==============================================================================
--- branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/service_data.jsp (original)
+++ branches/carbon/3.0.0/components/bam/org.wso2.carbon.bam.mgt.ui/3.0.0/src/main/resources/web/bam-server-data/service_data.jsp Mon Jun 21 00:35:49 2010
@@ -128,38 +128,17 @@
<fmt:message key="service.data.summary"/>
</h2>
<div id="workArea">
-<table style="width: 100%" class="styledLeft" id="report_ui">
-<thead>
-<tr>
- <th>
- </th>
-</tr>
-<tr>
- <%
- if(request.getSession().getAttribute("reportServerData")!=null){
-%>
+<div id="report_ui">
<carbon:report component="org.wso2.carbon.bam.mgt"
template="server_data"
pdfReport="true"
htmlReport="true"
excelReport="true"
reportDataSession="reportServerData"/>
-<%
- }
-%>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td style="padding-top: 100px;">
+</div>
<div id="treeData">
</div>
-</td>
-</tr>
-</tbody>
-</table>
-
</div>
</div>
<div id="serverDataLegend" class="legendBox">
More information about the Carbon-commits
mailing list