Author: kishore
Date: Sat Apr 29 21:49:34 2017
New Revision: 1793235
URL: http://svn.apache.org/viewvc?rev=1793235&view=rev
Log:
Updated Certifications tab with new UI syntax
Modified:
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/editConfiguration_Email.html.vm
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Proxy.html.vm
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Robots.html.vm
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=1793235&r1=1793234&r2=1793235&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
Sat Apr 29 21:49:34 2017
@@ -16,72 +16,68 @@
-->
#set( $COUNTER = 0)
#if($TABNAME == $ResourceBundle.getString('WebcrawlerConnector.Certificates'))
-<table class="displaytable">
- <tr><td class="separator" colspan="2"><hr/></td></tr>
- <tr>
- <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.TrustCertificates'))</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.Certificate'))</nobr></td>
- </tr>
- #foreach($trustMap in $TRUSTMAPLIST)
- #set( $PREFIX = "trust_" + $COUNTER )
- <tr>
- <td class="formcolumncell">
- <a name="$PREFIX">
- <input type="button"
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Delete'))"
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteTrustUrlRegularExpression'))$foreach.count"
onclick='javascript:deleteTRegexp($COUNTER);'/>
- <input type="hidden" name="op_$PREFIX" value="Continue"/>
- <input type="hidden" name="regexp_$PREFIX"
value="$Encoder.attributeEscape($trustMap["regexp"])"/>
- <input type="hidden" name="trustall_$PREFIX"
value="$Encoder.attributeEscape($trustMap["trustEverything"])"/>
- <input type="hidden" name="truststore_$PREFIX"
value="#if($trustMap["trustEverything"] == "true") "" #{else}
$Encoder.attributeEscape($trustMap["trustStore"]) #end"/>
- </a>
- </td>
- <td class="formcolumncell">
- <nobr>$Encoder.bodyEscape($trustMap["regexp"])</nobr>
- </td>
- #if($trustMap["trustEverything"] == "true")
- <td class="formcolumncell">
-
<nobr><i>$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.TrustEverything"))</i></nobr>
- </td>
- #else
- <td class="formcolumncell">
- <nobr>$Encoder.bodyEscape($trustMap["shortenedDescription"])</nobr>
- </td>
- #end
- #set( $COUNTER = $COUNTER + 1)
+<div class="row">
+ <div class="col-md-6">
+ <table class="table">
+ <caption
class="text-left">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.TrustCertificates'))</caption>
+ <tr>
+ <th></th>
+
<th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression'))</th>
+
<th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Certificate'))</th>
+ </tr>
+ #foreach($trustMap in $TRUSTMAPLIST)
+ #set( $PREFIX = "trust_" + $COUNTER )
+ <tr>
+ <td>
+ <button class="btn btn-danger" 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>
+ <input type="hidden" name="op_$PREFIX" value="Continue"/>
+ <input type="hidden" name="regexp_$PREFIX"
value="$Encoder.attributeEscape($trustMap["regexp"])"/>
+ <input type="hidden" name="trustall_$PREFIX"
value="$Encoder.attributeEscape($trustMap["trustEverything"])"/>
+ <input type="hidden" name="truststore_$PREFIX"
value="#if($trustMap["trustEverything"] == "true") "" #{else}
$Encoder.attributeEscape($trustMap["trustStore"]) #end"/>
+ </td>
+ <td>$Encoder.bodyEscape($trustMap["regexp"])</td>
+ #if($trustMap["trustEverything"] == "true")
+
<td><i>$Encoder.bodyEscape($ResourceBundle.getString("WebcrawlerConnector.TrustEverything"))</i></td>
+ #else
+ <td>$Encoder.bodyEscape($trustMap["shortenedDescription"])</td>
#end
+ </tr>
+ #set( $COUNTER = $COUNTER + 1)
+ #end
- #if($COUNTER == "0")
- <tr class="formrow">
- <td class="formmessage"
colspan="6">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoTrustCertificatesSpecified'))</td>
- </tr>
- #end
-
- <tr class="formrow"><td class="formseparator"
colspan="6"><hr/></td></tr>
- <tr class="formrow">
- <td class="formcolumncell">
- <a name="trust">
- <input type="button"
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Add'))"
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddUrlRegularExpressionForTruststore'))"
onclick="javascript:addTRegexp();"/>
- </a>
- <input type="hidden" name="trust_count" value="$COUNTER"/>
- <input type="hidden" name="trust_op" value="Continue"/>
- </td>
- <td class="formcolumncell">
- <nobr><input type="text" size="30" name="regexp_trust"
value=""/></nobr>
- </td>
- <td class="formcolumncell">
-
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.UploadCertificate'))
- <input name="certificate_trust" size="50" type="file"/>
- <label><input type="checkbox" name="all_trust"
value="true"/>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.TrustEverything'))</label>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
+ #if($COUNTER == "0")
+ <tr class="formrow">
+ <td colspan="3">
+ <div class="alert
alert-info">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoTrustCertificatesSpecified'))</div>
+ </td>
+ </tr>
+ #end
+ </table>
+ </div>
+</div>
+<hr/>
+<div class="row">
+ <div class="col-md-4">
+ <div class="form-group">
+ <label
for="regexp_trust">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression'))</label>
+ <input class="form-control" type="text" size="30" name="regexp_trust"
id="regexp_trust" value=""/>
+ </div>
+ <div class="form-group">
+ <label
for="certificate_trust">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.UploadCertificate'))</label>
+ <input name="certificate_trust" id="certificate_trust" type="file"/>
+ </div>
+ <div class="form-group">
+ <div class="checkbox">
+ <label><input type="checkbox" name="all_trust"
value="true"/>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.TrustEverything'))</label>
+ </div>
+ </div>
+ <div class="form-group">
+ <button class="btn btn-success" type="button"
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddUrlRegularExpressionForTruststore'))"
onclick="javascript:addTRegexp();"><i class="fa fa-plus-circle fa-fw"
aria-hidden="true"></i>$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Add'))</button>
+ <input type="hidden" name="trust_count" value="$COUNTER"/>
+ <input type="hidden" name="trust_op" value="Continue"/>
+ </div>
+ </div>
+</div>
#else
#foreach($trustMap in $TRUSTMAPLIST)
#set( $PREFIX = "trust_" + $COUNTER )
Modified:
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Email.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_Email.html.vm?rev=1793235&r1=1793234&r2=1793235&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Email.html.vm
(original)
+++
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Email.html.vm
Sat Apr 29 21:49:34 2017
@@ -20,11 +20,10 @@
<div class="col-md-4">
<div class="form-group">
<label
for="email">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.EmailAddressToContact'))</label>
- <input type="email" size="32" class="form-control" name="email"
id="email" value="$Encoder.attributeEscape($EMAIL)"/>
+ <input class="form-control" type="email" size="32" name="email"
id="email" value="$Encoder.attributeEscape($EMAIL)"/>
</div>
</div>
</div>
#else
<input type="hidden" name="email" value="$Encoder.attributeEscape($EMAIL)"/>
#end
-
Modified:
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Proxy.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_Proxy.html.vm?rev=1793235&r1=1793234&r2=1793235&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Proxy.html.vm
(original)
+++
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Proxy.html.vm
Sat Apr 29 21:49:34 2017
@@ -16,29 +16,42 @@
-->
#if($TABNAME == $ResourceBundle.getString('WebcrawlerConnector.Proxy'))
-<table class="displaytable">
- <tr><td class="separator" colspan="2"><hr/></td></tr>
- <tr>
- <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ProxyHostColon'))</nobr></td>
- <td class="value"><input type="text" size="40" name="proxyhost"
value="$Encoder.attributeEscape($PROXYHOST)"/></td>
- </tr>
- <tr>
- <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ProxyPortColon'))</nobr></td>
- <td class="value"><input type="text" size="5" name="proxyport"
value="$Encoder.attributeEscape($PROXYPORT)"/></td>
- </tr>
- <tr>
- <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ProxyAuthenticationDomainColon'))</nobr></td>
- <td class="value"><input type="text" size="32" name="proxyauthdomain"
value="$Encoder.attributeEscape($PROXYAUTHDOMAIN)"/></td>
- </tr>
- <tr>
- <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ProxyAuthenticationUserNameColon'))</nobr></td>
- <td class="value"><input type="text" size="32" name="proxyauthusername"
value="$Encoder.attributeEscape($PROXYAUTHUSERNAME)"/></td>
- </tr>
- <tr>
- <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ProxyAuthenticationPasswordColon'))</nobr></td>
- <td class="value"><input type="password" size="16"
name="proxyauthpassword"
value="$Encoder.attributeEscape($PROXYAUTHPASSWORD)"/></td>
- </tr>
-</table>
+<div class="row">
+ <div class="col-md-4">
+ <div class="form-group">
+ <label
for="proxyhost">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ProxyHostColon'))</label>
+ <input class="form-control" type="text" size="40" name="proxyhost"
id="proxyhost" value="$Encoder.attributeEscape($PROXYHOST)"/>
+ </div>
+ </div>
+ <div class="col-md-2">
+ <div class="form-group">
+ <label
for="proxyport">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ProxyPortColon'))</label>
+ <input class="form-control" type="text" size="5" name="proxyport"
id="proxyport" value="$Encoder.attributeEscape($PROXYPORT)"/>
+ </div>
+ </div>
+</div>
+<div class="row">
+ <div class="col-md-6">
+ <div class="form-group">
+ <label
for="proxyauthdomain">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ProxyAuthenticationDomainColon'))</label>
+ <input class="form-control" type="text" size="32" name="proxyauthdomain"
id="proxyauthdomain" value="$Encoder.attributeEscape($PROXYAUTHDOMAIN)"/>
+ </div>
+ </div>
+</div>
+<div class="row">
+ <div class="col-md-3">
+ <div class="form-group">
+ <label
for="proxyauthusername">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ProxyAuthenticationUserNameColon'))</label>
+ <input class="form-control" type="text" size="32"
name="proxyauthusername" id="proxyauthusername"
value="$Encoder.attributeEscape($PROXYAUTHUSERNAME)"/>
+ </div>
+ </div>
+ <div class="col-md-3">
+ <div class="form-group">
+ <label
for="proxyauthpassword">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ProxyAuthenticationPasswordColon'))</label>
+ <input class="form-control" type="password" size="16"
name="proxyauthpassword" id="proxyauthpassword"
value="$Encoder.attributeEscape($PROXYAUTHPASSWORD)"/>
+ </div>
+ </div>
+</div>
#else
<input type="hidden" name="proxyhost"
value="$Encoder.attributeEscape($PROXYHOST)"/>
<input type="hidden" name="proxyport"
value="$Encoder.attributeEscape($PROXYPORT)"/>
@@ -46,4 +59,3 @@
<input type="hidden" name="proxyauthdomain"
value="$Encoder.attributeEscape($PROXYAUTHDOMAIN)"/>
<input type="hidden" name="proxyauthpassword"
value="$Encoder.attributeEscape($PROXYAUTHPASSWORD)"/>
#end
-
Modified:
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Robots.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_Robots.html.vm?rev=1793235&r1=1793234&r2=1793235&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Robots.html.vm
(original)
+++
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/webcrawler/editConfiguration_Robots.html.vm
Sat Apr 29 21:49:34 2017
@@ -20,7 +20,7 @@
<div class="col-md-4">
<div class="form-group">
<label
for="robotsusage">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RobotsTxtUsage'))</label>
- <select name="robotsusage" id="robotsusage" class="form-control">
+ <select class="form-control" name="robotsusage" id="robotsusage">
<option value="none" #if($ROBOTSUSAGE == 'none') selected="selected"
#end
>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.DontLookAtRobotsTxt'))</option>
<option value="data" #if($ROBOTSUSAGE == 'data') selected="selected"
#end
>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ObeyRobotsTxtForDataFetchesOnly'))</option>
<option value="all" #if($ROBOTSUSAGE == 'all') selected="selected"
#end
>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ObeyRobotsTxtForAllFetches'))</option>
@@ -28,7 +28,7 @@
</div>
<div class="form-group">
<label
for="metarobotstagsusage">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.MetaRobotsTagsUsage'))</label>
- <select name="metarobotstagsusage" id="metarobotstagsusage"
class="form-control">
+ <select class="form-control" name="metarobotstagsusage"
id="metarobotstagsusage">
<option value="none" #if($METAROBOTSTAGSUSAGE == 'none')
selected="selected"
#end>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.DontLookAtMetaRobotsTags'))</option>
<option value="all" #if($METAROBOTSTAGSUSAGE == 'all')
selected="selected"
#end>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.ObeyMetaRobotsTags'))</option>
</select>
@@ -39,4 +39,3 @@
<input type="hidden" name="robotsusage"
value="$Encoder.attributeEscape($ROBOTSUSAGE)"/>
<input type="hidden" name="metarobotstagsusage"
value="$Encoder.attributeEscape($METAROBOTSTAGSUSAGE)"/>
#end
-
