Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 72B30200C41 for ; Fri, 24 Mar 2017 20:02:54 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7157D160B75; Fri, 24 Mar 2017 19:02:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4FFBC160B93 for ; Fri, 24 Mar 2017 20:02:52 +0100 (CET) Received: (qmail 76591 invoked by uid 500); 24 Mar 2017 19:02:51 -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 76380 invoked by uid 99); 24 Mar 2017 19:02:51 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Mar 2017 19:02:51 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 1EE953A3ACF for ; Fri, 24 Mar 2017 19:02:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1788531 [9/18] - in /manifoldcf/trunk: ./ connectors/ connectors/activedirectory/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/activedirectory/tests/ connectors/alfresco-webscript/ connectors/alfresco-webscript/conn... Date: Fri, 24 Mar 2017 19:02:47 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170324190249.1EE953A3ACF@svn01-us-west.apache.org> archived-at: Fri, 24 Mar 2017 19:02:54 -0000 Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp?rev=1788531&r1=1788530&r2=1788531&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp (original) +++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp Fri Mar 24 19:02:46 2017 @@ -105,210 +105,195 @@ try } %> - - - - - - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.ApacheManifoldCFEditMapping")%> - - - + <% MappingConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); %> - - - - - - - - - - -
- - +
+
<% + // Get connectors, since this will be needed to determine what to display. if (set.getRowCount() == 0) { %> -

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditMappingConnection")%>

-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NoMappingConnectorsRegistered")%>
+
+

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NoMappingConnectorsRegistered")%>

