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=1788301&r1=1788300&r2=1788301&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp (original) +++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editmapper.jsp Thu Mar 23 18:49:54 2017 @@ -105,195 +105,210 @@ try } %> -<script type="text/javascript"> - <!-- -<% - String title = null; - if (description.length() > 0) - { - title = Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditMapping") + " - " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description); - } - else +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html> +<meta http-equiv="X-UA-Compatible" content="IE=edge"/> + +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/> + <title> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.ApacheManifoldCFEditMapping")%> + </title> + + <script type="text/javascript"> + <!-- +// Use this method to repost the form and pick a new tab +function SelectTab(newtab) +{ + if (checkForm()) { - title = Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditAMapping"); + document.editconnection.tabname.value = newtab; + document.editconnection.submit(); } -%> - - $.ManifoldCF.setTitle( - '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "editmapper.ApacheManifoldCFEditMapping")%>', - '<%=title%>', - 'authorities' - ); +} - // Use this method to repost the form and pick a new tab - function SelectTab(newtab) +// Use this method to repost the form, +// and set the anchor request. +function postFormSetAnchor(anchorValue) +{ + if (checkForm()) { - if (checkForm()) - { - document.editconnection.tabname.value=newtab; - $.ManifoldCF.submit(document.editconnection); - } + if (anchorValue != "") + document.editconnection.action = document.editconnection.action + "#" + anchorValue; + document.editconnection.submit(); } +} - // Use this method to repost the form, - // and set the anchor request. - function postFormSetAnchor(anchorValue) +// Use this method to repost the form +function postForm() +{ + if (checkForm()) { - if (checkForm()) - { - if (anchorValue != "") - document.editconnection.action=document.editconnection.action + "#" + anchorValue; - $.ManifoldCF.submit(document.editconnection); - } + document.editconnection.submit(); } +} - // Use this method to repost the form - function postForm() +function Save() +{ + if (checkForm()) { - if (checkForm()) + // Can't submit until all required fields have been set. + // Some of these don't live on the current tab, so don't set + // focus. + + // Check our part of the form, for save + if (editconnection.connname.value == "") { - $.ManifoldCF.submit(document.editconnection); + alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editmapper.ConnectionMustHaveAName")%>"); + SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editmapper.Name")%>"); + document.editconnection.connname.focus(); + return; } - } - - function Save() - { - if (checkForm()) + if (window.checkConfigForSave) { - // Can't submit until all required fields have been set. - // Some of these don't live on the current tab, so don't set - // focus. - - // Check our part of the form, for save - if (editconnection.connname.value == "") - { - alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editmapper.ConnectionMustHaveAName")%>"); - SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editmapper.Name")%>"); - document.editconnection.connname.focus(); + if (!checkConfigForSave()) return; - } - if (window.checkConfigForSave) - { - if (!checkConfigForSave()) - return; - } - document.editconnection.op.value="Save"; - $.ManifoldCF.submit(document.editconnection); } + document.editconnection.op.value="Save"; + document.editconnection.submit(); } +} - function Continue() - { - document.editconnection.op.value="Continue"; - postForm(); - } +function Continue() +{ + document.editconnection.op.value="Continue"; + postForm(); +} - function Cancel() - { - document.editconnection.op.value="Cancel"; - $.ManifoldCF.submit(document.editconnection); - } +function Cancel() +{ + document.editconnection.op.value="Cancel"; + document.editconnection.submit(); +} - function checkForm() +function checkForm() +{ + if (!checkConnectionCount()) + return false; + if (window.checkConfig) + return checkConfig(); + return true; +} + +function checkConnectionCount() +{ + if (!isInteger(editconnection.maxconnections.value)) { - if (!checkConnectionCount()) - return false; - if (window.checkConfig) - return checkConfig(); - return true; + alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editmapper.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); + editconnection.maxconnections.focus(); + return false; } + return true; +} - function checkConnectionCount() +function isRegularExpression(value) +{ + try { - if (!isInteger(editconnection.maxconnections.value)) - { - alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editmapper.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); - editconnection.maxconnections.focus(); - return false; - } + var foo = "teststring"; + foo.search(value.replace(/\(\?i\)/,"")); return true; } - - function isRegularExpression(value) + catch (e) { - try - { - var foo="teststring"; - foo.search(value.replace(/\(\?i\)/,"")); - return true; - } - catch (e) - { - return false; - } - + return false; } - function isInteger(value) - { - var anum=/(^\d+$)/; - return anum.test(value); - } +} + +function isInteger(value) +{ + var anum=/(^\d+$)/; + return anum.test(value); +} //--> -</script> + </script> <% MappingConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); %> -<div class="row"> - <div class="col-md-12"> +</head> + +<body class="standardbody"> + + <table class="page"> + <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr> + <tr> + <td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td> + <td class="darkwindow"> + + <% - // Get connectors, since this will be needed to determine what to display. if (set.getRowCount() == 0) { %> - <div class="callout callout-warning"> - <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NoMappingConnectorsRegistered")%></p> - </div> + <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditMappingConnection")%></p> + <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NoMappingConnectorsRegistered")%></td></tr></table> <% } else { %> - <div class="box box-primary"> - <form class="standardform" name="editconnection" action="execute.jsp" method="POST" enctype="multipart/form-data"> - <input type="hidden" name="op" value="Continue"/> - <input type="hidden" name="type" value="mapper"/> - <input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/> - <input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/> - - <div class="box-header"> - <ul class="nav nav-tabs" role="tablist"> + <form class="standardform" name="editconnection" action="execute.jsp" method="POST" enctype="multipart/form-data"> + <input type="hidden" name="op" value="Continue"/> + <input type="hidden" name="type" value="mapper"/> + <input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/> + <input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/> + <table class="tabtable"> + <tr class="tabspacerrow"> + <td class="spacertab" colspan="<%=tabsArray.size()%>"></td> + <td class="remaindertab" rowspan="3"> +<% + if (description.length() > 0) + { +%> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditMapping")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr> +<% + } + else + { +%> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditAMapping")%></nobr> +<% + } +%> + </td> + </tr> + <tr class="tabsequencerow"> + <td class="blanksequencetab" colspan="<%=tabsArray.size()%>"></td> + </tr> + <tr class="tabrow"> <% int tabNum = 0; - int activeTab = 0; while (tabNum < tabsArray.size()) { String tab = (String)tabsArray.get(tabNum++); if (tab.equals(tabName)) { %> - <li class="active"><a href="#tab_<%=tabNum%>" data-toggle="tab"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></li> + <td class="activetab"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></nobr></td> <% } else { %> - <li> - <a href="#tab_<%=tabNum%>" data-toggle="tab" - alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" "+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.tab")%>' - onclick='<%="javascript:SelectTab(\""+tab+"\");return false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a> - </li> + <td class="passivetab"><nobr><a href="javascript:void(0);" alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" "+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.tab")%>' onclick='<%="javascript:SelectTab(\""+tab+"\");return false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></nobr></td> <% } } %> - </ul> - </div> - <div class="box-body"> - <div class="tab-content"> + </tr> + <tr class="tabbodyrow"> + <td class="tabbody" colspan='<%=Integer.toString(tabsArray.size()+1)%>'> <% @@ -301,39 +316,44 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Name"))) { %> - <div class="tab-pane active" id="tab_<%=activeTab%>"> - <div class="form-group"> - <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NameColon")%></label> + <table class="displaytable"> + <tr><td class="separator" colspan="5"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NameColon")%></nobr></td> + <td class="value" colspan="4"> <% // If the connection doesn't exist yet, we are allowed to change the name. if (isNew) { %> - <input type="text" size="32" name="connname" class="form-control" placeholder="Name..." value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <input type="text" size="32" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> <% } else { %> - <input type="text" size="32" class="form-control" disabled value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> - <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> + <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> <% } %> - </div> - <div class="form-group"> - <label for="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.DescriptionColon")%></label> - <input type="text" size="50" class="form-control" name="description" id="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> - </div> - </div> + </td> + </tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.DescriptionColon")%></nobr></td> + <td class="value" colspan="4"> + <input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> + </td> + </tr> + </table> <% } else { // Hiddens for the Name tab %> - <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> - <input type="hidden" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> + <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <input type="hidden" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> <% } @@ -342,9 +362,11 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Type"))) { %> - <div class="tab-pane active" id="tab_<%=activeTab%>"> - <div class="form-group"> - <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.ConnectionTypeColon")%></label> + <table class="displaytable"> + <tr><td class="separator" colspan="5"><hr/></td></tr> + <tr> + <td class="description"> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.ConnectionTypeColon")%></nobr></td><td class="value" colspan="4"> <% if (className.length() > 0) { @@ -352,24 +374,24 @@ try if (value == null) { %> - <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr> <% } else { %> - <input type="text" class="form-control" disabled value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(value)%>'/> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> <% } %> - <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> + <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> <% } else { int i = 0; %> - <select name="classname" class="form-control"> + <select name="classname" size="1"> <% while (i < set.getRowCount()) { @@ -377,23 +399,26 @@ try String thisClassName = row.getValue("classname").toString(); String thisDescription = row.getValue("description").toString(); %> - <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisClassName)%>' <%=className.equals(thisClassName)?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option> + <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisClassName)%>' + <%=className.equals(thisClassName)?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%> + </option> <% } %> - </select> + </select> <% } %> - </div> - </div> + </td> + </tr> + </table> <% } else { // Hiddens for the "Type" tab %> - <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> + <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> <% } @@ -401,24 +426,23 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Prerequisites"))) { %> - <div class="tab-pane active" id="tab_<%=activeTab%>"> - <div class="form-group"> - <strong><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.PrerequisiteUserMappingColon")%></strong> - - <div class="radio"> - <label> - <input type="hidden" name="prerequisites_present" value="true"/> + <table class="displaytable"> + <tr><td class="separator" colspan="5"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.PrerequisiteUserMappingColon")%></nobr></td> + <td class="value" colspan="4"> + <input type="hidden" name="prerequisites_present" value="true"/> <% if (prereq == null) { %> - <input type="radio" name="prerequisites" value="" checked="true"/> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NoPrerequisites")%><br/> + <input type="radio" name="prerequisites" value="" checked="true"/> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NoPrerequisites")%><br/> <% } else { %> - <input type="radio" name="prerequisites" value=""/> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NoPrerequisites")%><br/> + <input type="radio" name="prerequisites" value=""/> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NoPrerequisites")%><br/> <% } @@ -431,35 +455,32 @@ try if (prereq != null && prereq.equals(mappingName)) { %> - <input type="radio" name="prerequisites" - value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mappingName)%>' - checked="true"/> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(mappingDescription)%><br/> + <input type="radio" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mappingName)%>' checked="true"/> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(mappingDescription)%><br/> <% } else { %> - <input type="radio" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mappingName)%>'/> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(mappingDescription)%><br/> + <input type="radio" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mappingName)%>'/> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(mappingDescription)%><br/> <% } } %> - </label> - </div> - </div> - </div> + </td> + </tr> + </table> <% } else { // Hiddens for Prerequisites tab %> - <input type="hidden" name="prerequisites_present" value="true"/> + <input type="hidden" name="prerequisites_present" value="true"/> <% if (prereq != null) { %> - <input type="hidden" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(prereq)%>'/> + <input type="hidden" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(prereq)%>'/> <% } } @@ -468,36 +489,36 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Throttling"))) { %> - <div class="tab-pane active" id="tab_<%=activeTab%>"> - <div class="form-group"> - <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.MaxConnectionsColon")%></label> - <input type="text" size="6" name="maxconnections" class="form-control" value='<%=Integer.toString(maxConnections)%>'/> - </div> - </div> + <table class="displaytable"> + <tr><td class="separator" colspan="5"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.MaxConnectionsColon")%></nobr></td> + <td class="value" colspan="4"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td> + </tr> + </table> <% } else { // Hiddens for "Throttling" tab %> - <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/> + <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/> <% } if (className.length() > 0) MappingConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabName); %> - </div> - </div> - <div class="box-footer clearfix"> - <div class="btn-group"> + <table class="displaytable"> + <tr><td class="separator" colspan="4"><hr/></td></tr> + <tr> + <td class="message" colspan="4"> + <nobr> <% if (className.length() > 0) { %> - <a class="btn btn-primary" role="button" onClick="javascript:Save()" - title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.SaveThisMappingConnection")%>" - data-toggle="tooltip"><i class="fa fa-save fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Save")%></a> + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.SaveThisMappingConnection")%>"/> <% } else @@ -505,21 +526,30 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Type"))) { %> - <a class="btn btn-primary" role="button" onClick="javascript:Continue()" - title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.ContinueToNextPage")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Continue")%></a> + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.ContinueToNextPage")%>"/> <% } } %> - <a class="btn btn-primary" role="button" onClick="javascript:Cancel()" - title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.CancelMappingEditing")%>" data-toggle="tooltip"><i class="fa fa-times-circle-o fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Cancel")%></a> - </div> - </div> - </div> - </form> + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.CancelMappingEditing")%>"/> + </nobr> + </td> + </tr> + </table> + </td> + </tr> + </table> + </form> <% } %> + </td> + </tr> + </table> + +</body> + +</html> <% } @@ -534,6 +564,3 @@ catch (ManifoldCFException e) } %> - </div> - </div> -</div>
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=1788301&r1=1788300&r2=1788301&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp (original) +++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp Thu Mar 23 18:49:54 2017 @@ -96,197 +96,211 @@ try %> -<script type="text/javascript"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html> +<meta http-equiv="X-UA-Compatible" content="IE=edge"/> + +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/> + <title> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.ApacheManifoldCFEditNotificationConnection")%> + </title> + + <script type="text/javascript"> <!-- -<% - String title = null; - if (description.length() > 0) - { - title = Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditNotificationConnection") + " - " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description); - } - else - { - title = Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditANotificationConnection"); - } -%> - $.ManifoldCF.setTitle( - '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "editnotification.ApacheManifoldCFEditNotificationConnection")%>', - '<%=title%>', - 'repositories' - ); - // Use this method to repost the form and pick a new tab - function SelectTab(newtab) +// Use this method to repost the form and pick a new tab +function SelectTab(newtab) +{ + if (checkForm()) { - if (checkForm()) - { - document.editconnection.tabname.value=newtab; - $.ManifoldCF.submit(document.editconnection); - } + document.editconnection.tabname.value = newtab; + document.editconnection.submit(); } +} - // Use this method to repost the form, - // and set the anchor request. - function postFormSetAnchor(anchorValue) +// Use this method to repost the form, +// and set the anchor request. +function postFormSetAnchor(anchorValue) +{ + if (checkForm()) { - if (checkForm()) - { - if (anchorValue != "") - document.editconnection.action=document.editconnection.action + "#" + anchorValue; - $.ManifoldCF.submit(document.editconnection); - } + if (anchorValue != "") + document.editconnection.action = document.editconnection.action + "#" + anchorValue; + document.editconnection.submit(); } +} - // Use this method to repost the form - function postForm() +// Use this method to repost the form +function postForm() +{ + if (checkForm()) { - if (checkForm()) - { - $.ManifoldCF.submit(document.editconnection); - } + document.editconnection.submit(); } +} - function Save() +function Save() +{ + if (checkForm()) { - if (checkForm()) + // Can't submit until all required fields have been set. + // Some of these don't live on the current tab, so don't set + // focus. + + // Check our part of the form, for save + if (editconnection.connname.value == "") + { + alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editnotification.ConnectionMustHaveAName")%>"); + SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editnotification.Name")%>"); + document.editconnection.connname.focus(); + return; + } + if (window.checkConfigForSave) { - // Can't submit until all required fields have been set. - // Some of these don't live on the current tab, so don't set - // focus. - - // Check our part of the form, for save - if (editconnection.connname.value == "") - { - alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editnotification.ConnectionMustHaveAName")%>"); - SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editnotification.Name")%>"); - document.editconnection.connname.focus(); + if (!checkConfigForSave()) return; - } - if (window.checkConfigForSave) - { - if (!checkConfigForSave()) - return; - } - document.editconnection.op.value="Save"; - $.ManifoldCF.submit(document.editconnection); } + document.editconnection.op.value="Save"; + document.editconnection.submit(); } +} - function Continue() - { - document.editconnection.op.value="Continue"; - postForm(); - } +function Continue() +{ + document.editconnection.op.value="Continue"; + postForm(); +} - function Cancel() - { - document.editconnection.op.value="Cancel"; - $.ManifoldCF.submit(document.editconnection); - } +function Cancel() +{ + document.editconnection.op.value="Cancel"; + document.editconnection.submit(); +} + +function checkForm() +{ + if (!checkConnectionCount()) + return false; + if (window.checkConfig) + return checkConfig(); + return true; +} - function checkForm() +function checkConnectionCount() +{ + if (!isInteger(editconnection.maxconnections.value)) { - if (!checkConnectionCount()) - return false; - if (window.checkConfig) - return checkConfig(); - return true; + alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editnotification.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); + editconnection.maxconnections.focus(); + return false; } + return true; +} - function checkConnectionCount() +function isRegularExpression(value) +{ + try { - if (!isInteger(editconnection.maxconnections.value)) - { - alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editnotification.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); - editconnection.maxconnections.focus(); - return false; - } + var foo = "teststring"; + foo.search(value.replace(/\(\?i\)/,"")); return true; } - - function isRegularExpression(value) + catch (e) { - try - { - var foo="teststring"; - foo.search(value.replace(/\(\?i\)/,"")); - return true; - } - catch (e) - { - return false; - } - + return false; } - function isInteger(value) - { - var anum=/(^\d+$)/; - return anum.test(value); - } +} + +function isInteger(value) +{ + var anum=/(^\d+$)/; + return anum.test(value); +} //--> -</script> + </script> <% NotificationConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); %> -<div class="row"> - <div class="col-md-12"> - <div class="box box-primary"> +</head> + +<body class="standardbody"> + + <table class="page"> + <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr> + <tr> + <td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td> + <td class="darkwindow"> <% // Get connector list; need this to decide what to do if (set.getRowCount() == 0) { %> - <div class="box-body"> - <div class="callout callout-warning"> - <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.NoNotificationConnectorsRegistered")%></p> - </div> - </div> + <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditNotificationConnection2")%></p> + <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.NoNotificationConnectorsRegistered")%></td></tr></table> <% } else { %> - <form class="standardform" name="editconnection" action="execute.jsp" method="POST" enctype="multipart/form-data"> - <input type="hidden" name="op" value="Continue"/> - <input type="hidden" name="type" value="notification"/> - <input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/> - <input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/> - - <div class="box-header"> - <ul class="nav nav-tabs" role="tablist"> + <form class="standardform" name="editconnection" action="execute.jsp" method="POST" enctype="multipart/form-data"> + <input type="hidden" name="op" value="Continue"/> + <input type="hidden" name="type" value="notification"/> + <input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/> + <input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/> + <table class="tabtable"> + <tr class="tabspacerrow"> + <td class="spacertab" colspan="<%=tabsArray.size()%>"></td> + <td class="remaindertab" rowspan="3"> +<% + if (description.length() > 0) + { +%> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditNotificationConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr> +<% + } + else + { +%> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditANotificationConnection")%></nobr> +<% + } +%> + </td> + </tr> + <tr class="tabsequencerow"> + <td class="blanksequencetab" colspan="<%=tabsArray.size()%>"></td> + </tr> + <tr class="tabrow"> <% int tabNum = 0; - int activeTab = 0; while (tabNum < tabsArray.size()) { String tab = (String)tabsArray.get(tabNum++); if (tab.equals(tabName)) { %> - <li class="active"><a href="#tab_<%=tabNum%>" data-toggle="tab"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></li> + <td class="activetab"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></nobr></td> <% } else { %> - <li> - <a href="#tab_<%=tabNum%>" data-toggle="tab" - alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" "+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.tab")%>' - onclick='<%="javascript:SelectTab(\""+tab+"\");return false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a> - </li> + <td class="passivetab"><nobr><a href="javascript:void(0);" alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" "+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.tab")%>' onclick='<%="javascript:SelectTab(\""+tab+"\");return false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></nobr></td> <% } } %> - </ul> - </div> - <div class="box-body"> - <div class="tab-content"> + </tr> + <tr class="tabbodyrow"> + <td class="tabbody" colspan='<%=Integer.toString(tabsArray.size()+1)%>'> <% @@ -294,39 +308,42 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Name"))) { %> - <div class="tab-pane active" id="tab_<%=activeTab%>"> - <div class="form-group"> - <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.NameColon")%></label> + <table class="displaytable"> + <tr><td class="separator" colspan="5"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.NameColon")%></nobr></td><td class="value" colspan="4"> <% // If the connection doesn't exist yet, we are allowed to change the name. if (connection == null || connectionName.length() < 1) { %> - <input type="text" size="32" name="connname" class="form-control" placeholder="Name..." value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <input type="text" size="32" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> <% } else { %> - <input type="text" size="32" class="form-control" disabled value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> - <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> + <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> <% } %> - </div> - <div class="form-group"> - <label for="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.DescriptionColon")%></label> - <input type="text" size="50" class="form-control" name="description" id="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> - </div> - </div> + </td> + </tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.DescriptionColon")%></nobr></td><td class="value" colspan="4"> + <input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> + </td> + </tr> + </table> <% } else { // Hiddens for the Name tab %> - <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> - <input type="hidden" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> + <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <input type="hidden" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> <% } @@ -335,10 +352,10 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Type"))) { %> - <div class="tab-pane active" id="tab_<%=activeTab%>"> - <div class="form-group"> - <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.ConnectionTypeColon")%></label> - + <table class="displaytable"> + <tr><td class="separator" colspan="5"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.ConnectionTypeColon")%></nobr></td><td class="value" colspan="4"> <% if (className.length() > 0) { @@ -346,24 +363,24 @@ try if (value == null) { %> - <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr> <% } else { %> - <input type="text" class="form-control" disabled value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(value)%>'/> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> <% } %> - <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> + <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> <% } else { int i = 0; %> - <select name="classname" class="form-control"> + <select name="classname" size="1"> <% while (i < set.getRowCount()) { @@ -371,23 +388,26 @@ try String thisClassName = row.getValue("classname").toString(); String thisDescription = row.getValue("description").toString(); %> - <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisClassName)%>' <%=className.equals(thisClassName)?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option> + <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisClassName)%>' + <%=className.equals(thisClassName)?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%> + </option> <% } %> - </select> + </select> <% } %> - </div> - </div> + </td> + </tr> + </table> <% } else { // Hiddens for the "Type" tab %> - <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> + <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> <% } @@ -396,20 +416,20 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Throttling"))) { %> - <div class="tab-pane active" id="tab_<%=activeTab%>"> - <div class="form-group"> - <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.MaxConnectionsColon")%> - </label> - <input type="text" size="6" name="maxconnections" class="form-control" value='<%=Integer.toString(maxConnections)%>'/> - </div> - </div> + <table class="displaytable"> + <tr><td class="separator" colspan="2"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.MaxConnectionsColon")%></nobr></td> + <td class="value"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td> + </tr> + </table> <% } else { // Hiddens for "Throttling" tab %> - <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/> + <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/> <% } @@ -417,18 +437,16 @@ try NotificationConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabName); %> - </div> - </div> - <div class="box-footer clearfix"> - <div class="btn-group"> - + <table class="displaytable"> + <tr><td class="separator" colspan="4"><hr/></td></tr> + <tr> + <td class="message" colspan="4"> + <nobr> <% if (className.length() > 0) { %> - <a role="button" class="btn btn-primary" onClick="javascript:Save()" - title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.SaveThisNotificationConnection")%>" data-toggle="tooltip"><i class="fa fa-save fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Save")%></a> - + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.SaveThisNotificationConnection")%>"/> <% } else @@ -436,25 +454,33 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Type"))) { %> - <a role="button" class="btn btn-primary" onClick="javascript:Continue()" - title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.ContinueToNextPage")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Continue")%></a> - + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.ContinueToNextPage")%>"/> <% } } %> - <a role="button" class="btn btn-primary" onClick="javascript:Cancel()" - title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.CancelNotificationConnectionEditing")%>" data-toggle="tooltip"><i class="fa fa-times-circle-o fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Cancel")%></a> - </div> - </div> - </form> + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.CancelNotificationConnectionEditing")%>"/> + </nobr> + </td> + </tr> + </table> + </td> + </tr> + </table> + </form> <% } %> - </div> - </div> -</div> + + </td> + </tr> + </table> + +</body> + +</html> + <% } catch (ManifoldCFException e) @@ -467,3 +493,4 @@ 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=1788301&r1=1788300&r2=1788301&view=diff ============================================================================== --- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp (original) +++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editoutput.jsp Thu Mar 23 18:49:54 2017 @@ -97,201 +97,211 @@ try %> -<% - 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"); - } -%> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html> +<meta http-equiv="X-UA-Compatible" content="IE=edge"/> + +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/> + <title> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.ApacheManifoldCFEditOutputConnection")%> + </title> -<script type="text/javascript"> + <script type="text/javascript"> <!-- - $.ManifoldCF.setTitle( - '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "editoutput.ApacheManifoldCFEditOutputConnection")%>', - '<%=heading%>', - 'outputs' - ); - // Use this method to repost the form and pick a new tab - function SelectTab(newtab) +// Use this method to repost the form and pick a new tab +function SelectTab(newtab) +{ + if (checkForm()) { - if (checkForm()) - { - document.editconnection.tabname.value=newtab; - $.ManifoldCF.submit(document.editconnection); - } + document.editconnection.tabname.value = newtab; + document.editconnection.submit(); } +} - // Use this method to repost the form, - // and set the anchor request. - function postFormSetAnchor(anchorValue) +// Use this method to repost the form, +// and set the anchor request. +function postFormSetAnchor(anchorValue) +{ + if (checkForm()) { - if (checkForm()) - { - if (anchorValue != "") - { - document.editconnection.action=document.editconnection.action + "#" + anchorValue; - } - $.ManifoldCF.submit(document.editconnection); - } + if (anchorValue != "") + document.editconnection.action = document.editconnection.action + "#" + anchorValue; + document.editconnection.submit(); } +} - // Use this method to repost the form - function postForm() +// Use this method to repost the form +function postForm() +{ + if (checkForm()) { - if (checkForm()) - { - $.ManifoldCF.submit(document.editconnection); - } + document.editconnection.submit(); } +} - function Save() +function Save() +{ + if (checkForm()) { - if (checkForm()) - { - // Can't submit until all required fields have been set. - // Some of these don't live on the current tab, so don't set - // focus. + // Can't submit until all required fields have been set. + // Some of these don't live on the current tab, so don't set + // focus. - // Check our part of the form, for save - if (editconnection.connname.value == "") - { - alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editoutput.ConnectionMustHaveAName")%>"); - SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editoutput.Name")%>"); - document.editconnection.connname.focus(); + // Check our part of the form, for save + if (editconnection.connname.value == "") + { + alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editoutput.ConnectionMustHaveAName")%>"); + SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editoutput.Name")%>"); + document.editconnection.connname.focus(); + return; + } + if (window.checkConfigForSave) + { + if (!checkConfigForSave()) return; - } - if (window.checkConfigForSave) - { - if (!checkConfigForSave()) - return; - } - document.editconnection.op.value="Save"; - $.ManifoldCF.submit(document.editconnection); } + document.editconnection.op.value="Save"; + document.editconnection.submit(); } +} - function Continue() - { - document.editconnection.op.value="Continue"; - postForm(); - } +function Continue() +{ + document.editconnection.op.value="Continue"; + postForm(); +} - function Cancel() - { - document.editconnection.op.value="Cancel"; - $.ManifoldCF.submit(document.editconnection); - } +function Cancel() +{ + document.editconnection.op.value="Cancel"; + document.editconnection.submit(); +} + +function checkForm() +{ + if (!checkConnectionCount()) + return false; + if (window.checkConfig) + return checkConfig(); + return true; +} - function checkForm() +function checkConnectionCount() +{ + if (!isInteger(editconnection.maxconnections.value)) { - if (!checkConnectionCount()) - return false; - if (window.checkConfig) - return checkConfig(); - return true; + alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editoutput.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); + editconnection.maxconnections.focus(); + return false; } + return true; +} - function checkConnectionCount() +function isRegularExpression(value) +{ + try { - if (!isInteger(editconnection.maxconnections.value)) - { - alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editoutput.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); - editconnection.maxconnections.focus(); - return false; - } + var foo = "teststring"; + foo.search(value.replace(/\(\?i\)/,"")); return true; } - - function isRegularExpression(value) + catch (e) { - try - { - var foo="teststring"; - foo.search(value.replace(/\(\?i\)/,"")); - return true; - } - catch (e) - { - return false; - } - + return false; } - function isInteger(value) - { - var anum=/(^\d+$)/; - return anum.test(value); - } +} + +function isInteger(value) +{ + var anum=/(^\d+$)/; + return anum.test(value); +} //--> -</script> + </script> +<% + OutputConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); +%> -<section id="script"> - <% - OutputConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); - %> -</section> +</head> +<body class="standardbody"> -<div class="row"> - <div class="col-md-12"> + <table class="page"> + <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr> + <tr> + <td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td> + <td class="darkwindow"> <% // Get connector list; need this to decide what to do if (set.getRowCount() == 0) { %> - <div class="callout callout-warning"> - <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NoOutputConnectorsRegistered")%></p> - </div> + <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.EditOutputConnection")%></p> + <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NoOutputConnectorsRegistered")%></td></tr></table> <% } else { %> - <div class="box box-primary"> - <form class="standardform" name="editconnection" action="execute.jsp" method="POST" enctype="multipart/form-data"> - <input type="hidden" name="op" value="Continue"/> - <input type="hidden" name="type" value="output"/> - <input type="hidden" name="tabname" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>"/> - <input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/> - <div class="box-header"> - <ul class="nav nav-tabs" role="tablist"> + <form class="standardform" name="editconnection" action="execute.jsp" method="POST" enctype="multipart/form-data"> + <input type="hidden" name="op" value="Continue"/> + <input type="hidden" name="type" value="output"/> + <input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/> + <input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/> + <table class="tabtable"> + <tr class="tabspacerrow"> + <td class="spacertab" colspan="<%=tabsArray.size()%>"></td> + <td class="remaindertab" rowspan="3"> +<% + if (description.length() > 0) + { +%> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.EditOutputConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr> +<% + } + else + { +%> + + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.EditAnOutputConnection")%></nobr> +<% + } +%> + </td> + </tr> + <tr class="tabsequencerow"> + <td class="blanksequencetab" colspan="<%=tabsArray.size()%>"></td> + </tr> + <tr class="tabrow"> <% int tabNum = 0; - int activeTab = 0; while (tabNum < tabsArray.size()) { String tab = (String)tabsArray.get(tabNum++); if (tab.equals(tabName)) { %> - <li class="active"><a href="#tab_<%=tabNum%>" data-toggle="tab"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></li> + <td class="activetab"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></nobr></td> <% } else { %> - <li> - <a href="#tab_<%=tabNum%>" data-toggle="tab" - alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" "+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.tab")%>' - onclick='<%="javascript:SelectTab(\""+tab+"\");return false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a> - </li> + <td class="passivetab"><nobr><a href="javascript:void(0);" alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" "+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.tab")%>' onclick='<%="javascript:SelectTab(\""+tab+"\");return false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></nobr></td> <% } } %> - </ul> - </div> - <div class="box-body"> - <div class="tab-content"> + </tr> + <tr class="tabbodyrow"> + <td class="tabbody" colspan='<%=Integer.toString(tabsArray.size()+1)%>'> <% @@ -299,39 +309,42 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name"))) { %> - <div class="tab-pane active" id="tab_<%=activeTab%>"> - <div class="form-group"> - <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NameColon")%></label> + <table class="displaytable"> + <tr><td class="separator" colspan="5"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NameColon")%></nobr></td><td class="value" colspan="4"> <% // If the connection doesn't exist yet, we are allowed to change the name. if (connection == null || connectionName.length() < 1) { %> - <input type="text" size="32" name="connname" class="form-control" placeholder="Name..." value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>"/> + <input type="text" size="32" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> <% } else { %> - <input type="text" class="form-control" disabled value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>"/> - <input type="hidden" name="connname" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>"/> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> + <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> <% } %> - </div> - <div class="form-group"> - <label for="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.DescriptionColon")%></label> - <input type="text" size="50" class="form-control" name="description" id="description" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>"/> - </div> - </div> + </td> + </tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.DescriptionColon")%></nobr></td><td class="value" colspan="4"> + <input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> + </td> + </tr> + </table> <% } else { // Hiddens for the Name tab %> - <input type="hidden" name="connname" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>"/> - <input type="hidden" name="description" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>"/> + <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <input type="hidden" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> <% } @@ -340,9 +353,10 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type"))) { %> - <div class="tab-pane active" id="tab_<%=activeTab%>"> - <div class="form-group"> - <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.ConnectionTypeColon")%></label> + <table class="displaytable"> + <tr><td class="separator" colspan="5"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.ConnectionTypeColon")%></nobr></td><td class="value" colspan="4"> <% if (className.length() > 0) { @@ -350,24 +364,24 @@ try if (value == null) { %> - <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr> <% } else { %> - <input type="text" class="form-control" disabled value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(value)%>"/> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> <% } %> - <input type="hidden" name="classname" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>"/> + <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> <% } else { int i = 0; %> - <select name="classname" clas="form-control"> + <select name="classname" size="1"> <% while (i < set.getRowCount()) { @@ -375,23 +389,26 @@ try String thisClassName = row.getValue("classname").toString(); String thisDescription = row.getValue("description").toString(); %> - <option value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisClassName)%>" <%=className.equals(thisClassName)?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option> + <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisClassName)%>' + <%=className.equals(thisClassName)?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%> + </option> <% } %> - </select> + </select> <% } %> - </div> - </div> + </td> + </tr> + </table> <% } else { // Hiddens for the "Type" tab %> - <input type="hidden" name="classname" value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>"/> + <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> <% } @@ -400,19 +417,20 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Throttling"))) { %> - <div class="tab-pane active" id="tab_<%=activeTab%>"> - <div class="form-group"> - <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.MaxConnectionsColon")%></label> - <input type="text" size="6" name="maxconnections" class="form-control" value="<%=Integer.toString(maxConnections)%>"/> - </div> - </div> + <table class="displaytable"> + <tr><td class="separator" colspan="2"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.MaxConnectionsColon")%></nobr></td> + <td class="value"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td> + </tr> + </table> <% } else { // Hiddens for "Throttling" tab %> - <input type="hidden" name="maxconnections" value="<%=Integer.toString(maxConnections)%>"/> + <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/> <% } @@ -420,16 +438,16 @@ try OutputConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabName); %> - </div> - </div> - <div class="box-footer clearfix"> - <div class="btn-group"> + <table class="displaytable"> + <tr><td class="separator" colspan="4"><hr/></td></tr> + <tr> + <td class="message" colspan="4"> + <nobr> <% if (className.length() > 0) { %> - <a class="btn btn-primary" onClick="javascript:Save()" - title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.SaveThisOutputConnection")%>" data-toggle="tooltip"><i class="fa fa-save fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Save")%></a> + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.SaveThisOutputConnection")%>"/> <% } else @@ -437,24 +455,33 @@ try if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type"))) { %> - <a class="btn btn-primary" onClick="javascript:Continue()" - title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.ContinueToNextPage")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Continue")%></a> + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.ContinueToNextPage")%>"/> <% } } %> - <a class="btn btn-primary" onClick="javascript:Cancel()" - title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.CancelOutputConnectionEditing")%>" data-toggle="tooltip"><i class="fa fa-times-circle-o fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Cancel")%></a> - </div> - </div> - </div> - </form> + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.CancelOutputConnectionEditing")%>"/> + </nobr> + </td> + </tr> + </table> + </td> + </tr> + </table> + </form> + <% } %> - </div> - </div> -</div> + + </td> + </tr> + </table> + +</body> + +</html> + <% } catch (ManifoldCFException e) @@ -467,3 +494,4 @@ catch (ManifoldCFException e) <% } %> +
