Author: kishore
Date: Mon May  1 21:45:33 2017
New Revision: 1793417

URL: http://svn.apache.org/viewvc?rev=1793417&view=rev
Log:
Updated Access Credentials tab with new UI

Modified:
    
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Access.html.vm
    
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Bandwidth.html.vm

Modified: 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Access.html.vm
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Access.html.vm?rev=1793417&r1=1793416&r2=1793417&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Access.html.vm
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Access.html.vm
 Mon May  1 21:45:33 2017
@@ -16,254 +16,313 @@
 -->
 #set( $COUNTER = 0)
 #if($TABNAME == 
$ResourceBundle.getString('WebcrawlerConnector.AccessCredentials'))
-<table class="displaytable">
-  <tr><td class="separator" colspan="2"><hr/></td></tr>
-  <tr>
-    <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.PageAccessCredentials'))</nobr></td>
-    <td class="boxcell">
-      <table class="formtable">
-        <tr class="formheaderrow">
-          <td class="formcolumnheader"></td>
-          <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression'))</nobr></td>
-          <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.AuthenticationType'))</nobr></td>
-          <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Domain'))</nobr></td>
-          <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.UserName'))</nobr></td>
-          <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Password'))</nobr></td>
-        </tr>
-        #foreach($pageAccessMap in $PAGEACCESSMAPLIST)
+<script type="text/javascript">
+  $(function(){
+      $('#session-access .btn-danger').hover(function(){
+          
$(this).closest('.panel').removeClass('panel-default').addClass('panel-danger');
+      },function(){
+          
$(this).closest('.panel').removeClass('panel-danger').addClass('panel-default');
+      });
+  });
+</script>
+<style type="text/css">
+  .list-group.webcrawler-access-credentials .form-group
+  {
+    display: block !important;
+  }
+</style>
+<h4><strong>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.PageAccessCredentials'))</strong></h4>
+<div class="row">
+  <div class="col-md-12">
+    <ul class="list-group webcrawler-access-credentials">
+      <li class="list-group-item list-group-item-header">
+        <div class="row form-inline">
+          <div class="col-md-1"></div>
+          <div 
class="col-md-3"><strong>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression'))</strong></div>
+          <div 
class="col-md-2"><strong>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.AuthenticationType'))</strong></div>
+          <div 
class="col-md-2"><strong>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Domain'))</strong></div>
+          <div 
class="col-md-2"><strong>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.UserName'))</strong></div>
+          <div 
class="col-md-2"><strong>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Password'))</strong></div>
+        </div>
+      </li>
+      #foreach($pageAccessMap in $PAGEACCESSMAPLIST)
           #set( $PREFIX = "acredential_" + $COUNTER )
-        <tr>
-          <td class="formcolumncell">
-            <a name="$PREFIX">
-              <input type="button" 
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Delete'))"
 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeletePageAuthenticationUrlRegularExpression'))$foreach.count"
 onclick='javascript:deleteARegexp($COUNTER);'/>
-              <input type="hidden" name="op_$PREFIX" value="Continue"/>
-              <input type="hidden" name="regexp_$PREFIX" 
value="$Encoder.attributeEscape($pageAccessMap["regexp"])"/>
-            </a>
-          </td>
-          <td class="formcolumncell">
-            <nobr>$Encoder.bodyEscape($pageAccessMap["regexp"])</nobr>
-          </td>
-          <td class="formcolumncell">
-            <input type="radio" name="type_$PREFIX" value="basic" 
#if($pageAccessMap["type"] == 'basic') checked #{else} "" #end 
/>$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.BasicAuthentication'))<br/>
-            <input type="radio" name="type_$PREFIX" value="ntlm" 
#if($pageAccessMap["type"] == 'ntlm') checked #{else} "" #end 
/>$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.NTLMAuthentication'))
-          </td>
-          <td class="formcolumncell">
-            <nobr><input type="text" size="16" name="domain_$PREFIX" 
value="$Encoder.attributeEscape($pageAccessMap["domain"])"/></nobr>
-          </td>
-          <td class="formcolumncell">
-            <nobr><input type="text" size="16" name="username_$PREFIX" 
value="$Encoder.attributeEscape($pageAccessMap["userName"])"/></nobr>
-          </td>
-          <td class="formcolumncell">
-            <nobr><input type="password" size="16" name="password_$PREFIX" 
value="$Encoder.attributeEscape($pageAccessMap["password"])"/></nobr>
-          </td>
-        </tr>
+          <li class="list-group-item">
+            <div class="row form-inline">
+              <div class="col-md-1">
+                <button class="btn btn-danger btn-sm" type="button" 
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeletePageAuthenticationUrlRegularExpression'))$foreach.count"
 onclick='javascript:deleteARegexp($COUNTER);'><i class="fa fa-minus-circle 
