manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kish...@apache.org
Subject svn commit: r1793473 - /manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/
Date Tue, 02 May 2017 11:38:53 GMT
Author: kishore
Date: Tue May  2 11:38:53 2017
New Revision: 1793473

URL: http://svn.apache.org/viewvc?rev=1793473&view=rev
Log:
Re indent Velocity code

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
    manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Certificates.html.vm
    manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Canonicalization.html.vm
    manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Mappings.html.vm
    manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Metadata.html.vm
    manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Security.html.vm
    manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewConfiguration.html.vm
    manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewSpecification.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=1793473&r1=1793472&r2=1793473&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
Tue May  2 11:38:53 2017
@@ -63,9 +63,9 @@
           <div class="col-md-2"><strong>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Password'))</strong></div>
         </div>
       </li>
-      #foreach($pageAccessMap in $PAGEACCESSMAPLIST)
-          #set( $PREFIX = "acredential_" + $COUNTER )
-          <li class="list-group-item">
+  #foreach($pageAccessMap in $PAGEACCESSMAPLIST)
+    #set( $PREFIX = "acredential_" + $COUNTER )
+      <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>
@@ -102,13 +102,13 @@
               </div>
             </div>
           </li>
-          #set( $COUNTER = $COUNTER + 1)
-        #end
-      #if($COUNTER == "0")
+    #set( $COUNTER = $COUNTER + 1)
+  #end
+  #if($COUNTER == "0")
       <li class="list-group-item list-group-item-warning">
-          $Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoPageAccessCredentialsSpecified'))
+        $Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoPageAccessCredentialsSpecified'))
       </li>
-      #end
+  #end
       <li class="list-group-item">
         <div class="row form-inline">
           <div class="col-md-1">
@@ -169,45 +169,45 @@
     </div>
     <div id="collapse_$PREFIX" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading_$PREFIX">
       <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);'><i
class="fa fa-minus-circle fa-fw" aria-hidden="true"></i>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.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>
+        <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);'><i
class="fa fa-minus-circle fa-fw" aria-hidden="true"></i>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.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>
-          <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 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>
-        </div>
-        #if($authPageMap["pageType"] == "form")
+      #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">
@@ -218,10 +218,10 @@
                 <div class="col-md-3"><strong>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Password'))</strong></div>
               </div>
             </li>
-            #set( $AUTHPARAMCOUNTER = 0)
-            #set( $AUTHPAGEPARAMMAPLIST = $authPageMap["authPageParamMapList"] )
-            #foreach($authPageParamMap in $AUTHPAGEPARAMMAPLIST)
-              #set( $AUTHPARAMPREFIX = $AUTHPAGEPREFIX + "_" + $AUTHPARAMCOUNTER)
+        #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">
@@ -245,11 +245,11 @@
                 </div>
               </div>
             </li>
-              #set( $AUTHPARAMCOUNTER = $AUTHPARAMCOUNTER + 1)
-            #end
-            #if($AUTHPAGEPARAMMAPLIST.size() == 0)
+          #set( $AUTHPARAMCOUNTER = $AUTHPARAMCOUNTER + 1)
+        #end
+        #if($AUTHPAGEPARAMMAPLIST.size() == 0)
             <li class="list-group-item list-group-item-warning">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoFormParametersSpecified'))</li>
-            #end
+        #end
             <li class="list-group-item">
               <div class="row">
                 <div class="col-md-2">
@@ -275,11 +275,11 @@
               </div>
             </li>
           </ul>
-        #end
-      </div>
-        #set( $AUTHPAGECOUNTER = $AUTHPAGECOUNTER + 1 )
       #end
-      <div class="panel panel-default">
+        </div>
+      #set( $AUTHPAGECOUNTER = $AUTHPAGECOUNTER + 1 )
+    #end
+        <div class="panel panel-default">
         <div class="panel-body">
           <div class="row">
             <div class="col-md-12">
@@ -323,16 +323,16 @@
           </div>
         </div>
       </div>
-    </div>
+      </div>
     </div>
   </div>
     #set( $COUNTER = $COUNTER + 1)
   #end
 </div>
 
