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/05/03 14:12:12 UTC

svn commit: r1478745 [8/9] - in /juddi/branches/juddi-3.2.x: juddi-core/src/main/java/org/apache/juddi/api/impl/ juddi-examples/subscription-notification-handler/ juddi-examples/subscription-notification-handler/nbproject/ juddi-examples/subscription-n...

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp?rev=1478745&r1=1478744&r2=1478745&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp Fri May  3 12:12:10 2013
@@ -48,7 +48,7 @@
 
                     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();
                     });
                 }
@@ -96,7 +96,7 @@
                         });
                     }); 
                     if (!ok)
-                    {
+                    {//TODO more internationalization
                         $("#saveresult").html("A value must be specified for each value.");
                         return;
                     }

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp?rev=1478745&r1=1478744&r2=1478745&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp Fri May  3 12:12:10 2013
@@ -17,13 +17,13 @@
     <!-- Example row of columns -->
     <div class="row">
         <div class="span12" >
-            <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecords"></span><br>
-            <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
-            <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
+            <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBusiness"></span><br>
+            <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBusiness"></span><br>
+            <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBusiness">0</span><br>
             <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
-            <a href="javascript:pagedown();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageup"></i></a>
+            <a href="javascript:pagedownBusiness();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBusiness"></i></a>
             <a href="javascript:refreshBusinessList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
-            <a href="javascript:pageup();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedown"></i></a>
+            <a href="javascript:pageupBusiness();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBusiness"></i></a>
 
             <div id="businesslist">
                 <img src="img/bigrollergreen.gif" title="<%=ResourceLoader.GetResource(session, "items.loading")%>"/>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp?rev=1478745&r1=1478744&r2=1478745&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp Fri May  3 12:12:10 2013
@@ -153,7 +153,7 @@
                             <%
                                 for (int i = 0; i < bd.getName().size(); i++) {
                                     out.write("<div id=\"" + PostBackConstants.NAME + i + "\" style=\"border-width:1px; border-style:solid\" >");
-                                    out.write("<div style=\"float:left; height:100%\"><a href=\"javascript:Remove('Name" + i + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>");
+                                    out.write("<div style=\"float:left; height:100%\"><a href=\"javascript:Remove('Name" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>");
                                     out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + ":&nbsp;</div>"
                                             + "<div class=\"edit\" id=\"" + PostBackConstants.NAME + i + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getName().get(i).getValue()) + "</div>");
                                     out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.lang") + "&nbsp;</div>"
@@ -174,7 +174,7 @@
                             <%
                                 for (int i = 0; i < bd.getDescription().size(); i++) {
                                     out.write("<div id=\"" + PostBackConstants.DESCRIPTION + i + "\" style=\"border-width:1px; border-style:solid\">");
-                                    out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('Description" + i + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>");
+                                    out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('Description" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>");
                                     out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + ":&nbsp;</div>"
                                             + "<div class=\"edit\" id=\"" + PostBackConstants.DESCRIPTION + i + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getDescription().get(i).getValue()) + "</div>");
                                     out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.lang") + ":&nbsp;</div>"
@@ -197,7 +197,7 @@
                                     for (int i = 0; i < bd.getDiscoveryURLs().getDiscoveryURL().size(); i++) {
 
                                         out.write("<div id=\"disco" + i + "\" style=\"border-width:1px; border-style:solid\">");
-                                        out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('disco" + i + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>");
+                                        out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('disco" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>");
                                         out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + ":&nbsp;</div>"
                                                 + "<div class=\"edit\" id=\"" + PostBackConstants.DISCOVERYURL + i + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getDiscoveryURLs().getDiscoveryURL().get(i).getValue()) + "</div>");
                                         out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.type") + ":&nbsp;</div>"
@@ -226,7 +226,7 @@
                                     //this is the outer framework, the add buttons
                                     out.write("<div id=\"" + PostBackConstants.CONTACT_PREFIX + i + "\" style=\"border-width:2px; border-style:solid; border-color:red\" >"
                                             + "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CONTACT_PREFIX + i
-                                            + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+                                            + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"
                                             + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.contact.type") + ": &nbsp;</div>"
                                             + "<div class=\"edit\" id=\"" + PostBackConstants.CONTACT_PREFIX + i + PostBackConstants.TYPE + "\">"
                                             + StringEscapeUtils.escapeHtml(bd.getContacts().getContact().get(i).getUseType())
@@ -243,7 +243,7 @@
                                         int contactname = k;
                                         out.write("<div id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.NAME + contactname + "\" style=\"border-width:1px; border-style:solid\" >"
                                                 + "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.NAME + contactname
-                                                + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+                                                + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"
                                                 + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.name") + ": &nbsp;</div>"
                                                 + "<div class=\"edit\" id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.NAME + contactname + PostBackConstants.VALUE + "\">"
                                                 + StringEscapeUtils.escapeHtml(bd.getContacts().getContact().get(i).getPersonName().get(k).getValue()) + "</div>"
@@ -259,7 +259,7 @@
                                         int contactemail = k;
                                         out.write("<div id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.EMAIL + contactemail + "\" style=\"border-width:1px; border-style:solid\" >"
                                                 + "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.EMAIL + contactemail
-                                                + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+                                                + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"
                                                 + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.type") + ": &nbsp;</div>"
                                                 + "<div class=\"edit\" id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.EMAIL + contactemail + PostBackConstants.TYPE + "\">"
                                                 + StringEscapeUtils.escapeHtml(bd.getContacts().getContact().get(i).getEmail().get(k).getUseType())
@@ -275,7 +275,7 @@
                                         int contactdescription = k;
                                         out.write("<div id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.DESCRIPTION + contactdescription + "\" style=\"border-width:1px; border-style:solid\" >"
                                                 + "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.DESCRIPTION + contactdescription
-                                                + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+                                                + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"
                                                 + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.description") + ": &nbsp;</div>"
                                                 + "<div class=\"edit\" id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.DESCRIPTION + contactdescription + PostBackConstants.VALUE + "\">"
                                                 + StringEscapeUtils.escapeHtml(bd.getContacts().getContact().get(i).getDescription().get(k).getValue())
@@ -297,7 +297,7 @@
                                                 + "\" style=\"border-width:1px; border-style:solid\" >"
                                                 + "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('"
                                                 + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.PHONE + contactphone
-                                                + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+                                                + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"
                                                 + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.phone") + ": &nbsp;</div>"
                                                 + "<div class=\"edit\" id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.PHONE + contactphone + PostBackConstants.VALUE + "\">"
                                                 + StringEscapeUtils.escapeHtml(bd.getContacts().getContact().get(i).getPhone().get(k).getValue())
@@ -315,7 +315,7 @@
                                         int contactaddress = k;
                                         out.write("<div id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.ADDRESS + contactaddress + "\" style=\"border-width:1px; border-style:solid\" >"
                                                 + "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.ADDRESS + contactaddress
-                                                + "');\"><i class=\"icon-remove-sign icon-large\"></i></a>" + ResourceLoader.GetResource(session, "items.address") + "</div><br>"
+                                                + "');\"><i class=\"icon-trash icon-large\"></i></a>" + ResourceLoader.GetResource(session, "items.address") + "</div><br>"
                                                 + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.lang") + ": &nbsp;</div>"
                                                 + "<div class=\"edit\" id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.ADDRESS + contactaddress + PostBackConstants.LANG + "\">"
                                                 + StringEscapeUtils.escapeHtml(bd.getContacts().getContact().get(i).getAddress().get(k).getLang())
@@ -341,7 +341,7 @@
                                             out.write("<div id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.ADDRESS + k + PostBackConstants.ADDRESSLINE + contactaddresslines
                                                     + "\" style=\"border-width:1px; border-style:solid\" >"
                                                     + "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.ADDRESSLINE + contactaddresslines
-                                                    + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+                                                    + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"
                                                     + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.addressvalue") + ": &nbsp;</div>"
                                                     + "<div class=\"edit\" id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.ADDRESS + k + PostBackConstants.ADDRESSLINE + contactaddresslines + PostBackConstants.VALUE + "\">"
                                                     + StringEscapeUtils.escapeHtml(bd.getContacts().getContact().get(i).getAddress().get(k).getAddressLine().get(k).getValue())
@@ -385,7 +385,7 @@
                                 for (int i = 0; i < bd.getCategoryBag().getKeyedReference().size(); i++) {
 
                                     out.write("<div id=\"" + PostBackConstants.CATBAG_KEY_REF + i + "\" style=\"border-width:2px; border-style:solid\">");
-                                    out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CATBAG_KEY_REF + i + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>");
+                                    out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CATBAG_KEY_REF + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>");
                                     out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.key") + " (<a href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.VALUE + "')\" >" + "<i class=\"icon-list-alt icon-large\"></i>" + ResourceLoader.GetResource(session, "items.picker") + "</a>): &nbsp;</div>"
                                             + "<div class=\"edit\" id=\"" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReference().get(i).getTModelKey()) + "</div>");
                                     out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.name") + ": &nbsp;</div>"
@@ -406,7 +406,7 @@
                                 for (int i = 0; i < bd.getCategoryBag().getKeyedReferenceGroup().size(); i++) {
 
                                     out.write("<div id=\"" + PostBackConstants.CATBAG_KEY_REF_GRP + i + "\" style=\"border-width:2px; border-style:solid\">"
-                                            + "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CATBAG_KEY_REF_GRP + i + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+                                            + "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CATBAG_KEY_REF_GRP + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"
                                             + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.key") + " (<a href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.VALUE + "')\" >" + "<i class=\"icon-list-alt icon-large\"></i>" + ResourceLoader.GetResource(session, "items.picker") + "</a>): &nbsp;</div>"
                                             + "<div class=\"edit\" id=\"" + PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.VALUE + "\">"
                                             + StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReferenceGroup().get(i).getTModelKey())
@@ -418,7 +418,7 @@
                                     for (int k = 0; k < bd.getCategoryBag().getKeyedReferenceGroup().get(i).getKeyedReference().size(); k++) {
 
                                         out.write("<div id=\"" + PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.KEY_REF + k + "\" style=\"border-width:1px; border-style:solid\">");
-                                        out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.KEY_REF + k + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>");
+                                        out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.KEY_REF + k + "');\"><i class=\"icon-trash icon-large\"></i></a></div>");
                                         out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.key") + " (<a href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.KEY_REF + k + PostBackConstants.VALUE + "')\" >" + "<i class=\"icon-list-alt icon-large\"></i>" + ResourceLoader.GetResource(session, "items.picker") + "</a>): &nbsp;</div>"
                                                 + "<div class=\"edit\" id=\"" + PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.KEY_REF + k + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReferenceGroup().get(i).getKeyedReference().get(k).getTModelKey()) + "</div>");
                                         out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.name") + ":  &nbsp;</div>"
@@ -445,7 +445,7 @@
                             <%
                                 for (int i = 0; i < bd.getIdentifierBag().getKeyedReference().size(); i++) {
                                     out.write("<div id=\"identbagkeyref" + i + "\" style=\"border-width:2px; border-style:solid\">");
-                                    out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('identbagkeyref" + i + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>");
+                                    out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('identbagkeyref" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>");
                                     out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.key") + " (<a href=\"javascript:tModelModal('" + PostBackConstants.IDENT_KEY_REF + i + PostBackConstants.VALUE + "')\" >" + "<i class=\"icon-list-alt icon-large\"></i> " + ResourceLoader.GetResource(session, "items.picker") + "</a>):  &nbsp;</div>"
                                             + "<div class=\"edit\" id=\"" + PostBackConstants.IDENT_KEY_REF + i + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getIdentifierBag().getKeyedReference().get(i).getTModelKey()) + "</div>");
                                     out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.name") + ":  &nbsp;</div>"
@@ -609,7 +609,7 @@
                     if (!newitem) {
 
                 %> | 
-                <a class="btn btn-danger " href="javascript:deleteBusiness();"><i class="icon-remove-sign icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.delete")%></a> |
+                <a class="btn btn-danger " href="javascript:deleteBusiness();"><i class="icon-trash icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.delete")%></a> |
                 <a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(bizid, "UTF-8")%>&type=business"><i class="icon-pencil icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.sign")%></a> |
                 <a class="btn btn-info " href="#" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><i class="icon-rss icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
                 <a class="btn btn-warning "  href="transfer.jsp?biz=<%=URLEncoder.encode(bizid, "UTF-8")%>" title="<%=ResourceLoader.GetResource(session, "actions.transfer.description")%>"><i class="icon-exchange icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.transfer")%></a> |

Copied: juddi/branches/juddi-3.2.x/juddi-gui/web/editSubscription.jsp (from r1476880, 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/editSubscription.jsp?p2=juddi/branches/juddi-3.2.x/juddi-gui/web/editSubscription.jsp&p1=juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp&r1=1476880&r2=1478745&rev=1478745&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/editSubscription.jsp Fri May  3 12:12:10 2013
@@ -16,11 +16,12 @@
  *
  */
 
-    Document   : createSubscription
+    Document   : editSubscription
     Created on : Apr 7, 2013, 8:47:48 AM
     Author     : Alex O'Ree
 --%>
 
+<%@page import="org.apache.juddi.v3.client.UDDIConstants"%>
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="java.text.DateFormat"%>
 <%@page import="java.util.Date"%>
@@ -53,6 +54,15 @@
             sub = x.GetSubscriptionDetails(request.getParameter("id"));
         }
         if (sub == null) {
+            if (request.getParameter("svcid") != null) {
+                //TODO handled a linked in subscription
+            }
+            if (request.getParameter("bizid") != null) {
+                //TODO handled a linked in subscription
+            }
+            if (request.getParameter("tid") != null) {
+                //TODO handled a linked in subscription
+            }
             sub = new Subscription();
             sub.setMaxEntities(50);
             sub.setBrief(false);
@@ -65,53 +75,64 @@
             sub.setSubscriptionFilter(new SubscriptionFilter());
             newitem = true;
         }
-        
+
     %>
 
     <!-- Example row of columns -->
     <div class="row">
         <div class="span12">
-            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.
+            <%=ResourceLoader.GetResource(session, "pages.subscription.content")%>
+
             <div class="accordion" id="accordion2">
                 <div class="accordion-group">
                     <div class="accordion-heading">
                         <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
-                            Step 1 - What do you type of information to you want alerts on?
+                            <%=ResourceLoader.GetResource(session, "pages.subscription.step1")%>
+
                         </a>
                     </div>
                     <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();" id="btn-specificitem" value="specificItem" class="btn <%                                    
+                                <button onclick="return toggleType1(false);" 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 <%                                    
+                                        %>" >
+                                    <%=ResourceLoader.GetResource(session, "pages.subscription.step1.specific")%>
+                                </button>
+                                <button onclick="return toggleType1(false);" 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>
+                                        %>">
+                                    <%=ResourceLoader.GetResource(session, "pages.subscription.step1.search")%>
+                                </button>
                             </div>
                         </div>
                         <script type="text/javascript">
-                            function toggleType1()
+                            function toggleType1(firstLoad)
                             {
-                                if ($("#btn-specificitem").hasClass("active"))
-                                {
-                                    $("#basedonresults").hide();
-                                    $("#specific").show();
-                                }
-                                else
-                                {
-                                    $("#basedonresults").show();
-                                    $("#specific").hide();
-                                }
+                                //window.console && console.log('hi  ' + $("#btn-specificitem").hasClass("active"));   
+                                setTimeout(function(){
+                                    if ($("#btn-specificitem").hasClass("active"))
+                                    {
+                                        $("#basedonresults").hide();
+                                        $("#specific").show();
+                                    }
+                                    else
+                                    {
+                                        $("#basedonresults").show();
+                                        $("#specific").hide();
+                                    }
+                                    if (firstLoad!=true){
+                                        $('#collapseOne').collapse('hide');
+                                        $('#collapseTwo').collapse('show');}
+                                }, 100);
+                                
                                 return false;
                             }
-                            $(document).ready(function(){ toggleType1();});
+                            $(document).ready(function(){ toggleType1(true);});
                            
                         </script>
                     </div>
@@ -120,7 +141,8 @@
                 <div class="accordion-group">
                     <div class="accordion-heading">
                         <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
-                            Step 2 - Which items do you want alerts on?
+
+                            <%=ResourceLoader.GetResource(session, "pages.subscription.step2")%>
                         </a>
                     </div>
                     <div id="collapseTwo" class="accordion-body collapse">
@@ -128,27 +150,167 @@
                             <div id="specific">
                                 A specific item:<Br>
                                 <div class="btn-group" id="alertCriteraSingleItem" data-toggle="buttons-radio">
-                                    <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>
+                                    <button onclick="javascript:clearbox(); return false;" class="btn <%=SubscriptionHelper.isBindingSpecific(sub)%>" value="binding"><%=ResourceLoader.GetResource(session, "items.bindingtemplate")%></button>
+                                    <button onclick="javascript:clearbox(); return false;" class="btn <%=SubscriptionHelper.isBusinessSpecific(sub)%>" value="business"><%=ResourceLoader.GetResource(session, "items.business")%></button>
+                                    <button onclick="javascript:clearbox(); return false;" class="btn <%=SubscriptionHelper.isServiceSpecific(sub)%>" value="service"><%=ResourceLoader.GetResource(session, "items.service")%></button>
+                                    <button onclick="javascript:clearbox(); return false;" class="btn <%=SubscriptionHelper.isTModelSpecific(sub)%>" value="tmodel"><%=ResourceLoader.GetResource(session, "items.tmodel")%></button>
+                                    <button onclick="javascript:publisherAssertionPicker(); return false;" class="btn <%=SubscriptionHelper.isPublisherAssertionSpecific(sub)%>" value="publisherAssertion"><%=ResourceLoader.GetResource(session, "items.publisherassertion.status")%></button>
                                 </div><br><br>
-                                <div style="float:left">Key: &nbsp;</div>
-                                <div class="edit" id="itemKey"></div>
+                                <div id="keylistcontainer">
+                                    <a href="javascript:additem();" class="btn" ><%=ResourceLoader.GetResource(session, "actions.add")%></a>
+                                    <a href="javascript:removeitem();" class="btn" ><%=ResourceLoader.GetResource(session, "actions.remove")%></a> 
+                                    <select  id="keylist" size="5" style="width:100%">
+                                        <%=SubscriptionHelper.getItemKeySpecific(sub)%>
+                                    </select>
+
+                                </div>
+                                <script type="text/javascript">
+                                    $("#pubassertcontainer").hide();
+                                    $("#keylist").resizable();
+                                    <%
+                                        if (!SubscriptionHelper.isPublisherAssertionSpecific(sub).equals("")) {
+                                            out.write("publisherAssertionPicker();");
+                                        }
+                                    %>
+                                        function publisherAssertionPicker()
+                                        {
+                                            $("#keylistcontainer").hide();
+                                            $("#pubassertcontainer").show();
+                                            selectPublisherAssertionStatus();
+                                        }
+                                        function clearbox()
+                                        {
+                                            $("#keylist option").remove();
+                                            $("#keylistcontainer").show();
+                                            $("#pubassertcontainer").hide();
+                                            return false;
+                                        }
+                                        function additem()
+                                        {
+                                            var alertCriteraSingleItem = $("#alertCriteraSingleItem > button.btn.active").val();
+                                            if (alertCriteraSingleItem=="binding")
+                                            {
+                                                reloadBindingModal();
+                                                $.dialogBinding.confirm({
+                                                    callback: function(success, result) {
+                                                        if (success)
+                                                        {
+                                                            for (var i=0;i<result.length;i++)
+                                                                if ($("#keylist option[value='"+result[i]+"']").length == 0)
+                                                                    $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
+                                                        }
+                                                    }
+                                                });
+                                            }
+                                            if (alertCriteraSingleItem=="business"){
+                                                reloadBusinessModal();
+                                                $.dialogBusiness.confirm({
+                                                    callback: function(success, result) {
+                                                        if (success)
+                                                        {
+                                                            for (var i=0;i<result.length;i++)
+                                                                if ($("#keylist option[value='"+result[i]+"']").length == 0)
+                                                                    $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
+                                                        }
+                                                    }
+                                                });
+                                            }
+                                            if (alertCriteraSingleItem=="service"){
+                                                reloadServiceModal();
+    
+                                                $.dialogService.confirm({
+                                                    callback: function(success, result) {
+                                                        if (success)
+                                                        {
+                                                            for (var i=0;i<result.length;i++)
+                                                                if ($("#keylist option[value='"+result[i]+"']").length == 0)
+                                                                    $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
+                                                        }
+                                                    }
+                                                });
+
+                                            }
+                                            if (alertCriteraSingleItem=="tmodel"){
+                                                reloadTmodelModal();
+                                                $.dialogTmodel.confirm({
+                                                    callback: function(success, result) {
+                                                        if (success)
+                                                        {
+                                                            for (var i=0;i<result.length;i++)
+                                                                if ($("#keylist option[value='"+result[i]+"']").length == 0)
+                                                                    $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
+                                                        }
+                                                    }
+                                                });
+                                            }
+                                        }
+                                        function removeitem()
+                                        {
+                                            $("#keylist option:selected").remove();
+                                        }
+                                </script>
+                                <div id="pubassertcontainer" class="">
+                                    <div style="float:left"><%=ResourceLoader.GetResource(session, "items.key")%>: &nbsp;</div>
+                                    <div class="" id="itemKey"><%
+                                        if (!SubscriptionHelper.isPublisherAssertionSpecific(sub).equals("")) {
+                                            out.write(StringEscapeUtils.escapeHtml(SubscriptionHelper.getItemKeySpecific(sub)));
+                                        }
+                                        %></div>
+                                </div>
                             </div>
                             <div id="basedonresults">
-                                Search results:<br>
+                                <%=ResourceLoader.GetResource(session, "search.results")%>:<br>
                                 <div class="btn-group" id="alertCriteraMultipleItem" 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="return false;" class="btn" value="publisherAssertion">Publisher Assertion Status</button>
-                                    <button onclick="return false;" class="btn" value="relatedBusiness">Related Business</button>
+                                    <button onclick="return false;" class="btn" value="binding"><%=ResourceLoader.GetResource(session, "items.bindingtemplate")%></button>
+                                    <button onclick="return false;" class="btn" value="business"><%=ResourceLoader.GetResource(session, "items.business")%></button>
+                                    <button onclick="return false;" class="btn" value="service"><%=ResourceLoader.GetResource(session, "items.service")%></button>
+                                    <button onclick="return false;" class="btn" value="tmodel"><%=ResourceLoader.GetResource(session, "items.tmodel")%></button>
+                                    <button onclick="return false;" class="btn" value="relatedBusiness"><%=ResourceLoader.GetResource(session, "pages.editor.tabnav.relatedbusinesses")%></button>
                                 </div>
                                 <br><br>
-                                <input type="text" placeholder="Type something…" id="searchcontent">
-                                <input type="text" placeholder="Language" id="lang"><br>
+                                <%=ResourceLoader.GetResource(session, "items.findqualifiers")%><br>
+                                <table class="table">
+                                    <tr>
+
+                                        <td><input class="fq" type="checkbox" name="<%=UDDIConstants.AND_ALL_KEYS%>" value="<%=UDDIConstants.AND_ALL_KEYS%>"> <%=UDDIConstants.AND_ALL_KEYS%></td>
+                                        <td><input class="fq" type="checkbox" name="<%=UDDIConstants.APPROXIMATE_MATCH%>" value="<%=UDDIConstants.APPROXIMATE_MATCH%>"> <%=UDDIConstants.APPROXIMATE_MATCH%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.BINARY_SORT%>" value="<%=UDDIConstants.BINARY_SORT%>"> <%=UDDIConstants.BINARY_SORT%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.BINDING_SUBSET%>" value="<%=UDDIConstants.BINDING_SUBSET%>"> <%=UDDIConstants.BINDING_SUBSET%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.CASE_INSENSITIVE_MATCH%>" value="<%=UDDIConstants.CASE_INSENSITIVE_MATCH%>"> <%=UDDIConstants.CASE_INSENSITIVE_MATCH%></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.CASE_INSENSITIVE_SORT%>" value="<%=UDDIConstants.CASE_INSENSITIVE_SORT%>"> <%=UDDIConstants.CASE_INSENSITIVE_SORT%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.CASE_SENSITIVE_MATCH%>" value="<%=UDDIConstants.CASE_SENSITIVE_MATCH%>"> <%=UDDIConstants.CASE_SENSITIVE_MATCH%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.CASE_SENSITIVE_SORT%>" value="<%=UDDIConstants.CASE_SENSITIVE_SORT%>"> <%=UDDIConstants.CASE_SENSITIVE_SORT%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.COMBINE_CATEGORY_BAGS%>" value="<%=UDDIConstants.COMBINE_CATEGORY_BAGS%>"> <%=UDDIConstants.COMBINE_CATEGORY_BAGS%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%>" value="<%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%>"> <%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%>" value="<%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%>"> <%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.EXACT_MATCH%>" value="<%=UDDIConstants.EXACT_MATCH%>"> <%=UDDIConstants.EXACT_MATCH%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.OR_ALL_KEYS%>" value="<%=UDDIConstants.OR_ALL_KEYS%>"> <%=UDDIConstants.OR_ALL_KEYS%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.OR_LIKE_KEYS%>" value="<%=UDDIConstants.OR_LIKE_KEYS%>"> <%=UDDIConstants.OR_LIKE_KEYS%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.SERVICE_SUBSET%>" value="<%=UDDIConstants.SERVICE_SUBSET%>"> <%=UDDIConstants.SERVICE_SUBSET%></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.SIGNATURE_PRESENT%>" value="<%=UDDIConstants.SIGNATURE_PRESENT%>"> <%=UDDIConstants.SIGNATURE_PRESENT%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.SORT_BY_DATE_ASC%>" value="<%=UDDIConstants.SORT_BY_DATE_ASC%>"> <%=UDDIConstants.SORT_BY_DATE_ASC%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.SORT_BY_DATE_DESC%>" value="<%=UDDIConstants.SORT_BY_DATE_DESC%>"> <%=UDDIConstants.SORT_BY_DATE_DESC%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.SORT_BY_NAME_ASC%>" value="<%=UDDIConstants.SORT_BY_NAME_ASC%>"> <%=UDDIConstants.SORT_BY_NAME_ASC%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.SORT_BY_NAME_DESC%>" value="<%=UDDIConstants.SORT_BY_NAME_DESC%>"> <%=UDDIConstants.SORT_BY_NAME_DESC%></td>
+                                    </tr>
+                                    <tr>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%>" value="<%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%>"> <%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%></td>
+                                        <td><input class="fq"  type="checkbox" name="<%=UDDIConstants.UTS_10%>" value="<%=UDDIConstants.UTS_10%>"> <%=UDDIConstants.UTS_10%></td>
+                                    </tr>
+                                </table>
+
+
+
+                                <div>
+
+                                    <input type="text" placeholder="<%=ResourceLoader.GetResource(session, "items.name")%>..." id="searchcontent">
+                                    <input type="text" placeholder="<%=ResourceLoader.GetResource(session, "items.lang")%>..." id="searchlang"><br></div>
                             </div>
 
 
@@ -160,32 +322,51 @@
                 <div class="accordion-group">
                     <div class="accordion-heading">
                         <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseThree">
-                            Step 3 - How do want to receive the alerts?
+                            <%=ResourceLoader.GetResource(session, "pages.subscription.step3")%>
                         </a>
                     </div>
                     <div id="collapseThree" class="accordion-body collapse">
                         <div class="accordion-inner">
                             <div class="btn-group" id="alertTransport" data-toggle="buttons-radio">
-                                <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>
+                                <button id="btn-bindingTemplate" onclick="return toggleTransport1();" value="bindingTemplate" class="btn <%=(sub.getBindingKey() == null ? "" : " active")%>" 
+                                        title="<%=ResourceLoader.GetResource(session, "pages.subscription.step3.direct.tooltip")%>"><%=ResourceLoader.GetResource(session, "pages.subscription.step3.direct")%></button>
+                                <button id="btn-manual" onclick="return toggleTransport1();" value="manual" class="btn <%=(sub.getBindingKey() == null ? " active " : "")%>" 
+                                        title="<%=ResourceLoader.GetResource(session, "pages.subscription.step3.pickup.tooltip")%>"><%=ResourceLoader.GetResource(session, "pages.subscription.step3.pickup")%></button>
                             </div><br>
                             <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>
+                                <%=ResourceLoader.GetResource(session, "pages.subscription.step3.content")%>
+                                <b><%=UDDIConstants.TRANSPORT_HTTP%></b>.
+                                <input type="text" id="bindingKey" placeholder="<%=ResourceLoader.GetResource(session, "items.bindingtemplate.key")%>" style="width:360px">
+                                <button onClick="javascript:bindingModal('bindingKey', 'val'); return false;" class="btn "><%=ResourceLoader.GetResource(session, "actions.select")%></button>
                             </div>
                             <script type="text/javascript">
-                                
-                             
-                                function toggleTransport1()
+                                function selectPublisherAssertionStatus()
                                 {
-                                    $("#bindingKeyDiv").show();
-                                    return false;
+                                    $("#assertionStatusChooser").modal('show');
                                 }
-                                function toggleTransport2()
+                             
+                                function toggleTransport1()
                                 {
-                                    $("#bindingKeyDiv").hide();
+                                    //window.console && console.log('hi  ' + $("#btn-specificitem").hasClass("active"));   
+                                    setTimeout(function(){
+                                        if ($("#btn-manual").hasClass("active"))
+                                        {
+                                            $("#bindingKeyDiv").hide();
+                                            //$("#specific").show();
+                                        }
+                                        else
+                                        {
+                                            $("#bindingKeyDiv").show();
+                                            // $("#specific").hide();
+                                        }
+                                        
+                                    }, 100);
+                                
+                                   
+                                    // $("#bindingKeyDiv").show();
                                     return false;
                                 }
+                                toggleTransport1();
                             </script>
                         </div>
                     </div>
@@ -195,31 +376,35 @@
                 <div class="accordion-group">
                     <div class="accordion-heading">
                         <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse4">
-                            Step 4 - Options
+                            <%=ResourceLoader.GetResource(session, "pages.subscription.step4")%>
+
                         </a>
                     </div>
                     <div id="collapse4" class="accordion-body collapse">
                         <div class="accordion-inner">
-                            <div style="float:left">Max records per callback: &nbsp;</div>
-                            <div class="edit" id="maxRecords">50</div>
-                            <div style="float:left">Brief subscription: &nbsp;</div>
+                            <div style="float:left"><%=ResourceLoader.GetResource(session, "items.maxrecords.callback")%>: &nbsp;</div>
+                            <div class="edit" id="maxRecords"><%
+                                if (sub.getMaxEntities() != null) {
+                                    sub.getMaxEntities().toString();
+                                }
+                                %></div>
+                            <div style="float:left"><%=ResourceLoader.GetResource(session, "items.subscriptionbrief")%>: &nbsp;</div>
                             <div> <input type="checkbox" id="brief" 
-                                         <%                                             
+                                         <%
                                              out.write(sub.isBrief() ? "checked" : "");
                                          %> >
                             </div><br>
-
-                            Expiration: 
+                            <%=ResourceLoader.GetResource(session, "items.expiration")%>: 
                             <div id="datetimepicker2" class="input-append">
-                                <input data-format="MM/dd/yyyy HH:mm:ss PP" type="text" value="<%                                    
+                                <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);
+                                        //TODO DOES NOT WORK     out.write(dateStr);
                                     }
                                        %>">
-                                
+
                                 <span class="add-on">
                                     <i data-time-icon="icon-time" data-date-icon="icon-calendar">
                                     </i>
@@ -235,10 +420,10 @@
                             </script>
 
 
-                            <div style="">Notification Interval (hh:mm:ss) : &nbsp;</div>
+                            <div style=""><%=ResourceLoader.GetResource(session, "items.notificationinterval")%>: &nbsp;</div>
 
                             <div class="input-append bootstrap-timepicker">
-                                <input id="timepicker2" type="text" class="input-small" placeholder="Duration of time (hh:mm:ss)" value="<%                                    
+                                <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() + ":"
@@ -263,7 +448,7 @@
                             <br>
 
                             <div style="float:left">Subscription Key: &nbsp;</div>
-                            <div class="edit" id="subkey"><%                                
+                            <div class="edit" id="subkey"><%
                                 if (sub.getSubscriptionKey() != null) {
                                     out.write(StringEscapeUtils.escapeHtml(sub.getSubscriptionKey()));
                                 }
@@ -279,7 +464,7 @@
 
 
                 <script type="text/javascript">
-                    Reedit()
+                    Reedit();
                     $("#bindingKey").resizable();
                     function saveSubscription()
                     {
@@ -288,16 +473,58 @@
                         var maxRecords = $("#maxRecords").val();
                         var brief = $("#brief").val();
                         var datetimepicker2 = $("#datetimepicker2").val();
-                        var subkey = $("#subkey").val();
+                        
+                        var subkey = $("#subkey").html();
 
                         var alertCriteraSingleItem = $("#alertCriteraSingleItem > button.btn.active").val();
                         var alertTransport = $("#alertTransport > button.btn.active").val();
-                        var itemKey = $("#itemKey").val();
+                        var itemKey = $("#keylist option");
+                        var keys="";
+                        var first=true;
+                        $.each(itemKey, function(idx, value){
+                            if (first)
+                                keys = value.value;
+                            else
+                                keys = keys + "," + value.value;
+                            first=false;
+                        });
                         var bindingKey = $("#bindingKey").val();
                         var alertType = $("#alertType > button.btn.active").val();
+                        
+                        var alertCriteraMultipleItem = $("#alertCriteraMultipleItem > button.btn.active").val();
+                        var searchcontent = $("#searchcontent").val();
+                        var searchlang = $("#searchlang").val();
+                        
                         var postbackdata = new Array();
                         var url='ajax/subscription.jsp';
+                        itemKey = $("#itemKey").html();
+                        
+                        //  var tqs = new Array();
+                        $.each($('.fq input:checkbox'), function(index,item){
+                            var itemname = item.id;
+                            if (item.checked)
+                            {
+                                postbackdata.push({
+                                    name:"findqualifier", 
+                                    value: itemname
+                                });
+                            }
+                        });
+                        
+                        alertCriteraMultipleItem
+                        postbackdata.push({
+                            name:"alertCriteraMultipleItem", 
+                            value: alertCriteraMultipleItem
+                        });
+                        postbackdata.push({
+                            name:"searchcontent", 
+                            value: searchcontent
+                        });
                         
+                        postbackdata.push({
+                            name:"searchlang", 
+                            value: searchlang
+                        });
                         
                         
                         postbackdata.push({
@@ -306,11 +533,16 @@
                         });
                         
                         postbackdata.push({
-                            name:"datetimepicker2", 
+                            name:"expires", 
                             value: datetimepicker2
                         });
                         
                         postbackdata.push({
+                            name:"interval", 
+                            value: interval
+                        });
+                        
+                        postbackdata.push({
                             name:"brief", 
                             value: brief
                         });
@@ -320,14 +552,6 @@
                             value: maxRecords
                         });
                         
-                        postbackdata.push({
-                            name:"interval", 
-                            value: interval
-                        });
-                        
-                        
-                        
-                        
                         
                         postbackdata.push({
                             name:"alertType", 
@@ -335,6 +559,11 @@
                         });
                         postbackdata.push({
                             name:"itemKey", 
+                            value: keys
+                        });
+                        
+                        postbackdata.push({
+                            name:"assertionStatus", 
                             value: itemKey
                         });
                         postbackdata.push({
@@ -349,6 +578,11 @@
                             name:"alertTransport", 
                             value: alertTransport
                         });
+                        postbackdata.push({
+                            name:"nonce", 
+                            value: $("#nonce").val()
+                        });
+    
             
                         var request=   $.ajax({
                             url: url,
@@ -370,7 +604,7 @@
 
                         request.fail(function(jqXHR, textStatus) {
                             window.console && console.log('postback failed ' + url);                                
-                            $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">&times;'  + '</a>' + textStatus);
+                            $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">&times;'  + '</a>' +jqXHR.responseText + textStatus);
                             $("#resultBar").show();
         
                         });
@@ -382,6 +616,47 @@
         </div>
     </div>
 
+
+    <div class="modal hide fade " id="assertionStatusChooser">
+        <div class="modal-header">
+            <a href="javascript:$('#assertionStatusChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
+            <h3><%=ResourceLoader.GetResource(session, "items.assertion.chooser")%> </h3>
+        </div>
+        <div class="modal-body">
+            <select id="assertionName" style="width:100%">
+                <%
+                    for (int i = 0; i < CompletionStatus.values().length; i++) {
+                        out.write("<option value=\""
+                                + StringEscapeUtils.escapeHtml(CompletionStatus.values()[i].toString()) + "\">"
+                                + StringEscapeUtils.escapeHtml(CompletionStatus.values()[i].toString()) + "</option>");
+                    }
+                %>
+
+            </select><br>
+            Explanation:<br>
+            <ul>
+                <%
+                    for (int i = 0; i < CompletionStatus.values().length; i++) {
+                        out.write("<li><b>" + StringEscapeUtils.escapeHtml(CompletionStatus.values()[i].toString()) + "</b> = "
+                                + ResourceLoader.GetResource(session, "items.subscription.CompletionStatus." + CompletionStatus.values()[i].toString()) + "</li>");
+                    }
+                %></ul>
+
+        </div>
+        <div class="modal-footer">
+            <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
+            <a href="javascript:assertionSuccess();" class="btn btn-primary" ><%=ResourceLoader.GetResource(session, "actions.select")%></a>
+            <script type="text/javascript">
+                function assertionSuccess()
+                {
+                    $("#itemKey").html($('#assertionName option:selected').val());
+                    $('#assertionStatusChooser').modal('hide');
+                }
+            </script>
+        </div>
+    </div>
+
+
     <%@include file="tmodelChooser.jsp" %>
     <%@include file="bindingChooser.jsp" %>
     <%@include file="businessChooser.jsp" %>

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=1478745&r1=1478744&r2=1478745&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 Fri May  3 12:12:10 2013
@@ -109,20 +109,20 @@
                         <a class="brand" href="home.jsp" style="padding-left:19px; padding-top:0px; padding-bottom:0px"><img src="img/logo2.png"></a>
                         <div class="nav-collapse collapse">
                             <ul class="nav">
-                                <li class="dropdown"><a href="home.jsp" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.home")%><b class="caret"></b></a>
+                                <li class="dropdown"><a href="home.jsp" data-toggle="dropdown" class="dropdowb-town"><i class="icon-home icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.home")%><b class="caret"></b></a>
                                     <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>
+                                        <li><a href="editSubscription.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.create.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.create")%></a></li>
                                         <li><a href="subscriptionFeed.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.feed.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.feed")%></a></li>
                                     </ul>
 
 
                                 </li>
-                                <li class="dropdown" ><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.discover")%><b class="caret"></b></a>
+                                <li class="dropdown" ><a href="#" data-toggle="dropdown" class="dropdowb-town"><i class="icon-search icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.discover")%><b class="caret"></b></a>
                                     <ul class="dropdown-menu">
                                         <li><a href="businessBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.businesses.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.businesses")%></a></li>
                                         <li><a href="serviceBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.services.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.services")%></a></li>
@@ -136,7 +136,7 @@
 
                                     </ul>
                                 </li>
-                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.create")%><b class="caret"></b></a>
+                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><i class="icon-pencil icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.create")%><b class="caret"></b></a>
                                     <ul class="dropdown-menu">
                                         <li><a href="businessEditor2.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.business.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.business")%></a></li>
                                         <li><a href="businessBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.service.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.service")%></a></li>
@@ -145,13 +145,13 @@
                                     </ul>
                                 </li>
 
-                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.settings")%><b class="caret"></b></a>
+                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><i class="icon-cog icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.settings")%><b class="caret"></b></a>
                                     <ul class="dropdown-menu">
                                         <li><a href="settings.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.settings.config.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.settings.config")%></a></li>
                                     </ul>
                                 </li>
 