fa-lg" aria-hidden="true"></i></button>
+                <input type="hidden" name="op_$PREFIX" value="Continue"/>
+                <input type="hidden" name="regexp_$PREFIX" 
value="$Encoder.attributeEscape($pageAccessMap["regexp"])"/>
+              </div>
+              <div class="col-md-3">
+                <div class="form-group">
+                  <p 
class="form-control-static">$Encoder.bodyEscape($pageAccessMap["regexp"])</p>
+                </div>
+              </div>
+              <div class="col-md-2">
+                <div class="form-group">
+                  <div class="checkbox">
+                    <label><input type="radio" name="type_$PREFIX" 
value="basic" #if($pageAccessMap["type"] == 'basic') checked #{else} "" #end 
/>$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.BasicAuthentication'))</label>
+                    <label><input type="radio" name="type_$PREFIX" 
value="ntlm" #if($pageAccessMap["type"] == 'ntlm') checked #{else} "" #end 
/>$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.NTLMAuthentication'))</label>
+                  </div>
+                </div>
+              </div>
+              <div class="col-md-2">
+                <div class="form-group">
+                  <input class="form-control" type="text" size="16" 
name="domain_$PREFIX" 
value="$Encoder.attributeEscape($pageAccessMap["domain"])"/>
+                </div>
+              </div>
+              <div class="col-md-2">
+                <div class="form-group">
+                  <input class="form-control" type="text" size="16" 
name="username_$PREFIX" 
value="$Encoder.attributeEscape($pageAccessMap["userName"])"/>
+                </div>
+              </div>
+              <div class="col-md-2">
+                <div class="form-group">
+                  <input class="form-control" type="password" size="16" 
name="password_$PREFIX" 
value="$Encoder.attributeEscape($pageAccessMap["password"])"/>
+                </div>
+              </div>
+            </div>
+          </li>
           #set( $COUNTER = $COUNTER + 1)
         #end
-
-        #if($COUNTER == "0")
-        <tr class="formrow">
-            <td class="formmessage" 
colspan="6">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoPageAccessCredentialsSpecified'))</td>
-        </tr>
-        #end
-
-        <tr class="formrow"><td class="formseparator" 
colspan="6"><hr/></td></tr>
-        <tr class="formrow">
-          <td class="formcolumncell">
-            <a name="bandwidth">
-              <input type="button" 
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Add'))"
 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddPageAuthenticationUrlRegularExpression'))"
 onclick="javascript:addARegexp();"/>
-            </a>
+      #if($COUNTER == "0")
+      <li class="list-group-item list-group-item-warning">
+          
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoPageAccessCredentialsSpecified'))
+      </li>
+      #end
+      <li class="list-group-item">
+        <div class="row form-inline">
+          <div class="col-md-1">
+            <button class="btn btn-success btn-sm" type="button" 
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddPageAuthenticationUrlRegularExpression'))"
 onclick="javascript:addARegexp();"><i class="fa fa-plus-circle fa-lg" 
aria-hidden="true"></i></button>
             <input type="hidden" name="acredential_count" value="$COUNTER"/>
             <input type="hidden" name="acredential_op" value="Continue"/>
