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/07 01:08:02 UTC

svn commit: r1465312 [2/3] - in /juddi/branches/juddi-3.2.x/juddi-gui: src/java/org/apache/juddi/webconsole/ src/java/org/apache/juddi/webconsole/hub/ src/java/org/apache/juddi/webconsole/hub/builders/ src/java/org/apache/juddi/webconsole/resources/ we...

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=1465312&r1=1465311&r2=1465312&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 Sat Apr  6 23:08:00 2013
@@ -1,10 +1,20 @@
-/* 
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+/*
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
  */
 
-var clicktoedit="Click to edit";
-
 function AddName()
 {
     currentNameEntries++;
@@ -12,9 +22,9 @@ function AddName()
     $("<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\"></i></a></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"Name" + i + "Value\"></div>"
-        +"<div style=\"float:left\">Language: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_lang + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"Name" + i + "Lang\"></div>"
         +"</div>").prependTo("#nameContainer");
     Reedit();
@@ -29,9 +39,9 @@ function AddDescriptionSpecific(div)
     $("<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\"></i></a></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"" + div + i + "Value\"></div>"
-        +"<div style=\"float:left\">Language: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_lang + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"" + div + i + "Lang\"></div>"
         +"</div>").prependTo("#" + div);
     Reedit();
@@ -45,9 +55,9 @@ function AddDescription()
     $("<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\"></i></a></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"Description" + i + "Value\"></div>"
-        +"<div style=\"float:left\">Language: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_lang + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"Description" + i + "Lang\"></div>"
         +"</div>").prependTo("#Description");
     Reedit();
@@ -62,9 +72,9 @@ 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\"></i></a></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"disco" + i + "Value\"></div>"
-        +"<div style=\"float:left\">Type: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_type + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"disco" + i + "Type\"></div>"
         +"</div>").prependTo("#discoContainer");
     
@@ -82,13 +92,13 @@ 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\"></i></a></div>"
-        +"<div style=\"float:left\">Contact Type: &nbsp;</div>"
-        +"<div class=\"edit\" id=\"contact" + i + "Type\">(Job Title, Role)</div>"
-        +"<a href=\"javascript:AddContactName('" + i + "');\"><i class=\"icon-plus-sign\"></i></a>Name &nbsp"
-        +"<a href=\"javascript:AddContactEmail('" + i + "');\"><i class=\"icon-plus-sign\"></i></a>Email &nbsp"
-        +"<a href=\"javascript:AddContactDescription('" + i + "');\"><i class=\"icon-plus-sign\"></i></a>Description &nbsp"
-        +"<a href=\"javascript:AddContactPhone('" + i + "');\"><i class=\"icon-plus-sign\"></i></a>Phone &nbsp"
-        +"<a href=\"javascript:AddContactAddress('" + i + "');\"><i class=\"icon-plus-sign\"></i></a>Address &nbsp"
+        +"<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\"></i></a>" + i18n_name + " &nbsp"
+        +"<a href=\"javascript:AddContactEmail('" + i + "');\"><i class=\"icon-plus-sign\"></i></a>" + i18n_email + " &nbsp"
+        +"<a href=\"javascript:AddContactDescription('" + i + "');\"><i class=\"icon-plus-sign\"></i></a>"+i18n_description+" &nbsp"
+        +"<a href=\"javascript:AddContactPhone('" + i + "');\"><i class=\"icon-plus-sign\"></i></a>" + i18n_phone + " &nbsp"
+        +"<a href=\"javascript:AddContactAddress('" + i + "');\"><i class=\"icon-plus-sign\"></i></a>" + i18n_address + " &nbsp"
      
         +"</div>").prependTo("#contactsContainer");
     
@@ -101,9 +111,9 @@ 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\"></i></a></div>"
-        +"<div style=\"float:left\">Name: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_name + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Name" + contactname + "Value\"></div>"
-        +"<div style=\"float:left\">Language: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_lang + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Name" + contactname + "Lang\"></div>"
         +"</div>").insertAfter("#contact" + contactid);
     Reedit();
@@ -116,9 +126,9 @@ 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\"></i></a></div>"
-        +"<div style=\"float:left\">Type: &nbsp;</div>"
-        +"<div class=\"edit\" id=\"contact" + contactid + "Email" + contactemail + "Type\">e-mail</div>"
-        +"<div style=\"float:left\">Value: &nbsp;</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>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Email" + contactemail + "Value\"></div>"
         +"</div>").insertAfter("#contact" + contactid);
     Reedit();