-                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.help")%> <b class="caret"></b></a>
+                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><i class="icon-question-sign icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.help")%> <b class="caret"></b></a>
                                     <ul class="dropdown-menu">
                                         <li><a href="http://juddi.apache.org/docs/3.x/userguide/html/index.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.userguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.userguide")%></a></li>
                                         <li><a href="http://juddi.apache.org/docs/3.x/devguide/html/index.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.devguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.devguide")%></a></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=1478745&r1=1478744&r2=1478745&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 Fri May  3 12:12:10 2013
@@ -106,7 +106,7 @@ 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 bindingModal(div, type){
     //reset the form in case it was lanucheed more than once per page view
     reloadBindingModal();
     
@@ -114,17 +114,19 @@ function bindingModal(div){
         callback: function(success, result) {
             if (!success)
             {
-              //  alert("aborted!");    
+            //  alert("aborted!");    
             }
                 
             else{
-               // alert('Result: ' + result.join());
-                $("#" + div).html(result[0]);
+                if (type=='val')
+                    $("#" + div).val(result[0]);
+                else if (type=='html')
+                    $("#" + div).html(result[0]);
             }
-       //     return false;
+        //     return false;
         }
     });
-   // return false;
+// return false;
 }
             
             

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=1478745&r1=1478744&r2=1478745&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 Fri May  3 12:12:10 2013
@@ -61,7 +61,7 @@ function AddName()
     var i =  currentNameEntries;         
     $("<div id=\"Name" + i + "\" style=\"border-width:1px; border-style:solid\" >" 
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('Name" + i 
-        +"');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+        +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
         +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"Name" + i + "Value\"></div>"
         +"<div style=\"float:left\">" + i18n_lang + ": &nbsp;</div>"
@@ -78,7 +78,7 @@ function AddDescriptionSpecific(div)
     var i = currentDescriptionSpecific;
     $("<div id=\""+ div + i + "\" style=\"border-width:1px; border-style:solid\" >" 
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + div + i 
-        +"');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+        +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
         +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"" + div + i + "Value\"></div>"
         +"<div style=\"float:left\">" + i18n_lang + ": &nbsp;</div>"
@@ -94,7 +94,7 @@ function AddDescription()
     var i = currentDescriptionEntries;
     $("<div id=\"Description" + i + "\" style=\"border-width:1px; border-style:solid\" >" 
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('Description" + i 
-        +"');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+        +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
         +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"Description" + i + "Value\"></div>"
         +"<div style=\"float:left\">" + i18n_lang + ": &nbsp;</div>"
@@ -111,7 +111,7 @@ function AddDisco()
     
     $("<div id=\"disco" + i + "\" style=\"border-width:1px; border-style:solid\" >" 
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('disco" + i 
-        +"');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+        +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
         +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"disco" + i + "Value\"></div>"
         +"<div style=\"float:left\">" + i18n_type + ": &nbsp;</div>"
@@ -131,7 +131,7 @@ function AddContact()
     
     $("<div id=\"contact" + i + "\" style=\"border-width:2px; border-style:solid; border-color:red\" >" 
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + i 
-        +"');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+        +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
         +"<div style=\"float:left\">" + i18n_contactType+ ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + i + "Type\">" + i18n_contactTypeDefault + "</div>"
         +"<a href=\"javascript:AddContactName('" + i + "');\"><i class=\"icon-plus-sign icon-large\"></i></a>" + i18n_name + " &nbsp"
@@ -150,7 +150,7 @@ function AddContactName(contactid)
 {
     $("<div id=\"contact" + contactid + "Name" + contactname + "\" style=\"border-width:1px; border-style:solid\" >" 
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "Name" + contactname
-        +"');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+        +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
         +"<div style=\"float:left\">" + i18n_name + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Name" + contactname + "Value\"></div>"
         +"<div style=\"float:left\">" + i18n_lang + ": &nbsp;</div>"
@@ -165,7 +165,7 @@ function AddContactEmail(contactid)
 {
     $("<div id=\"contact" + contactid + "Email" + contactemail + "\" style=\"border-width:1px; border-style:solid\" >" 
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "Email" + contactemail
-        +"');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+        +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
         +"<div style=\"float:left\">" + i18n_type + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Email" + contactemail + "Type\">" + i18n_email+ "</div>"
         +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
@@ -180,7 +180,7 @@ function AddContactDescription(contactid
 {
     $("<div id=\"contact" + contactid + "Description" + contactdescription + "\" style=\"border-width:1px; border-style:solid\" >" 
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "Description" + contactdescription
-        +"');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+        +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
         +"<div style=\"float:left\">" + i18n_description + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Description" + contactdescription + "Value\">"+i18n_contactPrimary+"</div>"
         +"<div style=\"float:left\">" + i18n_lang + ": &nbsp;</div>"
@@ -194,7 +194,7 @@ function AddContactPhone(contactid)
 {
     $("<div id=\"contact" + contactid + "Phone" + contactphone + "\" style=\"border-width:1px; border-style:solid\" >" 
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "Phone" + contactphone
-        +"');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+        +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
         +"<div style=\"float:left\">" + i18n_phone + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Phone" + contactphone + "Value\"></div>"
         +"<div style=\"float:left\">" + i18n_type + ": &nbsp;</div>"
@@ -210,7 +210,7 @@ function AddContactAddress(contactid)
     $("<div id=\"contact" + contactid + "Address" + contactaddress + "\" style=\"border-width:1px; border-style:solid\" >" 
         
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "Address" + contactaddress
-        +"');\"><i class=\"icon-remove-sign icon-large\"></i></a>" + i18n_address + "</div><br>"
+        +"');\"><i class=\"icon-trash icon-large\"></i></a>" + i18n_address + "</div><br>"
         +"<div style=\"float:left\">" + i18n_lang + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Address" + contactaddress + "Lang\"></div>"
         +"<div style=\"float:left\">" + i18n_addressSortCode + ": &nbsp;</div>"
@@ -234,7 +234,7 @@ function AddContactAddressLine(contactid
         "\" style=\"border-width:1px; border-style:solid\" >" 
         
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "addressLine" +contactaddresslines 
-        +"');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"
+        +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
         +"<div style=\"float:left\">" + i18n_addressValue + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "addressLine" + contactaddresslines + "Value\"></div>"
         +"<div style=\"float:left\">" +i18n_keyname_optional + ": &nbsp;</div>"
@@ -254,7 +254,7 @@ function AddCategoryKeyReference()
     var i=currentcatkeyref;
     
     $("<div id=\"catbagkeyref" + i + "\" style=\"border-width:1px; border-style:solid\">"+
-        "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbagkeyref" + i + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"+
+        "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbagkeyref" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"+
         // <div style=\"float:left\">" + s.key") + ": <a href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.VALUE + "')\" class=\"btn btn-mini\">Picker</a> &nbsp;</div>"
         "<div style=\"float:left\">" + i18n_key +" (<a href=\"javascript:tModelModal('catbagkeyref" + i + "Value')\" ><i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): &nbsp;</div>"
         + "<div class=\"edit\" id=\"catbagkeyref" + i + "Value\"></div>"
@@ -272,7 +272,7 @@ function AddCategoryKeyReferenceGroup()
     var i=currentcatkeyrefgrp;
     
     $("<div id=\"catbaggrpkeyref" + i + "\" style=\"border-width:2px; border-style:solid\">"+
-        "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbaggrpkeyref" + i + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"+
+        "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbaggrpkeyref" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"+
         "<div style=\"float:left\">" + i18n_key + " (<a href=\"javascript:tModelModal('catbaggrpkeyref" + i + "Value')\"><i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): &nbsp;</div>"
         + "<div class=\"edit\" id=\"catbaggrpkeyref" + i + "Value\"></div>"
         
@@ -294,7 +294,7 @@ function AddCategoryKeyReferenceGroupKey
     
     $("<div id=\"" + div + "keyref" + k + "\" style=\"border-width:1px; border-style:solid\">"+
         "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + div  + "keyref" + k+  
-        "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"+
+        "');\"><i class=\"icon-trash icon-large\"></i></a></div>"+
         "<div style=\"float:left\">" + i18n_key + " (<a href=\"javascript:tModelModal('" + div  +"keyref" + k+ "Value')\"><i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): &nbsp;</div>"
         + "<div class=\"edit\" id=\"" + div  +"keyref" + k+ "Value\"></div>"
         +"<div style=\"float:left\">" + i18n_name + ": &nbsp;</div>"
@@ -310,7 +310,7 @@ function AddIdentKeyReference()
     var i=currentident;
     
     $("<div id=\"identbagkeyref" + i + "\" style=\"border-width:1px; border-style:solid\">"+
-        "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('identbagkeyref" + i + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>"+
+        "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('identbagkeyref" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"+
         "<div style=\"float:left\">" + i18n_key + " (<a href=\"javascript:tModelModal('identbagkeyref" + i + "Value')\"><i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): &nbsp;</div>"
         + "<div class=\"edit\" id=\"identbagkeyref" + i + "Value\"></div>"
         +"<div style=\"float:left\">" + i18n_name + ": &nbsp;</div>"
@@ -379,7 +379,7 @@ function saveBusiness()
     var postbackdata = new Array();
     $("div.edit").each(function()
     {
-        //TODO filter out (click to edit) values
+
         var id=$(this).attr("id");
         var value=$(this).text();
         postbackdata.push({

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=1478745&r1=1478744&r2=1478745&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 Fri May  3 12:12:10 2013
@@ -15,40 +15,41 @@
  *
  */
 
-var offset=0; //start at the begining
-var maxrecords=20;  //record 20 at a time
-var totalrecords=0;
 
-RenderBusinessListBySearch('%', offset, maxrecords);
+var offsetBusiness=0; //start at the begining
+var maxrecordsBusiness=10;  //record 20 at a time
+var totalrecordsBusiness=0;
 
-function pagedown()
+RenderBusinessListBySearch('%', offsetBusiness, maxrecordsBusiness);
+
+function pagedownBusiness()
 {
-    offset = $("#offset").text();
+    offset = $("#offsetBusiness").text();
     //alert(offset);
-    var newoffset = offset - maxrecords;
+    var newoffset = offsetBusiness - maxrecordsBusiness;
     if (newoffset < 0)
         return;
     //alert(newoffset);
-    if (newoffset != offset)
-        RenderBusinessListBySearch('%', newoffset, maxrecords);
+    if (newoffset != offsetBusiness)
+        RenderBusinessListBySearch('%', newoffset, maxrecordsBusiness);
 }
 function refreshBusinessList()
 {
-    RenderBusinessListBySearch('%', offset, maxrecords);
+    RenderBusinessListBySearch('%', offsetBusiness, maxrecordsBusiness);
 }
-function pageup()
+function pageupBusiness()
 {
-    offset = $("#offset").text();
+    offsetBusiness = $("#offsetBusiness").text();
     //alert(offset);
-    var fetch = maxrecords;
-    if ((parseInt(offset) + parseInt(maxrecords))  > totalrecords)
+    var fetch = maxrecordsBusiness;
+    if ((parseInt(offsetBusiness) + parseInt(maxrecordsBusiness))  > totalrecordsBusiness)
         //fetch = maxrecords - offset;
         return;
     else 
-        fetch = (parseInt(offset) + parseInt(maxrecords));    
+        fetch = (parseInt(offsetBusiness) + parseInt(maxrecordsBusiness));    
     //alert(fetch);
-    offset = fetch;
-    RenderBusinessListBySearch('%', fetch, maxrecords);
+    offsetBusiness = fetch;
+    RenderBusinessListBySearch('%', fetch, maxrecordsBusiness);
 }
 
 //offset, maxrecords, keyword
@@ -84,23 +85,23 @@ function RenderBusinessListBySearch(keyw
 
 function refresh()
 {
-    var displayrecords = $("#displayrecords").text();
-    if (displayrecords == totalrecords)
+    var displayrecords = $("#displayrecordsBusiness").text();
+    if (displayrecords == totalrecordsBusiness)
     {
-        $("#pageup").addClass("disabled");
-        $("#pagedown").addClass("disabled");
+        $("#pageupBusiness").addClass("disabled");
+        $("#pagedownBusiness").addClass("disabled");
     }
-    else if (offset + maxrecords > totalrecords)
+    else if (offsetBusiness + maxrecordsBusiness > totalrecordsBusiness)
     {
-        $("#pageup").addClass("disabled");    
+        $("#pageupBusiness").addClass("disabled");    
     }
-    else if (offset ==0)
+    else if (offsetBusiness ==0)
     {
-        $("#pagedown").removeClass("disabled");        
+        $("#pagedownBusiness").removeClass("disabled");        
     }
     else
     {
-        $("#pagedown").removeClass("disabled");        
-        $("#pageup").removeClass("disabled");        
+        $("#pagedownBusiness").removeClass("disabled");        
+        $("#pageupBusiness").removeClass("disabled");        
     }
 }
\ No newline at end of file



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