-          </td>
-          <td class="formcolumncell">
-            <nobr><input type="text" size="30" name="regexp_acredential" 
value=""/></nobr>
-          </td>
-          <td class="formcolumncell">
-            <nobr><input type="radio" name="type_acredential" value="basic" 
checked="" 
/>&nbsp;$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.BasicAuthentication'))</nobr><br/>
-            <nobr><input type="radio" name="type_acredential" value="ntlm" 
/>&nbsp;$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.NTLMAuthentication'))</nobr>
-          </td>
-          <td class="formcolumncell">
-            <nobr><input type="text" size="16" name="domain_acredential" 
value=""/></nobr>
-          </td>
-          <td class="formcolumncell">
-            <nobr><input type="text" size="16" name="username_acredential" 
value=""/></nobr>
-          </td>
-          <td class="formcolumncell">
-            <nobr><input type="password" size="16" name="password_acredential" 
value=""/></nobr>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr><td class="separator" colspan="2"><hr/></td></tr>
-  <tr>
-      <td 
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.SessionBasedAccessCredentials'))</nobr></td>
-      <td class="boxcell">
-      <table class="formtable">
-        <tr class="formheaderrow">
-          <td class="formcolumnheader"></td>
-          <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression'))</nobr></td>
-          <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.LoginPages'))</nobr></td>
-        </tr>
-  
-        #set( $COUNTER = 0)
-        #foreach($sessionAccessMap in $SESSIONACCESSMAPLIST)
-          #set( $PREFIX = "scredential_" + $COUNTER )
-        <tr>
-          <td class="formcolumncell">
-            <a name="$PREFIX">
-              <input type="button" 
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Delete'))"
 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteSessionAuthenticationUrlRegularExpression'))$foreach.count"
 onclick='javascript:deleteSRegexp($COUNTER);'/>
-              <input type="hidden" name="${PREFIX}_op" value="Continue"/>
-              <input type="hidden" name="${PREFIX}_regexp" 
value="$Encoder.attributeEscape($sessionAccessMap["regexp"])"/>
-            </a>
-          </td>
-          <td class="formcolumncell">
-            <nobr>$Encoder.bodyEscape($sessionAccessMap["regexp"])</nobr>
-          </td>
-          <td class="boxcell">
-            <table class="formtable">
-              <tr class="formheaderrow">
-                <td class="formcolumnheader"></td>
-                <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.LoginURLRegularExpression'))</nobr></td>
-                <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.PageType'))</nobr></td>
-                <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.FormNamelinkTargetRegularExpression'))</nobr></td>
-                <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.OverrideTargetURL'))</nobr></td>
-                <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.OverrideFormParameters'))</nobr></td>
-              </tr>
-              #set( $AUTHPAGECOUNTER = 0 )
-              #set( $AUTHPAGEMAPLIST = $sessionAccessMap["authPageMapList"])
-              #foreach($authPageMap in $AUTHPAGEMAPLIST)
-                #set( $AUTHPAGEPREFIX = $PREFIX + "_" + $AUTHPAGECOUNTER)
-              <tr>
-                <td class="formcolumncell">
-                  <a name="$AUTHPAGEPREFIX">
-                    <input type="button" value="Delete" 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteLoginPage'))$foreach.count
 for url regular expression #$AUTHPAGECOUNTER" 