@@ -131,9 +141,9 @@ 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\"></i></a></div>"
-        +"<div style=\"float:left\">Description: &nbsp;</div>"
-        +"<div class=\"edit\" id=\"contact" + contactid + "Description" + contactdescription + "Value\">Primary Contact</div>"
-        +"<div style=\"float:left\">Language: &nbsp;</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>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Description" + contactdescription + "Lang\"></div>"
         +"</div>").insertAfter("#contact" + contactid);
     Reedit();
@@ -145,10 +155,10 @@ 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\"></i></a></div>"
-        +"<div style=\"float:left\">Phone: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_phone + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Phone" + contactphone + "Value\"></div>"
-        +"<div style=\"float:left\">Type: &nbsp;</div>"
-        +"<div class=\"edit\" id=\"contact" + contactid + "Phone" + contactphone + "Type\">(Extension, Domestic, International, DSN)</div>"
+        +"<div style=\"float:left\">" + i18n_type + ": &nbsp;</div>"
+        +"<div class=\"edit\" id=\"contact" + contactid + "Phone" + contactphone + "Type\">" + i18n_phoneType + "</div>"
         +"</div>").insertAfter("#contact" + contactid);
     Reedit();
     contactphone++;
@@ -160,15 +170,16 @@ 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\"></i></a>Address</div><br>"
-        +"<div style=\"float:left\">Language: &nbsp;</div>"
+        +"');\"><i class=\"icon-remove-sign\"></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\">Sort Code: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_addressSortCode + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Address" + contactaddress + "Sortcode\">" + contactaddress +"</div>"
-        +"<div style=\"float:left\">Type: &nbsp;</div>"
-        +"<div class=\"edit\" id=\"contact" + contactid + "Address" + contactaddress + "Type\">(headquarters. sales office, billing)</div>"
+        +"<div style=\"float:left\">" + i18n_type + ": &nbsp;</div>"
+        +"<div class=\"edit\" id=\"contact" + contactid + "Address" + contactaddress + "Type\">" + i18n_addressDefaultType + "</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "Address" + contactaddress + "KeyName\"></div>"
-        +"<div><a href=\"javascript:AddContactAddressLine('" + contactid+ "Address" + contactaddress+"');\"><i class=\"icon-plus-sign\"></i></a> Add an addline (at least one is required)</div>"
+        +"<div><a href=\"javascript:AddContactAddressLine('" + contactid+ "Address" + 
+        contactaddress+"');\"><i class=\"icon-plus-sign\"></i></a> " + i18n_addressLineAdd + "</div>"
         +"</div>").insertAfter("#contact" + contactid);
     Reedit();
     contactaddress++;
@@ -182,11 +193,11 @@ function AddContactAddressLine(contactid
         
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "addressLine" +contactaddresslines 
         +"');\"><i class=\"icon-remove-sign\"></i></a></div>"
-        +"<div style=\"float:left\">Address Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_addressValue + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "addressLine" + contactaddresslines + "Value\"></div>"
-        +"<div style=\"float:left\">Key Name (optional): &nbsp;</div>"
+        +"<div style=\"float:left\">" +i18n_keyname_optional + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "addressLine" + contactaddresslines + "KeyName\"></div>"
-        +"<div style=\"float:left\">Key Value (optional): &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_keyvalue_optional + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"contact" + contactid + "addressLine" + contactaddresslines + "KeyValue\"></div>"
     
         +"</div>").insertAfter("#contact" + contactid);
@@ -202,11 +213,11 @@ function AddCategoryKeyReference()
     
     $("<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\"></i></a></div>"+
-        "<div style=\"float:left\">Key: &nbsp;</div>"
+        "<div style=\"float:left\">" + i18n_key +": &nbsp;</div>"
         + "<div class=\"edit\" id=\"catbagkeyref" + i + "Value\"></div>"
-        +"<div style=\"float:left\">Name: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_name + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\"catbagkeyref" + i + "KeyName\"></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\"catbagkeyref" + i + "KeyValue\"></div>"
         +"</div>").appendTo("#catContainer");
     Reedit();