-#if($COUNTER == 0)
+  #if($COUNTER == 0)
 <div class="callout callout-warning">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoSessionBasedAccessCredentialsSpecified'))</div>
-#end
+  #end
 <hr/>
 <div class="row">
   <div class="col-md-6">

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=1793473&r1=1793472&r2=1793473&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
Tue May  2 11:38:53 2017
@@ -26,8 +26,8 @@
   <div class="col-md-12">
     <h5>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Throttles'))</h5>
     <ul id="webcrawler-bandwidth-throttles" class="list-group">
-      #foreach($throttleMap in $THROTTLESMAPLIST)
-        #set( $THROTTLEPREFIX = "bandwidth_" + $BINCOUNTER )
+  #foreach($throttleMap in $THROTTLESMAPLIST)
+    #set( $THROTTLEPREFIX = "bandwidth_" + $BINCOUNTER )
       <li class="list-group-item">
         <div class="row form-inline">
           <div class="col-md-1">
@@ -67,11 +67,11 @@
         </div>
       </li>
         #set( $BINCOUNTER = $BINCOUNTER + 1)
-      #end
+  #end
       ## If it looks like this is a brand-new configuration, add in a default throttle.
       ## This only works because other nodes must get created on the first post, and cannot
then be deleted.
-      #if($BRANDNEW)
-        #set( $THROTTLEPREFIX = "bandwidth_" + $BINCOUNTER )
+  #if($BRANDNEW)
+    #set( $THROTTLEPREFIX = "bandwidth_" + $BINCOUNTER )
       <li class="list-group-item">
         <div class="row form-inline">
           <div class="col-md-1">
@@ -110,13 +110,13 @@
           </div>
         </div>
       </li>
-        #set( $BINCOUNTER = $BINCOUNTER + 1)
-      #end
-      #if($BINCOUNTER == "0")
+    #set( $BINCOUNTER = $BINCOUNTER + 1)
+  #end
+  #if($BINCOUNTER == "0")
       <li class="list-group-item list-group-item-warning">
         $Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoBandwidthOrConnectionThrottlingSpecified'))
       </li>
-      #end
+  #end
       <li class="list-group-item">
         <div class="row form-inline">
           <div class="col-md-1">

Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Certificates.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_Certificates.html.vm?rev=1793473&r1=1793472&r2=1793473&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Certificates.html.vm
(original)
+++ manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Certificates.html.vm
Tue May  2 11:38:53 2017
@@ -27,17 +27,17 @@
           <div class="col-md-2"></div>
         </div>
       </li>
-      #foreach($trustMap in $TRUSTMAPLIST)
-        #set( $PREFIX = "trust_" + $COUNTER )
+  #foreach($trustMap in $TRUSTMAPLIST)
+    #set( $PREFIX = "trust_" + $COUNTER )
       <li class="list-group-item">
         <div class="row">
           <div class="col-md-5">$Encoder.bodyEscape($trustMap["regexp"])</div>
           <div class="col-md-5">
-            #if($trustMap["trustEverything"] == "true")
+    #if($trustMap["trustEverything"] == "true")
             <i>$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.TrustEverything"))</i>
-            #else
+    #else
             $Encoder.bodyEscape($trustMap["shortenedDescription"])
-            #end
+  #end
           </div>
           <div class="col-md-2">
             <button class="btn btn-danger btn-xs pull-right" type="button" title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteTrustUrlRegularExpression'))$foreach.count"
onclick="javascript:deleteTRegexp($COUNTER);"><i class="fa fa-minus-circle fa-fw" aria-hidden="true"></i>$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Delete'))</button>
@@ -48,18 +48,18 @@
           </div>
         </div>
       </li>
-        #set( $COUNTER = $COUNTER + 1)
-      #end
+    #set( $COUNTER = $COUNTER + 1)
+  #end
     </ul>
   </div>
 </div>
-#if($COUNTER == "0")
+  #if($COUNTER == "0")
 <div class="row">
   <div class="col-xs-12">
     <div class="callout callout-warning">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoTrustCertificatesSpecified'))</div>
   </div>
 </div>
