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 2013/04/29 04:49:10 UTC
svn commit: r1476880 [2/3] - in /juddi/branches/juddi-3.2.x: juddi-gui-dsig/
juddi-gui/ juddi-gui/license/
juddi-gui/src/java/org/apache/juddi/webconsole/hub/
juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/
juddi-gui/src/java/org/apache/ju...
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp Mon Apr 29 02:49:09 2013
@@ -21,6 +21,14 @@
Author : Alex O'Ree
--%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@page import="java.text.DateFormat"%>
+<%@page import="java.util.Date"%>
+<%@page import="javax.xml.datatype.DatatypeFactory"%>
+<%@page import="java.util.Calendar"%>
+<%@page import="java.util.GregorianCalendar"%>
+<%@page import="org.uddi.sub_v3.SubscriptionFilter"%>
+<%@page import="org.apache.juddi.webconsole.hub.builders.SubscriptionHelper"%>
<%@page import="java.util.List"%>
<%@page import="org.uddi.sub_v3.Subscription"%>
<%@page import="java.net.URLEncoder"%>
@@ -35,20 +43,37 @@
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.subscriptions")%></h1>
</div>
+ <%
+ //TODO i18n
+ //TODO use this page as a subscription editor
+ Subscription sub = null;
+ boolean newitem = false;
+ UddiHub x = UddiHub.getInstance(application, session);
+ if (request.getParameter("id") != null) {
+ sub = x.GetSubscriptionDetails(request.getParameter("id"));
+ }
+ if (sub == null) {
+ sub = new Subscription();
+ sub.setMaxEntities(50);
+ sub.setBrief(false);
+ GregorianCalendar gcal = new GregorianCalendar();
+ gcal.setTimeInMillis(System.currentTimeMillis());
+ gcal.add(Calendar.YEAR, 1);
+ DatatypeFactory df = DatatypeFactory.newInstance();
+ sub.setNotificationInterval(df.newDuration(1000 * 60 * 15));
+ sub.setExpiresAfter(df.newXMLGregorianCalendar(gcal));
+ sub.setSubscriptionFilter(new SubscriptionFilter());
+ newitem = true;
+ }
+
+ %>
<!-- Example row of columns -->
<div class="row">
<div class="span12">
- <p>
-
-
- </p>
-
- <%
-
- %>
-
-
+ UDDI has a feature that allows you to be alerted of updates to either specific UDDI entries or to search results.
+ This page will help you setup a subscription to meet your needs. Note: only one type of subscription filter can be defined per subscription.
+ Normally, users can make as many subscriptions as they want, however it may be effectively limited by the registry implementation.
<div class="accordion" id="accordion2">
<div class="accordion-group">
<div class="accordion-heading">
@@ -59,23 +84,35 @@
<div id="collapseOne" class="accordion-body collapse in">
<div class="accordion-inner">
<div class="btn-group" id="alertType" data-toggle="buttons-radio">
- <button onclick="return toggleType1();" value="specificItem" class="btn active" >Changes to a specific item</button>
- <button onclick="return toggleType2();" value="searchResults" class="btn">Changes to search results, such as a new item</button>
+ <button onclick="return toggleType1();" id="btn-specificitem" value="specificItem" class="btn <%
+ if (newitem || SubscriptionHelper.isSpecificItem(sub)) {
+ out.write(" active");
+ }
+ %>" >Changes to a specific item</button>
+ <button onclick="return toggleType1();" id="btn-searchresults" value="searchResults" class="btn <%
+ if (!newitem && !SubscriptionHelper.isSpecificItem(sub)) {
+ out.write(" active");
+ }
+ %>">Changes to search results, such as a new item</button>
</div>
</div>
<script type="text/javascript">
function toggleType1()
{
- $("#basedonresults").hide();
- $("#specific").show();
- return false;
- }
- function toggleType2()
- {
- $("#basedonresults").show();
- $("#specific").hide();
+ if ($("#btn-specificitem").hasClass("active"))
+ {
+ $("#basedonresults").hide();
+ $("#specific").show();
+ }
+ else
+ {
+ $("#basedonresults").show();
+ $("#specific").hide();
+ }
return false;
}
+ $(document).ready(function(){ toggleType1();});
+
</script>
</div>
</div>
@@ -91,10 +128,10 @@
<div id="specific">
A specific item:<Br>
<div class="btn-group" id="alertCriteraSingleItem" data-toggle="buttons-radio">
- <button onclick="return false;" class="btn" value="binding">Binding</button>
- <button onclick="return false;" class="btn" value="business">Business</button>
- <button onclick="return false;" class="btn" value="service">Service</button>
- <button onclick="return false;" class="btn" value="tmodel">tModel</button>
+ <button onclick="javascript:bindingModal('itemKey'); return false;" class="btn" value="binding">Binding</button>
+ <button onclick="javascript:businessModal('itemKey'); return false;" class="btn" value="business">Business</button>
+ <button onclick="javascript:serviceModal('itemKey'); return false;" class="btn" value="service">Service</button>
+ <button onclick="javascript:tModelModal('itemKey'); return false;" class="btn" value="tmodel">tModel</button>
</div><br><br>
<div style="float:left">Key: </div>
<div class="edit" id="itemKey"></div>
@@ -132,16 +169,21 @@
<button onclick="return toggleTransport1();" value="bindingTemplate" class="btn" title="Either via a UDDI Subscription Callback or via Email">Send me alerts directly</button>
<button onclick="return toggleTransport2();" value="manual" class="btn" title="Either via this website or from your own software">I'll pick them up</button>
</div><br>
- <input type="text" id="bindingKey" autocomplete="false" placeholder="Binding Template Key or Email Address">
+ <div class="" id="bindingKeyDiv">
+ <input type="text" id="bindingKey" placeholder="Binding Template Key or Email Address" style="width:300px">
+ <a href="javascript:bindingModal('bindingKey');" class="btn " data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.select")%></a>
+ </div>
<script type="text/javascript">
+
+
function toggleTransport1()
{
- $("#bindingKey").show();
+ $("#bindingKeyDiv").show();
return false;
}
function toggleTransport2()
{
- $("#bindingKey").hide();
+ $("#bindingKeyDiv").hide();
return false;
}
</script>
@@ -161,18 +203,30 @@
<div style="float:left">Max records per callback: </div>
<div class="edit" id="maxRecords">50</div>
<div style="float:left">Brief subscription: </div>
- <div class="edit" id="brief">true</div>
+ <div> <input type="checkbox" id="brief"
+ <%
+ out.write(sub.isBrief() ? "checked" : "");
+ %> >
+ </div><br>
Expiration:
<div id="datetimepicker2" class="input-append">
- <input data-format="MM/dd/yyyy HH:mm:ss PP" type="text"></input>
+ <input data-format="MM/dd/yyyy HH:mm:ss PP" type="text" value="<%
+ if (sub.getExpiresAfter() != null) {
+ Date d = sub.getExpiresAfter().toGregorianCalendar().getTime();
+ DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss a");
+ String dateStr = dateFormat.format(d);
+ //TODO DOES NOT WORK out.write(dateStr);
+ }
+ %>">
+
<span class="add-on">
<i data-time-icon="icon-time" data-date-icon="icon-calendar">
</i>
</span>
</div>
<script type="text/javascript">
- $(function() {
+ $(document).ready(function() {
$('#datetimepicker2').datetimepicker({
language: '<%=(String) session.getAttribute("locale")%>',
pick12HourFormat: true
@@ -181,10 +235,16 @@
</script>
- <div style="">Notification Interval: </div>
+ <div style="">Notification Interval (hh:mm:ss) : </div>
<div class="input-append bootstrap-timepicker">
- <input id="timepicker2" type="text" class="input-small">
+ <input id="timepicker2" type="text" class="input-small" placeholder="Duration of time (hh:mm:ss)" value="<%
+ if (sub.getNotificationInterval() != null) {
+ out.write(sub.getNotificationInterval().getHours() + ":"
+ + sub.getNotificationInterval().getMinutes() + ":"
+ + sub.getNotificationInterval().getSeconds());
+ }
+ %>">
<span class="add-on">
<i class="icon-time"></i>
</span>
@@ -193,14 +253,23 @@
<script type="text/javascript">
$('#timepicker2').timepicker({
minuteStep: 1,
+ defaultTime: '00:05:00',
+ showSeconds: true,
template: 'modal',
showSeconds: true,
showMeridian: false
});
</script>
<br>
+
<div style="float:left">Subscription Key: </div>
- <div class="edit" id="subkey"></div>
+ <div class="edit" id="subkey"><%
+ if (sub.getSubscriptionKey() != null) {
+ out.write(StringEscapeUtils.escapeHtml(sub.getSubscriptionKey()));
+ }
+ %> </div>
+ About Subscription Keys: You can optionally specify a subscription key. If you do, it must follow the rules for UDDI keys (uniqueness, prefixes, tModel Partitions, etc).
+ If you do not define one, the UDDI server should generate one for you.
@@ -211,6 +280,7 @@
<script type="text/javascript">
Reedit()
+ $("#bindingKey").resizable();
function saveSubscription()
{
@@ -311,4 +381,9 @@
<a class="btn btn-primary" href="javascript:saveSubscription();"><i class="icon-save icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.save")%></a>
</div>
</div>
+
+ <%@include file="tmodelChooser.jsp" %>
+ <%@include file="bindingChooser.jsp" %>
+ <%@include file="businessChooser.jsp" %>
+ <%@include file="serviceChooser.jsp" %>
<%@include file="header-bottom.jsp" %>
\ No newline at end of file
Added: juddi/branches/juddi-3.2.x/juddi-gui/web/error.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/error.jsp?rev=1476880&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/error.jsp (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/error.jsp Mon Apr 29 02:49:09 2013
@@ -0,0 +1,92 @@
+<%--
+/*
+ * Copyright 2001-2013 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ *
+ */
+
+
+ Document : error
+ Created on : Apr 28, 2013, 4:01:43 PM
+ Author : Alex O'Ree
+--%>
+
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page import="javax.xml.datatype.DatatypeFactory"%>
+<%@page import="java.util.GregorianCalendar"%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Welcome to jUDDI</title>
+ <meta charset="utf-8">
+ <title>Welcome to Apache jUDDI</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="description" content="Apache jUDDI">
+ <meta name="author" content="Apache Software Foundation">
+
+ <!-- Le styles -->
+ <link href="css/bootstrap.css" rel="stylesheet">
+ <link rel="shortcut icon" href="favicon.ico" />
+ <link href="css/bootstrap-responsive.css" rel="stylesheet">
+
+ <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+ <!--[if lt IE 9]>
+ <script src="js/html5shiv.js"></script>
+ <![endif]-->
+
+ <link rel="stylesheet" href="css/font-awesome.min.css">
+ <link rel="stylesheet" href="css/ui-lightness/jquery-ui-1.10.2.custom.min.css">
+ <!--[if IE 7]>
+ <link rel="stylesheet" href="css/font-awesome-ie7.min.css">
+ <![endif]-->
+
+
+ <link rel="shortcut icon" href="ico/favicon.png">
+ <style type="text/css">
+ body {
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+ }
+ </style>
+
+ </head>
+ <body>
+ <div style="width:100%; height: 100%; position:absolute; text-align: center; vertical-align: middle; padding: 0px; margin: 0px;
+ background-image: url('img/bluemarble2.jpg'); background-repeat: no-repeat; background-position-x: center;
+ background-position-y: center; background-size: cover">
+ <div style="color: black; background-color: whitesmoke;
+ background: rgb(235, 235, 235); /* Fall-back for browsers that don't
+ support rgba */
+ background: rgba(235, 235, 235, .7);width:60%; position: relative; left:20%; top:25%; height:50%; vertical-align: middle">
+ <br><br>
+ <h1><%=ResourceLoader.GetResource(session, "error.ohno")%> <i class="icon-warning-sign icon-large"></i></h1>
+ <Br>
+ <b><%=ResourceLoader.GetResource(session, "error.occurred")%> </b><br><br>
+ <%=ResourceLoader.GetResource(session, "error.pleasereport")%> <Br>
+ <%=ResourceLoader.GetResource(session, "error.timeofevent")%>:
+ <%
+ GregorianCalendar gcal = new GregorianCalendar();
+ gcal.setTimeInMillis(System.currentTimeMillis());
+ DatatypeFactory df = DatatypeFactory.newInstance();
+ out.write(df.newXMLGregorianCalendar(gcal).toString());
+ %><Br><Br>
+ <%=ResourceLoader.GetResource(session, "error.reportadmin")%> <Br>
+ <a class="btn btn-primary" href="https://issues.apache.org/jira/browse/JUDDI"><%=ResourceLoader.GetResource(session, "error.filereport")%> </a>.</b><br>
+
+ </div>
+ </div>
+ </body>
+</html>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp Mon Apr 29 02:49:09 2013
@@ -66,6 +66,7 @@
}
</style>
<link href="css/bootstrap-responsive.min.css" rel="stylesheet">
+ <link href="css/bootstrap-modal.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
@@ -80,6 +81,8 @@
<script src="js/bootstrap.min.js"></script>
<script src="js/bootstrap-datetimepicker.min.js"></script>
<script src="js/bootstrap-timepicker.min.js"></script>
+ <script src="js/bootstrap-modalmanager.js"></script>
+ <script src="js/bootstrap-modal.js"></script>
<script src="js/jquery.jeditable.js"></script>
<script src="js/jquery-ui-1.10.2.custom.min.js"></script>
<script src="js/main.js"></script>
@@ -110,6 +113,7 @@
<ul class="dropdown-menu">
<li><a href="reginfo.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.mybiz.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.mybiz")%></a></li>
<li><a href="assertions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.publisherassertions.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.publisherassertions")%></a></li>
+ <li><a href="transfer.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.transfer.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.transfer")%></a></li>
<li class="divider"></li>
<li><a href="viewSubscriptions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.view.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.view")%></a></li>
<li><a href="createSubscription.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.create.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.create")%></a></li>
@@ -124,7 +128,7 @@
<li><a href="serviceBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.services.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.services")%></a></li>
<li><a href="tmodelBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.tmodels.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.tmodels")%></a></li>
<%// <li><a href="publisherBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.publishers.tooltip")">ResourceLoader.GetResource(session, "navbar.publishers")</a></li>
- %>
+%>
<li class="divider"> </li>
<li><a href="search.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.search.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.search")%></a></li>
@@ -156,6 +160,7 @@
<li><a href="http://juddi.apache.org/issue-tracking.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%>"><%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%></a></li>
<li><a href="http://juddi.apache.org/" title="<%=ResourceLoader.GetResource(session, "navbar.help.website")%>"><%=ResourceLoader.GetResource(session, "navbar.help.website")%></a></li>
<li><a href="http://www.nabble.com/jUDDI-f218.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%>"><%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%></a></li>
+ <li><a href="about.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.help.about.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.help.about")%></a></li>
</ul>
</li>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js Mon Apr 29 02:49:09 2013
@@ -7,14 +7,14 @@
function reloadBindingModal()
{
- RenderBindingListBySearch('%', offset, maxrecords, true);
+ RenderBindingListBySearch('%', offsetBinding, maxrecordsBinding, true);
}
var offsetBinding=0; //start at the begining
-var maxrecordsBinding=20; //record 20 at a time
+var maxrecordsBinding=10; //record 20 at a time
var langBinding="en"; //langauge english
var totalrecordsBinding=0;
@@ -63,15 +63,13 @@ function RenderBindingListBySearch(keywo
request.done(function(msg) {
window.console && console.log('postback done ');
$("#bindinglist").html(msg);
- $('.modalable').click(function(){
- selectedItem =$(this).attr("id");
- });
+
//refresh();
});
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ');
- $("#bindinglist").html("An error occured! " + textStatus + jqXHR);
+ $("#bindinglist").html("An error occured! " + jqXHR.responseText + textStatus);
//refresh();
});
/*
@@ -112,25 +110,27 @@ function bindingModal(div){
//reset the form in case it was lanucheed more than once per page view
reloadBindingModal();
- $.dialog.confirm({
+ $.dialogBinding.confirm({
callback: function(success, result) {
if (!success)
{
- alert("aborted!");
+ // alert("aborted!");
}
else{
- alert('Result: ' + result.join());
+ // alert('Result: ' + result.join());
$("#" + div).html(result[0]);
}
+ // return false;
}
});
+ // return false;
}
function bindingCancel()
{
- $(".modalable").each(function()
+ $(".modalableBinding").each(function()
{
$(this).prop('checked', false);
});
@@ -141,7 +141,7 @@ function bindingCancel()
/**
*returns an array of selected tmodel keys
*/
-$.dialog = {
+$.dialogBinding = {
confirm: function(options) {
var $modal = $('#bindingChooser');
//$modal.find('.modal-body').text(options.message);
@@ -157,7 +157,7 @@ $.dialog = {
* find the result from the model (the selected key)
*/
var selectedtmodels = new Array();
- $(".modalable").each(function()
+ $(".modalableBinding").each(function()
{
var id=$(this).attr("id");
if ($(this).is(':checked')) {
Copied: juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessChooser.js (from r1476397, juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js)
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessChooser.js?p2=juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessChooser.js&p1=juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js&r1=1476397&r2=1476880&rev=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessChooser.js Mon Apr 29 02:49:09 2013
@@ -5,73 +5,72 @@
* and open the template in the editor.
*/
-function reloadBindingModal()
+function reloadBusinessModal()
{
- RenderBindingListBySearch('%', offset, maxrecords, true);
+ var name=$("#nameBusiness").text();
+ RenderBusinessListBySearchModal(name, offsetBusiness, maxrecordsBusiness, true);
}
-var offsetBinding=0; //start at the begining
-var maxrecordsBinding=20; //record 20 at a time
-var langBinding="en"; //langauge english
-var totalrecordsBinding=0;
+var offsetBusiness=0; //start at the begining
+var maxrecordsBusiness=10; //record 20 at a time
+var langBusiness="en"; //langauge english
+var totalrecordsBusiness=0;
-RenderBindingListBySearch('%', offsetBinding, maxrecordsBinding, true);
+RenderBusinessListBySearchModal('%', offsetBusiness, maxrecordsBusiness, true);
-function pagedownChooserBinding()
+function pagedownChooserBusiness()
{
- offsetBinding = $("#offsetBinding").text();
+ offsetBusiness = $("#offsetBusiness").text();
//alert(offset);
- var newoffset = offsetBinding - maxrecordsBinding;
+ var newoffset = offsetBusiness - maxrecordsBusiness;
if (newoffset < 0)
return;
//alert(newoffset);
- if (newoffset != offsetBinding)
- RenderBindingListBySearch('%', newoffset, maxrecordsBinding, true);
+ if (newoffset != offsetBusiness)
+ RenderBusinessListBySearchModal($("#nameBusiness").text(), newoffset, maxrecordsBusiness, true);
}
-function pageupChooserBinding()
+function pageupChooserBusiness()
{
- offsetBinding = $("#offsetBinding").text();
+ offsetBusiness = $("#offsetBusiness").text();
//alert(offset);
- var fetch = maxrecordsBinding;
- if ((parseInt(offsetBinding) + parseInt(maxrecordsBinding)) > totalrecordsBinding)
+ var fetch = maxrecordsBusiness;
+ if ((parseInt(offsetBusiness) + parseInt(maxrecordsBusiness)) > totalrecordsBusiness)
//fetch = maxrecords - offset;
return;
else
- fetch = (parseInt(offsetBinding) + parseInt(maxrecordsBinding));
+ fetch = (parseInt(offsetBusiness) + parseInt(maxrecordsBusiness));
//alert(fetch);
- offsetBinding = fetch;
- RenderBindingListBySearch('%', fetch, maxrecordsBinding, true);
+ offsetBusiness = fetch;
+ RenderBusinessListBySearchModal($("#nameBusiness").text(), fetch, maxrecordsBusiness, true);
}
-var selectedItemBinding=null;
+var selectedItemBusiness=null;
//offset, maxrecords, keyword
-function RenderBindingListBySearch(keyword1, offset1, maxrecords1, isForChooser)
+function RenderBusinessListBySearchModal(keyword1, offset1, maxrecords1, isForChooser)
{
- var lang = $("#langBinding").text();
- $("#bindinglist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
+ var lang = $("#langBusiness").text();
+ $("#businesslist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
var request= $.ajax({
- url: 'ajax/bindingsearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
+ url: 'ajax/businesssearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
type:"GET",
cache: false
});
request.done(function(msg) {
window.console && console.log('postback done ');
- $("#bindinglist").html(msg);
- $('.modalable').click(function(){
- selectedItem =$(this).attr("id");
- });
+ $("#businesslist").html(msg);
+
//refresh();
});
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ');
- $("#bindinglist").html("An error occured! " + textStatus + jqXHR);
+ $("#businesslist").html("An error occured! " + jqXHR.responseText + textStatus);
//refresh();
});
/*
@@ -81,26 +80,26 @@ function RenderBindingListBySearch(keywo
});*/
}
-function refreshBinding()
+function refreshBusiness()
{
var displayrecords = $("#displayrecords").text();
- if (displayrecords == totalrecordsBinding)
+ if (displayrecords == totalrecordsBusiness)
{
- $("#pageupBinding").addClass("disabled");
- $("#pagedownBinding").addClass("disabled");
+ $("#pageupBusiness").addClass("disabled");
+ $("#pagedownBusiness").addClass("disabled");
}
- else if (offsetBinding + maxrecordsBinding > totalrecordsBinding)
+ else if (offsetBusiness + maxrecordsBusiness > totalrecordsBusiness)
{
- $("#pageupBinding").addClass("disabled");
+ $("#pageupBusiness").addClass("disabled");
}
- else if (offsetBinding ==0)
+ else if (offsetBusiness ==0)
{
- $("#pagedownBinding").removeClass("disabled");
+ $("#pagedownBusiness").removeClass("disabled");
}
else
{
- $("#pagedownBinding").removeClass("disabled");
- $("#pageupBinding").removeClass("disabled");
+ $("#pagedownBusiness").removeClass("disabled");
+ $("#pageupBusiness").removeClass("disabled");
}
}
@@ -108,42 +107,44 @@ function refreshBinding()
*This launches the tModel model div, upon return (and if not abprted), the contents of the div parameter will be replaced with the
*first selected tModel
*/
-function bindingModal(div){
+function businessModal(div){
//reset the form in case it was lanucheed more than once per page view
- reloadBindingModal();
+ reloadBusinessModal();
- $.dialog.confirm({
+ $.dialogBusiness.confirm({
callback: function(success, result) {
if (!success)
{
- alert("aborted!");
+ // alert("aborted!");
}
else{
- alert('Result: ' + result.join());
+ // alert('Result: ' + result.join());
$("#" + div).html(result[0]);
}
+ // return false;
}
});
+ // return false;
}
-function bindingCancel()
+function businessCancel()
{
- $(".modalable").each(function()
+ $(".modalableBusinessChooser").each(function()
{
$(this).prop('checked', false);
});
- $('#bindingChooser').modal('hide');
+ $('#businessChooser').modal('hide');
}
/**
*returns an array of selected tmodel keys
*/
-$.dialog = {
+$.dialogBusiness = {
confirm: function(options) {
- var $modal = $('#bindingChooser');
+ var $modal = $('#businessChooser');
//$modal.find('.modal-body').text(options.message);
$modal.off('click.dialog', '.btn, .close')
@@ -157,7 +158,7 @@ $.dialog = {
* find the result from the model (the selected key)
*/
var selectedtmodels = new Array();
- $(".modalable").each(function()
+ $(".modalableBusinessChooser").each(function()
{
var id=$(this).attr("id");
if ($(this).is(':checked')) {
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessEditor.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessEditor.js?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessEditor.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessEditor.js Mon Apr 29 02:49:09 2013
@@ -365,7 +365,7 @@ function deleteBusiness()
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText );
+ $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText + textStatus );
//$(".alert").alert();
$("#resultBar").show();
@@ -422,7 +422,7 @@ function saveBusiness()
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText );
+ $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + textStatus );
//$(".alert").alert();
$("#resultBar").show();
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/businesssearch.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/businesssearch.js?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/businesssearch.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/businesssearch.js Mon Apr 29 02:49:09 2013
@@ -70,7 +70,7 @@ function RenderBusinessListBySearch(keyw
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ');
- $("#businesslist").html("An error occured! " + textStatus + jqXHR);
+ $("#businesslist").html("An error occured! " + jqXHR.responseText + textStatus);
//refresh();
});
/*
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js Mon Apr 29 02:49:09 2013
@@ -130,7 +130,7 @@ function ShowServicesByBusinessKey(bizid
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ');
- $("#" + jqSelector(bizid)).html("An error occured! " + textStatus + jqXHR);
+ $("#" + jqSelector(bizid)).html("An error occured! " + jqXHR.responseText + textStatus);
//refresh();
});
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js Mon Apr 29 02:49:09 2013
@@ -72,7 +72,7 @@ function RenderServiceListBySearch(keywo
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ');
- $("#serviceBrowserListings").html("An error occured! " + textStatus + jqXHR);
+ $("#serviceBrowserListings").html("An error occured! " + jqXHR.responseText + textStatus);
//refresh();
});
/*
Copied: juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceChooser.js (from r1476397, juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js)
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceChooser.js?p2=juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceChooser.js&p1=juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js&r1=1476397&r2=1476880&rev=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceChooser.js Mon Apr 29 02:49:09 2013
@@ -5,73 +5,72 @@
* and open the template in the editor.
*/
-function reloadBindingModal()
+function reloadServiceModal()
{
- RenderBindingListBySearch('%', offset, maxrecords, true);
+ var name=$("#nameService").text();
+ RenderServiceListBySearchModal(name, offsetService, maxrecordsService, true);
}
-var offsetBinding=0; //start at the begining
-var maxrecordsBinding=20; //record 20 at a time
-var langBinding="en"; //langauge english
-var totalrecordsBinding=0;
+var offsetService=0; //start at the begining
+var maxrecordsService=10; //record 20 at a time
+var langService="en"; //langauge english
+var totalrecordsService=0;
-RenderBindingListBySearch('%', offsetBinding, maxrecordsBinding, true);
+RenderServiceListBySearchModal('%', offsetService, maxrecordsService, true);
-function pagedownChooserBinding()
+function pagedownChooserService()
{
- offsetBinding = $("#offsetBinding").text();
+ offsetService = $("#offsetService").text();
//alert(offset);
- var newoffset = offsetBinding - maxrecordsBinding;
+ var newoffset = offsetService - maxrecordsService;
if (newoffset < 0)
return;
//alert(newoffset);
- if (newoffset != offsetBinding)
- RenderBindingListBySearch('%', newoffset, maxrecordsBinding, true);
+ if (newoffset != offsetService)
+ RenderServiceListBySearchModal($("#nameService").text(), newoffset, maxrecordsService, true);
}
-function pageupChooserBinding()
+function pageupChooserService()
{
- offsetBinding = $("#offsetBinding").text();
+ offsetService = $("#offsetService").text();
//alert(offset);
- var fetch = maxrecordsBinding;
- if ((parseInt(offsetBinding) + parseInt(maxrecordsBinding)) > totalrecordsBinding)
+ var fetch = maxrecordsService;
+ if ((parseInt(offsetService) + parseInt(maxrecordsService)) > totalrecordsService)
//fetch = maxrecords - offset;
return;
else
- fetch = (parseInt(offsetBinding) + parseInt(maxrecordsBinding));
+ fetch = (parseInt(offsetService) + parseInt(maxrecordsService));
//alert(fetch);
- offsetBinding = fetch;
- RenderBindingListBySearch('%', fetch, maxrecordsBinding, true);
+ offsetService = fetch;
+ RenderServiceListBySearchModal($("#nameService").text(), fetch, maxrecordsService, true);
}
-var selectedItemBinding=null;
+var selectedItemService=null;
//offset, maxrecords, keyword
-function RenderBindingListBySearch(keyword1, offset1, maxrecords1, isForChooser)
+function RenderServiceListBySearchModal(keyword1, offset1, maxrecords1, isForChooser)
{
- var lang = $("#langBinding").text();
- $("#bindinglist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
+ var lang = $("#langService").text();
+ $("#servicelist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
var request= $.ajax({
- url: 'ajax/bindingsearch.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,
type:"GET",
cache: false
});
request.done(function(msg) {
window.console && console.log('postback done ');
- $("#bindinglist").html(msg);
- $('.modalable').click(function(){
- selectedItem =$(this).attr("id");
- });
+ $("#servicelist").html(msg);
+
//refresh();
});
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ');
- $("#bindinglist").html("An error occured! " + textStatus + jqXHR);
+ $("#servicelist").html("An error occured! " + jqXHR.responseText + textStatus);
//refresh();
});
/*
@@ -81,26 +80,26 @@ function RenderBindingListBySearch(keywo
});*/
}
-function refreshBinding()
+function refreshService()
{
var displayrecords = $("#displayrecords").text();
- if (displayrecords == totalrecordsBinding)
+ if (displayrecords == totalrecordsService)
{
- $("#pageupBinding").addClass("disabled");
- $("#pagedownBinding").addClass("disabled");
+ $("#pageupService").addClass("disabled");
+ $("#pagedownService").addClass("disabled");
}
- else if (offsetBinding + maxrecordsBinding > totalrecordsBinding)
+ else if (offsetService + maxrecordsService > totalrecordsService)
{
- $("#pageupBinding").addClass("disabled");
+ $("#pageupService").addClass("disabled");
}
- else if (offsetBinding ==0)
+ else if (offsetService ==0)
{
- $("#pagedownBinding").removeClass("disabled");
+ $("#pagedownService").removeClass("disabled");
}
else
{
- $("#pagedownBinding").removeClass("disabled");
- $("#pageupBinding").removeClass("disabled");
+ $("#pagedownService").removeClass("disabled");
+ $("#pageupService").removeClass("disabled");
}
}
@@ -108,42 +107,44 @@ function refreshBinding()
*This launches the tModel model div, upon return (and if not abprted), the contents of the div parameter will be replaced with the
*first selected tModel
*/
-function bindingModal(div){
+function serviceModal(div){
//reset the form in case it was lanucheed more than once per page view
- reloadBindingModal();
+ reloadServiceModal();
- $.dialog.confirm({
+ $.dialogService.confirm({
callback: function(success, result) {
if (!success)
{
- alert("aborted!");
+ // alert("aborted!");
}
else{
- alert('Result: ' + result.join());
+ // alert('Result: ' + result.join());
$("#" + div).html(result[0]);
}
+ // return false;
}
});
+ // return false;
}
-function bindingCancel()
+function serviceCancel()
{
- $(".modalable").each(function()
+ $(".modalableServiceChooser").each(function()
{
$(this).prop('checked', false);
});
- $('#bindingChooser').modal('hide');
+ $('#serviceChooser').modal('hide');
}
/**
*returns an array of selected tmodel keys
*/
-$.dialog = {
+$.dialogService = {
confirm: function(options) {
- var $modal = $('#bindingChooser');
+ var $modal = $('#serviceChooser');
//$modal.find('.modal-body').text(options.message);
$modal.off('click.dialog', '.btn, .close')
@@ -157,7 +158,7 @@ $.dialog = {
* find the result from the model (the selected key)
*/
var selectedtmodels = new Array();
- $(".modalable").each(function()
+ $(".modalableServiceChooser").each(function()
{
var id=$(this).attr("id");
if ($(this).is(':checked')) {
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceEditor.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceEditor.js?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceEditor.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceEditor.js Mon Apr 29 02:49:09 2013
@@ -197,7 +197,7 @@ function saveService()
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText );
+ $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + textStatus );
//$(".alert").alert();
$("#resultBar").show();
@@ -231,7 +231,7 @@ function deleteService()
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText );
+ $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText + textStatus );
//$(".alert").alert();
$("#resultBar").show();
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelChooser.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelChooser.js?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelChooser.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelChooser.js Mon Apr 29 02:49:09 2013
@@ -20,7 +20,7 @@ function tModelModal(div){
//reset the form in case it was lanucheed more than once per page view
reloadTmodelModal();
- $.dialog.confirm({
+ $.dialogTmodel.confirm({
callback: function(success, result) {
if (!success)
{
@@ -31,14 +31,16 @@ function tModelModal(div){
//alert('Result: ' + result.join());
$("#" + div).html(result[0]);
}
+ // return false;
}
});
+ // return false;
}
function tModelCancel()
{
- $(".modalable").each(function()
+ $(".modalableTmodel").each(function()
{
$(this).prop('checked', false);
});
@@ -49,7 +51,7 @@ function tModelCancel()
/**
*returns an array of selected tmodel keys
*/
-$.dialog = {
+$.dialogTmodel = {
confirm: function(options) {
var $modal = $('#tmodelChooser');
//$modal.find('.modal-body').text(options.message);
@@ -65,7 +67,7 @@ $.dialog = {
* find the result from the model (the selected key)
*/
var selectedtmodels = new Array();
- $(".modalable").each(function()
+ $(".modalableTmodel").each(function()
{
var id=$(this).attr("id");
if ($(this).is(':checked')) {
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodeledit.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodeledit.js?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodeledit.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodeledit.js Mon Apr 29 02:49:09 2013
@@ -113,7 +113,7 @@ function savetModel()
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText );
+ $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + textStatus );
//$(".alert").alert();
$("#resultBar").show();
@@ -149,7 +149,7 @@ function deletetModel()
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText );
+ $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText + textStatus);
//$(".alert").alert();
$("#resultBar").show();
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelsearch.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelsearch.js?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelsearch.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelsearch.js Mon Apr 29 02:49:09 2013
@@ -82,7 +82,7 @@ function RenderTmodelListBySearch(keywor
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ');
- $("#tmodellist").html("An error occured! " + textStatus + jqXHR);
+ $("#tmodellist").html("An error occured! " + jqXHR.responseText + textStatus);
//refresh();
});
/*
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp Mon Apr 29 02:49:09 2013
@@ -220,5 +220,5 @@
</script>
<%@include file="tmodelChooser.jsp" %>
- <%@include file="bindingChooser.jsp" %>
+
<%@include file="header-bottom.jsp" %>
\ No newline at end of file
Added: juddi/branches/juddi-3.2.x/juddi-gui/web/serviceChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/serviceChooser.jsp?rev=1476880&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/serviceChooser.jsp (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/serviceChooser.jsp Mon Apr 29 02:49:09 2013
@@ -0,0 +1,60 @@
+<%--
+ Document : serviceChooser
+ Created on : Apr 28, 2013, 7:11:19 PM
+ Author : Alex O'Ree
+--%>
+
+
+<%@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">×</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 : '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/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp Mon Apr 29 02:49:09 2013
@@ -670,7 +670,7 @@
<script type="text/javascript" src="js/serviceEditor.js"></script>
</div> <!-- span12-->
-<div class="modal hide fade" id="confirmDialog">
+<div class="modal hide fade container" id="confirmDialog">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3><%=ResourceLoader.GetResource(session, "modal.digitalsignaturewarning.title")%></h3>
@@ -688,10 +688,10 @@
if (!newitem) {
%>
-<div class="modal hide fade" id="viewAsXml">
+<div class="modal hide fade container" id="viewAsXml">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h3>As XML</h3>
+ <h3><%=ResourceLoader.GetResource(session, "actions.asxml")%> </h3>
</div>
<script type="text/javascript">
function closeXmlPop(modaldiv)
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp Mon Apr 29 02:49:09 2013
@@ -7,7 +7,7 @@ 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" id="tmodelChooser">
+<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">×</a>
<h3><%=ResourceLoader.GetResource(session, "items.tmodel.chooser")%></h3>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp Mon Apr 29 02:49:09 2013
@@ -359,7 +359,7 @@
</div>
- <div class="modal hide fade" id="confirmDialog">
+ <div class="modal hide fade container" id="confirmDialog">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3><%=ResourceLoader.GetResource(session, "modal.digitalsignaturewarning.title")%></h3>
@@ -378,10 +378,10 @@
if (!newitem) {
%>
- <div class="modal hide fade" id="viewAsXml">
+ <div class="modal hide fade container" id="viewAsXml">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h3>As XML</h3>
+ <h3><%=ResourceLoader.GetResource(session, "actions.asxml")%></h3>
</div>
<div class="modal-body" id="viewAsXmlContent">
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/transfer.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/transfer.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/transfer.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/transfer.jsp Mon Apr 29 02:49:09 2013
@@ -41,6 +41,8 @@
<li><a href="#discard" >Discard a Token</a></li>
+ <li><a href="#accept" >Accept a Transfer</a></li>
+
</ul>
<script>
$(function () {
@@ -54,6 +56,10 @@
e.preventDefault();
$(this).tab('show');
});
+ $('#myTab a[href=#accept]').click(function (e) {
+ e.preventDefault();
+ $(this).tab('show');
+ });
</script>
<div class="tab-content">
@@ -66,10 +72,6 @@
<img src="img/ajax-loader.gif">
</div>
-
- <div>
- Transfer to: <input type="text" id="transferto" placeholder="Username">
- </div>
<div>
<a href="javascript:getToken();" class="btn btn-primary btn-large" style="width:90%">Get Token</a>
</div>
@@ -109,21 +111,7 @@
name: "keylist",
value: keys.join()
});
- /*
- var id=$("#businesslist.transferable").find('option:selected').attr('id');
- //$("#businesslist").val();
- if (id!=null)
- postbackdata.push({
- name: "businesslist",
- value: id.join()
- });
- id=id=$("#tmodellist").find('option:selected').attr('id');//$("#tmodellist").val();
- if (id!=null)
- postbackdata.push({
- name: "tmodellist",
- value: id.join()
- });
- */
+
postbackdata.push({
name:"transferto",
value: $("#transferto").val()
@@ -147,6 +135,103 @@
request.done(function(msg) {
window.console && console.log('postback done ' + url);
+ $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +
+ safe_tags_replace(msg));
+ $("#resultBar").show();
+
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ' + url);
+ $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + textStatus );
+ //$(".alert").alert();
+ $("#resultBar").show();
+
+ });
+ }
+
+ function discardToken()
+ {
+ var url='ajax/abortTransferToken.jsp';
+ var postbackdata = new Array();
+
+
+ postbackdata.push({
+ name:"tokenxml",
+ value: $("#tokenxml").val()
+ });
+
+ postbackdata.push({
+ name:"nonce",
+ value: $("#nonce").val()
+ });
+
+ var request= $.ajax({
+ url: url,
+ type:"POST",
+ // data" + i18n_type + ": "html",
+ cache: false,
+ // processData: false,f
+ data: postbackdata
+ });
+
+
+ request.done(function(msg) {
+ window.console && console.log('postback done ' + url);
+
+ $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
+ $("#resultBar").show();
+
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ' + url);
+ $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + textStatus );
+ //$(".alert").alert();
+ $("#resultBar").show();
+
+ });
+ }
+
+
+
+
+
+ function acceptToken()
+ {
+ var url='ajax/acceptTransferToken.jsp';
+ var postbackdata = new Array();
+
+
+ postbackdata.push({
+ name:"tokenxml",
+ value: $("#accepttoken").val()
+ });
+
+
+ postbackdata.push({
+ name:"keybag",
+ value: $("#keybag").val()
+ });
+
+ postbackdata.push({
+ name:"nonce",
+ value: $("#nonce").val()
+ });
+
+ var request= $.ajax({
+ url: url,
+ type:"POST",
+ // data" + i18n_type + ": "html",
+ cache: false,
+ // processData: false,f
+ data: postbackdata
+ });
+
+
+ request.done(function(msg) {
+ window.console && console.log('postback done ' + url);
+
$("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
$("#resultBar").show();
@@ -162,11 +247,20 @@
}
</script>
</div>
+ <div class="tab-pane" id="accept">
+ Accept a transfer<Br><br>
+
+ Token: <textarea id="accepttoken" placeholder="Token XML"></textarea> <br>
+
+ Key Cag: <textarea id="keybag" placeholder="Token XML"></textarea> <br>
+ <a href="javascript:acceptToken();" class="btn btn-info btn-large" style="width:90%"><i class="icon-large icon-plus"></i> Accept</a>
+ </div>
+
<div class="tab-pane" id="discard">
Discard a transfer token (abort the transfer)<Br><br>
- Token: <input type="text" id="discardtoken" placeholder="Token data"> <br>
- <a href="javascript:submit();" class="btn btn-danger btn-large" style="width:90%"><i class="icon-large icon-remove-sign"></i> Discard Token</a>
+ Token: <textarea id="tokenxml" placeholder="Token XML"></textarea> <br>
+ <a href="javascript:discardToken();" class="btn btn-danger btn-large" style="width:90%"><i class="icon-large icon-remove-sign"></i> Discard Token</a>
</div>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org