[cti~opencti:563] Removed SCA_ID from server and client fixed mailing bug(mails sent 2x)

  • From: Ondrej_Moravcik@kenai.com
  • To: commits@cti.kenai.com
  • Subject: [cti~opencti:563] Removed SCA_ID from server and client fixed mailing bug(mails sent 2x)
  • Date: Tue, 24 May 2011 20:22:47 +0000

Project:    cti
Repository: opencti
Revision:   563
Author:     Ondrej_Moravcik
Date:       2011-05-24 20:22:44 UTC
Link:       

Log Message:
------------
Removed SCA_ID from server and client fixed mailing bug(mails sent 2x)


Revisions:
----------
563


Modified Paths:
---------------
trunk/newclient/WebContent/WEB-INF/jspf/design/wsfragments/registration.jspf
trunk/server/src/org/opencti/server/handler/README.txt
trunk/newclient/WebContent/js/modules/l10n/nls/he/static.js
trunk/server/src/org/opencti/server/handler/package.html
trunk/server/src/org/opencti/server/handler/HANDLERupdateUser.java
trunk/newclient/WebContent/js/modules/l10n/nls/cs/static.js
trunk/newclient/WebContent/WEB-INF/jspf/design/wsfragments/preferences.jspf
trunk/newclient/WebContent/html/he/footer.html
trunk/server/src/org/opencti/server/handler/HANDLERregister.java
trunk/newclient/WebContent/resources/tou.html
trunk/newclient/WebContent/images/icons/readme.txt
trunk/newclient/WebContent/html/he/help.html
trunk/newclient/WebContent/html/en/footer.html
trunk/server/src/org/opencti/server/overview.html
trunk/newclient/WebContent/WEB-INF/jspf/html/head.jspf
trunk/newclient/WebContent/images/flags/readme.txt
trunk/newclient/WebContent/html/he/terminology.html
trunk/newclient/WebContent/html/cs/footer.html
trunk/newclient/WebContent/images/logoStrip.png
trunk/newclient/WebContent/js/modules/l10n/nls/en/static.js
trunk/newclient/WebContent/html/en/help.html
trunk/server/src/org/opencti/server/CommunityServletEx.java
trunk/server/src/org/opencti/server/handler/HANDLERgetUserPrefs.java
trunk/newclient/WebContent/style/main.css
trunk/newclient/WebContent/js/modules/l10n/nls/static.js
trunk/newclient/WebContent/html/sampledata/oneentry.json
trunk/newclient/WebContent/html/en/terminology.html
trunk/server/src/org/opencti/server/package.html
trunk/server/src/org/opencti/server/Constants.java
trunk/newclient/WebContent/html/cs/help.html
trunk/newclient/WebContent/html/cs/terminology.html


Diffs:
------
Index: trunk/server/src/org/opencti/server/CommunityServletEx.java
===================================================================
--- trunk/server/src/org/opencti/server/CommunityServletEx.java (revision 562)
+++ trunk/server/src/org/opencti/server/CommunityServletEx.java (revision 563)
@@ -59,7 +59,7 @@
      * @return number of the last version
      */
     public String getVersion() {
-        return "1.2";
+        return "1.3";
     }
 
 
@@ -82,7 +82,7 @@
             out = new PrintWriterEx(outOld, log);
             String type = request.getParameter("type");
             response.setContentType("application/json");
