Author: alexoree
Date: Tue Nov 5 22:18:04 2013
New Revision: 1539164
URL: http://svn.apache.org/r1539164
Log:
JUDDI-687, done
JUDDI-692 fixed publisher assertion page
Added:
juddi/trunk/juddi-gui/src/main/webapp/keyHelpModal.jsp
Modified:
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
juddi/trunk/juddi-gui/src/main/webapp/assertions.jsp
juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
Modified:
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties?rev=1539164&r1=1539163&r2=1539164&view=diff
==============================================================================
---
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
(original)
+++
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
Tue Nov 5 22:18:04 2013
@@ -79,7 +79,7 @@ items.lang=Language
items.loading=Loading
pages.businesseditor.title=Business Editor
pages.businesskey=Business Key
-pages.businesskey.description=The Business Key is the unique identifier for
this business and exists within this registry.
+pages.businesskey.description=The Business Key is the unique identifier for
this business and exists within this registry.
pages.editor.tabnav.general=General
pages.editor.tabnav.discovery=Discovery
pages.editor.tabnav.contacts=Contacts
@@ -353,3 +353,9 @@ navbar.create.serviceimport.tooltip.wadl
navbar.advanced=Advanced
actions.submit=Submit
pages.advanced.content=The Advanced page let's users proficient in XML and
UDDI manually enter data to send to the UDDI server. Authentication credentials
will be handled automatically.
+pages.uddikeys=The keys in UDDI v3 must start with the prefix "uddi:" followed
by one or more key domains (also known as a key partition). Example:
uddi:mybusiness.com:salesunit:service1 or uddi:mybusiness.com:service2. If you
do not specify a key, one will usually be generated for you. UDDI v2 keys
follow different rules and can also be used in a v3 registry if necessary, but
it's not recommended. Keys must be unique across UDDI nodes.
+items.publisherassertion.add.description=Adding a business relationship is
simple. It starts off by one party asserting its relationship with another.
Once completed, the other business entity can then be notified of the pending
request and then decide to either confirm it, or ignore it. Click to edit the
fields to make any changes.
+items.publisherassertion.add.tokey=To Key
+items.publisherassertion.add.fromkey=From Key
+items.publisherassertion.add.keyname=Key Name
+items.publisherassertion.add.keyvalue=Key Value
Modified:
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties?rev=1539164&r1=1539163&r2=1539164&view=diff
==============================================================================
---
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
(original)
+++
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
Tue Nov 5 22:18:04 2013
@@ -82,7 +82,7 @@ items.lang=Idioma
items.loading=Carga
pages.businesseditor.title=Empresas Editor
pages.businesskey=Business Key
-pages.businesskey.description=La clave del negocio es el identificador
\u00fanico para este negocio y existe dentro de este registro.
+pages.businesskey.description=La clave del negocio es el identificador
\u00fanico para este negocio y existe dentro de este registro.
pages.editor.tabnav.general=General
pages.editor.tabnav.discovery=Descubrimiento
pages.editor.tabnav.contacts=Contactos
@@ -355,3 +355,9 @@ navbar.create.serviceimport.tooltip.wadl
navbar.advanced=Avanzado
actions.submit=Entregar
pages.advanced.content=Los usuarios de la p\u00e1gina Advanced vamos
competentes en XML y UDDI introducir manualmente los datos para enviar al
servidor UDDI. Las credenciales de autenticaci\u00f3n se realizan
autom\u00e1ticamente.
+pages.uddikeys=Las claves en UDDI v3 deben comenzar con el prefijo "uddi:",
seguido por uno o m\u00e1s dominios clave (tambi\u00e9n conocida como una clave
de partici\u00f3n). Ejemplo: uddi: mybusiness.com: salesunit: service1 o uddi:
mybusiness.com: service2. Si no se especifica una clave, por lo general se
generar\u00e1 para usted. Teclas UDDI v2 siguen diferentes reglas y
tambi\u00e9n se puede utilizar en un registro v3 si es necesario, pero no es
recomendable. Las claves deben ser \u00fanicas en nodos UDDI.
+items.publisherassertion.add.description=Adici\u00f3n de una relaci\u00f3n de
negocios es simple. Comienza por una parte la afirmaci\u00f3n de su
relaci\u00f3n con otro. Una vez completada, la otra entidad de negocio puede
ser notificado de la solicitud pendiente y luego decidir de confirmar, o lo
ignoran. Haga clic para editar los campos para hacer los cambios.
+items.publisherassertion.add.tokey=Para clave
+items.publisherassertion.add.fromkey=Desde clave
+items.publisherassertion.add.keyname=Nombre de clave
+items.publisherassertion.add.keyvalue=Clave Valor
Modified: juddi/trunk/juddi-gui/src/main/webapp/assertions.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/assertions.jsp?rev=1539164&r1=1539163&r2=1539164&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/assertions.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/assertions.jsp Tue Nov 5 22:18:04
2013
@@ -247,15 +247,17 @@
<h3><%=ResourceLoader.GetResource(session,
"items.publisherassertion.add")%></h3>
</div>
<div class="modal-body" id="addPublisherAssertionContent">
- <div style="float:left;width:25%">From Key : </div><div
id="fromkey" class="edit"><%
+ <%=ResourceLoader.GetResource(session,
"items.publisherassertion.add.description")%>
+ <div style="float:left;width:25%">
+ <%=ResourceLoader.GetResource(session,
"items.publisherassertion.add.fromkey")%> : </div><div id="fromkey"
class="edit"><%
if (fromkey != null) {
out.write(StringEscapeUtils.escapeHtml(fromkey));
}
%></div>
- <div style="float:left;width:25%">To Key : </div><div id="tokey"
class="edit"></div>
- <div style="float:left;width:25%">tModel Key : </div><div
id="tmodelkey" class="edit">uddi:uddi.org:relationships</div>
- <div style="float:left;width:25%">Key Name : </div><div
id="keyname" class="edit">Subsidiary</div>
- <div style="float:left;width:25%">Key Value : </div><div
id="keyvalue" class="edit">parent-child</div>
+ <div
style="float:left;width:25%"><%=ResourceLoader.GetResource(session,
"items.publisherassertion.add.tokey")%> : </div><div id="tokey"
class="edit"></div>
+ <div
style="float:left;width:25%"><%=ResourceLoader.GetResource(session,
"items.tmodel.key")%> : </div><div id="tmodelkey"
class="edit">uddi:uddi.org:relationships</div>
+ <div
style="float:left;width:25%"><%=ResourceLoader.GetResource(session,
"items.publisherassertion.add.keyname")%> : </div><div id="keyname"
class="edit">Subsidiary</div>
+ <div
style="float:left;width:25%"><%=ResourceLoader.GetResource(session,
"items.publisherassertion.add.keyvalue")%> : </div><div id="keyvalue"
class="edit">parent-child</div>
<div id="saveresult" style="color:red"></div>
</div>
<script type="text/javascript">
Modified: juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp?rev=1539164&r1=1539163&r2=1539164&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp Tue Nov 5
22:18:04 2013
@@ -57,6 +57,7 @@
%>
<b><%=ResourceLoader.GetResource(session,
"pages.businesskey")%></b>-
<%=ResourceLoader.GetResource(session,
"pages.businesskey.description")%>
+ <a href="javascript:ShowKeyHelp();"><i
class="icon-question-sign icon-large"></i>
<%=ResourceLoader.GetResource(session, "navbar.help")%></a>
<br>
<div style="border-width: 2px; border-style: solid;" class="<%
@@ -702,9 +703,13 @@
<a href="javascript:closeXmlPop('viewAsXml');"
class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
</div>
</div>
+
+
+
<%
}
%>
+ <%@include file="keyHelpModal.jsp" %>
<%@include file="tmodelChooser.jsp" %>
<!-- container div is in header bottom-->
<%@include file="header-bottom.jsp" %>
\ No newline at end of file
Added: juddi/trunk/juddi-gui/src/main/webapp/keyHelpModal.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/keyHelpModal.jsp?rev=1539164&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/keyHelpModal.jsp (added)
+++ juddi/trunk/juddi-gui/src/main/webapp/keyHelpModal.jsp Tue Nov 5 22:18:04
2013
@@ -0,0 +1,26 @@
+<%--
+ Document : keyHelpModal.jsp
+ Created on : Nov 5, 2013, 7:29:53 AM
+ Author : Alex O'Ree
+--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<script type="text/javascript">
+ function ShowKeyHelp()
+ {
+ $("#aboutKeys").modal('show');
+ }
+</script>
+
+<div class="modal hide fade container" id="aboutKeys">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
+ <h3><%=ResourceLoader.GetResource(session, "navbar.help")%></h3>
+ </div>
+ <div class="modal-body">
+ <%=ResourceLoader.GetResource(session, "pages.uddikeys")%>
+ </div>
+ <div class="modal-footer">
+
+ <a href="javascript:closeXmlPop('aboutKeys');"
class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+ </div>
+</div>
Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp?rev=1539164&r1=1539163&r2=1539164&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp Tue Nov 5 22:18:04
2013
@@ -93,7 +93,7 @@
<b><%=ResourceLoader.GetResource(session,
"pages.businesskey")%></b>-
<%=ResourceLoader.GetResource(session,
"pages.businesskey.description")%>
-
+ <a href="javascript:ShowKeyHelp();"><i
class="icon-question-sign icon-large"></i>
<%=ResourceLoader.GetResource(session, "navbar.help")%></a>
<br>
<div style="border-width: 2px; border-style: solid;"
class="noedit" id="<%=PostBackConstants.BUSINESSKEY%>">
<%
@@ -726,4 +726,5 @@
%>
<!-- container div is in header bottom-->
<%@include file="tmodelChooser.jsp" %>
-<%@include file="header-bottom.jsp" %>
\ No newline at end of file
+<%@include file="header-bottom.jsp" %>
+<%@include file="keyHelpModal.jsp" %>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp?rev=1539164&r1=1539163&r2=1539164&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp Tue Nov 5 22:18:04
2013
@@ -123,6 +123,7 @@
}
%>
<%= ResourceLoader.GetResource(session,
"items.tmodel.key.description")%>
+ <a href="javascript:ShowKeyHelp();"><i
class="icon-question-sign icon-large"></i>
<%=ResourceLoader.GetResource(session, "navbar.help")%></a>
<div style="border-width: 2px; border-style: solid;" <%
if (!newitem) {
@@ -521,4 +522,5 @@
}
%>
<%@include file="tmodelChooser.jsp" %>
- <%@include file="header-bottom.jsp" %>
\ No newline at end of file
+ <%@include file="header-bottom.jsp" %>
+ <%@include file="keyHelpModal.jsp" %>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