onclick='javascript:deleteLoginPage($COUNTER,$AUTHPAGECOUNTER);'/>
-                    <input type="hidden" name="${AUTHPAGEPREFIX}_op" 
value="Continue"/>
-                    <input type="hidden" name="${AUTHPAGEPREFIX}_regexp" 
value="$Encoder.attributeEscape($authPageMap["pageRegexp"])"/>
-                    <input type="hidden" name="${AUTHPAGEPREFIX}_type" 
value="$Encoder.attributeEscape($authPageMap["pageType"])"/>
-                  </a>
-                </td>
-
-                <td 
class="formcolumncell"><nobr>$Encoder.bodyEscape($authPageMap["pageRegexp"])</nobr></td>
-                <td 
class="formcolumncell"><nobr>$authPageMap["pageType"]</nobr></td>
-                <td class="formcolumncell"><nobr><input type="text" size="30" 
name="${AUTHPAGEPREFIX}_matchregexp" 
value="$Encoder.attributeEscape($authPageMap["matchRegexp"])"/></nobr></td>
-                <td class="formcolumncell"><nobr><input type="text" size="30" 
name="${AUTHPAGEPREFIX}_overridetargeturl" 
value="$Encoder.attributeEscape($authPageMap["overrideTargetURL"])"/></nobr></td>
-                
-                #if($authPageMap["pageType"] == "form")
-                <td class="boxcell">
-                  <table class="formtable">
-                    <tr class="formheaderrow">
-                      <td class="formcolumnheader"></td>
-                      <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ParameterRegularExpression'))</nobr></td>
-                      <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Value'))</nobr></td>
-                      <td 
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Password'))</nobr></td>
-                    </tr>
-                  #set( $AUTHPARAMCOUNTER = 0)
-                  #set( $AUTHPAGEPARAMMAPLIST = 
$authPageMap["authPageParamMapList"] )
-                  #foreach($authPageParamMap in $AUTHPAGEPARAMMAPLIST)
-                    #set( $AUTHPARAMPREFIX = $AUTHPAGEPREFIX + "_" + 
$AUTHPARAMCOUNTER)
-                    <tr>
-                      <td class="formcolumncell">
-                        <a name="$AUTHPARAMPREFIX">
-                          <input type="button" value="Delete" 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteParameter'))$foreach.count$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.ForLoginPage'))$AUTHPAGECOUNTER$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.ForCredential'))$COUNTER"
 
onclick='javascript:deleteLoginPageParameter($COUNTER,$AUTHPAGECOUNTER,$AUTHPARAMCOUNTER);'/>
-                          <input type="hidden" name="${AUTHPARAMPREFIX}_op" 
value="Continue"/>
-                        </a>
-                      </td>
-                      <td class="formcolumncell">
-                        <nobr><input type="text" size="30" 
name="${AUTHPARAMPREFIX}_param" 
value="$Encoder.attributeEscape($authPageParamMap["param"])"/></nobr>
-                      </td>
-                      <td class="formcolumncell">
-                        <nobr><input type="text" size="15" 
name="${AUTHPARAMPREFIX}_value" 
value="$Encoder.attributeEscape($authPageParamMap["value"])"/></nobr>
-                      </td>
-                      <td class="formcolumncell">
-                        <nobr><input type="password" size="15" 
name="${AUTHPARAMPREFIX}_password" 
value="$Encoder.attributeEscape($authPageParamMap["password"])"/></nobr>
-                      </td>
-                    </tr>
-                    #set( $AUTHPARAMCOUNTER = $AUTHPARAMCOUNTER + 1)
-                  #end
-                    <tr class="formrow"><td class="formseparator" 
colspan="4"><hr/></td></tr>
-                    <tr class="formrow">
-                      <td class="formcolumncell">
-                        <a name="${AUTHPAGEPREFIX}_loginparam">
-                          <input type="button" value="Add" 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddParameterToLoginPage'))$AUTHPAGECOUNTER$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.ForCredential'))$COUNTER"
 onclick='javascript:addLoginPageParameter($COUNTER,$AUTHPAGECOUNTER);'/>
