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 2020/07/19 20:19:27 UTC
[juddi] branch master updated: JUDDI-1009 reworks a number of
functions in the ui related to paging operations, limits, offsets,
etc. i think everything is working now. Adds some new functionality and some
alt text warnings when using uddiv2 connections (offsets are not in the
data model)
This is an automated email from the ASF dual-hosted git repository.
alexoree pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juddi.git
The following commit(s) were added to refs/heads/master by this push:
new ab72847 JUDDI-1009 reworks a number of functions in the ui related to paging operations, limits, offsets, etc. i think everything is working now. Adds some new functionality and some alt text warnings when using uddiv2 connections (offsets are not in the data model)
ab72847 is described below
commit ab728473c9197a48c15934bedafde537d502512d
Author: Alex O'Ree <al...@apache.org>
AuthorDate: Sun Jul 19 16:19:29 2020 -0400
JUDDI-1009 reworks a number of functions in the ui related to paging operations, limits, offsets, etc. i think everything is working now. Adds some new functionality and some alt text warnings when using uddiv2 connections (offsets are not in the data model)
---
.../org/apache/juddi/webconsole/hub/UddiHub.java | 14 ++-
.../juddi/webconsole/resources/web.properties | 2 +
.../juddi/webconsole/resources/web_es.properties | 2 +
juddi-gui/src/main/webapp/about.jsp | 4 +-
juddi-gui/src/main/webapp/advanced.jsp | 4 +-
juddi-gui/src/main/webapp/ajax/businesssearch.jsp | 8 +-
juddi-gui/src/main/webapp/ajax/servicesearch.jsp | 2 +-
juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp | 6 +-
juddi-gui/src/main/webapp/assertions.jsp | 4 +-
juddi-gui/src/main/webapp/bindingEditor.jsp | 4 +-
juddi-gui/src/main/webapp/businessBrowse.jsp | 9 +-
juddi-gui/src/main/webapp/businessEditor2.jsp | 4 +-
juddi-gui/src/main/webapp/editSubscription.jsp | 4 +-
juddi-gui/src/main/webapp/home.jsp | 4 +-
juddi-gui/src/main/webapp/importFromWadl.jsp | 4 +-
juddi-gui/src/main/webapp/importFromWsdl.jsp | 4 +-
juddi-gui/src/main/webapp/js/businesssearch.js | 13 ++-
juddi-gui/src/main/webapp/js/serviceBrowse.js | 14 ++-
juddi-gui/src/main/webapp/js/serviceEditor.js | 4 +
juddi-gui/src/main/webapp/js/tmodelsearch.js | 99 ++++++++++---------
juddi-gui/src/main/webapp/reginfo.jsp | 4 +-
juddi-gui/src/main/webapp/search.jsp | 4 +-
juddi-gui/src/main/webapp/serviceBrowse.jsp | 94 +++++++++---------
juddi-gui/src/main/webapp/serviceEditor.jsp | 4 +-
juddi-gui/src/main/webapp/settings.jsp | 4 +-
juddi-gui/src/main/webapp/signer.jsp | 4 +-
juddi-gui/src/main/webapp/subscriptionFeed.jsp | 4 +-
juddi-gui/src/main/webapp/tmodelBrowse.jsp | 109 +++++++++++----------
juddi-gui/src/main/webapp/tmodelChooser.jsp | 4 +-
juddi-gui/src/main/webapp/tmodelEditor.jsp | 4 +-
juddi-gui/src/main/webapp/tmodelPartitions.jsp | 4 +-
juddi-gui/src/main/webapp/transfer.jsp | 4 +-
juddi-gui/src/main/webapp/viewSubscriptions.jsp | 4 +-
33 files changed, 250 insertions(+), 206 deletions(-)
diff --git a/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java b/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
index d7ec2ec..19ace92 100644
--- a/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
+++ b/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
@@ -1037,11 +1037,13 @@ public class UddiHub implements Serializable {
throw ex;
}
}
- return ResourceLoader.GetResource(session, "actions.saved") + " "
- + "<a href=\"serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")
- + "\">" + StringEscapeUtils.escapeHtml(saveService.getBusinessService().get(0).getServiceKey()) + "</a>";
+ return ResourceLoader.GetResource(session, "actions.saved") + " "
+ + " <script type=\"text/javascript\">window.location.href='"
+ + StringEscapeUtils.escapeJavaScript("serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")) + "';</script>"
+ + "<a href=\"serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")
+ + "\">" + StringEscapeUtils.escapeHtml(saveService.getBusinessService().get(0).getServiceKey()) + "</a>";
} catch (Exception ex) {
- return HandleException(ex);
+ return HandleException(ex);
}
}
@@ -2241,7 +2243,9 @@ public class UddiHub implements Serializable {
}
}
//return ResourceLoader.GetResource(session, "actions.saved");
- return ResourceLoader.GetResource(session, "actions.saved") + " "
+ return ResourceLoader.GetResource(session, "actions.saved") +
+ " <script type=\"text/javascript\">window.location.href='"+
+ StringEscapeUtils.escapeJavaScript("tmodelEditor.jsp?id=" + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(), "UTF8")) + "';</script>"
+ "<a href=\"tmodelEditor.jsp?id=" + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(), "UTF8")
+ "\">" + StringEscapeUtils.escapeHtml(saveTModel.getTModel().get(0).getTModelKey()) + "</a>";
} catch (Exception ex) {
diff --git a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
index c834934..c1aae9c 100644
--- a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
+++ b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
@@ -451,3 +451,5 @@ items.categorizations=Categorizations
items.categorizations.uddi=UDDI Categorizations
actions.return=Return
items.settings.edit=Edit
+totals.offset.v2disclaimer=Offset does not work with UDDIv2 based endpoints.
+totals.fetch=Fetch
\ No newline at end of file
diff --git a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
index d316427..fb567ed 100644
--- a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
+++ b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
@@ -453,3 +453,5 @@ items.categorizations=Categorizaciones
items.categorizations.uddi=UDDI Categorizaciones
actions.return=Volver
items.settings.edit=Editar
+totals.offset.v2disclaimer=La compensaci\u00f3n no funciona con puntos finales basados \u200b\u200ben UDDIv2.
+totals.fetch=Recuperar Tama\u00f1o
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/about.jsp b/juddi-gui/src/main/webapp/about.jsp
index 641dcf2..5b68337 100644
--- a/juddi-gui/src/main/webapp/about.jsp
+++ b/juddi-gui/src/main/webapp/about.jsp
@@ -30,12 +30,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.help.about")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<%=ResourceLoader.GetResource(session, "pages.about.content")%>
diff --git a/juddi-gui/src/main/webapp/advanced.jsp b/juddi-gui/src/main/webapp/advanced.jsp
index 3deed79..385e841 100644
--- a/juddi-gui/src/main/webapp/advanced.jsp
+++ b/juddi-gui/src/main/webapp/advanced.jsp
@@ -35,12 +35,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.advanced")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<%= ResourceLoader.GetResource(session, "pages.advanced.content")%>
diff --git a/juddi-gui/src/main/webapp/ajax/businesssearch.jsp b/juddi-gui/src/main/webapp/ajax/businesssearch.jsp
index c64903a..2cfd511 100644
--- a/juddi-gui/src/main/webapp/ajax/businesssearch.jsp
+++ b/juddi-gui/src/main/webapp/ajax/businesssearch.jsp
@@ -29,7 +29,7 @@
UddiHub x = UddiHub.getInstance(application, request.getSession());
int offset = 0;
- int maxrecords = 20;
+ int maxrecords = 1000;
String lang = request.getParameter("lang");
if (lang == null || lang.length() == 0) {
lang = null;
@@ -54,8 +54,8 @@
}
try {
maxrecords = Integer.parseInt(request.getParameter("maxrecords"));
- if (maxrecords <= 0 || maxrecords > 50) {
- maxrecords = 50;
+ if (maxrecords <= 0 || maxrecords > 1000) {
+ maxrecords = 1000;
}
} catch (Exception ex) {
}
@@ -74,7 +74,7 @@
<script type="text/javascript">
totalrecordsBusiness=<%=ret.totalrecords%>;
$("#totalrecordsBusiness").text(totalrecordsBusiness);
- $("#offsetBusiness").text(<%=offset%>);
+ $("#offsetBusiness").val(<%=offset%>);
$("#displayrecordsBusiness").text (<%=ret.displaycount%>);
refresh();
</script>
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/ajax/servicesearch.jsp b/juddi-gui/src/main/webapp/ajax/servicesearch.jsp
index 2c69381..1d5a5b5 100644
--- a/juddi-gui/src/main/webapp/ajax/servicesearch.jsp
+++ b/juddi-gui/src/main/webapp/ajax/servicesearch.jsp
@@ -73,7 +73,7 @@
<script type="text/javascript">
totalrecordsService=<%=ret.totalrecords%>;
$("#totalrecordsService").text(totalrecordsService);
- $("#offsetService").text(<%=offset%>);
+ $("#offsetService").val(<%=offset%>);
$("#displayrecordsService").text (<%=ret.displaycount%>);
refresh();
</script>
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp b/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp
index 70886da..ed27237 100644
--- a/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp
+++ b/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp
@@ -28,7 +28,7 @@
<!DOCTYPE html>
<%
UddiHub x = UddiHub.getInstance(application, request.getSession());
- int maxrecords = 50;
+ int maxrecords = 1000;
int offset = 0;
String lang = request.getParameter("lang");
if (lang == null || lang.length() == 0) {
@@ -53,8 +53,8 @@
if (offset < 0) {
offset = 0;
}
- if (maxrecords > 50) {
- maxrecords = 50;
+ if (maxrecords > 1000) {
+ maxrecords = 1000;
}
boolean isChooser = false;
try {
diff --git a/juddi-gui/src/main/webapp/assertions.jsp b/juddi-gui/src/main/webapp/assertions.jsp
index ce1b43c..dc71484 100644
--- a/juddi-gui/src/main/webapp/assertions.jsp
+++ b/juddi-gui/src/main/webapp/assertions.jsp
@@ -24,12 +24,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.publisherassertions")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
diff --git a/juddi-gui/src/main/webapp/bindingEditor.jsp b/juddi-gui/src/main/webapp/bindingEditor.jsp
index 9a1a1f1..6811887 100644
--- a/juddi-gui/src/main/webapp/bindingEditor.jsp
+++ b/juddi-gui/src/main/webapp/bindingEditor.jsp
@@ -73,12 +73,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
<script type="text/javascript" src="js/bindingeditor.js"></script>
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "pages.bindingeditor.title")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
diff --git a/juddi-gui/src/main/webapp/businessBrowse.jsp b/juddi-gui/src/main/webapp/businessBrowse.jsp
index c59957b..40d67b8 100644
--- a/juddi-gui/src/main/webapp/businessBrowse.jsp
+++ b/juddi-gui/src/main/webapp/businessBrowse.jsp
@@ -24,12 +24,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.businesses")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
<table class="table-bordered table-striped">
@@ -38,13 +38,16 @@
<table>
<tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsBusiness"></span></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsBusiness"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offsetBusiness">0</span></td></tr>
+ <tr><td title="<%=ResourceLoader.GetResource(session, "totals.offset.v2disclaimer")%>">
+ <%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><input id="offsetBusiness" value="0"></td></tr>
</table>
</td>
<td>
<table>
<tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_business" value="%" tabindex="1"></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_business" tabindex="2"></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.fetch")%></td><td><input type="number" id="fetch" value="40"></td></tr>
+
</table>
</td>
</tr>
diff --git a/juddi-gui/src/main/webapp/businessEditor2.jsp b/juddi-gui/src/main/webapp/businessEditor2.jsp
index 7dddaee..e6693c0 100644
--- a/juddi-gui/src/main/webapp/businessEditor2.jsp
+++ b/juddi-gui/src/main/webapp/businessEditor2.jsp
@@ -32,12 +32,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "pages.businesseditor.title")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
<script type="text/javascript" src="js/businessEditor.js"></script>
diff --git a/juddi-gui/src/main/webapp/editSubscription.jsp b/juddi-gui/src/main/webapp/editSubscription.jsp
index cf85d4f..9741888 100644
--- a/juddi-gui/src/main/webapp/editSubscription.jsp
+++ b/juddi-gui/src/main/webapp/editSubscription.jsp
@@ -40,7 +40,7 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.subscriptions")%></h1>
</div>
@@ -85,7 +85,7 @@
%>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<%=ResourceLoader.GetResource(session, "pages.subscription.content")%>
diff --git a/juddi-gui/src/main/webapp/home.jsp b/juddi-gui/src/main/webapp/home.jsp
index 33bc934..f40b863 100644
--- a/juddi-gui/src/main/webapp/home.jsp
+++ b/juddi-gui/src/main/webapp/home.jsp
@@ -25,14 +25,14 @@
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="hero-unit">
<h1>jUDDI</h1>
<p><%=ResourceLoader.GetResource(session, "index.juddi")%></p>
<p><a href="http://juddi.apache.org" class="btn btn-primary btn-large"><%=ResourceLoader.GetResource(session, "learnmore")%> »</a></p>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span4">
<h2><%=ResourceLoader.GetResource(session, "index.browse.title")%></h2>
diff --git a/juddi-gui/src/main/webapp/importFromWadl.jsp b/juddi-gui/src/main/webapp/importFromWadl.jsp
index 52d6546..e39c6dd 100644
--- a/juddi-gui/src/main/webapp/importFromWadl.jsp
+++ b/juddi-gui/src/main/webapp/importFromWadl.jsp
@@ -29,13 +29,13 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.create.serviceimport.wadl")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
<%=ResourceLoader.GetResource(session, "pages.serviceimport.content.wadl")%>
diff --git a/juddi-gui/src/main/webapp/importFromWsdl.jsp b/juddi-gui/src/main/webapp/importFromWsdl.jsp
index 8bbe8b9..ff6419b 100644
--- a/juddi-gui/src/main/webapp/importFromWsdl.jsp
+++ b/juddi-gui/src/main/webapp/importFromWsdl.jsp
@@ -29,13 +29,13 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.create.serviceimport")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
<%=ResourceLoader.GetResource(session, "pages.serviceimport.content")%>
diff --git a/juddi-gui/src/main/webapp/js/businesssearch.js b/juddi-gui/src/main/webapp/js/businesssearch.js
index 51e20a6..859b5bb 100644
--- a/juddi-gui/src/main/webapp/js/businesssearch.js
+++ b/juddi-gui/src/main/webapp/js/businesssearch.js
@@ -24,11 +24,11 @@ RenderBusinessListBySearch('%', offsetBusiness, maxrecordsBusiness);
function pagedownBusiness()
{
- offset = $("#offsetBusiness").text();
+ offset = $("#offsetBusiness").val();
//alert(offset);
var newoffset = offsetBusiness - maxrecordsBusiness;
if (newoffset < 0)
- return;
+ newoffset=0;
//alert(newoffset);
if (newoffset != offsetBusiness)
{
@@ -42,7 +42,7 @@ function refreshBusinessList()
}
function pageupBusiness()
{
- offsetBusiness = $("#offsetBusiness").text();
+ offsetBusiness = $("#offsetBusiness").val();
//alert(offset);
var fetch = maxrecordsBusiness;
if ((parseInt(offsetBusiness) + parseInt(maxrecordsBusiness)) > totalrecordsBusiness)
@@ -58,6 +58,13 @@ function pageupBusiness()
//offset, maxrecords, keyword
function RenderBusinessListBySearch(keyword1, offset1, maxrecords1)
{
+ var maxrecords1 = $("#fetch").val();
+ try{
+ maxrecords1 = parseInt(maxrecords1);
+ }catch (e){
+ maxrecords1=40;
+ }
+ maxrecordsBusiness=maxrecords1;
var keyword =$("#name_business").val();
var lang = $("#lang_business").text();
if (lang==undefined)
diff --git a/juddi-gui/src/main/webapp/js/serviceBrowse.js b/juddi-gui/src/main/webapp/js/serviceBrowse.js
index 7d532e0..ec61ade 100644
--- a/juddi-gui/src/main/webapp/js/serviceBrowse.js
+++ b/juddi-gui/src/main/webapp/js/serviceBrowse.js
@@ -27,18 +27,18 @@ RenderServiceListBySearch('%', offsetService, maxrecordsService);
//offset += maxrecords;
function pagedownService()
{
- offsetService = $("#offsetService").text();
+ offsetService = $("#offsetService").val();
//alert(offset);
var newoffset = offsetService - maxrecordsService;
if (newoffset < 0)
- return;
+ newoffset=0;
//alert(newoffset);
if (newoffset != offsetService)
RenderServiceListBySearch('%', newoffset, maxrecordsService);
}
function pageupService()
{
- offsetService = $("#offsetService").text();
+ offsetService = $("#offsetService").val();
//alert(offset);
var fetch = maxrecordsService;
if ((parseInt(offsetService) + parseInt(maxrecordsService)) > totalrecordsService)
@@ -53,6 +53,12 @@ function pageupService()
function RenderServiceListBySearch(keyword, offset, maxrecords)
{
+ var maxr = 10;
+ try {
+ maxr = parseInt($("#fetch").val());
+ } catch (e) {
+ }
+ maxrecordsService=maxr;
var keyword2 = $("#name_service_search").val();
var lang = $("#lang_service_search").val();
@@ -62,7 +68,7 @@ function RenderServiceListBySearch(keyword, offset, maxrecords)
keyword2="";
lang = encodeURIComponent(lang);
offset = encodeURIComponent(offset);
- maxrecords = encodeURIComponent(maxrecords);
+ maxrecords = encodeURIComponent(maxrecordsService);
keyword2 = encodeURIComponent(keyword2);
$("#serviceBrowserListing").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
var request= $.ajax({
diff --git a/juddi-gui/src/main/webapp/js/serviceEditor.js b/juddi-gui/src/main/webapp/js/serviceEditor.js
index 8b61b88..0446a39 100644
--- a/juddi-gui/src/main/webapp/js/serviceEditor.js
+++ b/juddi-gui/src/main/webapp/js/serviceEditor.js
@@ -190,6 +190,10 @@ function saveService()
$("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
$("#alert").modal();
+
+
+
+
});
request.fail(function(jqXHR, textStatus) {
diff --git a/juddi-gui/src/main/webapp/js/tmodelsearch.js b/juddi-gui/src/main/webapp/js/tmodelsearch.js
index cd37327..d4d3f29 100644
--- a/juddi-gui/src/main/webapp/js/tmodelsearch.js
+++ b/juddi-gui/src/main/webapp/js/tmodelsearch.js
@@ -13,34 +13,36 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-var offset=0; //start at the begining
-var maxrecords=10; //record 20 at a time
-var lang="en"; //langauge english
-var totalrecords=0;
+var offset = 0; //start at the begining
+var maxrecords = 10; //record 20 at a time
+var lang = "en"; //langauge english
+var totalrecords = 0;
RenderTmodelListBySearch('%', offset, maxrecords);
function pagedownChooserTmodel()
{
- offset = $("#offset").text();
+ offset = $("#offset").val();
+ maxrecords = $("#fetch").val();
//alert(offset);
var newoffset = offset - maxrecords;
if (newoffset < 0)
- return;
+ newoffset=0;
//alert(newoffset);
if (newoffset != offset)
RenderTmodelListBySearch('%', newoffset, maxrecords, true);
}
function pageupChooserTmodel()
{
- offset = $("#offset").text();
+ offset = $("#offset").val();
+ maxrecords = $("#fetch").val();
//alert(offset);
var fetch = maxrecords;
- if ((parseInt(offset) + parseInt(maxrecords)) > totalrecords)
+ if ((parseInt(offset) + parseInt(maxrecords)) > totalrecords)
//fetch = maxrecords - offset;
return;
- else
- fetch = (parseInt(offset) + parseInt(maxrecords));
+ else
+ fetch = (parseInt(offset) + parseInt(maxrecords));
//alert(fetch);
offset = fetch;
RenderTmodelListBySearch('%', fetch, maxrecords, true);
@@ -49,72 +51,74 @@ function pageupChooserTmodel()
function pagedown()
{
- offset = $("#offset").text();
+ offset = $("#offset").val();
+ maxrecords = $("#fetch").val();
//alert(offset);
var newoffset = offset - maxrecords;
if (newoffset < 0)
- return;
+ newoffset=0;
//alert(newoffset);
if (newoffset != offset)
RenderTmodelListBySearch('%', newoffset, maxrecords, false);
}
function pageup()
{
- offset = $("#offset").text();
+ offset = $("#offset").val();
+ maxrecords = $("#fetch").val();
//alert(offset);
var fetch = maxrecords;
- if ((parseInt(offset) + parseInt(maxrecords)) > totalrecords)
+ if ((parseInt(offset) + parseInt(maxrecords)) > totalrecords)
//fetch = maxrecords - offset;
return;
- else
- fetch = (parseInt(offset) + parseInt(maxrecords));
+ else
+ fetch = (parseInt(offset) + parseInt(maxrecords));
//alert(fetch);
offset = fetch;
RenderTmodelListBySearch('%', fetch, maxrecords, false);
}
-var selectedItem=null;
+var selectedItem = null;
//offset, maxrecords, keyword
function RenderTmodelListBySearch(keyword1, offset1, maxrecords1, isForChooser)
{
+ var maxr = 10;
+ try {
+ maxr = parseInt($("#fetch").val());
+ } catch (e) {
+ }
+ maxrecords = maxr;
- var keyword =$("#name_tmodel").val();
+ var keyword = $("#name_tmodel").val();
var lang = $("#lang_tmodel").val();
- if (lang==undefined)
- lang = "";
- if (keyword==undefined)
- keyword = "";
+ if (lang == undefined)
+ lang = "";
+ if (keyword == undefined)
+ keyword = "";
lang = encodeURIComponent(lang);
keyword = encodeURIComponent(keyword);
offset1 = encodeURIComponent(offset1);
- maxrecords1 = encodeURIComponent(maxrecords1);
+ maxrecords1 = encodeURIComponent(maxrecords);
isForChooser = encodeURIComponent(isForChooser);
$("#tmodellist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
- var request= $.ajax({
+ var request = $.ajax({
url: 'ajax/tmodelsearch.jsp?keyword=' + keyword + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
- type:"GET",
+ type: "GET",
cache: false
});
-
- request.done(function(msg) {
- window.console && console.log('postback done ');
+
+ request.done(function (msg) {
+ window.console && console.log('postback done ');
$("#tmodellist").html(msg);
- $('.modalable').click(function(){
- selectedItem =$(this).attr("id");
+ $('.modalable').click(function () {
+ selectedItem = $(this).attr("id");
});
- //refresh();
+ $("#offset").val(offset1);
});
- request.fail(function(jqXHR, textStatus) {
- window.console && console.log('postback failed ');
+ request.fail(function (jqXHR, textStatus) {
+ window.console && console.log('postback failed ');
$("#tmodellist").html("An error occured! " + jqXHR.responseText + textStatus);
- //refresh();
});
-/*
- $.get('ajax/businesssearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang, function(data) {
- $("#businesslist").html(data);
- refresh();
- });*/
}
function refresh()
@@ -124,18 +128,15 @@ function refresh()
{
$("#pageup").addClass("disabled");
$("#pagedown").addClass("disabled");
- }
- else if (offset + maxrecords > totalrecords)
+ } else if (offset + maxrecords > totalrecords)
{
- $("#pageup").addClass("disabled");
- }
- else if (offset ==0)
+ $("#pageup").addClass("disabled");
+ } else if (offset == 0)
{
- $("#pagedown").removeClass("disabled");
- }
- else
+ $("#pagedown").removeClass("disabled");
+ } else
{
- $("#pagedown").removeClass("disabled");
- $("#pageup").removeClass("disabled");
+ $("#pagedown").removeClass("disabled");
+ $("#pageup").removeClass("disabled");
}
}
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/reginfo.jsp b/juddi-gui/src/main/webapp/reginfo.jsp
index cece1c9..a9060c6 100644
--- a/juddi-gui/src/main/webapp/reginfo.jsp
+++ b/juddi-gui/src/main/webapp/reginfo.jsp
@@ -30,12 +30,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.create.mybiz")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<%=ResourceLoader.GetResource(session, "navbar.create.mybiz.content")%>
diff --git a/juddi-gui/src/main/webapp/search.jsp b/juddi-gui/src/main/webapp/search.jsp
index fe7175f..d6ef417 100644
--- a/juddi-gui/src/main/webapp/search.jsp
+++ b/juddi-gui/src/main/webapp/search.jsp
@@ -26,12 +26,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%= ResourceLoader.GetResource(session, "navbar.search")%> </h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
diff --git a/juddi-gui/src/main/webapp/serviceBrowse.jsp b/juddi-gui/src/main/webapp/serviceBrowse.jsp
index 7da8bb6..922c53e 100644
--- a/juddi-gui/src/main/webapp/serviceBrowse.jsp
+++ b/juddi-gui/src/main/webapp/serviceBrowse.jsp
@@ -25,53 +25,57 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
- <div class="well" >
- <h1><%=ResourceLoader.GetResource(session, "navbar.services")%></h1>
- </div>
- <!-- Example row of columns -->
- <div class="row">
- <div class="span12" >
- <div id="businesslist">
- <table class="table-striped table-bordered">
- <tr><td>
- <table>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsService"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsService"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offsetService">0</span></td></tr>
- </table>
- </td>
- <td>
- <table>
- <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_service_search" value="%"></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_service_search" value=""></td></tr>
- </table>
- </td>
- </tr>
- </table>
+ <div class="well" >
+ <h1><%=ResourceLoader.GetResource(session, "navbar.services")%></h1>
+ </div>
- <a href="javascript:pagedownService();"><i class="icon-circle-arrow-left icon-2x" id="pageupService"></i></a>
- <a href="javascript:refreshServiceList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
- <a href="javascript:pageupService();"><i class="icon-circle-arrow-right icon-2x" id="pagedownService"></i></a>
- <div id="serviceBrowserListings">
- <img src="img/bigrollergreen.gif" title="Loading"/>
- </div>
- <script src="js/serviceBrowse.js"></script>
- <script type="text/javascript">
+ <div class="row">
+ <div class="span12" >
+ <div id="businesslist">
+ <table class="table-striped table-bordered">
+ <tr><td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsService"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsService"></span></td></tr>
+ <tr><td title="<%=ResourceLoader.GetResource(session, "totals.offset.v2disclaimer")%>">
+ <%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><input type="number" id="offsetService" value="0"></td></tr>
+ </table>
+ </td>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_service_search" value="%"></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_service_search" value=""></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.fetch")%></td><td><input type="number" id="fetch" value="40"></td></tr>
+
+ </table>
+ </td>
+ </tr>
+ </table>
+
+ <a href="javascript:pagedownService();"><i class="icon-circle-arrow-left icon-2x" id="pageupService"></i></a>
+ <a href="javascript:refreshServiceList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
+ <a href="javascript:pageupService();"><i class="icon-circle-arrow-right icon-2x" id="pagedownService"></i></a>
- $('.edit').editable(function(value, settings) {
- window.console && console.log(value + this + settings);
- RenderServiceListBySearch('%', offset, maxrecords);
- return(value);
- }, {
- type: 'text',
- submit: i18n_ok
- });
- </script>
- </div>
+ <div id="serviceBrowserListings">
+ <img src="img/bigrollergreen.gif" title="Loading"/>
+ </div>
+ <script src="js/serviceBrowse.js"></script>
+ <script type="text/javascript">
+
+ $('.edit').editable(function (value, settings) {
+ window.console && console.log(value + this + settings);
+ RenderServiceListBySearch('%', offset, maxrecords);
+
+ return(value);
+ }, {
+ type: 'text',
+ submit: i18n_ok
+ });
+ </script>
+ </div>
- </div>
- </div>
- <%@include file="header-bottom.jsp" %>
\ No newline at end of file
+ </div>
+ </div>
+ <%@include file="header-bottom.jsp" %>
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/serviceEditor.jsp b/juddi-gui/src/main/webapp/serviceEditor.jsp
index 9c1c37f..353cbc4 100644
--- a/juddi-gui/src/main/webapp/serviceEditor.jsp
+++ b/juddi-gui/src/main/webapp/serviceEditor.jsp
@@ -74,12 +74,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "pages.serviceeditor.title")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
diff --git a/juddi-gui/src/main/webapp/settings.jsp b/juddi-gui/src/main/webapp/settings.jsp
index 111abfb..114bcdc 100644
--- a/juddi-gui/src/main/webapp/settings.jsp
+++ b/juddi-gui/src/main/webapp/settings.jsp
@@ -29,12 +29,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.settings")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<h2><%=ResourceLoader.GetResource(session, "navbar.settings")%></h2>
diff --git a/juddi-gui/src/main/webapp/signer.jsp b/juddi-gui/src/main/webapp/signer.jsp
index 84acf46..8d72968 100644
--- a/juddi-gui/src/main/webapp/signer.jsp
+++ b/juddi-gui/src/main/webapp/signer.jsp
@@ -23,14 +23,14 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1>
<%=ResourceLoader.GetResource(session, "items.dsigs")%>
</h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<%=ResourceLoader.GetResource(session, "items.dsigs.description")%><br>
diff --git a/juddi-gui/src/main/webapp/subscriptionFeed.jsp b/juddi-gui/src/main/webapp/subscriptionFeed.jsp
index 550a3de..e22c076 100644
--- a/juddi-gui/src/main/webapp/subscriptionFeed.jsp
+++ b/juddi-gui/src/main/webapp/subscriptionFeed.jsp
@@ -26,13 +26,13 @@
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.subscriptions.feed")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<p><%=ResourceLoader.GetResource(session, "navbar.subscriptions.feed.content")%>.</p>
diff --git a/juddi-gui/src/main/webapp/tmodelBrowse.jsp b/juddi-gui/src/main/webapp/tmodelBrowse.jsp
index fc86cf1..16b40f9 100644
--- a/juddi-gui/src/main/webapp/tmodelBrowse.jsp
+++ b/juddi-gui/src/main/webapp/tmodelBrowse.jsp
@@ -25,57 +25,66 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
- <div class="well" >
- <h2><%=ResourceLoader.GetResource(session, "items.tmodel.browser")%></h2>
- </div>
- <!-- Example row of columns -->
- <div class="row">
- <div class="span12" >
- <table class="table-striped table-bordered">
- <tr>
- <td>
- <table>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecords"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecords"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offset">0</span></td></tr>
- </table>
- </td>
- <td>
- <table>
- <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_tmodel" value="%"></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_tmodel" value=""></td></tr>
- </table>
- </td>
- </tr>
+ <div class="well" >
+ <h2><%=ResourceLoader.GetResource(session, "items.tmodel.browser")%></h2>
+ </div>
- </table>
- <a href="javascript:pagedown();"><i class="icon-circle-arrow-left icon-2x" id="pageup"></i></a>
- <a href="javascript:reload();"><i class="icon-refresh icon-2x"></i></a>
- <a href="javascript:pageup();"><i class="icon-circle-arrow-right icon-2x" id="pagedown"></i></a>
- <div id="tmodellist">
- <img src="img/bigrollergreen.gif" title="Loading"/>
- </div>
- <script src="js/tmodelsearch.js"></script>
- <script type="text/javascript">
+ <div class="row">
+ <div class="span12" >
+ <table class="table-striped table-bordered">
+ <tr>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecords"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecords"></span></td></tr>
+ <tr><td title="<%=ResourceLoader.GetResource(session, "totals.offset.v2disclaimer")%>">
+ <%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><input type="number" id="offset" value="0"></td></tr>
+ </table>
+ </td>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_tmodel" value="%"></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_tmodel" value=""></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.fetch")%></td><td><input type="number" id="fetch" value="40"></td></tr>
+ </table>
+ </td>
+ </tr>
- function reload()
- {
- RenderTmodelListBySearch('%', offset, maxrecords, false);
- }
- $('.edit').editable(function(value, settings) {
- window.console && console.log(value + this + settings);
- reload();
- // RenderTmodelListBySearch('%', offset, maxrecords);
- return(value);
- }, {
- type: 'text',
- submit: i18n_ok
- });
- reload();
- </script>
- </div>
- </div>
- <%@include file="header-bottom.jsp" %>
\ No newline at end of file
+ </table>
+ <a href="javascript:pagedown();"><i class="icon-circle-arrow-left icon-2x" id="pageup"></i></a>
+ <a href="javascript:reload();"><i class="icon-refresh icon-2x"></i></a>
+ <a href="javascript:pageup();"><i class="icon-circle-arrow-right icon-2x" id="pagedown"></i></a>
+
+ <div id="tmodellist">
+ <img src="img/bigrollergreen.gif" title="Loading"/>
+ </div>
+ <script src="js/tmodelsearch.js"></script>
+ <script type="text/javascript">
+
+ function reload()
+ {
+ var maxr = 10;
+ try {
+ maxr = parseInt($("#fetch").val());
+ } catch (e) {
+ }
+
+ maxrecords = maxr;
+ RenderTmodelListBySearch($('#name_tmodel').val(), offset, maxrecords, false);
+ }
+ $('.edit').editable(function (value, settings) {
+ window.console && console.log(value + this + settings);
+ reload();
+ // RenderTmodelListBySearch('%', offset, maxrecords);
+ return(value);
+ }, {
+ type: 'text',
+ submit: i18n_ok
+ });
+ reload();
+ </script>
+ </div>
+ </div>
+ <%@include file="header-bottom.jsp" %>
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/tmodelChooser.jsp b/juddi-gui/src/main/webapp/tmodelChooser.jsp
index 0e5bb88..744a75f 100644
--- a/juddi-gui/src/main/webapp/tmodelChooser.jsp
+++ b/juddi-gui/src/main/webapp/tmodelChooser.jsp
@@ -35,13 +35,15 @@ this page is meant to be included via jsp:include
<table>
<tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecords"></span></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecords"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offset">0</span></td></tr>
+ <tr><td title="<%=ResourceLoader.GetResource(session, "totals.offset.v2disclaimer")%>">
+ <%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><input type="number" id="offset" value="0"></td></tr>
</table>
</td>
<td>
<table>
<tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_tmodel" value="%"></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_tmodel" value=""></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.fetch")%></td><td><input type="number" id="fetch" value="40"></td></tr>
</table>
</td>
diff --git a/juddi-gui/src/main/webapp/tmodelEditor.jsp b/juddi-gui/src/main/webapp/tmodelEditor.jsp
index 137f12b..6de546b 100644
--- a/juddi-gui/src/main/webapp/tmodelEditor.jsp
+++ b/juddi-gui/src/main/webapp/tmodelEditor.jsp
@@ -30,12 +30,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "pages.tmodeleditor.title")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<p>
diff --git a/juddi-gui/src/main/webapp/tmodelPartitions.jsp b/juddi-gui/src/main/webapp/tmodelPartitions.jsp
index 89a3d45..49a2119 100644
--- a/juddi-gui/src/main/webapp/tmodelPartitions.jsp
+++ b/juddi-gui/src/main/webapp/tmodelPartitions.jsp
@@ -25,12 +25,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "pages.tmodelpart.title")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
diff --git a/juddi-gui/src/main/webapp/transfer.jsp b/juddi-gui/src/main/webapp/transfer.jsp
index f6522e3..1838c6b 100644
--- a/juddi-gui/src/main/webapp/transfer.jsp
+++ b/juddi-gui/src/main/webapp/transfer.jsp
@@ -29,13 +29,13 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "actions.transfer")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
<%=ResourceLoader.GetResource(session, "pages.transfer.content")%>
diff --git a/juddi-gui/src/main/webapp/viewSubscriptions.jsp b/juddi-gui/src/main/webapp/viewSubscriptions.jsp
index 6150595..09a5b02 100644
--- a/juddi-gui/src/main/webapp/viewSubscriptions.jsp
+++ b/juddi-gui/src/main/webapp/viewSubscriptions.jsp
@@ -34,12 +34,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.subscriptions")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org