-#end
+  #end
 <hr/>
 <div class="row">
   <div class="col-md-6 col-lg-4">

Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Canonicalization.html.vm
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Canonicalization.html.vm?rev=1793473&r1=1793472&r2=1793473&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Canonicalization.html.vm
(original)
+++ manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Canonicalization.html.vm
Tue May  2 11:38:53 2017
@@ -60,8 +60,8 @@
     #end
   </table>
 </div>
-#end
-#set( $NEXTCOUNTER = $COUNTER + 1 )
+  #end
+  #set( $NEXTCOUNTER = $COUNTER + 1 )
 <hr/>
 <div class="row">
   <div class="col-md-4">

Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Mappings.html.vm
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Mappings.html.vm?rev=1793473&r1=1793472&r2=1793473&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Mappings.html.vm
(original)
+++ manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Mappings.html.vm
Tue May  2 11:38:53 2017
@@ -44,34 +44,34 @@
 <div class="row">
   <div class="col-md-8">
     <ul class="list-group">
-    #foreach($REGEXP in $REGEXPLIST)
-      #set( $PREFIX = $SEQPREFIX + "rssregexp_" + $foreach.index +"_" )
+  #foreach($REGEXP in $REGEXPLIST)
+    #set( $PREFIX = $SEQPREFIX + "rssregexp_" + $foreach.index +"_" )
       <li class="list-group-item">
         <input type="hidden" name="${PREFIX}match" value="$Encoder.attributeEscape($REGEXP)"/>
         <div class="mapping">
           <div class="text-right mapping-regexp">$Encoder.bodyEscape($REGEXP)</div>
           <div class="text-center mapping-arrow"><i class="fa fa-long-arrow-right"
aria-hidden="true"></i></div>
           <div class="text-left mapping-match">
-          #set( $MATCH = $MATCHSTRINGS.get($foreach.index))
+    #set( $MATCH = $MATCHSTRINGS.get($foreach.index))
             <input type="hidden" name="${PREFIX}map" value="$Encoder.attributeEscape($MATCH)"/>
-          #if($MATCH.length() == 0)
+    #if($MATCH.length() == 0)
             &lt;as is&gt;
-          #else
+    #else
             $Encoder.bodyEscape($MATCH)
-          #end
+    #end
           </div>
           <div class="pull-right">
             <button class="btn btn-xs btn-danger" type="button" onclick='javascript:${SEQPREFIX}RemoveRegexp($foreach.index,"${SEQPREFIX}regexp_$foreach.index")'
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.RemoveRegexp'))$foreach.index"><i
class="fa fa-minus-circle fa-fw" aria-hidden="true"></i>$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Remove'))</button>
           </div>
         </div>
       </li>
-    #end
+  #end
     </ul>
   </div>
 </div>
 <hr/>
-#set( $COUNTER = $REGEXPLIST.size() )
-#set( $NEXTCOUNTER = $COUNTER + 1 )
+  #set( $COUNTER = $REGEXPLIST.size() )
+  #set( $NEXTCOUNTER = $COUNTER + 1 )
 <div class="row">
   <div class="col-lg-8 form-inline">
     <div class="form-group">

Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Metadata.html.vm
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Metadata.html.vm?rev=1793473&r1=1793472&r2=1793473&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Metadata.html.vm
(original)
+++ manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Metadata.html.vm
Tue May  2 11:38:53 2017
@@ -22,11 +22,11 @@
     <h5>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ExcludedHeadersColon'))</h5>
     <input type="hidden" name="${SEQPREFIX}excludedheaders_present" value="true"/>
     <div class="list-group">
-    #foreach($potentiallyExcludedHeader in $POTENTIALLYEXCLUDEDHEADERS)
+  #foreach($potentiallyExcludedHeader in $POTENTIALLYEXCLUDEDHEADERS)
       <label class="list-group-item">
         <input type="checkbox" name="${SEQPREFIX}excludedheaders" value="$Encoder.attributeEscape($potentiallyExcludedHeader)"
#if($EXCLUDEDHEADERS.contains($potentiallyExcludedHeader)) checked="true" #end />&nbsp;&nbsp;$Encoder.bodyEscape($potentiallyExcludedHeader)
       </label>