-                        </a>
-                        <input type="hidden" 
name="${AUTHPAGEPREFIX}_loginparamcount" value="$AUTHPARAMCOUNTER"/>
-                        <input type="hidden" 
name="${AUTHPAGEPREFIX}_loginparamop" value="Continue"/>
-                      </td>
-                      <td class="formcolumncell">
-                        <nobr><input type="text" size="30" 
name="${AUTHPAGEPREFIX}_loginparamname" value=""/></nobr>
-                      </td>
-                      <td class="formcolumncell">
-                        <nobr><input type="text" size="15" 
name="${AUTHPAGEPREFIX}_loginparamvalue" value=""/></nobr>
-                      </td>
-                      <td class="formcolumncell">
-                        <nobr><input type="password" size="15" 
name="${AUTHPAGEPREFIX}_loginparampassword" value=""/></nobr>
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-                #else
-                <td class="formcolumncell"></td>
-                #end
-              </tr>
-                #set( $AUTHPAGECOUNTER = $AUTHPAGECOUNTER + 1 )
+          </div>
+          <div class="col-md-3">
+            <div class="form-group">
+              <input class="form-control" type="text" size="30" 
name="regexp_acredential" value=""/>
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <div class="checkbox">
+                <label><input type="radio" name="type_acredential" 
value="basic" checked="" 
/>&nbsp;$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.BasicAuthentication'))</label>
+                <label><input type="radio" name="type_acredential" 
value="ntlm" 
/>&nbsp;$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.NTLMAuthentication'))</label>
+              </div>
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <div class="form-group">
+                <input class="form-control" type="text" size="16" 
name="domain_acredential" value=""/>
+              </div>
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <input class="form-control" type="text" size="16" 
name="username_acredential" value=""/>
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <input class="form-control" type="password" size="16" 
name="password_acredential" value=""/>
+            </div>
+          </div>
+        </div>
+      </li>
+    </ul>
+  </div>
+</div>
+<hr/>
+<h5><strong>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.SessionBasedAccessCredentials'))</strong></h5>
+<div class="row" id="session-access">
+  <div class="col-md-12">
+    #set( $COUNTER = 0)
+    #foreach($sessionAccessMap in $SESSIONACCESSMAPLIST)
+      #set( $PREFIX = "scredential_" + $COUNTER )
+    <div class="panel panel-default">
+      <div class="panel-heading clearfix">
+        <h4 class="panel-title 
pull-left">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression')):&nbsp;$Encoder.bodyEscape($sessionAccessMap["regexp"])</h4>
+        <div class="pull-right">
+          <button class="btn btn-danger btn-xs" type="button" 
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteSessionAuthenticationUrlRegularExpression'))$foreach.count"
 
onclick='javascript:deleteSRegexp($COUNTER);'>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Delete'))</button>
+          <input type="hidden" name="${PREFIX}_op" value="Continue"/>
+          <input type="hidden" name="${PREFIX}_regexp" 
value="$Encoder.attributeEscape($sessionAccessMap["regexp"])"/>
+        </div>
+      </div>
+      <div class="panel-body">
+        
<h5><strong>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.LoginPages'))</strong></h5>
+        #set( $AUTHPAGECOUNTER = 0 )
+        #set( $AUTHPAGEMAPLIST = $sessionAccessMap["authPageMapList"])
+        #foreach($authPageMap in $AUTHPAGEMAPLIST)
+          #set( $AUTHPAGEPREFIX = $PREFIX + "_" + $AUTHPAGECOUNTER)
+        <div class="panel panel-default">
+          <div class="panel-body">
+            <div class="form-group">
+              <button class="btn btn-danger btn-xs pull-right" type="button" 
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteLoginPage'))$foreach.count
 for url regular expression #$AUTHPAGECOUNTER" 
