Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editmapper.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editmapper.jsp?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editmapper.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editmapper.jsp Thu Mar 23 18:56:26 2017 @@ -105,210 +105,195 @@ try } %> - -<?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"> +<script type="text/javascript"> <!-- -// Use this method to repost the form and pick a new tab -function SelectTab(newtab) -{ - if (checkForm()) + +<% + String title = null; + if (description.length() > 0) { - document.editconnection.tabname.value = newtab; - document.editconnection.submit(); + title = Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditMapping") + " - " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description); } -} - -// Use this method to repost the form, -// and set the anchor request. -function postFormSetAnchor(anchorValue) -{ - if (checkForm()) + else { - if (anchorValue != "") - document.editconnection.action = document.editconnection.action + "#" + anchorValue; - document.editconnection.submit(); + title = Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.EditAMapping"); } -} +%> -// Use this method to repost the form -function postForm() -{ - if (checkForm()) + $.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) { - document.editconnection.submit(); + if (checkForm()) + { + document.editconnection.tabname.value=newtab; + $.ManifoldCF.submit(document.editconnection); + } } -} -function Save() -{ - if (checkForm()) + // Use this method to repost the form, + // and set the anchor request. + function postFormSetAnchor(anchorValue) { - // 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. + if (checkForm()) + { + if (anchorValue != "") + document.editconnection.action=document.editconnection.action + "#" + anchorValue; + $.ManifoldCF.submit(document.editconnection); + } + } - // Check our part of the form, for save - if (editconnection.connname.value == "") + // Use this method to repost the form + function postForm() + { + if (checkForm()) { - alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editmapper.ConnectionMustHaveAName")%>"); - SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editmapper.Name")%>"); - document.editconnection.connname.focus(); - return; + $.ManifoldCF.submit(document.editconnection); } - if (window.checkConfigForSave) + } + + function Save() + { + if (checkForm()) { - if (!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(); 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 Cancel() -{ - document.editconnection.op.value="Cancel"; - document.editconnection.submit(); -} - -function checkForm() -{ - if (!checkConnectionCount()) - return false; - if (window.checkConfig) - return checkConfig(); - return true; -} + function Continue() + { + document.editconnection.op.value="Continue"; + postForm(); + } -function checkConnectionCount() -{ - if (!isInteger(editconnection.maxconnections.value)) + function Cancel() { - alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editmapper.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); - editconnection.maxconnections.focus(); - return false; + document.editconnection.op.value="Cancel"; + $.ManifoldCF.submit(document.editconnection); } - return true; -} -function isRegularExpression(value) -{ - try + function checkForm() { - var foo = "teststring"; - foo.search(value.replace(/\(\?i\)/,"")); + if (!checkConnectionCount()) + return false; + if (window.checkConfig) + return checkConfig(); return true; } - catch (e) + + function checkConnectionCount() { - return false; + if (!isInteger(editconnection.maxconnections.value)) + { + alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editmapper.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); + editconnection.maxconnections.focus(); + return false; + } + return true; } -} + function isRegularExpression(value) + { + try + { + var foo="teststring"; + foo.search(value.replace(/\(\?i\)/,"")); + return true; + } + catch (e) + { + 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); %> -</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"> - - +<div class="row"> + <div class="col-md-12"> <% + // Get connectors, since this will be needed to determine what to display. if (set.getRowCount() == 0) { %> - <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> + <div class="callout callout-warning"> + <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NoMappingConnectorsRegistered")%></p> + </div> <% } 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="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"> + <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"> <% int tabNum = 0; + int activeTab = 0; while (tabNum < tabsArray.size()) { String tab = (String)tabsArray.get(tabNum++); if (tab.equals(tabName)) { %> - <td class="activetab"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></nobr></td> + <li class="active"><a href="#tab_<%=tabNum%>" data-toggle="tab"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></li> <% } else { %> - <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> + <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> <% } } %> - </tr> - <tr class="tabbodyrow"> - <td class="tabbody" colspan='<%=Integer.toString(tabsArray.size()+1)%>'> + </ul> + </div> + <div class="box-body"> + <div class="tab-content"> <% @@ -316,44 +301,39 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Name"))) { %> - <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"> + <div class="tab-pane active" id="tab_<%=activeTab%>"> + <div class="form-group"> + <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.NameColon")%></label> <% // If the connection doesn't exist yet, we are allowed to change the name. if (isNew) { %> - <input type="text" size="32" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <input type="text" size="32" name="connname" class="form-control" placeholder="Name..." value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> - <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <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)%>'/> <% } %> - </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> + </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> <% } 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)%>'/> <% } @@ -362,11 +342,9 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Type"))) { %> - <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"> + <div class="tab-pane active" id="tab_<%=activeTab%>"> + <div class="form-group"> + <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editmapper.ConnectionTypeColon")%></label> <% if (className.length() > 0) { @@ -374,24 +352,24 @@ function isInteger(value) 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 { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> + <input type="text" class="form-control" disabled value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(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" size="1"> + <select name="classname" class="form-control"> <% while (i < set.getRowCount()) { @@ -399,26 +377,23 @@ function isInteger(value) 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> <% } %> - </td> - </tr> - </table> + </div> + </div> <% } 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)%>'/> <% } @@ -426,23 +401,24 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Prerequisites"))) { %> - <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"/> + <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"/> <% 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/> <% } @@ -455,32 +431,35 @@ function isInteger(value) 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/> <% } } %> - </td> - </tr> - </table> + </label> + </div> + </div> + </div> <% } 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)%>'/> <% } } @@ -489,36 +468,36 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Throttling"))) { %> - <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> + <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> <% } 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); %> - <table class="displaytable"> - <tr><td class="separator" colspan="4"><hr/></td></tr> - <tr> - <td class="message" colspan="4"> - <nobr> + </div> + </div> + <div class="box-footer clearfix"> + <div class="btn-group"> <% if (className.length() > 0) { %> - <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.SaveThisMappingConnection")%>"/> + <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> <% } else @@ -526,30 +505,21 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Type"))) { %> - <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: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.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.CancelMappingEditing")%>"/> - </nobr> - </td> - </tr> - </table> - </td> - </tr> - </table> - </form> + <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> <% } %> - </td> - </tr> - </table> - -</body> - -</html> <% } @@ -564,3 +534,6 @@ catch (ManifoldCFException e) } %> + </div> + </div> +</div>
Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editnotification.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editnotification.jsp?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editnotification.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editnotification.jsp Thu Mar 23 18:56:26 2017 @@ -96,211 +96,197 @@ try %> -<?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"> +<script type="text/javascript"> <!-- - -// Use this method to repost the form and pick a new tab -function SelectTab(newtab) -{ - if (checkForm()) +<% + String title = null; + if (description.length() > 0) { - document.editconnection.tabname.value = newtab; - document.editconnection.submit(); + title = Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditNotificationConnection") + " - " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description); } -} - -// Use this method to repost the form, -// and set the anchor request. -function postFormSetAnchor(anchorValue) -{ - if (checkForm()) + else { - if (anchorValue != "") - document.editconnection.action = document.editconnection.action + "#" + anchorValue; - document.editconnection.submit(); + title = Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.EditANotificationConnection"); } -} +%> -// Use this method to repost the form -function postForm() -{ - if (checkForm()) + $.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) { - document.editconnection.submit(); + if (checkForm()) + { + document.editconnection.tabname.value=newtab; + $.ManifoldCF.submit(document.editconnection); + } } -} -function Save() -{ - if (checkForm()) + // Use this method to repost the form, + // and set the anchor request. + function postFormSetAnchor(anchorValue) { - // 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 (checkForm()) + { + if (anchorValue != "") + document.editconnection.action=document.editconnection.action + "#" + anchorValue; + $.ManifoldCF.submit(document.editconnection); } - if (window.checkConfigForSave) + } + + // Use this method to repost the form + function postForm() + { + if (checkForm()) { - if (!checkConfigForSave()) - return; + $.ManifoldCF.submit(document.editconnection); } - document.editconnection.op.value="Save"; - document.editconnection.submit(); } -} -function Continue() -{ - document.editconnection.op.value="Continue"; - postForm(); -} + function Save() + { + 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. -function Cancel() -{ - document.editconnection.op.value="Cancel"; - document.editconnection.submit(); -} + // 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) + { + if (!checkConfigForSave()) + return; + } + document.editconnection.op.value="Save"; + $.ManifoldCF.submit(document.editconnection); + } + } -function checkForm() -{ - if (!checkConnectionCount()) - return false; - if (window.checkConfig) - return checkConfig(); - return true; -} + function Continue() + { + document.editconnection.op.value="Continue"; + postForm(); + } -function checkConnectionCount() -{ - if (!isInteger(editconnection.maxconnections.value)) + function Cancel() { - alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editnotification.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); - editconnection.maxconnections.focus(); - return false; + document.editconnection.op.value="Cancel"; + $.ManifoldCF.submit(document.editconnection); } - return true; -} -function isRegularExpression(value) -{ - try + function checkForm() { - var foo = "teststring"; - foo.search(value.replace(/\(\?i\)/,"")); + if (!checkConnectionCount()) + return false; + if (window.checkConfig) + return checkConfig(); return true; } - catch (e) + + function checkConnectionCount() { - return false; + if (!isInteger(editconnection.maxconnections.value)) + { + alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editnotification.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); + editconnection.maxconnections.focus(); + return false; + } + return true; } -} + function isRegularExpression(value) + { + try + { + var foo="teststring"; + foo.search(value.replace(/\(\?i\)/,"")); + return true; + } + catch (e) + { + 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) { %> - <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> + <div class="box-body"> + <div class="callout callout-warning"> + <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.NoNotificationConnectorsRegistered")%></p> + </div> + </div> <% } 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")%>'/> - <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 - { -%> + <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"> - <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)) { %> - <td class="activetab"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></nobr></td> + <li class="active"><a href="#tab_<%=tabNum%>" data-toggle="tab"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></li> <% } else { %> - <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> + <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> <% } } %> - </tr> - <tr class="tabbodyrow"> - <td class="tabbody" colspan='<%=Integer.toString(tabsArray.size()+1)%>'> + </ul> + </div> + <div class="box-body"> + <div class="tab-content"> <% @@ -308,42 +294,39 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Name"))) { %> - <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"> + <div class="tab-pane active" id="tab_<%=activeTab%>"> + <div class="form-group"> + <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.NameColon")%></label> <% // 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" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <input type="text" size="32" name="connname" class="form-control" placeholder="Name..." value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> - <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <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)%>'/> <% } %> - </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> + </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> <% } 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)%>'/> <% } @@ -352,10 +335,10 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Type"))) { %> - <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"> + <div class="tab-pane active" id="tab_<%=activeTab%>"> + <div class="form-group"> + <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editnotification.ConnectionTypeColon")%></label> + <% if (className.length() > 0) { @@ -363,24 +346,24 @@ function isInteger(value) 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 { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> + <input type="text" class="form-control" disabled value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(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" size="1"> + <select name="classname" class="form-control"> <% while (i < set.getRowCount()) { @@ -388,26 +371,23 @@ function isInteger(value) 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> <% } %> - </td> - </tr> - </table> + </div> + </div> <% } 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)%>'/> <% } @@ -416,20 +396,20 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Throttling"))) { %> - <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> + <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> <% } else { // Hiddens for "Throttling" tab %> - <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/> + <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/> <% } @@ -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); %> - <table class="displaytable"> - <tr><td class="separator" colspan="4"><hr/></td></tr> - <tr> - <td class="message" colspan="4"> - <nobr> + </div> + </div> + <div class="box-footer clearfix"> + <div class="btn-group"> + <% if (className.length() > 0) { %> - <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.SaveThisNotificationConnection")%>"/> + <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> + <% } else @@ -454,33 +436,25 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Type"))) { %> - <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: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.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.CancelNotificationConnectionEditing")%>"/> - </nobr> - </td> - </tr> - </table> - </td> - </tr> - </table> - </form> + <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> <% } %> - - </td> - </tr> - </table> - -</body> - -</html> - + </div> + </div> +</div> <% } catch (ManifoldCFException e) @@ -493,4 +467,3 @@ catch (ManifoldCFException e) <% } %> - Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editoutput.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editoutput.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/editoutput.jsp Thu Mar 23 18:56:26 2017 @@ -97,211 +97,201 @@ try %> -<?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> +<% + 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"); + } +%> - <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) -{ - if (checkForm()) + // Use this method to repost the form and pick a new tab + function SelectTab(newtab) { - document.editconnection.tabname.value = newtab; - document.editconnection.submit(); + if (checkForm()) + { + document.editconnection.tabname.value=newtab; + $.ManifoldCF.submit(document.editconnection); + } } -} -// Use this method to repost the form, -// and set the anchor request. -function postFormSetAnchor(anchorValue) -{ - if (checkForm()) + // Use this method to repost the form, + // and set the anchor request. + function postFormSetAnchor(anchorValue) { - if (anchorValue != "") - document.editconnection.action = document.editconnection.action + "#" + anchorValue; - document.editconnection.submit(); + if (checkForm()) + { + if (anchorValue != "") + { + document.editconnection.action=document.editconnection.action + "#" + anchorValue; + } + $.ManifoldCF.submit(document.editconnection); + } } -} -// Use this method to repost the form -function postForm() -{ - if (checkForm()) + // Use this method to repost the form + function postForm() { - document.editconnection.submit(); + if (checkForm()) + { + $.ManifoldCF.submit(document.editconnection); + } } -} -function Save() -{ - if (checkForm()) + function Save() { - // 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(); - return; - } - if (window.checkConfigForSave) + if (checkForm()) { - if (!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(),"editoutput.ConnectionMustHaveAName")%>"); + SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editoutput.Name")%>"); + document.editconnection.connname.focus(); 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 Cancel() -{ - document.editconnection.op.value="Cancel"; - document.editconnection.submit(); -} -function checkForm() -{ - if (!checkConnectionCount()) - return false; - if (window.checkConfig) - return checkConfig(); - return true; -} + function Continue() + { + document.editconnection.op.value="Continue"; + postForm(); + } -function checkConnectionCount() -{ - if (!isInteger(editconnection.maxconnections.value)) + function Cancel() { - alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editoutput.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); - editconnection.maxconnections.focus(); - return false; + document.editconnection.op.value="Cancel"; + $.ManifoldCF.submit(document.editconnection); } - return true; -} -function isRegularExpression(value) -{ - try + function checkForm() { - var foo = "teststring"; - foo.search(value.replace(/\(\?i\)/,"")); + if (!checkConnectionCount()) + return false; + if (window.checkConfig) + return checkConfig(); return true; } - catch (e) + + function checkConnectionCount() { - return false; + if (!isInteger(editconnection.maxconnections.value)) + { + alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editoutput.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>"); + editconnection.maxconnections.focus(); + return false; + } + return true; } -} + function isRegularExpression(value) + { + try + { + var foo="teststring"; + foo.search(value.replace(/\(\?i\)/,"")); + return true; + } + catch (e) + { + return false; + } -function isInteger(value) -{ - var anum=/(^\d+$)/; - return anum.test(value); -} + } + + function isInteger(value) + { + var anum=/(^\d+$)/; + return anum.test(value); + } //--> - </script> -<% - OutputConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); -%> +</script> -</head> +<section id="script"> + <% + OutputConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray); + %> +</section> -<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"> +<div class="row"> + <div class="col-md-12"> <% // Get connector list; need this to decide what to do if (set.getRowCount() == 0) { %> - <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> + <div class="callout callout-warning"> + <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NoOutputConnectorsRegistered")%></p> + </div> <% } 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")%>'/> - <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"> + <div class="box-header"> + <ul class="nav nav-tabs" role="tablist"> <% int tabNum = 0; + int activeTab = 0; while (tabNum < tabsArray.size()) { String tab = (String)tabsArray.get(tabNum++); if (tab.equals(tabName)) { %> - <td class="activetab"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></nobr></td> + <li class="active"><a href="#tab_<%=tabNum%>" data-toggle="tab"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></li> <% } else { %> - <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> + <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> <% } } %> - </tr> - <tr class="tabbodyrow"> - <td class="tabbody" colspan='<%=Integer.toString(tabsArray.size()+1)%>'> + </ul> + </div> + <div class="box-body"> + <div class="tab-content"> <% @@ -309,42 +299,39 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Name"))) { %> - <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"> + <div class="tab-pane active" id="tab_<%=activeTab%>"> + <div class="form-group"> + <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NameColon")%></label> <% // 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" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <input type="text" size="32" name="connname" class="form-control" placeholder="Name..." value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>"/> <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> - <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <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)%>"/> <% } %> - </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> + </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> <% } 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)%>"/> <% } @@ -353,10 +340,9 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type"))) { %> - <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"> + <div class="tab-pane active" id="tab_<%=activeTab%>"> + <div class="form-group"> + <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.ConnectionTypeColon")%></label> <% if (className.length() > 0) { @@ -364,24 +350,24 @@ function isInteger(value) 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 { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> + <input type="text" class="form-control" disabled value="<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(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" size="1"> + <select name="classname" clas="form-control"> <% while (i < set.getRowCount()) { @@ -389,26 +375,23 @@ function isInteger(value) 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> <% } %> - </td> - </tr> - </table> + </div> + </div> <% } 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)%>"/> <% } @@ -417,20 +400,19 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Throttling"))) { %> - <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> + <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> <% } else { // Hiddens for "Throttling" tab %> - <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/> + <input type="hidden" name="maxconnections" value="<%=Integer.toString(maxConnections)%>"/> <% } @@ -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); %> - <table class="displaytable"> - <tr><td class="separator" colspan="4"><hr/></td></tr> - <tr> - <td class="message" colspan="4"> - <nobr> + </div> + </div> + <div class="box-footer clearfix"> + <div class="btn-group"> <% if (className.length() > 0) { %> - <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.SaveThisOutputConnection")%>"/> + <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> <% } else @@ -455,33 +437,24 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type"))) { %> - <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: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.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.CancelOutputConnectionEditing")%>"/> - </nobr> - </td> - </tr> - </table> - </td> - </tr> - </table> - </form> - + <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> <% } %> - - </td> - </tr> - </table> - -</body> - -</html> - + </div> + </div> +</div> <% } catch (ManifoldCFException e) @@ -494,4 +467,3 @@ catch (ManifoldCFException e) <% } %> -