-    #end
+  #end
     </div>
   </div>
 </div>

Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Security.html.vm
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Security.html.vm?rev=1793473&r1=1793472&r2=1793473&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Security.html.vm
(original)
+++ manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editSpecification_Security.html.vm
Tue May  2 11:38:53 2017
@@ -20,9 +20,9 @@
 <div class="row">
   <div class="col-md-8">
     <ul class="list-group">
-    #foreach($TOKEN in $TOKENS)
-      #set( $ACCESSDESC = "_" + $foreach.index )
-      #set( $ACCESSOPNAME = $SEQPREFIX + "accessop" + $ACCESSDESC )
+  #foreach($TOKEN in $TOKENS)
+    #set( $ACCESSDESC = "_" + $foreach.index )
+    #set( $ACCESSOPNAME = $SEQPREFIX + "accessop" + $ACCESSDESC )
       <li class="list-group-item">
         <input type="hidden" name="$ACCESSOPNAME" value=""/>
         <input type="hidden" name="${SEQPREFIX}spectoken${ACCESSDESC}" value="$Encoder.attributeEscape($TOKEN)"
/>
@@ -31,18 +31,20 @@
           <button class="btn btn-xs btn-danger" type="button" onClick='Javascript:${SEQPREFIX}SpecOp("$ACCESSOPNAME","Delete","${SEQPREFIX}token_${foreach.index}")'
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteToken'))$foreach.index"><i
class="fa fa-minus-circle fa-fw" aria-hidden="true"></i>$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Delete'))</button>
         </span>
       </li>
-    #end
+  #end
     </ul>
   </div>
 </div>
-#set( $COUNTER = $TOKENS.size() )
-#if($COUNTER == 0)
+
+  #set( $COUNTER = $TOKENS.size() )
+  #if($COUNTER == 0)
 <div class="row">
   <div class="col-xs-12">
     <div class="alert alert-warning">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoAccessTokensPresent'))</div>
   </div>
 </div>
-#end
+  #end
+
 <hr/>
 <div class="row">
   <div class="col-md-8 form-inline">

Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewConfiguration.html.vm
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewConfiguration.html.vm?rev=1793473&r1=1793472&r2=1793473&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewConfiguration.html.vm
(original)
+++ manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewConfiguration.html.vm
Tue May  2 11:38:53 2017
@@ -23,21 +23,21 @@
   <tr>
     <th colspan="1">$ResourceBundle.getString('WebcrawlerConnector.RobotsUsage')</th>
     <td colspan="1">
-    #if($ROBOTSUSAGE == 'none')
+#if($ROBOTSUSAGE == 'none')
       $ResourceBundle.getString('WebcrawlerConnector.DontLookAtRobotsTxt')
-    #elseif($ROBOTUSAGE == 'data')
+#elseif($ROBOTUSAGE == 'data')
       $ResourceBundle.getString('WebcrawlerConnector.ObeyRobotsTxtForDataFetchesOnly')
-    #elseif($ROBOTUSAGE == 'all')
+#elseif($ROBOTUSAGE == 'all')
       $ResourceBundle.getString('WebcrawlerConnector.ObeyRobotsTxtForAllFetches')
-    #end
+#end
     </td>
     <th colspan="1">$ResourceBundle.getString('WebcrawlerConnector.MetaRobotsTagsUsage')</th>
     <td colspan="1">
-    #if($METAROBOTSTAGSUSAGE == 'none')
+#if($METAROBOTSTAGSUSAGE == 'none')
       $ResourceBundle.getString('WebcrawlerConnector.DontLookAtMetaRobotsTags')
-    #elseif($METAROBOTSTAGSUSAGE == 'all')
+#elseif($METAROBOTSTAGSUSAGE == 'all')
       $ResourceBundle.getString('WebcrawlerConnector.ObeyMetaRobotsTags')
-    #end
+#end
     </td>
   </tr>
   <tr>
@@ -63,40 +63,41 @@
           <th>$ResourceBundle.getString('WebcrawlerConnector.MaxKbytesSec')</th>
           <th>$ResourceBundle.getString('WebcrawlerConnector.MaxFetchesMin')</th>
         </tr>
