[Carbon-commits] [Carbon] svn commit r111710 - in trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources: org/wso2/carbon/governance/list/ui/i18n web/list

[fazlan at wso2.com]

Author: fazlan
Date: Tue Aug 16 22:56:51 2011
New Revision: 111710
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=111710

Log:
Fixing CARBON-9678


Added:
   trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/web/list/service_name_filter_ajaxprocessor.jsp
Modified:
   trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/org/wso2/carbon/governance/list/ui/i18n/Resources.properties
   trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/web/list/service.jsp

Modified: trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/org/wso2/carbon/governance/list/ui/i18n/Resources.properties
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/org/wso2/carbon/governance/list/ui/i18n/Resources.properties?rev=111710&r1=111709&r2=111710&view=diff
==============================================================================
--- trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/org/wso2/carbon/governance/list/ui/i18n/Resources.properties	(original)
+++ trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/org/wso2/carbon/governance/list/ui/i18n/Resources.properties	Tue Aug 16 22:56:51 2011
@@ -32,7 +32,7 @@
 filter.list=Filter
 unable.to.list=Unable to list services
 session.timed.out=Session timed out. Please login again
-filter.service.message=Filter the service list
+filter.service.message=Advanced Filter
 not.sufficient.permissions=You do not have sufficient permissions to browse dependencies.
 clear=Clear
 select.path=Select Path
\ No newline at end of file

Modified: trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/web/list/service.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/web/list/service.jsp?rev=111710&r1=111709&r2=111710&view=diff
==============================================================================
--- trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/web/list/service.jsp	(original)
+++ trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/web/list/service.jsp	Tue Aug 16 22:56:51 2011
@@ -73,15 +73,57 @@
         return;
     }
 %>
+
+<script type="text/javascript">
+    function submitFilterByNameForm() {
+
+        sessionAwareFunction(function() {
+            var advancedSearchForm = $('filterByNameForm');
+            advancedSearchForm.submit();
+        }, org_wso2_carbon_governance_list_ui_jsi18n["session.timed.out"]);
+    }
+</script>
+
 <fmt:bundle basename="org.wso2.carbon.governance.list.ui.i18n.Resources">
 <br/>
 <div id="middle">
 <h2><fmt:message key="service.list"/></h2>
 <div id="workArea">
  <%if(bean.getSize() != 0){%>
- <p style="padding:5px">
- <a href="../list/service_filter.jsp"><fmt:message key="filter.service.message"/></a>
- </p>
+    <p style="padding:5px">
+    <form id="filterByNameForm" action="service_name_filter_ajaxprocessor.jsp"
+          onsubmit="return submitFilterByNameForm();" method="post">
+
+        <table id="#_innerTable" style="width:100%">
+            <tr id="buttonRow">
+                <td style="line-height:25px;padding-right:10px;width:100px;">Service Name:</td>
+                <td nowrap="nowrap" style="width:200px">
+                    <input id="id_Service_Name" onkeypress="if (event.keyCode == 13) {submitFilterByNameForm(); }"
+                           type="text" name="Service_Name" style="width:200px;margin-bottom:10px;">
+                </td>
+                <td>
+                    <input class="button" type="button"
+                           onclick="submitFilterByNameForm()"
+                           value="<fmt:message key="filter.list"/>"
+                           style="margin-right:10px; float:left"
+                            />
+                    <a href="../list/service_filter.jsp" class="icon-link"
+                       style="background-image:url(../search/images/search-top.png);"><fmt:message
+                            key="filter.service.message"/></a>
+                </td>
+            </tr>
+            <tr id="waitMessage" style="display:none">
+                <td>
+                    <div style="font-size:13px !important;margin-top:10px;margin-bottom:10px;margin-left:5px !important"
+                         id="serviceLoader" class="ajax-loading-message">
+                    </div>
+                </td>
+            </tr>
+
+        </table>
+    </form>
+    </p>
+    <br>
  <%}%> 
 <form id="profilesEditForm">
 <table class="styledLeft" id="customTable">

Added: trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/web/list/service_name_filter_ajaxprocessor.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/web/list/service_name_filter_ajaxprocessor.jsp?pathrev=111710
==============================================================================
--- (empty file)
+++ trunk/carbon/components/governance/org.wso2.carbon.governance.list.ui/src/main/resources/web/list/service_name_filter_ajaxprocessor.jsp	Tue Aug 16 22:56:51 2011
@@ -0,0 +1,22 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you under the Apache License,
+ ~ Version 2.0 (the "License"); you may not use this file except
+ ~ in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~    http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied.  See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<%
+
+    session.setAttribute("criteria", "<serviceMetaData xmlns=\"http://www.wso2.org/governance/metadata\"><overview><name>" + request.getParameter("Service_Name")+"</name></overview><serviceLifecycle /><contacts /><interface /><security /><endpoints /><docLinks /><operation xmlns=\"\">Add</operation><currentName xmlns=\"\"></currentName><currentNamespace xmlns=\"\"></currentNamespace></serviceMetaData>");
+    response.sendRedirect("../list/service.jsp?filter=filter&region=region3&item=governance_list_services_menu");
+%>
\ No newline at end of file