-            log.debug("query type: " + type);
+            log.debug("query type: " + type);            
 
             if (type == null) {
                 out.println("{}");
Index: trunk/server/src/org/opencti/server/overview.html
===================================================================
--- trunk/server/src/org/opencti/server/overview.html   (revision 562)
+++ trunk/server/src/org/opencti/server/overview.html   (revision 563)
@@ -1,8 +1,8 @@
-
-<html>
-  <body>
-    The OpenCTI servlet is the server part of the OpenCTI application.
-    It serves as an interface between the client-side OpenCTI web 
application and Idiom WorldServer.
-    It handles requests by parsing them, deciding the request type and then 
calling the appropriate handling class.
-  </body>
-</html>
+
+<html>
+  <body>
+    The OpenCTI servlet is the server part of the OpenCTI application.
+    It serves as an interface between the client-side OpenCTI web 
application and Idiom WorldServer.
+    It handles requests by parsing them, deciding the request type and then 
calling the appropriate handling class.
+  </body>
+</html>
Index: trunk/server/src/org/opencti/server/Constants.java
===================================================================
--- trunk/server/src/org/opencti/server/Constants.java  (revision 562)
+++ trunk/server/src/org/opencti/server/Constants.java  (revision 563)
@@ -14,13 +14,9 @@
          */
         public static final String DEFAULT_USERTYPE = "Community";
         /**
-         * id of the attribute identifieng user's agreement id
-         */
-        public static final String COMMUNITY_SCA_ID_ATTRIBUTE = 
"Community_SCA_ID";
-        /**
          * demo email
          */
-        public static final String EMAIL = "NAME_NOTIFY@ME.COM";             
               // Notification email alias - for announcing new user
+        public static final String EMAIL = "opencti_ww@oracle.com";
         /**
          * limit of number of returned fuzzy matches
          */
Index: trunk/server/src/org/opencti/server/handler/HANDLERgetUserPrefs.java
===================================================================
--- trunk/server/src/org/opencti/server/handler/HANDLERgetUserPrefs.java      
  (revision 562)
+++ trunk/server/src/org/opencti/server/handler/HANDLERgetUserPrefs.java      
  (revision 563)
@@ -49,8 +49,7 @@
                        .put("updateFormPassword", "*****") 
                        .put("updateFormConfPassword", "*****") 
                        .put("updateFormRealName", user.getFirstName())
-                       .put("updateFormEmail",  user.getEmail() == null ? "" 
: user.getEmail()) 
-                       .put("updateFormEyeColor", 
user.getAttribute(Constants.COMMUNITY_SCA_ID_ATTRIBUTE));
+                       .put("updateFormEmail",  user.getEmail() == null ? "" 
: user.getEmail());
                        
 
 /*            JSONArray items = new JSONArray()
@@ -63,9 +62,6 @@
             .put(new JSONObject()
                .put("type", "RealName")
                .put("value", user.getFirstName()))
-            .put(new JSONObject()
-               .put("type", "EyeColor")
-               .put("value", "xxxx"));
 */
             WSLocale[] locales = context.getUserManager().getLocales();
             List<WSLocale> userLocales = Arrays.asList(user.getLocales());
Index: trunk/server/src/org/opencti/server/handler/package.html
===================================================================
--- trunk/server/src/org/opencti/server/handler/package.html    (revision 562)
+++ trunk/server/src/org/opencti/server/handler/package.html    (revision 563)
@@ -1,14 +1,14 @@
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  </head>
-  <body>
-    Contains separate handler classes for each request type.
-  </body>
-</html>
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  </head>
+  <body>
+    Contains separate handler classes for each request type.
+  </body>
+</html>
Index: trunk/server/src/org/opencti/server/handler/HANDLERupdateUser.java
===================================================================
--- trunk/server/src/org/opencti/server/handler/HANDLERupdateUser.java  
(revision 562)
+++ trunk/server/src/org/opencti/server/handler/HANDLERupdateUser.java  
(revision 563)
@@ -46,11 +46,6 @@
     /**
      *
      */
-    protected String eyeColor;
-
-    /**
-     *
-     */
     public static final String COMMUNITY_COMMON_LASTNAME="Community User";
     
     /**
@@ -72,10 +67,6 @@
         /**
          *
          */
-        protected String formEyeColor;
-        /**
-         *
-         */
         protected String formLanguages;
         /**
          *
@@ -107,7 +98,6 @@
        pwdc = jo.getString(formPasswordConf);
        realname = jo.getString(formRealName);
        email = jo.getString(formEmail);
-       eyeColor = jo.getString(formEyeColor);
        
        JSONArray joArr = jo.getJSONArray(formLanguages);
        locales = new String [joArr.length()];
@@ -130,7 +120,6 @@
                formPasswordConf = "updateFormConfPassword";
                formRealName = "updateFormRealName";
                formEmail = "updateFormEmail";
-               formEyeColor = "updateFormEyeColor";
                formLanguages = "updateSelectLanguages";
                formProjects = "updateSelectProjects";
                
@@ -142,7 +131,8 @@
                
                setAndParsePostData();
                
-               if ("".equals(email) || "".equals(realname) || 
"".equals(eyeColor)) {
+               if ("".equals(email) || "".equals(realname))
+                {
                        throw new Exception("update_mandatory");
                }
 
@@ -284,7 +274,6 @@
         user.setEmail(email);
         user.setFirstName(realname);
         user.setLastName(COMMUNITY_COMMON_LASTNAME);
-        user.setAttribute(Constants.COMMUNITY_SCA_ID_ATTRIBUTE, eyeColor);
     }
 
 
Index: trunk/server/src/org/opencti/server/handler/HANDLERregister.java
===================================================================
--- trunk/server/src/org/opencti/server/handler/HANDLERregister.java    
(revision 562)
+++ trunk/server/src/org/opencti/server/handler/HANDLERregister.java    
(revision 563)
@@ -81,7 +81,6 @@
                formPasswordConf = "registerFormConfPassword";
                formRealName = "registerFormRealName";
                formEmail = "registerFormEmail";
-               formEyeColor = "registerFormEyeColor";
                formLanguages = "registerSelectLanguages";
                formProjects = "registerSelectProjects";
                formUserName = "registerFormUsername";
@@ -89,8 +88,8 @@
                
                setAndParsePostData();
                
-               if ("".equals(username) || "".equals(email) || 
"".equals(realname)
-                               || "".equals(eyeColor)) {
+               if ("".equals(username) || "".equals(email) || 
"".equals(realname))
+                {
                         throw new Exception("register_mandatory");
                }
                
@@ -125,6 +124,8 @@
             setUserPreference(user, "preferences.email.issues", "false", 
context);
             setUserPreference(user, "preferences.email.tasks", "false", 
context);
 
+            sendEmail(context.getNotificationManager(), user);
+
             sendStatus("User registered successfully!");
             
         } catch (Exception ex) {
@@ -147,8 +148,7 @@
             WSUser user = um.createUser(username, pwd, realname, 
COMMUNITY_COMMON_LASTNAME, um.getUserType(COMMUNITY_USER_TYPE));
             um.getRole("Translators").addUser(user);
             user.setEmail(email);
-            user.setPassword(pwd);
-            user.setAttribute(Constants.COMMUNITY_SCA_ID_ATTRIBUTE, 
eyeColor);
+            user.setPassword(pwd);            
         } catch (Exception ex) {
                log.error("New user creation failed: " + ex.getMessage(), ex);
                throw new IllegalStateException("New user creation failed: " 
+ ex.getMessage());
@@ -199,7 +199,6 @@
                                     + rows);
             }
             connection.commit();
-            sendEmail(context.getNotificationManager(), user);
         } catch (Exception e) {
             log.error("Exception in setUserPreference: " + e.getMessage(), 
e);
             connection.rollback();
@@ -248,18 +247,14 @@
                 wgroupPrint = "WORKGROUP NOT SELECTED";
             }
 
-            // Sending notification to internal alias in order to verify SCA 
ID
+            // Sending notification to internal alias
             nmgr.sendNotification(Constants.EMAIL, "New CTI User: " + 
u.getUserName() + " check SCA ID! (NEW)",
                     "New user has been created with the following parameters 
in NEW CTI:\n\n" +
                     "username:\t" + u.getUserName() + "\n" +
                     "e-mail:  \t" + u.getEmail() + "\n" +
                     "full-name:\t" + u.getFirstName() + "\n" +
-                    "SCA ID:  \t\t" + 
u.getAttribute(Constants.COMMUNITY_SCA_ID_ATTRIBUTE) +"\n\n" +
                     "languages:" + localesPrint + "\n" +
-                    "projects:" + wgroupPrint + "\n" +
-                    "\n" +
-                    "Each product owner: please make sure the user submitted 
a valid SCA ID. If not, contact the user as soon as possible in order to fix 
this issue.\n\n"+
-                    "Thank you for your cooperation");
+                    "projects:" + wgroupPrint + "\n");
             log.info("sendEmail: sending email - new user : " + 
u.getUserName());
 
 
@@ -271,13 +266,12 @@
                         "username:\t" + u.getUserName() + "\n" +
                         "e-mail:  \t" + u.getEmail() + "\n" +
                         "full-name:\t" + u.getFirstName() + "\n" +
-                        "SCA ID:\t" 
+u.getAttribute(Constants.COMMUNITY_SCA_ID_ATTRIBUTE) +"\n\n" +
                         "languages:" + localesPrint + "\n" +
                         "projects:" + wgroupPrint + "\n" +
                         "\n\n\n" +
                         "Please note that information above can be updated 
in your profile anytime you need. \n\n" +
                         "Welcome to the CTI community!\n\n" +
-                        "Kind regards\nCTI 
team\n\ncti@sun.com\nhttp://blogs.sun.com/cti";);
+                        "Kind regards\nCTI 
team\n\nopencti_ww@oracle.com\nhttp://blogs.oracle.com/cti/";);
                 log.info("sendEmail: sending email - new user (info to 
USER): " + u.getUserName());
             }
         }
Index: trunk/server/src/org/opencti/server/handler/README.txt
===================================================================
--- trunk/server/src/org/opencti/server/handler/README.txt      (revision 562)
+++ trunk/server/src/org/opencti/server/handler/README.txt      (revision 563)
@@ -1,94 +1,94 @@
-
-To create a new request handler, please follow these steps:
-
-
-1. Create a file called HANDLERrequestType.java in 
org.opencti.server.handler package. Replace "requestType"
-   in the name by the specific request name, that will be specified by the 
"type" parameter in the http request,
-   e.g. HANDLERgetProjects, HANDLERgetTasks, HANDLERsaveTranslations ...
-
-2. Copy and paste following code into the new file, again, replace 
"requestType" by your new request type everywhere
-
-
---- BEGIN SOURCE ---
-
-package org.opencti.server.handler;
-
-import com.idiominc.wssdk.WSContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
-import org.opencti.server.PrintWriterEx;
-
-/**
- *
- *
- */
-public class HANDLERrequestType extends OpenCtiRequestHandler {
-
-    //make an array of all the obligatory parameters you expect to get in 
the request, except token and type, which are obligatory in all requests
-    //private String[] extraParams = {"param1", "param2"};
-
-    //add all the parameters from extraParams array as well as all the 
optional parameters as class fields, e.g.:
-    //private int param1;
-    //private String param2;
-
-    //optional parameter:
-    //private String param3;
-
-    public HANDLERrequestType(WSContext context, HttpServletRequest request, 
HttpServletResponse response, PrintWriterEx out, Logger log) {
-        super(context, request, response, out, log);
-
-        //if you have some extra parameters in extraParams uncomment this 
line:
-        //addToParamList(extraParams);
-    }
-
-    @Override
-    protected boolean loadParamList() {
-        //if you expect some obligatory extra parameters, extract them from 
the request and
-        //inicialize the respective fields, e.g.:
-        //
-        //try {
-        //    param1 = Integer.parseInt(request.getParameter("param1"));
-        //    param2 = request.getParameter("param1");
-        //} catch (Exception e) {
-        //    log.error(e);
-        //    return false;
-        //}
-
-        //if you haven't yet initialized the optional parameters, do it now:
-        //
-        //param3 = "hello";
-
-        // now try to extract the optional parameters from the request. If 
they are not specified, nothing happens,
-        // you have already set them to default values. Copy and paste the 
try-catch block for every parameter,
-        // don't put them all in one try-catch block!
-        //
-        //try {
-        //    param3 = request.getParameter("param3");
-        //} catch (Exception e) {}
-
-        return true;
-    }
-
-    @Override
-    public boolean handleRequest() {
-        try {
-            parseRequestIntelligent();
-
-            //TODO: insert your handler code here
-
-        } catch (Exception ex) {
-            sendError("Unable to execute requestType: "+ex.getMessage());
-        }
-        return true;
-    }
-
-}
-
---- END SOURCE ---
-
-
-3. Go throug all the comments in the code and uncomment or change the 
necessary lines
-
-4. Now it's up to you to add all the helper functions, fields or nested 
classes you will need.
+
+To create a new request handler, please follow these steps:
+
+
+1. Create a file called HANDLERrequestType.java in 
org.opencti.server.handler package. Replace "requestType"
+   in the name by the specific request name, that will be specified by the 
"type" parameter in the http request,
+   e.g. HANDLERgetProjects, HANDLERgetTasks, HANDLERsaveTranslations ...
+
+2. Copy and paste following code into the new file, again, replace 
"requestType" by your new request type everywhere
+
+
+--- BEGIN SOURCE ---
+
+package org.opencti.server.handler;
+
+import com.idiominc.wssdk.WSContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.log4j.Logger;
+import org.opencti.server.PrintWriterEx;
+
+/**
+ *
+ *
+ */
+public class HANDLERrequestType extends OpenCtiRequestHandler {
+
+    //make an array of all the obligatory parameters you expect to get in 
the request, except token and type, which are obligatory in all requests
+    //private String[] extraParams = {"param1", "param2"};
+
+    //add all the parameters from extraParams array as well as all the 
optional parameters as class fields, e.g.:
+    //private int param1;
+    //private String param2;
+
+    //optional parameter:
+    //private String param3;
+
+    public HANDLERrequestType(WSContext context, HttpServletRequest request, 
HttpServletResponse response, PrintWriterEx out, Logger log) {
+        super(context, request, response, out, log);
+
+        //if you have some extra parameters in extraParams uncomment this 
line:
+        //addToParamList(extraParams);
+    }
+
+    @Override
+    protected boolean loadParamList() {
+        //if you expect some obligatory extra parameters, extract them from 
the request and
+        //inicialize the respective fields, e.g.:
+        //
+        //try {
+        //    param1 = Integer.parseInt(request.getParameter("param1"));
+        //    param2 = request.getParameter("param1");
+        //} catch (Exception e) {
+        //    log.error(e);
+        //    return false;
+        //}
+
+        //if you haven't yet initialized the optional parameters, do it now:
+        //
+        //param3 = "hello";
+
+        // now try to extract the optional parameters from the request. If 
they are not specified, nothing happens,
+        // you have already set them to default values. Copy and paste the 
try-catch block for every parameter,
+        // don't put them all in one try-catch block!
+        //
+        //try {
+        //    param3 = request.getParameter("param3");
+        //} catch (Exception e) {}
+
+        return true;
+    }
+
+    @Override
+    public boolean handleRequest() {
+        try {
+            parseRequestIntelligent();
+
+            //TODO: insert your handler code here
+
+        } catch (Exception ex) {
+            sendError("Unable to execute requestType: "+ex.getMessage());
+        }
+        return true;
+    }
+
+}
+
+--- END SOURCE ---
+
+
+3. Go throug all the comments in the code and uncomment or change the 
necessary lines
+
+4. Now it's up to you to add all the helper functions, fields or nested 
classes you will need.
    You don't have to close the output stream, it is done in 
CommunityServerEx.java after this handler ends.
\ No newline at end of file
Index: trunk/server/src/org/opencti/server/package.html
===================================================================
--- trunk/server/src/org/opencti/server/package.html    (revision 562)
+++ trunk/server/src/org/opencti/server/package.html    (revision 563)
@@ -1,14 +1,14 @@
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  </head>
-  <body>
-    Contains the main class, that is called everytime a request is to be 
handled and some additional helper classes.
-  </body>
-</html>
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  </head>
+  <body>
+    Contains the main class, that is called everytime a request is to be 
handled and some additional helper classes.
+  </body>
+</html>
Index: trunk/newclient/WebContent/style/main.css
===================================================================
--- trunk/newclient/WebContent/style/main.css   (revision 562)
+++ trunk/newclient/WebContent/style/main.css   (revision 563)
@@ -1,14 +1,14 @@
 /*  
  * These dojo css imports needs to be kept in order to make all widgets work 
properly   
  */
-@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.4.1/dijit/themes/tundra/tundra.css";;
-@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.4.1/dojo/resources/dojo.css";;
-@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.4.1/dojox/layout/resources/ExpandoPane.css";;
-@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.4.1/dojox/layout/resources/tundraGrid.css";;
-@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.4.1/dojox/layout/resources/ResizeHandle.css";;
-@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.4.1/dojox/layout/resources/GridContainer.css";;
-@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.4.1/dojox/grid/resources/tundraGrid.css";;
-@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.4.1/dojox/layout/resources/DndGridContainer.css";;
+@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.6.0/dijit/themes/tundra/tundra.css";;
+@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.6.0/dojo/resources/dojo.css";;
+@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.6.0/dojox/layout/resources/ExpandoPane.css";;
+/*@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.6.0/dojox/layout/resources/tundraGrid.css";*/
+@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.6.0/dojox/layout/resources/ResizeHandle.css";;
+@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.6.0/dojox/layout/resources/GridContainer.css";;
+@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.6.0/dojox/grid/resources/tundraGrid.css";;
+@import 
"http://ajax.googleapis.com/ajax/libs/dojo/1.6.0/dojox/layout/resources/DndGridContainer.css";;
 
 @import "../js/modules/opencti/resources/editor.css";
 
Index: trunk/newclient/WebContent/html/en/footer.html
===================================================================
--- trunk/newclient/WebContent/html/en/footer.html      (revision 562)
+++ trunk/newclient/WebContent/html/en/footer.html      (revision 563)
@@ -8,8 +8,8 @@
 <div id="statusBar"></div>
 <div id="footer_main">
     <div id="footerLeft">OpenCTI</div>
-    <div id="footerCenter">v1.3 <span 
style="font-size:x-small"><!--AUTO-REPLACED-SVNREV--> 558 
<!--AUTO-REPLACED--></span></div>
-    <div id="footerRight"><!--AUTO-REPLACED-TIMESTAMP--> 2010-06-15 15:22 
<!--AUTO-REPLACED--></div>
+    <div id="footerCenter">v1.3 <span 
style="font-size:x-small"><!--AUTO-REPLACED-SVNREV--> 562 
<!--AUTO-REPLACED--></span></div>
+    <div id="footerRight"><!--AUTO-REPLACED-TIMESTAMP--> 2011-05-24 20:25 
<!--AUTO-REPLACED--></div>
 </div>
 </body>
 </html>
\ No newline at end of file
Index: trunk/newclient/WebContent/html/en/help.html
===================================================================
--- trunk/newclient/WebContent/html/en/help.html        (revision 562)
+++ trunk/newclient/WebContent/html/en/help.html        (revision 563)
@@ -53,7 +53,7 @@
                        link labeled 'Log In' located on right side of the 
header. <br />
                        When the log in form appears, click on the 'Register' 
button in order to open the registration tab.<br />
                        Now you have to fill in all the fields of the 
registration form.<br />
-                       A ID stands for agreement ID. This parameter is meant 
to be used by OpenCTI operator to identify certified users. If you don't have 
one, go with 0. Please provide valid e-mail address or we will not be able to 
restore your password in case you forget it. Select the projects you will 
want to translate
+                       Please provide valid e-mail address or we will not be 
able to restore your password in case you forget it. Select the projects you 
will want to translate
                        and the languages you know. You have to agree to the 
license terms. Now proceed by clicking on the Register button.<br />
 
                        With your account created you can click again on the 
'Log In' link and log into the OpenCTI system.
Index: trunk/newclient/WebContent/html/en/terminology.html
===================================================================
--- trunk/newclient/WebContent/html/en/terminology.html (revision 562)
+++ trunk/newclient/WebContent/html/en/terminology.html (revision 563)
@@ -1,254 +1,254 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
-<html>
-<head>
-
-    <!--link rel="stylesheet" type="text/css" 
href="http://ajax.googleapis.com/ajax/libs/dojo/1.3.0/dijit/themes/tundra/tundra.css"/>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/dojo/1.3.0/dojo/dojo.xd.js" ;
djConfig="isDebug:true,parseOnLoad:true"></script-->
-
-    <link rel="stylesheet" type="text/css" 
href="http://ajax.googleapis.com/ajax/libs/dojo/1.4.1/dijit/themes/tundra/tundra.css"/>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/dojo/1.4.1/dojo/dojo.xd.js" ;
djConfig="isDebug:true,parseOnLoad:true"></script>
-
-    <link rel="stylesheet" href="../style/main.css" type="text/css" />
-    <style type="text/css">#tdSearchBorderContainer { width: 100%; height: 
100%; }</style>
-
-    <script type="text/javascript" src="../js/terminology.js"></script>
-    <script type="text/javascript">
-            dojo.require("dijit.form.Button");
-            dojo.require("dijit.layout.ContentPane");
-            dojo.require("dijit.layout.BorderContainer");
-            dojo.require("dijit.form.Button")
-            dojo.require("dijit.form.FilteringSelect")
-            dojo.require("dojo.data.ItemFileReadStore")
-            dojo.require("dojo.data.ItemFileWriteStore")
-            dojo.require("dojox.grid.DataGrid")
-            dojo.require("dijit.Dialog")
-            dojo.require("dijit.form.Textarea")
-            dojo.require("dijit.form.CheckBox")
-            //dojo.require("dojo.parser")
-            window.sample_tdlist = 'sampledata/tdlist.json'
-            window.sample_tdsearchresult = 'sampledata/tdsearchresult.json'
-            window.sample_oneEntry = 'sampledata/oneentry.json'
-            window.sample_preferedlangs = 'sampledata/preferedlangs.json'
-            window.sample_langlist = 'sampledata/langs.json'
-            window.sample_proposenewterm = 'sampledata/proposenewterm.json'
-            window.sample_products = 'sampledata/products.json'
-            loadUserTerminology()
-            dojo.addOnLoad(onTerminologyPaneLoaded)
-    </script>
-
-</head>
-<body class="tundra">
-
-<div dojoType="dijit.layout.BorderContainer"  id="tdSearchBorderContainer" 
jsid="tdSearchBorderContainer">
-    
-        <div dojoType="dijit.layout.ContentPane" region="top">
-<div id='tdSearchBasicOptions'>
-    <a href="#" 
style='color:black;float:right;padding-top:1em;padding-right:1em'  
class="tooltipLink" onclick="openTerminologyHelp()">Help</a>
-            <label for='tdSearchString'>Search:</label><input 
style='width:30em;height:1.5em' jsid='tdSearchString' type="text" 
name="tdSearchString" value="" dojoType="dijit.form.TextBox" trim="true" 
id="tdSearchString" propercase="false"/>
-            <button type="button" id="tdSearchButton" 
dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Search&nbsp;&nbsp;&nbsp;" 
onClick="searchTerms"></button>
-            &nbsp;&nbsp;&nbsp;
-            <span style="white-space:nowrap">
-                <label for='searchLangSelect'>Language:&nbsp;</label>
-                <div id="searchLangSelect" 
dojoType="dijit.form.FilteringSelect" jsid="searchLangSelect" ></div>
-            </span>
-            <span style="white-space:nowrap;">
-                <a href="#" style='font-size:x-small;color:black; 
padding:1em;'  class="tooltipLink" id="tdSearchAdvancedSwitchMore" 
onclick="showAdvancedSearchOptions(true)">More&nbsp;Options</a>
-                <a href="#" style='font-size:x-small;color:black; 
padding:1em; display:none;'  class="tooltipLink" 
id="tdSearchAdvancedSwitchLess" 
onclick="showAdvancedSearchOptions(false)">Less&nbsp;Options</a>
-                <a href="#" style='font-size:x-small;color:black; 
padding:1em 1em 1em 0em'  class="tooltipLink" id="chooseLanguages" 
onclick="showChooseLanguages()">Display Languages</a>
-                
-
-            </span>
-</div>
-
-<table id='tdSearchAdvancedOptions' 
style='padding-top:1em;display:none;padding-right:-100'><tr><td>
-    <table style="display:inline">
-        <tr><td><label for='searchTDSelect'>Term 
Database:</label></td><td><div id="searchTDSelect" 
dojoType="dijit.form.FilteringSelect" jsid="searchTDSelect" ></div></td></tr>
-        <tr><td><label for='targetLangSelect'>Target 
Language:</label></td><td><div id="targetLangSelect" 
dojoType="dijit.form.FilteringSelect" jsid="targetLangSelect"></div></td></tr>
-        <tr><td><label for='productSelect'>Product:</label></td><td><div 
id="productSelect" dojoType="dijit.form.FilteringSelect" 
jsid="productSelect"></div></td></tr>
-        <tr><td><label for='statusSelect'>Term 
Status:</label></td><td><select id="statusSelect" 
dojoType="dijit.form.FilteringSelect" jsid="statusSelect">
-                    <option value="ap" selected>approved</option>
-                    <option value="rr">review required</option>
-                    <option value="re">rejected</option>
-                    <option value="any" >any status</option>
-                </select></td></tr>
-    </table></td><td>
-    <table style="display:inline; padding-left:4em">
-        <tr>
-            <td><label for='maxhits'>Maximum # of Hits:</label></td>
-            <td><input style='width:8em;height:1.5em' jsid='maxhits' 
type="text" value="50" dojoType="dijit.form.TextBox" trim="true" 
id="maxhits"/></td>
-        </tr>
-        <tr>
-            <td><label for='tdSearchMode'>Search Mode:</label></td>
-            <td><select name="select" dojoType="dijit.form.FilteringSelect" 
style="width:8em" id="tdSearchMode">
-                    <option value="sub">Include</option>
-                    <option value="ex">Exact Words</option>
-                    <option value="re">Regular Expression</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td><label for='tdSearchMatchCase'>Match Case:</label></td>
-            <td><input jsid='tdSearchMatchCase' type="checkBox" 
dojoType="dijit.form.CheckBox" id="tdSearchMatchCase"/></td>
-        </tr>
-    </table></td><td style="padding-left:6em">
-        <span>
-            <div id="tdProposeNewEntry" dojoType="dijit.form.Button" 
label="&nbsp;Propose New Entry&nbsp;" onclick="proposeEntry()"></div><br/>
-            <div id="tdExportTD" dojoType="dijit.form.Button" 
label="&nbsp;Export Terminology&nbsp;" onclick="openTdExportWindow()"></div>
-        </span>
-</td></tr></table>
-            <div id="tdSearchStatusBox" style="padding-top:1em; 
font-weight:bold">
-                <span id="tdSearchStatusMessage"></span> &nbsp;&nbsp
-                <a id="tdExportLink" 
style="display:none;font-size:x-small;color:black;" class="tooltipLink" 
href="#" onclick="openExportTDDialog()">Export result set to file</a>
-           </div>
-        </div>
-        <div dojoType="dijit.layout.ContentPane"  region="center">
-            <div id="tdSearchResultGrid" jsid="tdSearchResultGrid" 
dojoType="dojox.grid.DataGrid" onRowClick="entryClicked" 
selectable="true"></div>
-        </div>
-    </div>
-    <div dojoType="dijit.Dialog" id="entryDialog"jsid="entryDialog">
-        <div dojoType="dijit.layout.ContentPane" style="width:800px;" >
-            <span style="display:none" id="entryId"></span>
-            <span style="display:none" id="tdId"></span>
-            <div class="terminologyTableBorder">
-                <div class="termDialogTableHead"><div>Entry 
Details</div></div>
-                <table class="terminologyTable" width="100%">
-                    <tbody>
-                        <tr>
-                            <th>Definition</th>
-                            <td id="entryDefinition"></td>
-                        </tr>
-                        <tr>
-                            <th>Product</th>
-                            <td id="entryProduct"></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <br/>
-            <div class="terminologyTableBorder">
-                <div class="termDialogTableHead"><div>Entry Terms</div></div>
-                <table width="100%" id="termsInEntryGrid" 
jsId="termsInEntryGrid" dojoType="dojox.grid.DataGrid" autoHeight="true" 
onRowClick="termClicked">
-                </table>
-            </div>
-            <br/>
-            <div class="terminologyTableBorder" id="termDetailsPane">
-                <div class="termDialogTableHead"><div>Term 
Details</div></div>
-                <table width="100%" class="terminologyTable">
-                    <!--<thead ><tr><td colspan="2" 
class="termDialogTableHead">Term Details</td></tr></thead>-->
-                    <tbody >
-                        <tr><th >Text</th><td id="termTerm"></td></tr>
-                        <tr><th>Language</th><td id="termLanguage"></td></tr>
-                        <tr><th>Status</th><td id="termStatus"></td></tr>
-                        <tr><th>Comment</th><td id="termComment"></td></tr>
-                        <tr style="display:none"><th>Term Id</th><td 
id="termId"></td></tr>
-                        <tr style="display:none"><th>Term Id</th><td 
id="termLangId"></td></tr>
-                        <tr style="display:none" 
id="termProposalRow"><th>Proposal Comment</th><td id="termProposal"></td></tr>
-                        <tr style="display:none" 
id="termProposalChangeRow"><th>Change Proposal</th><td 
id="termChangeProposal"></td></tr>
-
-                    </tbody>
-                </table>
-            </div>
-            <br/>
-            <div id="proposeButtonsPane">
-                <button type="button" id="tdProposeNewTermButton" 
jsid="tdProposeNewTermButton" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Propose New Term&nbsp;&nbsp;&nbsp;" 
onClick="proposeNewTerm"></button>
-                <button type="button" id="tdProposeChangeTermButton" 
jsid="tdProposeChangeTermButton" dojoType="dijit.form.Button" disabled="true" 
label="&nbsp;&nbsp;&nbsp;Propose Term Change&nbsp;&nbsp;&nbsp;" 
onClick="proposeChangeTerm"></button>
-                <button type="button" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Close&nbsp;&nbsp;&nbsp;" 
onClick="entryDialog.hide()"></button>
-            </div>
-            
-            <div id="proposeNewTermPane"jsid="proposeNewTermPane" 
style="display:none;width:100%" >
-                <div class="terminologyTableBorder">
-                    <div class="termDialogTableHead"><div>Propose New 
Term</div></div>
-                    <table width="100%" class="terminologyTable">
-                        <tbody id="proposeTermTable">
-                            
-                            <tr><th>Text</th><td 
style="padding:0px;margin:0px" ><input jsid='proposeNewTermText' type="text" 
value="" dojoType="dijit.form.TextBox" trim="true" id="proposeNewTermText" 
class="proposalEditField"/></td></tr>
-                            <tr><th>Language</th><td><div 
id="proposeNewTermLang" dojoType="dijit.form.FilteringSelect" 
jsid="proposeNewTermLang" ></div></td></tr>
-                            <tr><th>Proposal Comment</th><td>
-                                    <textarea id="proposeNewTermProposal" 
jsid="proposeNewTermProposal" dojoType="dijit.form.Textarea" 
class="proposalEditField"></textarea>
-                                </td></tr>
-                    </tbody>
-                    </table>
-                </div>
-                <br/>
-                <button type="button" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Propose&nbsp;&nbsp;&nbsp;" 
onClick="proposeNewTermSubmit"></button>
-                <button type="button" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Cancel Proposal&nbsp;&nbsp;&nbsp;" 
onClick="closeProposeNewTermPane"></button>
-            </div>
-            
-            <div id="proposeChangeTermPane"jsid="proposeChangeTermPane" 
style="display:none;width:100%">
-                <div class="terminologyTableBorder">
-                    <div class="termDialogTableHead"><div>Propose Term 
Change</div></div>
-                    <table width="100%" class="terminologyTable">
-                        <tbody>
-                            <tr><th>New Text</th><td><input 
jsid='proposeChangeTermText' type="text" value="" 
dojoType="dijit.form.TextBox" trim="true" id="proposeChangeTermText" 
class="proposalEditField"/></td></tr>
-                            <tr><th>Proposal Comment</th><td>
-                                    <textarea id="proposeChangeTermProposal" 
jsid="proposeChangeTermProposal" dojoType="dijit.form.Textarea" 
class="proposalEditField"></textarea>
-                                </td></tr>
-                        </tbody>
-                    </table>
-                </div>
-                <br/>
-                <button type="button" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Propose Change&nbsp;&nbsp;&nbsp;" 
onClick="proposeChangeTermSubmit"></button>
-                <button type="button" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Cancel Proposal&nbsp;&nbsp;&nbsp;" 
onClick="closeProposeChangeTermPane"></button>
-            </div>
-
-
-
-        </div>
-    </div>
-
-
-    <div dojoType="dijit.Dialog" 
id="proposeNewEntryDialog"jsid="proposeNewEntryDialog">
-        <div dojoType="dijit.layout.ContentPane" style="width:800px;" >
-            <div class="terminologyTableBorder">
-                <div class="termDialogTableHead"><div>Propose New 
Entry</div></div>
-                <table width="100%" class="terminologyTable">
-                    <tbody>
-                        <tr><th>New English Term</th><td 
style="padding:0px;margin:0px" ><input jsid='proposeNewEntryEnText' 
type="text" value="" dojoType="dijit.form.TextBox" trim="true" 
id="proposeNewEntryEnText" class="proposalEditField"/></td></tr>
-                        <tr><th>Definition</th><td>
-                                <textarea id="proposeNewEntryDefinition" 
jsid="proposeNewEntryDefinition" dojoType="dijit.form.Textarea" 
class="proposalEditField"></textarea>
-                            </td></tr>
-                        <tr><th>Product</th><td 
style="padding:0px;margin:0px" ><div id="proposeNewEntryProductSelect" 
dojoType="dijit.form.FilteringSelect" 
jsid="proposeNewEntryProductSelect"></div></td></tr>
-                        <tr><th>Translated Term</th><td 
style="padding:0px;margin:0px" ><input jsid='proposeNewEntryTranText' 
type="text" value="" dojoType="dijit.form.TextBox" trim="true" 
id="proposeNewEntryTranText" class="proposalEditField"/></td></tr>
-                        <tr><th>Language</th><td><div 
id="proposeNewEntryLang" dojoType="dijit.form.FilteringSelect" 
jsid="proposeNewEntryLang" ></div></td></tr>
-                        <tr><th>Proposal Comment</th><td>
-                                <textarea id="proposeNewEntryProposal" 
jsid="proposeNewEntryProposal" dojoType="dijit.form.Textarea" 
class="proposalEditField"></textarea>
-                            </td></tr>
-                </tbody>
-                </table>
-            </div>
-            <br/>
-            <button type="button" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Propose Entry&nbsp;&nbsp;&nbsp;" 
onClick="proposeNewEntrySubmit"></button>
-            <button type="button" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Cancel Proposal&nbsp;&nbsp;&nbsp;" 
onClick="closeProposeNewEntryDialog"></button>
-        </div>
-    </div>
-
-
-    <div dojoType="dijit.Dialog" 
id="chooseLanguagesDialog"jsid="chooseLanguagesDialog">
-        Choose languages you would like to see in Terminology search result 
table.<br/>
-        The table will not display the language column if there are no terms 
for this language.
-        <br/><br/>
-        <a href="#" onclick="selectAll_ChooseLanguage(true)" 
style="font-size:x-small">Select All</a>&nbsp;&nbsp;<a href="#" 
onclick="selectAll_ChooseLanguage(false)" style="font-size:x-small">Deselect 
All</a>
-        <br/><br/>
-        <table cellspacing="5">
-            <tbody id="chooseLanguagesDialogTBody"><tr><td></td></tr>
-            </tbody>
-        </table><br/>
-        <input id='chooseLanguagesDialogDisplayProduct' checked 
type='checkbox'/> Display Product Name
-        <br/><br/>
-        <button type="button" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Ok&nbsp;&nbsp;&nbsp;" 
onClick="saveChoosedLanguages"></button>
-        <button type="button" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;" 
onClick="chooseLanguagesDialog.hide()"></button>
-    </div>
-
-    <div dojoType="dijit.Dialog" id="exportTDDialog"jsid="exportTDDialog">
-        <span id="tdExportUrlString" style="display:none"></span>
-        <br/>
-        <a href="#" id="tdExportLinkSimple">Simple .csv Format</a>
-        <br/>
-        <br/>
-        <a href="#" id="tdExportLinkAdvanced">Advanced .csv Format</a>
-        <br/><br/>
-        <button type="button" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Close&nbsp;&nbsp;&nbsp;" 
onClick="exportTDDialog.hide()"></button>
-    </div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>
+<html>
+<head>
+
+    <!--link rel="stylesheet" type="text/css" 
href="http://ajax.googleapis.com/ajax/libs/dojo/1.3.0/dijit/themes/tundra/tundra.css"/>
+    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/dojo/1.3.0/dojo/dojo.xd.js" ;
djConfig="isDebug:true,parseOnLoad:true"></script-->
+
+    <link rel="stylesheet" type="text/css" 
href="http://ajax.googleapis.com/ajax/libs/dojo/1.6.0/dijit/themes/tundra/tundra.css"/>
+    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/dojo/1.6.0/dojo/dojo.xd.js" ;
djConfig="isDebug:true,parseOnLoad:true"></script>
+
+    <link rel="stylesheet" href="../style/main.css" type="text/css" />
+    <style type="text/css">#tdSearchBorderContainer { width: 100%; height: 
100%; }</style>
+
+    <script type="text/javascript" src="../js/terminology.js"></script>
+    <script type="text/javascript">
+            dojo.require("dijit.form.Button");
+            dojo.require("dijit.layout.ContentPane");
+            dojo.require("dijit.layout.BorderContainer");
+            dojo.require("dijit.form.Button")
+            dojo.require("dijit.form.FilteringSelect")
+            dojo.require("dojo.data.ItemFileReadStore")
+            dojo.require("dojo.data.ItemFileWriteStore")
+            dojo.require("dojox.grid.DataGrid")
+            dojo.require("dijit.Dialog")
+            dojo.require("dijit.form.Textarea")
+            dojo.require("dijit.form.CheckBox")
+            //dojo.require("dojo.parser")
+            window.sample_tdlist = 'sampledata/tdlist.json'
+            window.sample_tdsearchresult = 'sampledata/tdsearchresult.json'
+            window.sample_oneEntry = 'sampledata/oneentry.json'
+            window.sample_preferedlangs = 'sampledata/preferedlangs.json'
+            window.sample_langlist = 'sampledata/langs.json'
+            window.sample_proposenewterm = 'sampledata/proposenewterm.json'
+            window.sample_products = 'sampledata/products.json'
+            loadUserTerminology()
+            dojo.addOnLoad(onTerminologyPaneLoaded)
+    </script>
+
+</head>
+<body class="tundra">
+
+<div dojoType="dijit.layout.BorderContainer"  id="tdSearchBorderContainer" 
jsid="tdSearchBorderContainer">
+    
+        <div dojoType="dijit.layout.ContentPane" region="top">
+<div id='tdSearchBasicOptions'>
+    <a href="#" 
style='color:black;float:right;padding-top:1em;padding-right:1em'  
class="tooltipLink" onclick="openTerminologyHelp()">Help</a>
+            <label for='tdSearchString'>Search:</label><input 
style='width:30em;height:1.5em' jsid='tdSearchString' type="text" 
name="tdSearchString" value="" dojoType="dijit.form.TextBox" trim="true" 
id="tdSearchString" propercase="false"/>
+            <button type="button" id="tdSearchButton" 
dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Search&nbsp;&nbsp;&nbsp;" 
onClick="searchTerms"></button>
+            &nbsp;&nbsp;&nbsp;
+            <span style="white-space:nowrap">
+                <label for='searchLangSelect'>Language:&nbsp;</label>
+                <div id="searchLangSelect" 
dojoType="dijit.form.FilteringSelect" jsid="searchLangSelect" ></div>
+            </span>
+            <span style="white-space:nowrap;">
+                <a href="#" style='font-size:x-small;color:black; 
padding:1em;'  class="tooltipLink" id="tdSearchAdvancedSwitchMore" 
onclick="showAdvancedSearchOptions(true)">More&nbsp;Options</a>
+                <a href="#" style='font-size:x-small;color:black; 
padding:1em; display:none;'  class="tooltipLink" 
id="tdSearchAdvancedSwitchLess" 
onclick="showAdvancedSearchOptions(false)">Less&nbsp;Options</a>
+                <a href="#" style='font-size:x-small;color:black; 
padding:1em 1em 1em 0em'  class="tooltipLink" id="chooseLanguages" 
onclick="showChooseLanguages()">Display Languages</a>
+                
+
+            </span>
+</div>
+
+<table id='tdSearchAdvancedOptions' 
style='padding-top:1em;display:none;padding-right:-100'><tr><td>
+    <table style="display:inline">
+        <tr><td><label for='searchTDSelect'>Term 
Database:</label></td><td><div id="searchTDSelect" 
dojoType="dijit.form.FilteringSelect" jsid="searchTDSelect" ></div></td></tr>
+        <tr><td><label for='targetLangSelect'>Target 
Language:</label></td><td><div id="targetLangSelect" 
dojoType="dijit.form.FilteringSelect" jsid="targetLangSelect"></div></td></tr>
+        <tr><td><label for='productSelect'>Product:</label></td><td><div 
id="productSelect" dojoType="dijit.form.FilteringSelect" 
jsid="productSelect"></div></td></tr>
+        <tr><td><label for='statusSelect'>Term 
Status:</label></td><td><select id="statusSelect" 
dojoType="dijit.form.FilteringSelect" jsid="statusSelect">
+                    <option value="ap" selected>approved</option>
+                    <option value="rr">review required</option>
+                    <option value="re">rejected</option>
+                    <option value="any" >any status</option>
+                </select></td></tr>
+    </table></td><td>
+    <table style="display:inline; padding-left:4em">
+        <tr>
+            <td><label for='maxhits'>Maximum # of Hits:</label></td>
+            <td><input style='width:8em;height:1.5em' jsid='maxhits' 
type="text" value="50" dojoType="dijit.form.TextBox" trim="true" 
id="maxhits"/></td>
+        </tr>
+        <tr>
+            <td><label for='tdSearchMode'>Search Mode:</label></td>
+            <td><select name="select" dojoType="dijit.form.FilteringSelect" 
style="width:8em" id="tdSearchMode">
+                    <option value="sub">Include</option>
+                    <option value="ex">Exact Words</option>
+                    <option value="re">Regular Expression</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td><label for='tdSearchMatchCase'>Match Case:</label></td>
+            <td><input jsid='tdSearchMatchCase' type="checkBox" 
dojoType="dijit.form.CheckBox" id="tdSearchMatchCase"/></td>
+        </tr>
+    </table></td><td style="padding-left:6em">
+        <span>
+            <div id="tdProposeNewEntry" dojoType="dijit.form.Button" 
label="&nbsp;Propose New Entry&nbsp;" onclick="proposeEntry()"></div><br/>
+            <div id="tdExportTD" dojoType="dijit.form.Button" 
label="&nbsp;Export Terminology&nbsp;" onclick="openTdExportWindow()"></div>
+        </span>
+</td></tr></table>
+            <div id="tdSearchStatusBox" style="padding-top:1em; 
font-weight:bold">
+                <span id="tdSearchStatusMessage"></span> &nbsp;&nbsp
+                <a id="tdExportLink" 
style="display:none;font-size:x-small;color:black;" class="tooltipLink" 
href="#" onclick="openExportTDDialog()">Export result set to file</a>
+           </div>
+        </div>
+        <div dojoType="dijit.layout.ContentPane"  region="center">
+            <div id="tdSearchResultGrid" jsid="tdSearchResultGrid" 
dojoType="dojox.grid.DataGrid" onRowClick="entryClicked" 
selectable="true"></div>
+        </div>
+    </div>
+    <div dojoType="dijit.Dialog" id="entryDialog"jsid="entryDialog">
+        <div dojoType="dijit.layout.ContentPane" style="width:800px;" >
+            <span style="display:none" id="entryId"></span>
+            <span style="display:none" id="tdId"></span>
+            <div class="terminologyTableBorder">
+                <div class="termDialogTableHead"><div>Entry 
Details</div></div>
+                <table class="terminologyTable" width="100%">
+                    <tbody>
+                        <tr>
+                            <th>Definition</th>
+                            <td id="entryDefinition"></td>
+                        </tr>
+                        <tr>
+                            <th>Product</th>
+                            <td id="entryProduct"></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <br/>
+            <div class="terminologyTableBorder">
+                <div class="termDialogTableHead"><div>Entry Terms</div></div>
+                <table width="100%" id="termsInEntryGrid" 
jsId="termsInEntryGrid" dojoType="dojox.grid.DataGrid" autoHeight="true" 
onRowClick="termClicked">
+                </table>
+            </div>
+            <br/>
+            <div class="terminologyTableBorder" id="termDetailsPane">
+                <div class="termDialogTableHead"><div>Term 
Details</div></div>
+                <table width="100%" class="terminologyTable">
+                    <!--<thead ><tr><td colspan="2" 
class="termDialogTableHead">Term Details</td></tr></thead>-->
+                    <tbody >
+                        <tr><th >Text</th><td id="termTerm"></td></tr>
+                        <tr><th>Language</th><td id="termLanguage"></td></tr>
+                        <tr><th>Status</th><td id="termStatus"></td></tr>
+                        <tr><th>Comment</th><td id="termComment"></td></tr>
+                        <tr style="display:none"><th>Term Id</th><td 
id="termId"></td></tr>
+                        <tr style="display:none"><th>Term Id</th><td 
id="termLangId"></td></tr>
+                        <tr style="display:none" 
id="termProposalRow"><th>Proposal Comment</th><td id="termProposal"></td></tr>
+                        <tr style="display:none" 
id="termProposalChangeRow"><th>Change Proposal</th><td 
id="termChangeProposal"></td></tr>
+
+                    </tbody>
+                </table>
+            </div>
+            <br/>
+            <div id="proposeButtonsPane">
+                <button type="button" id="tdProposeNewTermButton" 
jsid="tdProposeNewTermButton" dojoType="dijit.form.Button" 
label="&nbsp;&nbsp;&nbsp;Propose New Term&nbsp;&nbsp;&nbsp;" 
onClick="proposeNewTerm"></button>
+                <button type="button" id="tdProposeChangeTermButton" 
jsid="tdProposeChangeTermButton" dojoType="dijit.form.Button" disabled="true" 
label="&nbsp;&nbsp;&nbsp;Propose Term Change&nbsp;&nbsp;&nbsp;" 
onClick="proposeChangeTerm"></button>
+                <button type="button" 
[truncated due to length]



[cti~opencti:563] Removed SCA_ID from server and client fixed mailing bug(mails sent 2x)

Ondrej_Moravcik 05/24/2011
  • Mysql
  • Glassfish
  • Jruby
  • Rails
  • Nblogo
Terms of Use; Privacy Policy;
© 2010, Oracle Corporation and/or its affiliates
(revision 20120518.3c65429)
 
 
Close
loading
Please Confirm
Close