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/09 01:41:25 UTC
svn commit: r1465827 - in /juddi/branches/juddi-3.2.x/juddi-gui:
src/java/org/apache/juddi/webconsole/resources/web.properties
src/java/org/apache/juddi/webconsole/resources/web_es.properties
web/header-bottom.jsp web/serviceEditor.jsp
Author: alexoree
Date: Mon Apr 8 23:41:25 2013
New Revision: 1465827
URL: http://svn.apache.org/r1465827
Log:
adding a clearer "beta" flag, added a missing locale string, fixed an issued with the service editor failing to render due to a logic bug when creating a new service
Modified:
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties?rev=1465827&r1=1465826&r2=1465827&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties Mon Apr 8 23:41:25 2013
@@ -235,3 +235,4 @@ items.welcome=Welcome
items.expires=Expires
items.actions=Actions
actions.asxml=View as XML
+items.name.description=UDDI entities can have more than one name, such as abbreviations or in another language.
Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties?rev=1465827&r1=1465826&r2=1465827&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties Mon Apr 8 23:41:25 2013
@@ -236,3 +236,4 @@ items.welcome=Bienvenido
items.expires=Expira
items.actions=Acciones
actions.asxml=Ver como XML
+items.name.description=Entidades UDDI pueden tener m\u00e1s de un nombre, como abreviaturas o en otro idioma.
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp?rev=1465827&r1=1465826&r2=1465827&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp Mon Apr 8 23:41:25 2013
@@ -37,7 +37,10 @@
</div>
</div> <!-- /container -->
</form>
-<div style="padding: 0px 0px 0px 0px; bottom: 0px; margin: 0px 0px 0px 0px; width:100%; text-align: center; position: fixed"><center>BETA - v<%
+<div style="
+ padding: 0px 0px 0px 0px; bottom: 0px; margin: 0px 0px 0px 0px; width:100%; text-align: center; position: fixed;
+ background-color: white;
+ border-width: 4px; border-color: red; border-style: dashed"><center>BETA - v<%
Enumeration resEnum;
try {
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=1465827&r1=1465826&r2=1465827&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 8 23:41:25 2013
@@ -90,12 +90,14 @@
bd.setCategoryBag(new CategoryBag());
}
- %></div><br>
- <%
- if (!newitem) {
- out.write("<i class=\"icon-lock\"></i>");
- }
%>
+ </div>
+ <br>
+ <%
+ if (!newitem) {
+ out.write("<i class=\"icon-lock\"></i>");
+ }
+ %>
<b><%=ResourceLoader.GetResource(session, "items.service.key")%> </b>-
<%=ResourceLoader.GetResource(session, "items.service.key.description")%><br>
<div style="border-width: 2px; border-style: solid;" <%
@@ -106,8 +108,10 @@
}
%>
id="<%=PostBackConstants.SERVICEKEY%>">
- <% out.write(StringEscapeUtils.escapeHtml(bd.getServiceKey()));
-
+ <%
+ if (!newitem) {
+ out.write(StringEscapeUtils.escapeHtml(bd.getServiceKey()));
+ }
if (bd.getCategoryBag() == null) {
bd.setCategoryBag(new CategoryBag());
@@ -130,7 +134,9 @@
}
- %></div><br>
+ %>
+ </div>
+ <br>
<script type="text/javascript">
var currentNameEntries=<%= bd.getName().size() - 1%>;
@@ -187,7 +193,7 @@
<b><%=ResourceLoader.GetResource(session, "items.name")%> </b>-
- <%=ResourceLoader.GetResource(session, "items.name.descriptions")%><br>
+ <%=ResourceLoader.GetResource(session, "items.name.description")%><br>
<a href="javascript:AddName();"><i class="icon-plus-sign"></i></a><%=ResourceLoader.GetResource(session, "items.name.add")%>
<div id="nameContainer" style="border-width: 2px; border-style: solid;" >
<%
@@ -313,7 +319,7 @@
out.write(StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getBindingKey()));
}
// out.write("</div>");
-%>
+ %>
<br>
<a href="javascript:AddDescriptionSpecific('<%=PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.DESCRIPTION%>');">
<i class="icon-plus-sign"></i></a><%=ResourceLoader.GetResource(session, "items.bindingtemplate.description.add")%> <Br>
@@ -374,7 +380,7 @@
+ "<div class=\"edit\" id=\"" + PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k + PostBackConstants.KEYNAME + "\">" + StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey()) + "</div>");
// out.write("<div style=\"float:left\"><span title=\"Instance Params\">Value</span>: </div>"
// + "<div class=\"edit\" id=\"" + PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k + PostBackConstants.VALUE + "\">" + ((bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails() != null) ? StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails().getInstanceParms()) : "") + "</div>");
-%>
+ %>
<br>
<%
@@ -448,7 +454,7 @@
</div>
<% } //end of instance details
-%>
+ %>
</div>
<%
}
@@ -470,7 +476,7 @@
+ "<div class=\"edit\" id=\"" + PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF + k + "KeyName\">" + StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getCategoryBag().getKeyedReference().get(i).getKeyName()) + "</div>");
out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + ": </div>"
+ "<div class=\"edit\" id=\"" + PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF + k + "KeyValue\">" + StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getCategoryBag().getKeyedReference().get(i).getKeyValue()) + "</div>");
- out.write("</div>");
+ out.write("</div>"); //end key ref
}
%>
@@ -505,7 +511,7 @@
+ "<div class=\"edit\" id=\"" + PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP + z + PostBackConstants.KEY_REF + k + "KeyValue\">" + StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getCategoryBag().getKeyedReferenceGroup().get(z).getKeyedReference().get(k).getKeyValue()) + "</div>");
out.write("</div>");
}
- out.write("</div>");
+ out.write("</div>"); //end key refer group
}
%>
</div>
@@ -513,7 +519,7 @@
<%
} //end of binding templates loop
- %>
+%>
<%//end of tmodel instance%>
@@ -551,16 +557,23 @@
</div>
<div class="tab-pane" id="opinfo">
+ <%
+ if (!newitem) {
+
+ %>
<script type="text/javascript">
$.get("ajax/opInfo.jsp?id=<%=StringEscapeUtils.escapeJavaScript(bd.getServiceKey())%>", function(data){
$("#opinfodiv").html(data);
} )
</script>
<div id="opinfodiv"></div>
-
- </div>
+ <%
+ }
+ %>
+ </div><!-- end opinfo-->
</div>
</div>
+
<script type="text/javascript">
var currentDescriptionSpecific=<%=totalBTDescriptions%>;
</script>
@@ -568,49 +581,57 @@
<%
if (bd.getSignature().isEmpty()) {
%>
- <a class="btn btn-primary " href="javascript:saveService();"><%=ResourceLoader.GetResource(session, "actions.save")%></a> |
+ <a class="btn btn-primary " href="javascript:saveService();"><%=ResourceLoader.GetResource(session, "actions.save")%></a>
+
+
<% } else {
%>
<a href="#confirmDialog" role="button" class="btn btn-primary" data-toggle="modal"><%=ResourceLoader.GetResource(session, "actions.save")%></a> |
<% }
- // <a class="btn btn-primary " href="javascript:saveService();">Save</a> |
+ if (!newitem) {
%>
-
+ |
<a class="btn btn-danger " href="javascript:deleteService();"><%=ResourceLoader.GetResource(session, "actions.delete")%></a> |
<a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(bd.getServiceKey(), "UTF8")%>&type=service"><%=ResourceLoader.GetResource(session, "actions.sign")%></a> |
<a class="btn btn-info " href="#" title="Alert me when this entity changes"><%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
<a class="btn btn-warning " href="#" title="Transfer this entity to another UDDI node"><%=ResourceLoader.GetResource(session, "actions.transfer")%></a> |
<a class="btn " href="javascript:ViewAsXML();"><%=ResourceLoader.GetResource(session, "actions.asxml")%></a>
+ <script type="text/javascript">
+ function ViewAsXML()
+ {
+ $.get("ajax/toXML.jsp?id=<%=URLEncoder.encode(serviceid, "UTF-8")%>&type=business", function(data){
+ window.console && console.log('asXml success');
+ $("#viewAsXmlContent").html(safe_tags_replace(data));
+ $( "#viewAsXml" ).modal('show');
+ });
+
+ }
+ </script>
+ <%
+ }
+ %>
</div>
- <script type="text/javascript" src="js/businessEditor.js"></script>
- <script type="text/javascript" src="js/serviceEditor.js"></script>
+</div>
+<script type="text/javascript" src="js/businessEditor.js"></script>
+<script type="text/javascript" src="js/serviceEditor.js"></script>
- <script type="text/javascript">
- function ViewAsXML()
- {
- $.get("ajax/toXML.jsp?id=<%=URLEncoder.encode(serviceid, "UTF-8")%>&type=business", function(data){
- window.console && console.log('asXml success');
- $("#viewAsXmlContent").html(safe_tags_replace(data));
- $( "#viewAsXml" ).modal('show');
- });
-
- }
- </script>
- <div class="modal hide fade" 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>
- </div>
- <div class="modal-body">
- <p><%=ResourceLoader.GetResource(session, "modal.digitalsignaturewarning.body")%></p>
- </div>
- <div class="modal-footer">
- <a href="#" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
- <a href="javascript:saveService();$('#confirmDialog').modal('hide');" class="btn btn-primary">
- <%=ResourceLoader.GetResource(session, "modal.savechanges")%></a>
- </div>
+
+<div class="modal hide fade" 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>
+ </div>
+ <div class="modal-body">
+ <p><%=ResourceLoader.GetResource(session, "modal.digitalsignaturewarning.body")%></p>
</div>
- <!-- container div is in header bottom-->
- <%@include file="header-bottom.jsp" %>
\ No newline at end of file
+ <div class="modal-footer">
+ <a href="#" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+ <a href="javascript:saveService();$('#confirmDialog').modal('hide');" class="btn btn-primary">
+ <%=ResourceLoader.GetResource(session, "modal.savechanges")%></a>
+ </div>
+</div>
+
+<!-- container div is in header bottom-->
+<%@include file="header-bottom.jsp" %>
\ 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