Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C74949B31 for ; Sun, 24 Jun 2012 22:26:43 +0000 (UTC) Received: (qmail 46061 invoked by uid 500); 24 Jun 2012 22:26:43 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 46017 invoked by uid 500); 24 Jun 2012 22:26:43 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 46010 invoked by uid 99); 24 Jun 2012 22:26:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Jun 2012 22:26:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Jun 2012 22:26:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 255722388B43; Sun, 24 Jun 2012 22:26:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1353354 - in /manifoldcf/branches/CONNECTORS-474: ./ CHANGES.txt connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java Date: Sun, 24 Jun 2012 22:26:19 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120624222620.255722388B43@eris.apache.org> Author: kwright Date: Sun Jun 24 22:26:18 2012 New Revision: 1353354 URL: http://svn.apache.org/viewvc?rev=1353354&view=rev Log: Merge UI fixes for FileNet connector from trunk. Modified: manifoldcf/branches/CONNECTORS-474/ (props changed) manifoldcf/branches/CONNECTORS-474/CHANGES.txt manifoldcf/branches/CONNECTORS-474/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java Propchange: manifoldcf/branches/CONNECTORS-474/ ------------------------------------------------------------------------------ Merged /manifoldcf/trunk:r1353352 Modified: manifoldcf/branches/CONNECTORS-474/CHANGES.txt URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-474/CHANGES.txt?rev=1353354&r1=1353353&r2=1353354&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-474/CHANGES.txt (original) +++ manifoldcf/branches/CONNECTORS-474/CHANGES.txt Sun Jun 24 22:26:18 2012 @@ -3,6 +3,10 @@ $Id$ ======================= 0.6-dev ===================== +CONNECTORS-484: The FileNet connector UI has been broken since +the i18n work was done on it. +(Joe Becknell, Karl Wright) + CONNECTORS-472: Make changes related to graduation. (Karl Wright) Modified: manifoldcf/branches/CONNECTORS-474/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-474/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java?rev=1353354&r1=1353353&r2=1353354&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-474/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java (original) +++ manifoldcf/branches/CONNECTORS-474/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java Sun Jun 24 22:26:18 2012 @@ -1884,7 +1884,7 @@ public class FilenetConnector extends or "{\n"+ " if (editjob.pathaddon.value == \"\")\n"+ " {\n"+ -" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAFolderFirst") + ");\n"+ +" alert(\"" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAFolderFirst") + "\");\n"+ " editjob.pathaddon.focus();\n"+ " return;\n"+ " }\n"+ @@ -1895,13 +1895,13 @@ public class FilenetConnector extends or "{\n"+ " if (eval(\"editjob.matchfield_\"+docclass+\".value\") == \"\")\n"+ " {\n"+ -" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAFieldFirst") + ");\n"+ +" alert(\"" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAFieldFirst") + "\");\n"+ " eval(\"editjob.matchfield_\"+docclass+\".focus()\");\n"+ " return;\n"+ " }\n"+ " if (eval(\"editjob.matchtype_\"+docclass+\".value\") == \"\")\n"+ " {\n"+ -" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAMatchType") + ");\n"+ +" alert(\"" + Messages.getBodyJavascriptString(locale,"FilenetConnector.SelectAMatchType") + "\");\n"+ " eval(\"editjob.matchtype_\"+docclass+\".focus()\");\n"+ " return;\n"+ " }\n"+ @@ -1913,7 +1913,7 @@ public class FilenetConnector extends or "{\n"+ " if (editjob.spectoken.value == \"\")\n"+ " {\n"+ -" alert(" + Messages.getBodyJavascriptString(locale,"FilenetConnector.NullTokensNotAllowed") + ");\n"+ +" alert(\"" + Messages.getBodyJavascriptString(locale,"FilenetConnector.NullTokensNotAllowed") + "\");\n"+ " editjob.spectoken.focus();\n"+ " return;\n"+ " }\n"+ @@ -2035,7 +2035,7 @@ public class FilenetConnector extends or " \n"+ "  "+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(pathSoFar)+"\n" ); - if (pathSoFar.length() > 0) + if (pathSoFar.length() > 0 && !pathSoFar.equals("/")) { out.print( " \n"