-        #set( $BINCOUNTER = 0)
-        #foreach($throttleMap in $THROTTLESMAPLIST)
+#set( $BINCOUNTER = 0)
+#foreach($throttleMap in $THROTTLESMAPLIST)
         <tr>
           <td>
             $Encoder.bodyEscape($throttleMap.get("regexp"))
           </td>
           <td>$throttleMap["isCaseInsensitive"]</td>
           <td>
-          #if($throttleMap["maxConnections"] == "")
+  #if($throttleMap["maxConnections"] == "")
             Not limited
-          #else
+  #else
             $throttleMap["maxConnections"]
-          #end
+  #end
           </td>
           <td>
-          #if($throttleMap["maxKBPerSecond"] == "")
+  #if($throttleMap["maxKBPerSecond"] == "")
             Not limited
-          #else
+  #else
             $throttleMap["maxKBPerSecond"]
-          #end
+  #end
           </td>
           <td>
-          #if($throttleMap["maxFetchesPerMinute"] == "")
+  #if($throttleMap["maxFetchesPerMinute"] == "")
             Not limited
-          #else
+  #else
             $throttleMap["maxFetchesPerMinute"]
-          #end
+  #end
           </td>
         </tr>
-          #set( $BINCOUNTER = $BINCOUNTER + 1)
-        #end
-        #if($BINCOUNTER == 0)
+  #set( $BINCOUNTER = $BINCOUNTER + 1)
+#end
+
+#if($BINCOUNTER == 0)
           <tr class="formrow"><td class="formmessage" colspan="5"><div class="callout
callout-info">$ResourceBundle.getString('WebcrawlerConnector.NoBandwidthThrottling')</div></td></tr>
-        #end
+#end
       </table>
     </td>
   </tr>
@@ -111,8 +112,8 @@
           <th>$ResourceBundle.getString('WebcrawlerConnector.CredentialDomain')</th>
           <th>$ResourceBundle.getString('WebcrawlerConnector.UserName')</th>
         </tr>
-        #set( $COUNTER = 0)
-        #foreach($pageAccessMap in $PAGEACCESSMAPLIST)
+#set( $COUNTER = 0)
+#foreach($pageAccessMap in $PAGEACCESSMAPLIST)
         <tr>
           <td>
             $Encoder.bodyEscape($pageAccessMap["regexp"])
@@ -123,11 +124,12 @@
           <td>$Encoder.bodyEscape($pageAccessMap["domain"])</td>
           <td>$Encoder.attributeEscape($pageAccessMap["userName"])</td>
         </tr>
-          #set( $COUNTER = $COUNTER + 1)
-        #end
-        #if($COUNTER == 0)
+  #set( $COUNTER = $COUNTER + 1)
+#end
+
+#if($COUNTER == 0)
           <tr class="formrow"><td class="formmessage" colspan="4"><div class="callout
callout-info">$ResourceBundle.getString('WebcrawlerConnector.NoPageAccessCredentials')</div></td></tr>
-        #end
+#end
       </table>
     </td>
   </tr>
@@ -140,8 +142,8 @@
           <th>$ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression')</th>
           <th>$ResourceBundle.getString('WebcrawlerConnector.LoginPages')</th>
         </tr>
-        #set( $COUNTER = 0)
-        #foreach($sessionAccessMap in $SESSIONACCESSMAPLIST)
+#set( $COUNTER = 0)
+#foreach($sessionAccessMap in $SESSIONACCESSMAPLIST)
         <tr>
           <td>$Encoder.bodyEscape($sessionAccessMap["regexp"])</td>
           <td>
@@ -153,15 +155,15 @@
                 <th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.OverrideTargetURL'))</th>
                 <th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.OverrideFormParameters'))</th>
               </tr>
-              #set( $AUTHPAGECOUNTER = 0 )
-              #set( $AUTHPAGEMAPLIST = $sessionAccessMap["authPageMapList"])
-              #foreach($authPageMap in $AUTHPAGEMAPLIST)
+  #set( $AUTHPAGECOUNTER = 0 )
+  #set( $AUTHPAGEMAPLIST = $sessionAccessMap["authPageMapList"])
+  #foreach($authPageMap in $AUTHPAGEMAPLIST)
               <tr>
                 <td>$Encoder.bodyEscape($authPageMap["pageRegexp"])</td>
                 <td>$authPageMap["pageType"]</td>
                 <td>$Encoder.bodyEscape($authPageMap["matchRegexp"])</td>
                 <td>$Encoder.bodyEscape($authPageMap["overrideTargetURL"])</td>