onclick='javascript:deleteLoginPage($COUNTER,$AUTHPAGECOUNTER);'>Delete</button>
+              <input type="hidden" name="${AUTHPAGEPREFIX}_op" 
value="Continue"/>
+              <input type="hidden" name="${AUTHPAGEPREFIX}_regexp" 
value="$Encoder.attributeEscape($authPageMap["pageRegexp"])"/>
+              <input type="hidden" name="${AUTHPAGEPREFIX}_type" 
value="$Encoder.attributeEscape($authPageMap["pageType"])"/>
+            </div>
+            <div class="form-group">
+              <div class="row">
+                <div class="col-md-6">
+                  <label 
class="control-label">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.LoginURLRegularExpression'))</label>
+                  <p 
class="form-control-static">$Encoder.bodyEscape($authPageMap["pageRegexp"])</p>
+                </div>
+                <div class="col-md-6">
+                  <label 
class="control-label">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.PageType'))</label>
+                  <p class="form-control-static">$authPageMap["pageType"]</p>
+                </div>
+              </div>
+            </div>
+            <div class="form-group">
+              <div class="row">
+                <div class="col-md-6">
+                  <label class="control-label" 
for="${AUTHPAGEPREFIX}_matchregexp">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.FormNamelinkTargetRegularExpression'))</label>
+                  <input class="form-control" type="text" size="30" 
name="${AUTHPAGEPREFIX}_matchregexp" id="${AUTHPAGEPREFIX}_matchregexp" 
value="$Encoder.attributeEscape($authPageMap["matchRegexp"])"/>
+                </div>
+                <div class="col-md-6">
+                  <label class="control-label" 
for="${AUTHPAGEPREFIX}_overridetargeturl">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.OverrideTargetURL'))</label>
+                  <input class="form-control" type="text" size="30" 
name="${AUTHPAGEPREFIX}_overridetargeturl" 
id="${AUTHPAGEPREFIX}_overridetargeturl" 
value="$Encoder.attributeEscape($authPageMap["overrideTargetURL"])"/>
+                </div>
+              </div>
+            </div>
+          </div>
+          #if($authPageMap["pageType"] == "form")
+            <h5 
style="padding-left:15px;"><strong>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.OverrideFormParameters'))</strong></h5>
+            <ul class="list-group webcrawler-access-credentials">
+              <li class="list-group-item">
+                <div class="row">
+                  <div class="col-md-2"></div>
+                  <div 
class="col-md-4">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ParameterRegularExpression'))</div>
+                  <div 
class="col-md-3">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Value'))</div>
+                  <div 
class="col-md-3">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Password'))</div>
+                </div>
+              </li>
+              #set( $AUTHPARAMCOUNTER = 0)
+              #set( $AUTHPAGEPARAMMAPLIST = 
$authPageMap["authPageParamMapList"] )
+              #foreach($authPageParamMap in $AUTHPAGEPARAMMAPLIST)
+                #set( $AUTHPARAMPREFIX = $AUTHPAGEPREFIX + "_" + 
$AUTHPARAMCOUNTER)
+              <li class="list-group-item">
+                <div class="row form-inline">
+                  <div class="col-md-2">
+                    <button class="btn btn-danger btn-xs" type="button" 
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteParameter'))$foreach.count$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.ForLoginPage'))$AUTHPAGECOUNTER$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.ForCredential'))$COUNTER"
 
onclick='javascript:deleteLoginPageParameter($COUNTER,$AUTHPAGECOUNTER,$AUTHPARAMCOUNTER);'>Delete</button>
+                    <input type="hidden" name="${AUTHPARAMPREFIX}_op" 
value="Continue"/>
+                  </div>
+                  <div class="col-md-4">
+                    <div class="form-group">
+                      <input class="form-control" type="text" size="30" 
name="${AUTHPARAMPREFIX}_param" 
value="$Encoder.attributeEscape($authPageParamMap["param"])"/>
+                    </div>
+                  </div>
+                  <div class="col-md-3">
+                    <div class="form-group">
+                      <input class="form-control" type="text" size="15" 
name="${AUTHPARAMPREFIX}_value" 
value="$Encoder.attributeEscape($authPageParamMap["value"])"/>
+                    </div>
+                  </div>
+                  <div class="col-md-3">
+                    <div class="form-group">
+                      <input class="form-control" type="password" size="15" 
name="${AUTHPARAMPREFIX}_password" 
value="$Encoder.attributeEscape($authPageParamMap["password"])"/>
+                    </div>
+                  </div>
+                </div>
+              </li>
+                #set( $AUTHPARAMCOUNTER = $AUTHPARAMCOUNTER + 1)
               #end
-              <tr class="formrow"><td class="formseparator" 
colspan="6"><hr/></td></tr>
-              <tr class="formrow">
-                <td class="formcolumncell">
-                  <a name="${PREFIX}_loginpage">
-                    <input type="button" value="Add" 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddLoginPageToCredential'))$foreach.count"
 onclick='javascript:addLoginPage($COUNTER);'/>
