Author: kishore
Date: Sun Apr 30 20:38:30 2017
New Revision: 1793274
URL: http://svn.apache.org/viewvc?rev=1793274&view=rev
Log:
Updated Canonicalization tab
Modified:
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
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=1793274&r1=1793273&r2=1793274&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
Sun Apr 30 20:38:30 2017
@@ -17,73 +17,95 @@
#set( $SEQPREFIX = 's' + $SEQNUM + '_' )
#if($TABNAME ==
$ResourceBundle.getString('WebcrawlerConnector.Canonicalization') && ${SEQNUM}
== ${SELECTEDNUM})
-<table class="displaytable">
- <tr><td class="separator" colspan="2"><hr/></td></tr>
- <tr>
- <td class="boxcell" colspan="2">
- <input type="hidden" name="${SEQPREFIX}urlregexpop" value="Continue"/>
- <input type="hidden" name="${SEQPREFIX}urlregexpnumber" value=""/>
- <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.Description'))</nobr></td>
- <td
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Reorder'))</nobr></td>
- <td
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemoveJSPSessions'))</nobr></td>
- <td
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemoveASPSessions'))</nobr></td>
- <td
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemovePHPSessions'))</nobr></td>
- <td
class="formcolumnheader"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemoveBVSessions'))</nobr></td>
- </tr>
- #foreach($canonicalizationMap in $CANONICALIZATIONMAPLIST)
- <tr>
- <td class="formcolumncell">
- <a name="${SEQPREFIX}urlregexp_$foreach.index">
- <input type="button"
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Delete'))"
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteUrlRegexp'))$Encoder.attributeEscape($canonicalizationMap["regexpString"])"
onclick='javascript:${SEQPREFIX}URLRegexpDelete($foreach.index,"${SEQPREFIX}urlregexp_${foreach.index}");'/>
- </a>
- </td>
- <td class="formcolumncell">
- <input type="hidden" name="${SEQPREFIX}urlregexp_$foreach.index"
value="$Encoder.attributeEscape($canonicalizationMap["regexpString"])"/>
- <input type="hidden"
name="${SEQPREFIX}urlregexpdesc_$foreach.index"
value="$Encoder.attributeEscape($canonicalizationMap["description"])"/>
- <input type="hidden"
name="${SEQPREFIX}urlregexpreorder_$foreach.index"
value="$canonicalizationMap["allowReorder"]"/>
- <input type="hidden"
name="${SEQPREFIX}urlregexpjava_$foreach.index"
value="$canonicalizationMap["allowJavaSessionRemoval"]"/>
- <input type="hidden"
name="${SEQPREFIX}urlregexpasp_$foreach.index"
value="$canonicalizationMap["allowASPSessionRemoval"]"/>
- <input type="hidden"
name="${SEQPREFIX}urlregexpphp_$foreach.index"
value="$canonicalizationMap["allowPHPSessionRemoval"]"/>
- <input type="hidden" name="${SEQPREFIX}urlregexpbv_$foreach.index"
value="$$canonicalizationMap["allowBVSessionRemoval"]"/>
-
<nobr>$Encoder.bodyEscape($canonicalizationMap["regexpString"])</nobr>
- </td>
- <td
class="formcolumncell">$Encoder.bodyEscape($canonicalizationMap["description"])</td>
- <td
class="formcolumncell">$canonicalizationMap["allowReorderOutput"]</td>
- <td
class="formcolumncell">$canonicalizationMap["allowJavaSessionRemovalOutput"]</td>
- <td
class="formcolumncell">$canonicalizationMap["allowASPSessionRemovalOutput"]</td>
- <td
class="formcolumncell">$canonicalizationMap["allowPHPSessionRemovalOutput"]</td>
- <td
class="formcolumncell">$canonicalizationMap["allowBVSessionRemovalOutput"]</td>
- </tr>
- #end
- #set( $COUNTER = $CANONICALIZATIONMAPLIST.size() )
- #set( $NEXTCOUNTER = $COUNTER + 1 )
- #if($COUNTER == 0)
- <tr class="formrow"><td colspan="8"
class="formcolumnmessage"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('NoCanonicalizationSpecified'))</nobr></td></tr>
- #end
- <tr class="formrow"><td colspan="8"
class="formseparator"><hr/></td></tr>
- <tr class="formrow">
- <td class="formcolumncell">
- <a name="${SEQPREFIX}urlregexp_${COUNTER}">
- <input type="button"
value="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Add'))"
alt="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddUrlRegexp'))"
onclick='javascript:${SEQPREFIX}URLRegexpAdd("${SEQPREFIX}urlregexp_${NEXTCOUNTER}");'/>
- <input type="hidden" name="${SEQPREFIX}urlregexpcount"
value="$COUNTER"/>
- </a>
- </td>
- <td class="formcolumncell"><input type="text"
name="${SEQPREFIX}urlregexp" size="30" value=""/></td>
- <td class="formcolumncell"><input type="text"
name="${SEQPREFIX}urlregexpdesc" size="30" value=""/></td>
- <td class="formcolumncell"><input type="checkbox"
name="${SEQPREFIX}urlregexpreorder" value="yes"/></td>
- <td class="formcolumncell"><input type="checkbox"
name="${SEQPREFIX}urlregexpjava" value="yes" checked="true"/></td>
- <td class="formcolumncell"><input type="checkbox"
name="${SEQPREFIX}urlregexpasp" value="yes" checked="true"/></td>
- <td class="formcolumncell"><input type="checkbox"
name="${SEQPREFIX}urlregexpphp" value="yes" checked="true"/></td>
- <td class="formcolumncell"><input type="checkbox"
name="${SEQPREFIX}urlregexpbv" value="yes" checked="true"/></td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
+ #set( $COUNTER = $CANONICALIZATIONMAPLIST.size() )
+ #if($COUNTER == 0)
+<div class="alert
alert-warning">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.NoCanonicalizationSpecified'))</div>
+ #else
+<div class="row">
+ <input type="hidden" name="${SEQPREFIX}urlregexpop" value="Continue"/>
+ <input type="hidden" name="${SEQPREFIX}urlregexpnumber" value=""/>
+ <table class="table">
+ <tr>
+ <th></th>
+
<th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression'))</th>
+
<th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Description'))</th>
+
<th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Reorder'))</th>
+
<th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemoveJSPSessions'))</th>
+
<th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemoveASPSessions'))</th>
+
<th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemovePHPSessions'))</th>
+
<th>$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemoveBVSessions'))</th>
+ </tr>
+ #foreach($canonicalizationMap in $CANONICALIZATIONMAPLIST)
+ <tr>
+ <td>
+ <button class="btn btn-danger btn-xs" type="button"
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.DeleteUrlRegexp'))$Encoder.attributeEscape($canonicalizationMap["regexpString"])"
onclick='javascript:${SEQPREFIX}URLRegexpDelete($foreach.index,"${SEQPREFIX}urlregexp_${foreach.index}");'><i
class="fa fa-minus-circle fa-fw"
aria-hidden="true"></i>$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Delete'))</button>
+ </td>
+ <td>
+ <input type="hidden" name="${SEQPREFIX}urlregexp_$foreach.index"
value="$Encoder.attributeEscape($canonicalizationMap["regexpString"])"/>
+ <input type="hidden" name="${SEQPREFIX}urlregexpdesc_$foreach.index"
value="$Encoder.attributeEscape($canonicalizationMap["description"])"/>
+ <input type="hidden"
name="${SEQPREFIX}urlregexpreorder_$foreach.index"
value="$canonicalizationMap["allowReorder"]"/>
+ <input type="hidden" name="${SEQPREFIX}urlregexpjava_$foreach.index"
value="$canonicalizationMap["allowJavaSessionRemoval"]"/>
+ <input type="hidden" name="${SEQPREFIX}urlregexpasp_$foreach.index"
value="$canonicalizationMap["allowASPSessionRemoval"]"/>
+ <input type="hidden" name="${SEQPREFIX}urlregexpphp_$foreach.index"
value="$canonicalizationMap["allowPHPSessionRemoval"]"/>
+ <input type="hidden" name="${SEQPREFIX}urlregexpbv_$foreach.index"
value="$canonicalizationMap["allowBVSessionRemoval"]"/>
+ $Encoder.bodyEscape($canonicalizationMap["regexpString"])
+ </td>
+ <td>$Encoder.bodyEscape($canonicalizationMap["description"])</td>
+ <td>$canonicalizationMap["allowReorderOutput"]</td>
+ <td>$canonicalizationMap["allowJavaSessionRemovalOutput"]</td>
+ <td>$canonicalizationMap["allowASPSessionRemovalOutput"]</td>
+ <td>$canonicalizationMap["allowPHPSessionRemovalOutput"]</td>
+ <td>$canonicalizationMap["allowBVSessionRemovalOutput"]</td>
+ </tr>
+ #end
+ </table>
+</div>
+#end
+#set( $NEXTCOUNTER = $COUNTER + 1 )
+<hr/>
+<div class="row">
+ <div class="col-md-4">
+ <input type="hidden" name="${SEQPREFIX}urlregexpcount" value="$COUNTER"/>
+ <div class="form-group">
+ <label
for="${SEQPREFIX}urlregexp">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.URLRegularExpression'))</label>
+ <input class="form-control" type="text" name="${SEQPREFIX}urlregexp"
id="${SEQPREFIX}urlregexp" value=""/>
+ </div>
+ <div class="form-group">
+ <label
for="${SEQPREFIX}urlregexpdesc">$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Description'))</label>
+ <input class="form-control" type="text" name="${SEQPREFIX}urlregexpdesc"
id="${SEQPREFIX}urlregexpdesc" value=""/>
+ </div>
+ <div class="form-group">
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" name="${SEQPREFIX}urlregexpreorder"
value="yes"/>
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.Reorder'))
+ </label>
+ </div>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" name="${SEQPREFIX}urlregexpjava" value="yes"
checked="true"/>
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemoveJSPSessions'))
+ </label>
+ </div>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" name="${SEQPREFIX}urlregexpasp" value="yes"
checked="true"/>
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemoveASPSessions'))
+ </label>
+ </div>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" name="${SEQPREFIX}urlregexpphp" value="yes"
checked="true"/>
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemovePHPSessions'))
+ </label>
+ </div>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" name="${SEQPREFIX}urlregexpbv" value="yes"
checked="true"/>
$Encoder.bodyEscape($ResourceBundle.getString('WebcrawlerConnector.RemoveBVSessions'))
+ </label>
+ </div>
+ </div>
+ <div class="form-group pull-right">
+ <button class="btn btn-primary" type="button"
title="$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.AddUrlRegexp'))"
onclick='javascript:${SEQPREFIX}URLRegexpAdd("${SEQPREFIX}urlregexp_${NEXTCOUNTER}");'><i
class="fa fa-plus-circle fa-fw"
aria-hidden="true"></i>$Encoder.attributeEscape($ResourceBundle.getString('WebcrawlerConnector.Add'))</button>
+ </div>
+ </div>
+</div>
#else
#foreach($canonicalizationMap in $CANONICALIZATIONMAPLIST)
<input type="hidden" name="${SEQPREFIX}urlregexp_$foreach.index"
value="$Encoder.attributeEscape($canonicalizationMap["regexpString"])"/>
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=1793274&r1=1793273&r2=1793274&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
Sun Apr 30 20:38:30 2017
@@ -75,11 +75,9 @@
<div class="row">
<div class="col-md-6 form-inline">
<div class="form-group">
- <div class="input-group">
- <input class="form-control" type="text" name="${SEQPREFIX}rssmatch"
value=""/>
- <div class="input-group-addon"><i class="fa fa-long-arrow-right"
aria-hidden="true"></i></div>
- </div>
+ <input class="form-control" type="text" name="${SEQPREFIX}rssmatch"
value=""/>
</div>
+ <i class="fa fa-long-arrow-right fa-fw fa-lg" aria-hidden="true"></i>
<div class="form-group">
<input class="form-control" type="text" name="${SEQPREFIX}rssmap"
value=""/>
</div>
