You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/01/25 20:33:26 UTC

svn commit: r1561374 - in /juddi/trunk/juddi-gui/src/main: java/org/apache/juddi/webconsole/hub/ webapp/ webapp/js/

Author: alexoree
Date: Sat Jan 25 19:33:25 2014
New Revision: 1561374

URL: http://svn.apache.org/r1561374
Log:
JUDDI-811 done
JUDDI-818 done

Modified:
    juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
    juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp
    juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp
    juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js
    juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js
    juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js
    juddi/trunk/juddi-gui/src/main/webapp/js/tmodelChooser.js
    juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp
    juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp

Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1561374&r1=1561373&r2=1561374&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Sat Jan 25 19:33:25 2014
@@ -612,7 +612,7 @@ public class UddiHub implements Serializ
                         fb.setAuthInfo(GetToken());
                         org.uddi.api_v3.FindQualifiers fq = new org.uddi.api_v3.FindQualifiers();
                         fq.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
-
+                        fq.getFindQualifier().add(UDDIConstants.SORT_BY_NAME_ASC);
                         fb.setFindQualifiers(fq);
                         Name searchname = new Name();
                         searchname.setLang(lang);
@@ -1186,6 +1186,7 @@ public class UddiHub implements Serializ
                         fs.getName().add(n);
                         fs.setFindQualifiers(new org.uddi.api_v3.FindQualifiers());
                         fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+                        fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.SORT_BY_NAME_ASC);
                         ServiceList findService = null;//inquiry.findService(fs);
                         try {
                                 findService = inquiry.findService(fs);
@@ -1348,6 +1349,7 @@ public class UddiHub implements Serializ
                         fm.getName().setValue(keyword);
                         fm.setFindQualifiers(new org.uddi.api_v3.FindQualifiers());
                         fm.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+                        fm.getFindQualifiers().getFindQualifier().add(UDDIConstants.SORT_BY_NAME_ASC);
                         TModelList findTModel = null;
                         try {
                                 findTModel = inquiry.findTModel(fm);
@@ -2936,6 +2938,7 @@ public class UddiHub implements Serializ
                         fs.getName().add(n);
                         fs.setFindQualifiers(new org.uddi.api_v3.FindQualifiers());
                         fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+                        fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.SORT_BY_NAME_ASC);
                         ServiceList findService = null;//inquiry.findService(fs);
                         try {
                                 findService = inquiry.findService(fs);

Modified: juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp?rev=1561374&r1=1561373&r2=1561374&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp Sat Jan 25 19:33:25 2014
@@ -7,53 +7,59 @@ this page is meant to be included via js
 
 <%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<div class="modal hide fade container " id="bindingChooser">
-    <div class="modal-header">
-        <a href="javascript:$('#bindingChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
-        <h3><%=ResourceLoader.GetResource(session, "items.binding.chooser")%> </h3>
-    </div>
-    <div class="modal-body">
-
-        <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBinding"></span><br>
-        <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBinding"></span><br>
-        <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBinding">0</span><br>
-        <%//ResourceLoader.GetResource(session, "items.lang")%> <span id="langBinding" class=""></span><br>
-
-        <a href="javascript:pagedownChooserBinding();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBinding"></i></a>
-        <a href="javascript:reloadBinding();"><i class="icon-refresh icon-2x"></i></a>
-        <a href="javascript:pageupChooserBinding();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBinding"></i></a>
-
-        <div id="bindinglist">
-            <img src="img/bigrollergreen.gif" title="Loading"/>
-        </div>
-        <script src="js/bindingChooser.js"></script>
-        <script type="text/javascript">
-                    
-            $('.edit').editable(function(value, settings) { 
-                console.log(this);
-                console.log(value);
-                console.log(settings);
-                reloadBindingModal();
-                //  RenderTmodelListBySearch('%', offset, maxrecords);
-                return(value);
-            }, { 
-                type    : 'text',
-                submit  : i18n_ok
-            });
-            //only init the data when required reloadTmodelModal();
-        </script>
-
-    </div>
-    <div class="modal-footer">
-        <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
-        <a href="javascript:$('#bindingChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.select")%></a>
-    </div>
+<div class="modal hide fade container " id="bindingChooser" tabindex="103">
+   <div class="modal-header">
+      <a href="javascript:$('#bindingChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
+      <h3><%=ResourceLoader.GetResource(session, "items.binding.chooser")%> </h3>
+   </div>
+   <div class="modal-body">
+
+      <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBinding"></span><br>
+      <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBinding"></span><br>
+      <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBinding">0</span><br>
+      <%//ResourceLoader.GetResource(session, "items.lang")%> <span id="langBinding" class=""></span><br>
+
+      <a href="javascript:pagedownChooserBinding();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBinding"></i></a>
+      <a href="javascript:reloadBinding();"><i class="icon-refresh icon-2x"></i></a>
+      <a href="javascript:pageupChooserBinding();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBinding"></i></a>
+
+      <div id="bindinglist">
+         <img src="img/bigrollergreen.gif" title="Loading"/>
+      </div>
+      <script src="js/bindingChooser.js"></script>
+      <script type="text/javascript">
+         $("#bindingChooser").keydown(function(e) {
+            if (e.which == 37) { // left
+               pagedownChooserService();
+            }
+            else if (e.which == 39) { // right
+               pageupChooserService();
+            }
+         });
+         $('.edit').editable(function(value, settings) {
+            console.log(this);
+            console.log(value);
+            console.log(settings);
+            reloadBindingModal();
+            //  RenderTmodelListBySearch('%', offset, maxrecords);
+            return(value);
+         }, {
+            type: 'text',
+            submit: i18n_ok
+         });
+         //only init the data when required reloadTmodelModal();
+      </script>
+
+   </div>
+   <div class="modal-footer">
+      <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
+      <a href="javascript:$('#bindingChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.select")%></a>
+   </div>
 </div>
 <%
 //<a href="javascript:tModelCancel();" class="close" class="btn btn-danger">Cancel</a>
 //<a href="javascript:tModelModal();" class="btn" >Pick a tModel</a>
 