-                #if($authPageMap["pageType"] == "form")
+    #if($authPageMap["pageType"] == "form")
                 <td>
                   <table class="table">
                     <tr class="active">
@@ -169,42 +171,45 @@
                       <th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Value'))</th>
                       <th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Password'))</th>
                     </tr>
-                  #set( $AUTHPARAMCOUNTER = 0)
-                  #set( $AUTHPAGEPARAMMAPLIST = $authPageMap["authPageParamMapList"] )
-                  #foreach($authPageParamMap in $AUTHPAGEPARAMMAPLIST)
+      #set( $AUTHPARAMCOUNTER = 0)
+      #set( $AUTHPAGEPARAMMAPLIST = $authPageMap["authPageParamMapList"] )
+      #foreach($authPageParamMap in $AUTHPAGEPARAMMAPLIST)
                     <tr>
                       <td>$Encoder.bodyEscape($authPageParamMap["param"])</td>
                       <td>$Encoder.bodyEscape($authPageParamMap["value"])</td>
                       <td>
-                      #if($authPageParamMap["password"] != "")
+        #if($authPageParamMap["password"] != "")
                         *****
-                      #end
+        #end
                       </td>
                     </tr>
-                    #set( $AUTHPARAMCOUNTER = $AUTHPARAMCOUNTER + 1)
-                  #end
-                  #if($AUTHPAGEPARAMMAPLIST.size() == 0)
+        #set( $AUTHPARAMCOUNTER = $AUTHPARAMCOUNTER + 1)
+      #end
+
+      #if($AUTHPAGEPARAMMAPLIST.size() == 0)
                     <tr><td colspan="3"><div class="callout callout-info">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoFormParametersSpecified'))</div></td></tr>
-                  #end
+      #end
                   </table>
                 </td>
-                #else
+    #else
                 <td></td>
-                #end
+    #end
               </tr>
-                #set( $AUTHPAGECOUNTER = $AUTHPAGECOUNTER + 1 )
-              #end
-              #if($AUTHPAGECOUNTER == 0)
+    #set( $AUTHPAGECOUNTER = $AUTHPAGECOUNTER + 1 )
+  #end
+
+  #if($AUTHPAGECOUNTER == 0)
                 <tr><td colspan="5"><div class="callout callout-info">$ResourceBundle.getString('WebcrawlerConnector.NoLoginPagesSpecified')</div></td></tr>
-              #end
+  #end
             </table>
           </td>
         </tr>
-          #set( $COUNTER = $COUNTER + 1)
-        #end
-        #if($COUNTER == 0)
+  #set( $COUNTER = $COUNTER + 1)
+#end
+
+#if($COUNTER == 0)
           <tr><td colspan="2"><div class="callout callout-info">$ResourceBundle.getString('WebcrawlerConnector.NoSessionBasedAccessCredentials')</div></td></tr>
-        #end
+#end
       </table>
     </td>
   </tr>
@@ -217,20 +222,21 @@
           <th>$ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression')</th>
           <th>$ResourceBundle.getString('WebcrawlerConnector.Certificate')</th>
         </tr>
-        #set( $COUNTER = 0)
-        #foreach($trustMap in $TRUSTMAPLIST)
+#set( $COUNTER = 0)
+#foreach($trustMap in $TRUSTMAPLIST)
         <tr>
           <td>$Encoder.bodyEscape($trustMap["regexp"])</td>
-          #if($trustMap["trustEverything"] == "true")
+  #if($trustMap["trustEverything"] == "true")
           <td><i>$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.TrustEverything"))</i></td>
-          #else
+  #else
           <td>$Encoder.bodyEscape($trustMap["shortenedDescription"])</td>
-          #end
-          #set( $COUNTER = $COUNTER + 1)
-        #end
-        #if($COUNTER == 0)
+  #end
+  #set( $COUNTER = $COUNTER + 1)
+#end
+
+#if($COUNTER == 0)
           <tr><td colspan="2"><div class="callout callout-info">$ResourceBundle.getString('WebcrawlerConnector.NoTrustCertificates')</div></td></tr>