-                  </a>
-                  <input type="hidden" name="${PREFIX}_loginpagecount" 
value="$AUTHPAGECOUNTER"/>
-                  <input type="hidden" name="${PREFIX}_loginpageop" 
value="Continue"/>
-                </td>
-                <td class="formcolumncell">
-                  <nobr><input type="text" size="30" 
name="${PREFIX}_loginpageregexp" value=""/></nobr>
-                </td>
-                <td class="formcolumncell">
-                  <nobr><input type="radio" name="${PREFIX}_loginpagetype" 
value="form" 
checked=""/>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.FormName'))</nobr><br/>
-                  <nobr><input type="radio" name="${PREFIX}_loginpagetype" 
value="link"/>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.LinkTarget'))</nobr>
-                  <nobr><input type="radio" name="${PREFIX}_loginpagetype" 
value="redirection"/>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RedirectionTo'))</nobr>
-                  <nobr><input type="radio" name="${PREFIX}_loginpagetype" 
value="content"/>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.PageContent'))</nobr>
-                </td>
-                <td class="formcolumncell">
-                  <nobr><input type="text" size="30" 
name="${PREFIX}_loginpagematchregexp" value=""/></nobr>
-                </td>
-                <td class="formcolumncell">
-                  <nobr><input type="text" size="30" 
name="${PREFIX}_loginpageoverridetargeturl" value=""/></nobr>
-                </td>
-                <td class="formcolumncell">
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-        </tr>
-          #set( $COUNTER = $COUNTER + 1)
+              <li class="list-group-item">
+                <div class="row">
+                  <div class="col-md-2">
+                    <button class="btn btn-success btn-xs" type="button" 
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddParameterToLoginPage'))$AUTHPAGECOUNTER$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.ForCredential'))$COUNTER"
 
onclick='javascript:addLoginPageParameter($COUNTER,$AUTHPAGECOUNTER);'>Add</button>
+                    <input type="hidden" 
name="${AUTHPAGEPREFIX}_loginparamcount" value="$AUTHPARAMCOUNTER"/>
+                    <input type="hidden" name="${AUTHPAGEPREFIX}_loginparamop" 
value="Continue"/>
+                  </div>
+                  <div class="col-md-4">
+                    <div class="form-group">
+                      <input class="form-control" type="text" size="30" 
name="${AUTHPAGEPREFIX}_loginparamname" value=""/>
+                    </div>
+                  </div>
+                  <div class="col-md-3">
+                    <div class="form-group">
+                      <input class="form-control" type="text" size="15" 
name="${AUTHPAGEPREFIX}_loginparamvalue" value=""/>
+                    </div>
+                  </div>
+                  <div class="col-md-3">
+                    <div class="form-group">
+                      <input class="form-control" type="password" size="15" 
name="${AUTHPAGEPREFIX}_loginparampassword" value=""/>
+                    </div>
+                  </div>
+                </div>
+              </li>
+            </ul>
+          #end
+        </div>
+          #set( $AUTHPAGECOUNTER = $AUTHPAGECOUNTER + 1 )
         #end
+        <div class="panel panel-default">
+          <div class="panel-body">
+            <div class="row">
+              <div class="col-md-12">
+                <button class="btn btn-success btn-xs pull-right" 
type="button" 
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddLoginPageToCredential'))$foreach.count"
 onclick='javascript:addLoginPage($COUNTER);'>Add</button>