@@ -219,12 +230,13 @@ function AddCategoryKeyReferenceGroup()
     
     $("<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\"></i></a></div>"+
-        "<div style=\"float:left\">Key: &nbsp;</div>"
+        "<div style=\"float:left\">" + i18n_key + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\"catbaggrpkeyref" + i + "Value\"></div>"
         
         + "<div id=\"catbaggrpkeyref" + i + "keyref\" style=\"border-width:1px; border-style:solid\">"
         + "<div style=\"float:left;height:100%\"><a href=\"javascript:AddCategoryKeyReferenceGroupKeyRef('catbaggrpkeyref" + i + "keyref');\"><i class=\"icon-plus-sign\"></i></a></div>"
-        +"Add Key Reference"
+    
+        +i18n_addrefcat
         + "</div>"
     
         +"</div>").appendTo("#catContainerGrp");
@@ -233,17 +245,18 @@ function AddCategoryKeyReferenceGroup()
 var currentcatkeyrefgrpitems=0;
 function AddCategoryKeyReferenceGroupKeyRef(div)
 {
-     var i=currentcatkeyrefgrp;
+    var i=currentcatkeyrefgrp;
     currentcatkeyrefgrpitems++;
     var k=currentcatkeyrefgrpitems;
     
     $("<div id=\"catbaggrpkeyref" + i + "keyref" + k + "\" style=\"border-width:1px; border-style:solid\">"+
-        "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbaggrpkeyref" + i + "keyref" + k+  "');\"><i class=\"icon-remove-sign\"></i></a></div>"+
-        "<div style=\"float:left\">Key: &nbsp;</div>"
+        "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbaggrpkeyref" + i + "keyref" + k+  
+        "');\"><i class=\"icon-remove-sign\"></i></a></div>"+
+        "<div style=\"float:left\">" + i18n_key + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\"catbaggrpkeyref" + i +"keyref" + k+ "Value\"></div>"
-        +"<div style=\"float:left\">Name: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_name + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\"catbaggrpkeyref" + i +"keyref" + k+ "KeyName\"></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\"catbaggrpkeyref" + i +"keyref" + k+ "KeyValue\"></div>"
         +"</div>").appendTo("#" + div);
     Reedit();
@@ -255,11 +268,11 @@ function AddIdentKeyReference()
     
     $("<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\"></i></a></div>"+
-        "<div style=\"float:left\">Key: &nbsp;</div>"
+        "<div style=\"float:left\">" + i18n_key + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\"identbagkeyref" + i + "Value\"></div>"
-        +"<div style=\"float:left\">Name: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_name + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\"identbagkeyref" + i + "KeyName\"></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\"identbagkeyref" + i + "KeyValue\"></div>"
         +"</div>").insertAfter("#identContainer");
     Reedit();
@@ -293,7 +306,7 @@ function deleteBusiness()
     var request=   $.ajax({
         url: url,
         type:"POST",
-        //  dataType: "html", 
+        //  data" + i18n_type + ": "html", 
         cache: false, 
         //  processData: false,f
         data: postbackdata
@@ -349,7 +362,7 @@ function saveBusiness()
     var request=   $.ajax({
         url: url,
         type:"POST",
-        //  dataType: "html", 
+        //  data" + i18n_type + ": "html", 
         cache: false, 
         //  processData: false,f
         data: postbackdata

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=1465312&r1=1465311&r2=1465312&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 Sat Apr  6 23:08:00 2013
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 var offset=0; //start at the begining
 var maxrecords=20;  //record 20 at a time

Added: juddi/branches/juddi-3.2.x/juddi-gui/web/js/i18n.js.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/i18n.js.jsp?rev=1465312&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/i18n.js.jsp (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/i18n.js.jsp Sat Apr  6 23:08:00 2013
@@ -0,0 +1,87 @@
+
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%-- 
+/*
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+    Document   : i18n.js
+    Created on : Apr 6, 2013, 11:42:48 AM
+    Author     : Alex O'Ree
+--%>
+
+<%@page contentType="application/javascript" pageEncoding="UTF-8"%>
+//<script type="text/javascript">
+    var i18n_clicktoedit="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.clicktoedit"))%>";
+    var i18n_loading="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.loading"))%>";
+    var i18n_login="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "navbar.login.button"))%>";
+    
+    var i18n_name="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.name"))%>";
+    var i18n_value="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.value"))%>";
+    var i18n_key="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.key"))%>";
+    var i18n_lang="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.lang"))%>";
+    var i18n_email="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.email"))%>";
+    var i18n_type="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.type"))%>";
+    
+    var i18n_descriptionAdd="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.description.add"))%>";
+    var i18n_description="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.description"))%>";
+    var i18n_contactPrimary="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.contact.primary"))%>";
+    var i18n_contactType="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.contact.type"))%>";
+    var i18n_contactTypeDefault="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.contact.default"))%>";
+    var i18n_address="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.address"))%>";
+    var i18n_addressValue="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.addressvalue"))%>";
+    var i18n_addressDefaultType="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.addresstype.default"))%>";
+    var i18n_addressLineAdd="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.addressline.add"))%>";
+    
+    var i18n_keyname_optional="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.keyname.optional"))%>";
+    var i18n_keyvalue_optional="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.keyvalue.optional"))%>";
+    
+    var i18n_addrefcat="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.keyrefcat.add"))%>"; 
+    
+    var i18n_addressSortCode="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.sortcode"))%>";
+    var i18n_phone="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.phone"))%>";
+    
+    var i18n_phoneType="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.phone.types"))%>";
+    
+    
+    var i18n_bindingTemplateKey="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.bindingtemplate.key"))%>";
+    var i18n_bindingTemplateDescriptionAdd="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.bindingtemplate.description.add"))%>";
+    var i18n_accesspoint="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.accesspoint"))%>";
+    var i18n_accesspointType="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.accesspoint.type"))%>";
+    var i18n_accesspointValue="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.accesspoint.value"))%>";
+    
+    var i18n_tmodelinstanceinfo="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.tmodelinstance.info"))%>";
+    var i18n_tmodelinstanceinfoDescription="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.tmodelinstance.info.desc"))%>";
+    var i18n_tmodelinstanceinfoAdd="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.tmodelinstance.add"))%>";
+    var i18n_bindingTemplateKeyRefCat="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.bindingtemplate.keyrefcat"))%>";
+    var i18n_bindingTemplateKeyRefCatGrp="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.bindingtemplate.keyrefgrp"))%>";
+    
+    var i18n_keyRefGrpAdd="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.keyrefgroup.add"))%>";
+    var i18n_accesspointDescription="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.accesspoint.description"))%>";
+    var i18n_tmodelkey="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.tmodel.key"))%>";
+    var i18n_tmodelInstanceParams="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.tmodelinstance.parameters"))%>";
+    var i18n_tmodelInstanceDescription="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.tmodelinstance.description"))%>"; 
+    var i18n_tmodelInstanceDescription2="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.tmodelinstance.description2"))%>"; 
+    var i18n_tmodelInstanceDescriptionAdd="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.tmodelinstance.description.add"))%>"; 
+    
+    var i18n_overviewdoc="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.overviewurl"))%>"; 
+    var i18n_overviewdocDescription="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.overviewurl.description"))%>"; 
+    var i18n_overviewdocadd="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.overviewurl.add"))%>"; 
+    //items.overviewurl.description.add
+    //items.name.add
+    //items.overviewurl.description.add
+    //items.bindingtemplate.add
+    //items.bindingtemplate.description.add
+//</script>
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/jquery.jeditable.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/jquery.jeditable.js?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/jquery.jeditable.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/jquery.jeditable.js Sat Apr  6 23:08:00 2013
@@ -1,4 +1,6 @@
 /*
+ * MODIFIED by Juddi to support i18n
+ * 
  * Jeditable - jQuery in place edit plugin
  *
  * Copyright (c) 2006-2009 Mika Tuupola, Dylan Verheul
@@ -533,8 +535,8 @@
         event      : 'click.editable',
         onblur     : 'cancel',
         loadtype   : 'GET',
-        loadtext   : 'Loading...',
-        placeholder: 'Click to edit',
+        loadtext   : i18n_loading,
+        placeholder: i18n_clicktoedit,
         loaddata   : {},
         submitdata : {},
         ajaxoptions: {}

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js Sat Apr  6 23:08:00 2013
@@ -1,6 +1,18 @@
-/* 
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+/*
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
  */
 
 var loggedin=false;
@@ -44,7 +56,7 @@ function Login()
 {
     
     $("#loginbutton").addClass("disabled");
-    $("#loginbutton").text("Please wait");
+    $("#loginbutton").text(i18n_loading);
     
     var form = $("#uddiform");
     var d = form.serializeArray();
@@ -59,7 +71,7 @@ function Login()
                   
     request.done(function(msg) {
         window.console && console.log('postback done ');                
-        $("#loginbutton").text("Login");
+        $("#loginbutton").text(i18n_login);
         RefreshLoginPage();
     });
 
@@ -67,7 +79,7 @@ function Login()
         window.console && console.log('postback failed ');                                
         //TODO handle expired nonce values?
         RefreshLoginPage();
-        $("#loginbutton").text("Login");
+        $("#loginbutton").text(i18n_login);
     });
 }
 
@@ -115,9 +127,6 @@ function ShowServicesByBusinessKey(bizid
     //refresh();
     });
 
-//    $.get('ajax/servicelist.jsp?id=' + bizid, function(data) {
-//        $("#" + bizid).html(data);
-//    });
 }
 
 function ShowBusinssDetails(bizid)

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js Sat Apr  6 23:08:00 2013
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 var offset=0; //start at the begining
 var maxrecords=20;  //record 20 at a time

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceEditor.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceEditor.js?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceEditor.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceEditor.js Sat Apr  6 23:08:00 2013
@@ -1,6 +1,18 @@
-/* 
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+/*
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
  */
 
 
@@ -14,11 +26,11 @@ function AddCategoryKeyReferenceSpecific
     
     $("<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\"></i></a></div>"+
-        "<div style=\"float:left\">Key: &nbsp;</div>"
+        "<div style=\"float:left\">" + i18n_key + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\""+div + i + "Value\"></div>"
-        +"<div style=\"float:left\">Name: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_name + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\""+div + i + "KeyName\"></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\"" +div+ i + "KeyValue\"></div>"
         +"</div>").appendTo("#"+div);
     Reedit();
@@ -32,12 +44,13 @@ function AddCategoryKeyReferenceGroupSpe
     
     $("<div id=\""+div + i + "\" style=\"border-width:2px; border-style:solid\">"+
         "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('"+div + i + "');\"><i class=\"icon-remove-sign\"></i></a></div>"+
-        "<div style=\"float:left\">Key: &nbsp;</div>"
+        "<div style=\"float:left\">" + i18n_key + ": &nbsp;</div>"
         + "<div class=\"edit\" id=\"" +div+ i + "Value\"></div>"
         
         + "<div id=\""+div + i + "keyref\" style=\"border-width:1px; border-style:solid\">"
-        + "<div style=\"float:left;height:100%\"><a href=\"javascript:AddCategoryKeyReferenceGroupKeyRef('"+div + i + "keyref');\"><i class=\"icon-plus-sign\"></i></a></div>"
-        +"Add Key Reference"
+        + "<div style=\"float:left;height:100%\"><a href=\"javascript:AddCategoryKeyReferenceGroupKeyRef('"+div + i
+        + "keyref');\"><i class=\"icon-plus-sign\"></i></a></div>"
+        +i18n_addrefcat
         + "</div>"
     
         +"</div>").appendTo("#"+div);
@@ -51,13 +64,13 @@ function AddOverviewDocumentSpecific(div
     $("<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\"></i></a></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"" +div+ i + "Value\"></div>"
-        +"<div style=\"float:left\">Use Type: &nbsp;</div>"
+        +"<div style=\"float:left\">Use " + i18n_type + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"" + div + i + "Type\"></div>"
         //descriptions
         +"<a href=\"javascript:AddDescriptionSpecific('" + div + i + "Description');\">"
-        +"<i class=\"icon-plus-sign\"></i></a> Add a description"
+        +"<i class=\"icon-plus-sign\"></i></a> " + i18n_descriptionAdd
         + ("<div id=\"" + div + i + "Description\" style=\"border-width:1px; border-style:dotted\"></div>")
     
         +"</div>").prependTo("#" + div);
@@ -70,41 +83,27 @@ function AddBindingTemplate()
 
     currentbindingtemplates++;
     var i =  currentbindingtemplates;         
-    /*  $("<div id=\"bindingTemplate" + i + "\" style=\"border-width:1px; border-style:solid\" >" 
-        +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('bindingTemplate" + i 
-        +"');\"><i class=\"icon-remove-sign\"></i></a></div>"
-        +"<div class=\"editrableSelectAccessPoint\"></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
-        +"<div class=\"edit\" id=\"Name" + i + "Value\"></div>"
-        +"<div style=\"float:left\">Language: &nbsp;</div>"
-        +"<div class=\"edit\" id=\"Name" + i + "Lang\"></div>"
-        +"</div>").appendTo("#bindingTemplatesContainer");
-*/    
-    $("<br><div id=\"bindingTemplate" + i + "\" style=\"border-width: 2px; border-style: dashed;; border-color: lightseagreen\"><div style=\"float:left\"><a href=\"javascript:Remove('bindingTemplate"+i+"');\"><i class=\"icon-remove-sign\"></i></a>Binding Template Key: &nbsp;</div><div class=\"edit\" id=\"bindingTemplate"+i+"Value\">"
-        +"</div><br><a href=\"javascript:AddDescriptionSpecific('bindingTemplate"+i+"Description');\"><i class=\"icon-plus-sign\"></i></a>Add a Binding Template Description - binding templates can have more than one description, such as in a different language.<br>"
+      
+    $("<br><div id=\"bindingTemplate" + i + "\" style=\"border-width: 2px; border-style: dashed;; border-color: lightseagreen\"><div style=\"float:left\"><a href=\"javascript:Remove('bindingTemplate"+i+"');\"><i class=\"icon-remove-sign\"></i></a>" + i18n_bindingTemplateKey + ": &nbsp;</div><div class=\"edit\" id=\"bindingTemplate"+i+"Value\">"
+        +"</div><br><a href=\"javascript:AddDescriptionSpecific('bindingTemplate"+i+"Description');\"><i class=\"icon-plus-sign\"></i></a>"
+        +i18n_bindingTemplateDescriptionAdd
+        +"<br>"
         +"<div id=\"bindingTemplate"+i+"Description\" style=\"border-width: 1px; border-style: dotted;\"></div>"
-        +"<b>Access Point</b> - UDDI allows for a choice of either a Hosting Redirector OR an Access Point. Access Point is recommend. The access point is usually a URL for the service endpoint.<br>"
-        +"<div style=\"float:left\">Access Point Type: &nbsp;</div><div class=\"edit\" id=\"bindingTemplate"+i+"accessPointType\"></div><div style=\"float:left\">Access Point Value: &nbsp;</div><div class=\"edit\" id=\"bindingTemplate"+i+"accessPointValue\"></div></div>"
-        +"<br><b>tModel Instance Information</b> - a binding template can have additional information attached to it using the tModel Instance.<br>"
-        +"<a href=\"javascript:AddTmodelInstance('bindingTemplate"+i+"tmodelInstance');\"><i class=\"icon-plus-sign\"></i></a> Add a tModel Instance<br>"
+        +"<b>" + i18n_accesspoint + "</b> - " + i18n_accesspointDescription +"<br>"
+        +"<div style=\"float:left\">" + i18n_accesspointType + ": &nbsp;</div><div class=\"edit\" id=\"bindingTemplate"+i+"accessPointType\"></div><div style=\"float:left\">" + i18n_accesspointValue + ": &nbsp;</div><div class=\"edit\" id=\"bindingTemplate"+i+"accessPointValue\"></div></div>"
+        +"<br><b>" + i18n_tmodelinstanceinfo + "</b> - " + i18n_tmodelinstanceinfoDescription + "<br>"
+        +"<a href=\"javascript:AddTmodelInstance('bindingTemplate"+i+"tmodelInstance');\"><i class=\"icon-plus-sign\"></i></a> " + i18n_tmodelinstanceinfoAdd 
+        + "<br>"
         +"<div id=\"bindingTemplate"+i+"tmodelInstance\" style=\"border-width: 1px; border-style: solid; border-color: red\"></div><br>"
-        +"<b>Binding Template Keyed Reference Categories:</b><br><a href=\"javascript:AddCategoryKeyReferenceSpecific('bindingTemplate"+i+"catbagkeyref');\"><i class=\"icon-plus-sign\"></i></a> Add Key Reference Category <br>"
-        +"<div id=\"bindingTemplate"+i+"catbagkeyref\" style=\"border-width: 1px; border-style: dotted;\"></div><br><b>Binding Template Keyed Reference Groups</b><br>"
-        +"<a href=\"javascript:AddCategoryKeyReferenceGroupSpecificBT('bindingTemplate"+i+"catbaggrpkeyref');\"><i class=\"icon-plus-sign\"></i></a> Add Key Reference Group Category<br>"
+        +"<b>" + i18n_bindingTemplateKeyRefCat + ":</b><br><a href=\"javascript:AddCategoryKeyReferenceSpecific('bindingTemplate"+i+"catbagkeyref');\"><i class=\"icon-plus-sign\"></i></a> " + i18n_addrefcat + "<br>"
+        +"<div id=\"bindingTemplate"+i+"catbagkeyref\" style=\"border-width: 1px; border-style: dotted;\"></div><br>"
+        +"<b>" + i18n_bindingTemplateKeyRefCatGrp + "</b><br>"
+        +"<a href=\"javascript:AddCategoryKeyReferenceGroupSpecificBT('bindingTemplate"+i+"catbaggrpkeyref');\"><i class=\"icon-plus-sign\"></i></a> " + i18n_keyRefGrpAdd + "<br>"
         +"<div id=\"bindingTemplate"+i+"catbaggrpkeyref\" style=\"border-width: 1px; border-style: dotted;\"></div></div>").appendTo("#bindingTemplatesContainer");
 
     Reedit();
-//reselect();
-
 }
 
-function reselect()
-{
-    $('.editableSelectAccessPoint').editable(null, { 
-        data   : " {'accessPoint':'accessPoint','HostingRedirector':'HostingRedirector', 'selected':'accessPoint'}",
-        type   : 'select'
-    });
-}
 
 function AddTmodelInstance(div)
 {
@@ -112,15 +111,18 @@ function AddTmodelInstance(div)
     var i =  currentbindingtemplatesInstance;         
     
     $("<div id=\"" + div + i + "\" style=\"border-width: 2px; border-style: dashed; border-color: red\">"        
-        +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + div + i + "');\"><i class=\"icon-remove-sign\"></i></a></div><div style=\"float:left\"><b>tModel Key: </b>&nbsp;</div><div class=\"edit\" id=\"" + div + i + "KeyName\"></div>"
-        +"<br><div style=\"float:left\"><b>tModel Instance Parameters:</b> &nbsp;</div><div class=\"edit\" id=\"" + div + i + "instanceValue\"></div>"
-        +"<br><b>tModel Instance Description</b> - tModel instance infos can have more than one description, such as in a different language.<br>"
-        +"<a href=\"javascript:AddDescriptionSpecific('" + div + i + "instanceDescription');\"><i class=\"icon-plus-sign\"></i></a> Add a tModel Instance Description<br>"
+        +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + div + i + "');\"><i class=\"icon-remove-sign\"></i></a></div><div style=\"float:left\">"
+        +"<b>" + i18n_tmodelkey + ": </b>&nbsp;</div><div class=\"edit\" id=\"" + div + i + "KeyName\"></div>"
+        +"<br><div style=\"float:left\"><b>" + i18n_tmodelInstanceParams + ":</b> &nbsp;</div><div class=\"edit\" id=\"" + div + i + "instanceValue\"></div>"
+        +"<br><b>" + i18n_tmodelInstanceDescription + "</b> - " + i18n_tmodelInstanceDescription2 + "<br>"
+        +"<a href=\"javascript:AddDescriptionSpecific('" + div + i + "instanceDescription');\"><i class=\"icon-plus-sign\"></i></a> "
+        +i18n_tmodelInstanceDescriptionAdd+"<br>"
         +"<div id=\"" + div + i + "instanceDescription\" style=\"border-width: 1px; border-style: groove;\">"
         //issue
 
-        +"<div><br><b>Overview Documents</b> - These are typically URLs to web pages that describe this tModel's details and usage scenarios.<br>"
-        +"<a href=\"javascript:AddOverviewDocumentSpecific('" + div + i + "instanceoverviewDoc');\"><i class=\"icon-plus-sign\"></i></a> Add an Overview Document<br>"
+        +"<div><br><b>" + i18n_overviewdoc + "</b> - " + i18n_overviewdocDescription + "<br>"
+        +"<a href=\"javascript:AddOverviewDocumentSpecific('" + div + i + 
+        "instanceoverviewDoc');\"><i class=\"icon-plus-sign\"></i></a> "+ i18n_overviewdocadd + "<br>"
         +"<div id=\"" + div + i + "overviewDoc\" style=\"border-width: 1px; border-style: groove;\"></div></div></div></div></div>").appendTo("#"+div);
     Reedit();
 }
@@ -158,7 +160,7 @@ function saveService()
     var request=   $.ajax({
         url: url,
         type:"POST",
-        //  dataType: "html", 
+        //  data" + i18n_type + ": "html", 
         cache: false, 
         //  processData: false,f
         data: postbackdata
@@ -193,7 +195,7 @@ function deleteService()
     var request=   $.ajax({
         url: url,
         type:"POST",
-        //  dataType: "html", 
+        //  data" + i18n_type + ": "html", 
         cache: false, 
         //  processData: false,f
         data: postbackdata

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodeledit.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodeledit.js?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodeledit.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodeledit.js Sat Apr  6 23:08:00 2013
@@ -1,6 +1,18 @@
-/* 
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+/*
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
  */
 
 
@@ -11,13 +23,13 @@ function AddOverviewDocument()
     $("<div id=\"overviewDoc" + i + "\" style=\"border-width:1px; border-style:solid\" >" 
         +"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('overviewDoc" + i 
         +"');\"><i class=\"icon-remove-sign\"></i></a></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"overviewDoc" + i + "Value\"></div>"
-        +"<div style=\"float:left\">Use Type: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_type + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"overviewDoc" + i + "Type\"></div>"
         //descriptions
         +"<a href=\"javascript:AddDescriptionSpecific('overviewDoc" + i + "Description');\">"
-        +"<i class=\"icon-plus-sign\"></i></a> Add a description"
+        +"<i class=\"icon-plus-sign\"></i></a> " + i18n_descriptionAdd
         + ("<div id=\"overviewDoc" + i + "Description\" style=\"border-width:1px; border-style:dotted\"></div>")
     
         +"</div>").prependTo("#overviewDoc");
@@ -33,9 +45,9 @@ function AddDescriptionOverviewSpecific(
     $("<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\"></i></a></div>"
-        +"<div style=\"float:left\">Value: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_value + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"" + div + "Description" + i + "Value\"></div>"
-        +"<div style=\"float:left\">Language: &nbsp;</div>"
+        +"<div style=\"float:left\">" + i18n_lang + ": &nbsp;</div>"
         +"<div class=\"edit\" id=\"" + div + "Description" + i + "Lang\"></div>"
         +"</div>").appendTo("#" + div);
     Reedit();
@@ -74,7 +86,7 @@ function savetModel()
     var request=   $.ajax({
         url: url,
         type:"POST",
-        //  dataType: "html", 
+        //  data" + i18n_type + ": "html", 
         cache: false, 
         //  processData: false,f
         data: postbackdata
@@ -111,7 +123,7 @@ function deletetModel()
     var request=   $.ajax({
         url: url,
         type:"POST",
-        //  dataType: "html", 
+        //  data" + i18n_type + ": "html", 
         cache: false, 
         //  processData: false,f
         data: postbackdata

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/login.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/login.jsp?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/login.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/login.jsp Sat Apr  6 23:08:00 2013
@@ -10,26 +10,32 @@
 <!DOCTYPE html>
 
 <div class="navbar-form pull-right">
-   
-    <%
-        if (session.getAttribute("username") == null || session.getAttribute("password") == null) {
-    %>
-    <script type="text/javascript">
-        loggedin = false;
-    </script>
-    <input class="span2" type="text" placeholder="<%=ResourceLoader.GetResource(session,"navbar.login.username")%>" name="username" id="username">
-    <input class="span2" type="password" placeholder="<%=ResourceLoader.GetResource(session,"navbar.login.password")%>" name="password" id="password">
-    <button type="button" onclick="javascript:Login();" class="btn" id="loginbutton"><%=ResourceLoader.GetResource(session,"navbar.login.button") %></button>
 
-    <%    } else {
+    <%
+        if (session.getAttribute("username") != null && session.getAttribute("password") != null &&
+                ((String)session.getAttribute("username")).length()>0  && ((String)session.getAttribute("password")).length()>0 ) {
+            //we're probably logged in
+            
     %>
     <script type="text/javascript">
         loggedin = true;
     </script>
-    <a class="btn" title="<%=ResourceLoader.GetResource(session,"navbar.login.logout")%>" href="javascript:logout();"><i class="icon-user"></i>
+    <a class="btn" title="<%=ResourceLoader.GetResource(session, "navbar.login.logout")%>" href="javascript:logout();"><i class="icon-user"></i>
         <%
-                out.write("Welcome " + StringEscapeUtils.escapeHtml((String) session.getAttribute("username")) + "</a>");
+            out.write(ResourceLoader.GetResource(session, "items.welcome") + " " + StringEscapeUtils.escapeHtml((String) session.getAttribute("username")) + "</a>");
 
+        } else {
+        %>
+
+        <script type="text/javascript">
+            loggedin = false;
+        </script>
+        <input class="span2" type="text" placeholder="<%=ResourceLoader.GetResource(session, "navbar.login.username")%>" name="username" id="username">
+        <input class="span2" type="password" placeholder="<%=ResourceLoader.GetResource(session, "navbar.login.password")%>" name="password" id="password">
+        <button type="button" onclick="javascript:Login();" class="btn" id="loginbutton"><%=ResourceLoader.GetResource(session, "navbar.login.button")%></button>
+        <%
             }
         %>
+
+
 </div>



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