-
 //<a href="javascript:$('#bindingChooser').modal();" class="btn btn-primary" data-dismiss="modal">< %=ResourceLoader.GetResource(session, "actions.select")% ></a>
 %>
 

Modified: juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp?rev=1561374&r1=1561373&r2=1561374&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp Sat Jan 25 19:33:25 2014
@@ -7,45 +7,54 @@ this page is meant to be included via js
 
 <%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<div class="modal hide fade container " id="businessChooser">
-    <div class="modal-header">
-        <a href="javascript:$('#businessChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
-        <h3><%=ResourceLoader.GetResource(session, "items.business.chooser")%> </h3>
-    </div>
-    <div class="modal-body">
-
-        <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBusiness"></span><br>
-        <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBusiness"></span><br>
-        <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBusiness">0</span><br>
-        <%//ResourceLoader.GetResource(session, "items.lang")%> <span id="langBusiness" class=""></span><br>
-
-        <a href="javascript:pagedownChooserBusiness();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBusiness"></i></a>
-        <a href="javascript:reloadBusiness();"><i class="icon-refresh icon-2x"></i></a>
-        <a href="javascript:pageupChooserBusiness();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBusiness"></i></a>
-
-        <div id="businesslist">
-            <img src="img/bigrollergreen.gif" title="Loading"/>
-        </div>
-        <script src="js/businessChooser.js"></script>
-        <script type="text/javascript">
-                    
-            $('.edit').editable(function(value, settings) { 
-                console.log(this);
-                console.log(value);
-                console.log(settings);
-                reloadBusinessModal();
-                //  RenderTmodelListBySearch('%', offset, maxrecords);
-                return(value);
-            }, { 
-                type    : 'text',
-                submit  : i18n_ok
-            });
-            //only init the data when required reloadTmodelModal();
-        </script>
-
-    </div>
-    <div class="modal-footer">
-        <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
-        <a href="javascript:$('#businessChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.select")%></a>
-    </div>
+<div class="modal hide fade container " id="businessChooser" tabindex="100">
+   <div class="modal-header">
+      <a href="javascript:$('#businessChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
+      <h3><%=ResourceLoader.GetResource(session, "items.business.chooser")%> </h3>
+   </div>
+   <div class="modal-body">
+
+      <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBusiness"></span><br>
+      <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBusiness"></span><br>
+      <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBusiness">0</span><br>
+      <%//ResourceLoader.GetResource(session, "items.lang")%> <span id="langBusiness" class=""></span><br>
+
+      <a href="javascript:pagedownChooserBusiness();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBusiness"></i></a>
+      <a href="javascript:reloadBusiness();"><i class="icon-refresh icon-2x"></i></a>
+      <a href="javascript:pageupChooserBusiness();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBusiness"></i></a>
+
+      <div id="businesslist">
+         <img src="img/bigrollergreen.gif" title="Loading"/>
+      </div>
+      <script src="js/businessChooser.js"></script>
+      <script type="text/javascript">
+         $("#businessChooser").keydown(function(e) {
+
+            if (e.which == 37) { // left
+               pagedownChooserBusiness();
+            }
+            else if (e.which == 39) { // right
+               pageupChooserBusiness();
+            }
+
+         });
+         $('.edit').editable(function(value, settings) {
+            console.log(this);
+            console.log(value);
+            console.log(settings);
+            reloadBusinessModal();
+            //  RenderTmodelListBySearch('%', offset, maxrecords);
+            return(value);
+         }, {
+            type: 'text',
+            submit: i18n_ok
+         });
+         //only init the data when required reloadTmodelModal();
+      </script>
+
+   </div>
+   <div class="modal-footer">
+      <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
+      <a href="javascript:$('#businessChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.select")%></a>
+   </div>
 </div>

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js?rev=1561374&r1=1561373&r2=1561374&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/bindingChooser.js Sat Jan 25 19:33:25 2014
@@ -101,6 +101,7 @@ function refreshBinding()
  *first selected tModel
  */
 function bindingModal(div, type){
+   $(div).focus();
     //reset the form in case it was lanucheed more than once per page view
     reloadBindingModal();
     

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js?rev=1561374&r1=1561373&r2=1561374&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/businessChooser.js Sat Jan 25 19:33:25 2014
@@ -110,6 +110,7 @@ function refreshBusiness()
  *first selected tModel
  */
 function businessModal(div){
+   $(div).focus();
     //reset the form in case it was lanucheed more than once per page view
     reloadBusinessModal();
     

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js?rev=1561374&r1=1561373&r2=1561374&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/serviceChooser.js Sat Jan 25 19:33:25 2014
@@ -7,8 +7,8 @@
 
 function reloadServiceModal()
 {
-    var name=$("#nameService").text();
-    RenderServiceListBySearchModal(name, offsetService, maxrecordsService, true);
+   // var name=$("#nameService").text();
+    RenderServiceListBySearchModal('%', offsetService, maxrecordsService, true);
                       
 }
 
@@ -57,8 +57,9 @@ function RenderServiceListBySearchModal(
         keyword1 = "%25";
     var lang = $("#langService").text();
     $("#servicelist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
+    var fq = "approximateMatch";
     var request=   $.ajax({
-        url: 'ajax/servicesearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
+        url: 'ajax/servicesearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser + "&findqualifier=" + fq,
         type:"GET",
         cache: false
     });
@@ -110,6 +111,7 @@ function refreshService()
  *first selected tModel
  */
 function serviceModal(div){
+   $(div).focus();
     //reset the form in case it was lanucheed more than once per page view
     reloadServiceModal();
     

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/tmodelChooser.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/tmodelChooser.js?rev=1561374&r1=1561373&r2=1561374&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/tmodelChooser.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/tmodelChooser.js Sat Jan 25 19:33:25 2014
@@ -17,6 +17,7 @@ function reloadTmodelModal()
  *first selected tModel
  */
 function tModelModal(div){
+    $(div).focus();
     //reset the form in case it was lanucheed more than once per page view
     reloadTmodelModal();
     

Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp?rev=1561374&r1=1561373&r2=1561374&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp Sat Jan 25 19:33:25 2014
@@ -7,54 +7,60 @@
 
 <%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<div class="modal hide fade container " id="serviceChooser">
-    <div class="modal-header">
-        <a href="javascript:$('#serviceChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
-        <h3><%=ResourceLoader.GetResource(session, "items.service.chooser")%> </h3>
-    </div>
-    <div class="modal-body">
-
-        <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsService"></span><br>
-        <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsService"></span><br>
-        <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetService">0</span><br>
-        <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="langService" class="edit"></span><br>
-        <%=ResourceLoader.GetResource(session, "items.name")%>: <span id="nameService" class="edit">%</span><br>
-
-        <a href="javascript:pagedownChooserService();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupService"></i></a>
-        <a href="javascript:reloadService();"><i class="icon-refresh icon-2x"></i></a>
-        <a href="javascript:pageupChooserService();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownService"></i></a>
-
-        <div id="servicelist">
-            <img src="img/bigrollergreen.gif" title="Loading"/>
-        </div>
-        <script src="js/serviceChooser.js"></script>
-        <script type="text/javascript">
-                    
-            $('.edit').editable(function(value, settings) { 
-                console.log(this);
-                console.log(value);
-                console.log(settings);
-                reloadServiceModal();
-                //  RenderTmodelListBySearch('%', offset, maxrecords);
-                return(value);
-            }, { 
-                type    : 'text',
-                submit  : i18n_ok
-            });
-            //only init the data when required reloadTmodelModal();
-        </script>
-
-    </div>
-    <div class="modal-footer">
-        <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
-        <a href="javascript:$('#serviceChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.select")%></a>
-    </div>
+<div class="modal hide fade container " id="serviceChooser" tabindex="102">
+   <div class="modal-header">
+      <a href="javascript:$('#serviceChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
+      <h3><%=ResourceLoader.GetResource(session, "items.service.chooser")%> </h3>
+   </div>
+   <div class="modal-body">
+
+      <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsService"></span><br>
+      <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsService"></span><br>
+      <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetService">0</span><br>
+      <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="langService" class="edit"></span><br>
+      <% //=ResourceLoader.GetResource(session, "items.name"): <span id="nameService" class="edit">%</span><br>%>
+
+      <a href="javascript:pagedownChooserService();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupService"></i></a>
+      <a href="javascript:reloadService();"><i class="icon-refresh icon-2x"></i></a>
+      <a href="javascript:pageupChooserService();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownService"></i></a>
+
+      <div id="servicelist">
+         <img src="img/bigrollergreen.gif" title="Loading"/>
+      </div>
+      <script src="js/serviceChooser.js"></script>
+      <script type="text/javascript">
+         $("#serviceChooser").keydown(function(e) {
+            if (e.which == 37) { // left
+               pagedownChooserService();
+            }
+            else if (e.which == 39) { // right
+               pageupChooserService();
+            }
+         });
+         $('.edit').editable(function(value, settings) {
+            console.log(this);
+            console.log(value);
+            console.log(settings);
+            reloadServiceModal();
+            //  RenderTmodelListBySearch('%', offset, maxrecords);
+            return(value);
+         }, {
+            type: 'text',
+            submit: i18n_ok
+         });
+         //only init the data when required reloadTmodelModal();
+      </script>
+
+   </div>
+   <div class="modal-footer">
+      <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
+      <a href="javascript:$('#serviceChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.select")%></a>
+   </div>
 </div>
 <%
 //<a href="javascript:tModelCancel();" class="close" class="btn btn-danger">Cancel</a>
 //<a href="javascript:tModelModal();" class="btn" >Pick a tModel</a>
 
-
 //<a href="javascript:$('#bindingChooser').modal();" class="btn btn-primary" data-dismiss="modal">< %=ResourceLoader.GetResource(session, "actions.select")% ></a>
 %>
 

Modified: juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp?rev=1561374&r1=1561373&r2=1561374&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp Sat Jan 25 19:33:25 2014
@@ -7,48 +7,59 @@ this page is meant to be included via js
 
 <%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<div class="modal hide fade container" id="tmodelChooser">
-    <div class="modal-header">
-        <a href="javascript:$('#tmodelChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
-        <h3><%=ResourceLoader.GetResource(session, "items.tmodel.chooser")%></h3>
-    </div>
-    <div class="modal-body">
-
-        <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecords"></span><br>
-        <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
-        <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
-        <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
-
-        <a href="javascript:pagedownChooserTmodel();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageup"></i></a>
-        <a href="javascript:reload();"><i class="icon-refresh icon-large"></i></a>
-        <a href="javascript:pageupChooserTmodel();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedown"></i></a>
-
-        <div id="tmodellist">
-            <img src="img/bigrollergreen.gif" title="Loading"/>
-        </div>
-        <script src="js/tmodelsearch.js"></script>
-        <script src="js/tmodelChooser.js"></script>
-        <script type="text/javascript">
-                    
-            $('.edit').editable(function(value, settings) { 
-                console.log(this);
-                console.log(value);
-                console.log(settings);
-                reloadTmodelModal();
-                //  RenderTmodelListBySearch('%', offset, maxrecords);
-                return(value);
-            }, { 
-                type    : 'text',
-                submit  : i18n_ok
-            });
-           //only init the data when required reloadTmodelModal();
-        </script>
-
-    </div>
-    <div class="modal-footer">
-        <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
-        <a href="javascript:$('#tmodelChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.select")%></a>
-    </div>
+<div class="modal hide fade container" id="tmodelChooser" tabindex="101">
+   <div class="modal-header">
+      <a href="javascript:$('#tmodelChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
+      <h3><%=ResourceLoader.GetResource(session, "items.tmodel.chooser")%></h3>
+   </div>
+   <div class="modal-body">
+
+      <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecords"></span><br>
+      <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
+      <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
+      <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
+
+      <a href="javascript:pagedownChooserTmodel();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageup"></i></a>
+      <a href="javascript:reload();"><i class="icon-refresh icon-2x"></i></a>
+      <a href="javascript:pageupChooserTmodel();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedown"></i></a>
+
+      <div id="tmodellist">
+         <img src="img/bigrollergreen.gif" title="Loading"/>
+      </div>
+      <script src="js/tmodelsearch.js"></script>
+      <script src="js/tmodelChooser.js"></script>
+      <script type="text/javascript">
+
+         $("#tmodelChooser").keydown(function(e) {
+            //if ($("#tmodelChooser").dialog("isOpen") === true)
+            {
+               if (e.which == 37) { // left
+                  pagedownChooserTmodel();
+               }
+               else if (e.which == 39) { // right
+                  pageupChooserTmodel();
+               }
+            }
+         });
+         $('.edit').editable(function(value, settings) {
+            console.log(this);
+            console.log(value);
+            console.log(settings);
+            reloadTmodelModal();
+            //  RenderTmodelListBySearch('%', offset, maxrecords);
+            return(value);
+         }, {
+            type: 'text',
+            submit: i18n_ok
+         });
+         //only init the data when required reloadTmodelModal();
+      </script>
+
+   </div>
+   <div class="modal-footer">
+      <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
+      <a href="javascript:$('#tmodelChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.select")%></a>
+   </div>
 </div>
 <%
 //<a href="javascript:tModelCancel();" class="close" class="btn btn-danger">Cancel</a>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org