+                <input type="hidden" name="${PREFIX}_loginpagecount" 
value="$AUTHPAGECOUNTER"/>
+                <input type="hidden" name="${PREFIX}_loginpageop" 
value="Continue"/>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-md-12">
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-4">
+                      <label class="control-label" 
for="${PREFIX}_loginpageregexp">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.LoginURLRegularExpression'))</label>
+                      <input class="form-control" type="text" size="30" 
name="${PREFIX}_loginpageregexp" id="${PREFIX}_loginpageregexp" value=""/>
+                    </div>
+                    <div class="col-md-8">
+                      <label class="checkbox-inline"><input type="radio" 
name="${PREFIX}_loginpagetype" value="form" 
checked=""/>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.FormName'))</label>
+                      <label class="checkbox-inline"><input type="radio" 
name="${PREFIX}_loginpagetype" 
value="link"/>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.LinkTarget'))</label>
+                      <label class="checkbox-inline"><input type="radio" 
name="${PREFIX}_loginpagetype" 
value="redirection"/>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RedirectionTo'))</label>
+                      <label class="checkbox-inline"><input type="radio" 
name="${PREFIX}_loginpagetype" 
value="content"/>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.PageContent'))</label>
+                    </div>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                      <label 
for="${PREFIX}_loginpagematchregexp">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.FormNamelinkTargetRegularExpression'))</label>
+                      <input class="form-control" type="text" size="30" 
name="${PREFIX}_loginpagematchregexp" id="${PREFIX}_loginpagematchregexp" 
value=""/>
+                    </div>
+                    <div class="col-md-6">
+                      <label 
for="${PREFIX}_loginpageoverridetargeturl">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.OverrideTargetURL'))</label>
+                      <input class="form-control" type="text" size="30" 
name="${PREFIX}_loginpageoverridetargeturl" 
id="${PREFIX}_loginpageoverridetargeturl" value=""/>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+      #set( $COUNTER = $COUNTER + 1)
+    #end
+  </div>
+</div>
 
-        #if($COUNTER == 0)
-        <tr class="formrow"><td class="formmessage" 
colspan="3">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoSessionBasedAccessCredentialsSpecified'))</td></tr>
-        #end
+#if($COUNTER == 0)
+<div class="alert 
alert-warning">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoSessionBasedAccessCredentialsSpecified'))</div>
+#end
+<hr/>
+<div class="row">
+  <div class="col-md-6">
+    <div class="form-group">
+      <label 
for="scredential_regexp">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression'))</label>
+      <input class="form-control" type="text" size="30" 
name="scredential_regexp" id="scredential_regexp" value=""/>
+    </div>
+    <div class="form-group">
+      <button class="btn btn-success pull-right" type="button" 
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddSessionAuthenticationUrlRegularExpression'))"
 
onclick="javascript:addSRegexp();">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Add'))</button>
+      <input type="hidden" name="scredential_count" value="$COUNTER"/>
+      <input type="hidden" name="scredential_op" value="Continue"/>
+    </div>
+  </div>
+</div>
 
-        <tr class="formrow"><td class="formseparator" 
colspan="3"><hr/></td></tr>
-        <tr class="formrow">
-          <td class="formcolumncell">
-            <a name="scredential">
-              <input type="button" 
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Add'))"
 
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddSessionAuthenticationUrlRegularExpression'))"
 onclick="javascript:addSRegexp();"/>
-            </a>
-            <input type="hidden" name="scredential_count" value="$COUNTER"/>
-            <input type="hidden" name="scredential_op" value="Continue"/>
-          </td>
-          <td class="formcolumncell">
-            <nobr><input type="text" size="30" name="scredential_regexp" 
value=""/></nobr>
-          </td>
-          <td class="formcolumncell"></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
 #else
   #foreach($pageAccessMap in $PAGEACCESSMAPLIST)
     #set( $PREFIX = "acredential_" + $COUNTER )

Modified: 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Bandwidth.html.vm
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Bandwidth.html.vm?rev=1793417&r1=1793416&r2=1793417&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Bandwidth.html.vm
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Bandwidth.html.vm
 Mon May  1 21:45:33 2017
@@ -121,7 +121,7 @@
         <div class="row form-inline">
           <div class="col-md-1">
             <div class="form-group">
-              <button class="btn btn-primary btn-sm" type="button" 
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddBinRegularExpression'))"
 onclick="javascript:addRegexp();"><i class="fa fa-plus-circle fa-lg" 
aria-hidden="true"></i></button>
+              <button class="btn btn-success btn-sm" type="button" 
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddBinRegularExpression'))"
 onclick="javascript:addRegexp();"><i class="fa fa-plus-circle fa-lg" 
aria-hidden="true"></i></button>
               <input type="hidden" name="bandwidth_count" value="$BINCOUNTER"/>
               <input type="hidden" name="bandwidth_op" value="Continue"/>
             </div>


Reply via email to