-        #end
+#end
       </table>
     </td>
   </tr>

Modified: manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewSpecification.html.vm
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewSpecification.html.vm?rev=1793473&r1=1793472&r2=1793473&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewSpecification.html.vm
(original)
+++ manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/viewSpecification.html.vm
Tue May  2 11:38:53 2017
@@ -33,7 +33,7 @@
           <th>$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.RemovePHPSessions"))</th>
           <th>$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.RemoveBVSessions"))</th>
         </tr>
-        #foreach($canonicalizationMap in $CANONICALIZATIONMAPLIST)
+#foreach($canonicalizationMap in $CANONICALIZATIONMAPLIST)
         <tr>
           <td>$Encoder.bodyEscape($canonicalizationMap["regexpString"])</td>
           <td>$Encoder.bodyEscape($canonicalizationMap["description"])</td>
@@ -43,33 +43,34 @@
           <td>$canonicalizationMap["allowPHPSessionRemovalOutput"]</td>
           <td>$canonicalizationMap["allowBVSessionRemovalOutput"]</td>
         </tr>
-        #end
-        #if($CANONICALIZATIONMAPLIST.size() == 0)
+#end
+
+#if($CANONICALIZATIONMAPLIST.size() == 0)
           <tr><td colspan="7"><div class="callout callout-info">$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.NoCanonicalizationSpecified"))</div></td></tr>
-        #end
+#end
       </table>
     </td>
   </tr>
-  #if($REGEXPLIST.size() == 0)
+#if($REGEXPLIST.size() == 0)
     <tr><td colspan="2"><div class="callout callout-info">$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.NoMappingsSpecifiedWillAcceptAllUrls"))</div></td></tr>
-  #else
+#else
   <tr>
     <th>$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.URLMappingsColon"))</th>
     <td>
-      #foreach($REGEXP in $REGEXPLIST)
+  #foreach($REGEXP in $REGEXPLIST)
       <p><span>$Encoder.bodyEscape($REGEXP)</span>&nbsp;&nbsp;<i
class="fa fa-long-arrow-right" aria-hidden="true"></i>
       <span>
-      #set( $MATCH = $MATCHSTRINGS.get($foreach.index))
-      #if($MATCH.length() == 0)
+    #set( $MATCH = $MATCHSTRINGS.get($foreach.index))
+    #if($MATCH.length() == 0)
         &lt;as is&gt;
-      #else
+    #else
         $Encoder.bodyEscape($MATCH)
-      #end
+    #end
       </span></p>
-      #end
+  #end
     </td>
   </tr>
-  #end
+#end
   <tr>
     <th>$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.IncludeOnlyHostsMatchingSeeds"))</th>
     <td>#if($INCLUDEMATCHING)$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.yes"))#{else}$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.no"))#{end}</td>
@@ -94,24 +95,25 @@
     <th>$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.ExcludeContentFromIndex"))</th>
     <td><pre>$Encoder.bodyEscape($EXCLUSIONSCONTENTINDEX)</pre></td>
   </tr>
-  #if($TOKENS.size() == 0)
+
+#if($TOKENS.size() == 0)
     <tr><td colspan="2"><div class="callout callout-info">$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.NoAccessTokensSpecified"))</div></td></tr>
-  #else
+#else
   <tr>
     <th>$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.AccessTokens"))</th>
     <td>
-    #foreach($TOKEN in $TOKENS)
+  #foreach($TOKEN in $TOKENS)
       <p>$Encoder.bodyEscape($TOKEN)</p>
-    #end
+  #end
     </td>
   </tr>
-  #end
+#end
   <tr>
     <th>$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.ExcludedHeadersColon"))</th>
     <td>
-    #foreach($excludedHeader in $EXCLUDEDHEADERS)
+#foreach($excludedHeader in $EXCLUDEDHEADERS)
       <p>$Encoder.bodyEscape($excludedHeader)</p>
-    #end
+#end
     </td>
   </tr>
 </table>



Mime
View raw message