+
<% } else { %> -
- - - - - - - - - - - - - +
+ + + + + + +
+
    <% int tabNum = 0; + int activeTab = 0; while (tabNum < tabsArray.size()) { String tab = (String)tabsArray.get(tabNum++); if (tab.equals(tabName)) { %> -
+
  • <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%>
    • <% } else { %> - +
  • + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%> +
    • <% } } %> - - - - -
    -<% - if (description.length() > 0) - { -%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditMapping")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>' -<% - } - else - { -%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditAMapping")%> -<% - } -%> -
    <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%>
    + + +
    +
    <% @@ -316,44 +301,39 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Name"))) { %> - - - - - - - - - - -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NameColon")%> +
    +
    + <% // If the connection doesn't exist yet, we are allowed to change the name. if (isNew) { %> - + <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> - + + <% } %> -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.DescriptionColon")%> - -
    +
    +
    + + +
    +
    <% } else { // Hiddens for the Name tab %> - - + + <% } @@ -362,11 +342,9 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Type"))) { %> - - - - - -
    - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.ConnectionTypeColon")%> +
    +
    + <% if (className.length() > 0) { @@ -374,24 +352,24 @@ function isInteger(value) if (value == null) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%> <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> + <% } %> - + <% } else { int i = 0; %> - <% while (i < set.getRowCount()) { @@ -399,26 +377,23 @@ function isInteger(value) String thisClassName = row.getValue("classname").toString(); String thisDescription = row.getValue("description").toString(); %> - + <% } %> - + <% } %> -
    + + <% } else { // Hiddens for the "Type" tab %> - + <% } @@ -426,23 +401,24 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Prerequisites"))) { %> - - - - - - -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.PrerequisiteUserMappingColon")%> - +
    +
    + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.PrerequisiteUserMappingColon")%> + +
    +
    + + + + <% } else { // Hiddens for Prerequisites tab %> - + <% if (prereq != null) { %> - + <% } } @@ -489,36 +468,36 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Throttling"))) { %> - - - - - - -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.MaxConnectionsColon")%>
    +
    +
    + + +
    +
    <% } else { // Hiddens for "Throttling" tab %> - + <% } if (className.length() > 0) MappingConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabName); %> - - - - - -
    - + + +
    +
    <% if (className.length() > 0) { %> - " onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.SaveThisMappingConnection")%>"/> + " + data-toggle="tooltip"><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Save")%> <% } else @@ -526,30 +505,21 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Type"))) { %> - " onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.ContinueToNextPage")%>"/> + " data-toggle="tooltip"><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Continue")%> <% } } %> - " onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.CancelMappingEditing")%>"/> - -
    -
    -
    + " data-toggle="tooltip"><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Cancel")%> +
    +
    + + <% } %> -
    - - - - <% } @@ -564,3 +534,6 @@ catch (ManifoldCFException e) } %> + + + Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp?rev=1788531&r1=1788530&r2=1788531&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp (original) +++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp Fri Mar 24 19:02:46 2017 @@ -96,211 +96,197 @@ try %> - - - - - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.ApacheManifoldCFEditNotificationConnection")%> - - - + <% NotificationConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); %> +
    +
    +
    - - - - - - - - - - -
    <% // Get connector list; need this to decide what to do if (set.getRowCount() == 0) { %> -

    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditNotificationConnection2")%>

    -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.NoNotificationConnectorsRegistered")%>
    +
    +
    +

    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.NoNotificationConnectorsRegistered")%>

    +
    +
    <% } else { %> -
    - - - - - - - - - - - - - <% int tabNum = 0; + int activeTab = 0; while (tabNum < tabsArray.size()) { String tab = (String)tabsArray.get(tabNum++); if (tab.equals(tabName)) { %> - +
  • <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%>
    • <% } else { %> - +
  • + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%> +
    • <% } } %> - - - - -
    -<% - if (description.length() > 0) - { -%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditNotificationConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>' -<% - } - else - { -%> + + + + + + +
    +
      - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditANotificationConnection")%> -<% - } -%> -
    <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%>
    + + +
    +
    <% @@ -308,42 +294,39 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Name"))) { %> - - - - - - - - -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.NameColon")%> +
    +
    + <% // If the connection doesn't exist yet, we are allowed to change the name. if (connection == null || connectionName.length() < 1) { %> - + <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> - + + <% } %> -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.DescriptionColon")%> - -
    +
    +
    + + +
    +
    <% } else { // Hiddens for the Name tab %> - - + + <% } @@ -352,10 +335,10 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Type"))) { %> - - - - - -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.ConnectionTypeColon")%> +
    +
    + + <% if (className.length() > 0) { @@ -363,24 +346,24 @@ function isInteger(value) if (value == null) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%> <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> + <% } %> - + <% } else { int i = 0; %> - <% while (i < set.getRowCount()) { @@ -388,26 +371,23 @@ function isInteger(value) String thisClassName = row.getValue("classname").toString(); String thisDescription = row.getValue("description").toString(); %> - + <% } %> - + <% } %> -
    + + <% } else { // Hiddens for the "Type" tab %> - + <% } @@ -416,20 +396,20 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Throttling"))) { %> - - - - - - -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.MaxConnectionsColon")%>
    +
    +
    + + +
    +
    <% } else { // Hiddens for "Throttling" tab %> - + <% } @@ -437,16 +417,18 @@ function isInteger(value) NotificationConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabName); %> - - - - - -
    - + + +
    +
    + <% if (className.length() > 0) { %> - " onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.SaveThisNotificationConnection")%>"/> + " data-toggle="tooltip"><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Save")%> + <% } else @@ -454,33 +436,25 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Type"))) { %> - " onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.ContinueToNextPage")%>"/> + " data-toggle="tooltip"><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Continue")%> + <% } } %> - " onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.CancelNotificationConnectionEditing")%>"/> - -
    -
    -
    + " data-toggle="tooltip"><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Cancel")%> + + + <% } %> - -
    - - - - - +
    +
    +
    <% } catch (ManifoldCFException e) @@ -493,4 +467,3 @@ catch (ManifoldCFException e) <% } %> - Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1788531&r1=1788530&r2=1788531&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp (original) +++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp Fri Mar 24 19:02:46 2017 @@ -97,211 +97,201 @@ try %> - - - - - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.ApacheManifoldCFEditOutputConnection")%> - +<% + String heading = null; + if (description.length() > 0) + { + heading = Messages.getBodyString(pageContext.getRequest() + .getLocale(),"editoutput.EditOutputConnection") + " - " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description); + } + else + { + heading = Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.EditAnOutputConnection"); + } +%> - -<% - OutputConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); -%> + - +
    + <% + OutputConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); + %> +
    - - - - - - - -
    +
    +
    <% // Get connector list; need this to decide what to do if (set.getRowCount() == 0) { %> -

    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.EditOutputConnection")%>

    -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NoOutputConnectorsRegistered")%>
    +
    +

    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NoOutputConnectorsRegistered")%>

    +
    <% } else { %> +
    +
    + + + + - - - - - - - - - - - - - - +
    +
      <% int tabNum = 0; + int activeTab = 0; while (tabNum < tabsArray.size()) { String tab = (String)tabsArray.get(tabNum++); if (tab.equals(tabName)) { %> -
    +
  • <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%>
    • <% } else { %> - +
  • + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%> +
    • <% } } %> - - - - -
    -<% - if (description.length() > 0) - { -%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.EditOutputConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>' -<% - } - else - { -%> - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.EditAnOutputConnection")%> -<% - } -%> -
    <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%>
    + + +
    +
    <% @@ -309,42 +299,39 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name"))) { %> - - - - - - - - -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NameColon")%> +
    +
    + <% // If the connection doesn't exist yet, we are allowed to change the name. if (connection == null || connectionName.length() < 1) { %> - + <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> - + + <% } %> -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.DescriptionColon")%> - -
    +
    +
    + + +
    +
    <% } else { // Hiddens for the Name tab %> - - + + <% } @@ -353,10 +340,9 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type"))) { %> - - - - - -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.ConnectionTypeColon")%> +
    +
    + <% if (className.length() > 0) { @@ -364,24 +350,24 @@ function isInteger(value) if (value == null) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%> <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> + <% } %> - + <% } else { int i = 0; %> - <% while (i < set.getRowCount()) { @@ -389,26 +375,23 @@ function isInteger(value) String thisClassName = row.getValue("classname").toString(); String thisDescription = row.getValue("description").toString(); %> - + <% } %> - + <% } %> -
    + + <% } else { // Hiddens for the "Type" tab %> - + <% } @@ -417,20 +400,19 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Throttling"))) { %> - - - - - - -
    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.MaxConnectionsColon")%>
    +
    +
    + + +
    +
    <% } else { // Hiddens for "Throttling" tab %> - + <% } @@ -438,16 +420,16 @@ function isInteger(value) OutputConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabName); %> - - - - - -
    - + + +
    +
    <% if (className.length() > 0) { %> - " onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.SaveThisOutputConnection")%>"/> + " data-toggle="tooltip"><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Save")%> <% } else @@ -455,33 +437,24 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type"))) { %> - " onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.ContinueToNextPage")%>"/> + " data-toggle="tooltip"><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Continue")%> <% } } %> - " onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.CancelOutputConnectionEditing")%>"/> - -
    -
    -
    - + " data-toggle="tooltip"><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Cancel")%> +
    +
    +
    + <% } %> - -
    - - - - - + + + <% } catch (ManifoldCFException e) @@ -494,4 +467,3 @@ catch (ManifoldCFException e) <% } %> -