You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by ki...@apache.org on 2017/02/21 19:48:47 UTC
svn commit: r1783925 - in /manifoldcf/branches/CONNECTORS-1196/framework:
crawler-ui/src/main/webapp/ crawler-ui/src/main/webapp/css/
crawler-ui/src/main/webapp/javascript/ crawler-ui/src/main/webapp/less/
ui-core/src/main/native2ascii/org/apache/manif...
Author: kishore
Date: Tue Feb 21 19:48:46 2017
New Revision: 1783925
URL: http://svn.apache.org/viewvc?rev=1783925&view=rev
Log:
Added text next to icon for transformation, output and authority pages.
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/css/style.css
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/documentstatus.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editauthority.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/javascript/app.js
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/style.less
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listauthorities.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listoutputs.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listtransformations.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewauthority.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewoutput.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewtransformation.jsp
manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/css/style.css?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/css/style.css (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/css/style.css Tue Feb 21 19:48:46 2017
@@ -2744,6 +2744,10 @@ table.text-center th {
.skin-black .treeview-menu > li > a:hover {
color: #ffffff;
}
+.fa-fw {
+ width: auto;
+ margin-right: 0.4em;
+}
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/documentstatus.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/documentstatus.jsp?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/documentstatus.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/documentstatus.jsp Tue Feb 21 19:48:46 2017
@@ -373,19 +373,15 @@ try
if (statusConnection.length() > 0 && statusJobIdentifiers.length > 0)
{
%>
- <a name="MainButton"><input class="btn btn-primary btn-sm" type="button"
- value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Go")%>"
- onClick="javascript:Go()"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%>" /></a>
+ <a class="btn btn-primary" type="button" onClick="javascript:Go()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%>"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%></a>
<%
}
else
{
%>
- <a name="MainButton"><input class="btn btn-primary btn-sm" type="button"
- value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>"
- onClick="javascript:Continue()"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>" /></a>
+ <a class="btn btn-primary" type="button" onClick="javascript:Continue()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%></a>
<%
}
%>
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editauthority.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editauthority.jsp Tue Feb 21 19:48:46 2017
@@ -562,10 +562,8 @@ try
if (className.length() > 0)
{
%>
- <input type="button" class="btn btn-primary"
- value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Save")%>"
- onClick="javascript:Save()"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.SaveThisAuthorityConnection")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Save()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.SaveThisAuthorityConnection")%>" data-toggle="tooltip"><i class="fa fa-save fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Save")%></a>
<%
}
else
@@ -573,18 +571,14 @@ try
if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type")))
{
%>
- <input type="button" class="btn btn-primary"
- value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Continue")%>"
- onClick="javascript:Continue()"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.ContinueToNextPage")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Continue()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.ContinueToNextPage")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Continue")%></a>
<%
}
}
%>
- <input type="button" class="btn btn-primary"
- value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Cancel")%>"
- onClick="javascript:Cancel()"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.CancelAuthorityEditing")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Cancel()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.CancelAuthorityEditing")%>" data-toggle="tooltip"><i class="fa fa-times-circle-o fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Cancel")%></a>
</div>
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/editoutput.jsp Tue Feb 21 19:48:46 2017
@@ -427,10 +427,8 @@ try
if (className.length() > 0)
{
%>
- <input type="button" class="btn btn-primary"
- value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Save")%>"
- onClick="javascript:Save()"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.SaveThisOutputConnection")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Save()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.SaveThisOutputConnection")%>" data-toggle="tooltip"><i class="fa fa-save fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Save")%></a>
<%
}
else
@@ -438,18 +436,14 @@ try
if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editoutput.Type")))
{
%>
- <input type="button" class="btn btn-primary"
- value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Continue")%>"
- onClick="javascript:Continue()"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.ContinueToNextPage")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Continue()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.ContinueToNextPage")%>"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Continue")%></a>
<%
}
}
%>
- <input type="button" class="btn btn-primary"
- value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Cancel")%>"
- onClick="javascript:Cancel()"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.CancelOutputConnectionEditing")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Cancel()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.CancelOutputConnectionEditing")%>"><i class="fa fa-times-circle-o fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Cancel")%></a>
</div>
</div>
</div>
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/edittransformation.jsp Tue Feb 21 19:48:46 2017
@@ -420,10 +420,8 @@ try
if (className.length() > 0)
{
%>
- <input type="button" class="btn btn-primary"
- value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Save")%>"
- onClick="javascript:Save()"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.SaveThisTransformationConnection")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Save()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.SaveThisTransformationConnection")%>" data-toggle="tooltip"><i class="fa fa-save fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Save")%></a>
<%
}
else
@@ -431,18 +429,14 @@ try
if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Type")))
{
%>
- <input type="button" class="btn btn-primary"
- value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Continue")%>"
- onClick="javascript:Continue()"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.ContinueToNextPage")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Continue()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.ContinueToNextPage")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Continue")%></a>
<%
}
}
%>
- <input type="button" class="btn btn-primary"
- value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Cancel")%>"
- onClick="javascript:Cancel()"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.CancelTransformationConnectionEditing")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Cancel()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.CancelTransformationConnectionEditing")%>"><i class="fa fa-times-circle-o fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Cancel")%></a>
</div>
</div>
</div>
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/javascript/app.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/javascript/app.js?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/javascript/app.js (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/javascript/app.js Tue Feb 21 19:48:46 2017
@@ -431,6 +431,11 @@ $.ManifoldCF.submit=function(form){
else
History.replaceState({urlPath: encodeURI(action)}, null, '#execute_'+form.name);
console.log("textStatus: " + textStatus)
+ //Temporary fix for Javascript bug, when loading connector javascript.
+ if(window.checkConfig)
+ window.checkConfig = null;
+ if(window.checkConfigForSave)
+ window.checkConfigForSave = null;
$('#content').html(data);
}).fail(function(xhr, opts, error){
displayError(xhr);
@@ -469,4 +474,4 @@ $(function(){
var title = $(this).text();
History.pushState({urlPath: encodeURI(urlPath)}, title, '?p=' + encodeURI(urlPath)+'&_'+new Date().getTime());
});
-});
\ No newline at end of file
+});
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/style.less
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/style.less?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/style.less (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/style.less Tue Feb 21 19:48:46 2017
@@ -58,5 +58,11 @@
//THEME
@import "skin-black.less";
+//Custom
+.fa-fw{
+ width:auto;
+ margin-right: 0.4em;
+}
+
//google fonts
@import "sourcesanspro-fonts.less";
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listauthorities.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listauthorities.jsp?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listauthorities.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listauthorities.jsp Tue Feb 21 19:48:46 2017
@@ -99,21 +99,18 @@ try
<td>
<div class="btn-group">
<a href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
- title='<%="View "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.View") + " " +org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
class="link btn btn-success btn-xs" role="button" data-toggle="tooltip">
- <span class="fa fa-eye" aria-hidden="true"></span>
- </a>
+ <i class="fa fa-eye" aria-hidden="true"></i>View</a>
<a href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
- title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Edit") + " " + org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip">
- <span class="fa fa-pencil-square-o" aria-hidden="true"></span>
- </a>
+ <i class="fa fa-pencil-square-o" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Edit")%></a>
<a href="javascript:void(0);"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
- title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Delete") + " " + org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
class="btn btn-danger btn-xs" role="button" data-toggle="tooltip">
- <span class="fa fa-trash" aria-hidden="true"></span>
- </a>
+ <i class="fa fa-trash" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Delete")%></a>
</div>
</td>
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
@@ -128,12 +125,9 @@ try
</div>
<div class="box-footer clearfix">
<div class="btn-group">
- <a href="editauthority.jsp"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.AddNewConnection")%>"
+ <a href="editauthority.jsp" title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.AddaNewConnection")%>"
class="link btn btn-primary" role="button">
- <span class="fa fa-plus-circle" aria-hidden="true"></span>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.AddaNewConnection")%>
- </a>
+ <i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.AddNewConnection")%></a>
</div>
<%
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listoutputs.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listoutputs.jsp?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listoutputs.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listoutputs.jsp Tue Feb 21 19:48:46 2017
@@ -99,24 +99,15 @@ try
<td>
<div class="btn-group">
<a href='<%="viewoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
- title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
- alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
- class="link btn btn-success btn-xs" role="button" data-toggle="tooltip">
- <span class="fa fa-eye" aria-hidden="true"></span>
- </a>
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="link btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-eye fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")%></a>
<a href='<%="editoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
- title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
- alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
- class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip">
- <span class="fa fa-pencil-square-o" aria-hidden="true"></span>
- </a>
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")%></a>
<a href="javascript:void(0);"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
- title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
- alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
- class="btn btn-danger btn-xs" role="button" data-toggle="tooltip">
- <span class="fa fa-trash" aria-hidden="true"></span>
- </a>
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="btn btn-danger btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")%></a>
</div>
</td>
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
@@ -131,11 +122,9 @@ try
</div>
<div class="box-footer clearfix">
<div class="btn-group">
- <a href="editoutput.jsp"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.AddAnOutputConnection")%>"
- class="link btn btn-primary" role="button">
- <span class="fa fa-plus-circle" aria-hidden="true"></span>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.AddaNewOutputConnection")%>
+ <a href="editoutput.jsp" title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.AddaNewOutputConnection")%>"
+ class="link btn btn-primary" role="button" data-toggle="tooltip">
+ <i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Add")%>
</a>
</div>
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listtransformations.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listtransformations.jsp?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listtransformations.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listtransformations.jsp Tue Feb 21 19:48:46 2017
@@ -101,20 +101,14 @@ try
<div class="btn-group">
<a href='<%="viewtransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
- class="link btn btn-success btn-xs" role="button" data-toggle="tooltip">
- <span class="fa fa-eye" aria-hidden="true"></span>
- </a>
+ class="link btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-eye fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.View")%></a>
<a href='<%="edittransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
- class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip">
- <span class="fa fa-pencil-square-o" aria-hidden="true"></span>
- </a>
- <a href="javascript:void()"
+ class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Edit")%></a>
+ <a href="javascript:void(0);"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
- class="btn btn-danger btn-xs" role="button" data-toggle="tooltip">
- <span class="fa fa-trash" aria-hidden="true"></span>
- </a>
+ class="btn btn-danger btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Delete")%></a>
</div>
</td>
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
@@ -128,14 +122,13 @@ try
</table>
</div>
<div class="box-footer clearfix">
- <div class="btn-group">
- <a href="edittransformation.jsp"
- alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.AddATransformationConnection")%>"
- class="link btn btn-primary" role="button">
- <span class="fa fa-plus-circle" aria-hidden="true"></span>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.AddaNewTransformationConnection")%>
- </a>
- </div>
+ <a href="edittransformation.jsp" class="link btn btn-primary" role="button"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.AddaNewTransformationConnection")%>" data-toggle="tooltip"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Add")%></a>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
<%
}
catch (ManifoldCFException e)
@@ -148,8 +141,3 @@ catch (ManifoldCFException e)
<%
}
%>
- </div>
- </form>
- </div>
- </div>
-</div>
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewauthority.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewauthority.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewauthority.jsp Tue Feb 21 19:48:46 2017
@@ -180,14 +180,14 @@ try
<div class="btn-group">
<a href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%>"
- class="link btn btn-success" role="button" data-toggle="tooltip"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span></a>
+ class="link btn btn-success" role="button" data-toggle="tooltip"><i class="fa fa-refresh fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%></a>
<a href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.EditThisAuthorityConnection")%>"
- class="link btn btn-primary" role="button" data-toggle="tooltip"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
+ class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.Edit")%></a>
<a href="javascript:void(0);"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.DeleteThisAuthorityConnection")%>"
- class="btn btn-danger" role="button" data-toggle="tooltip"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
+ class="btn btn-danger" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.Delete")%></a>
</div>
</div>
</form>
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewoutput.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewoutput.jsp?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewoutput.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewoutput.jsp Tue Feb 21 19:48:46 2017
@@ -167,23 +167,22 @@ try
<div class="btn-group">
<a href='<%="viewoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%>"
- class="link btn btn-success" role="button" data-toggle="tooltip"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span></a>
+ class="link btn btn-success" role="button" data-toggle="tooltip"><i class="fa fa-refresh fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%></a>
<a href='<%="editoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.EditThisOutputConnection")%>"
- class="link btn btn-primary" role="button" data-toggle="tooltip"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
+ class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.Edit")%></a>
<a href="javascript:void(0);"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.DeleteThisOutputConnection")%>"
- class="btn btn-danger" role="button" data-toggle="tooltip"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
+ class="btn btn-danger" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.Delete")%></a>
<a href="javascript:void(0);"
onclick='<%="javascript:ReingestAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.ReIngestAllDocumentsAssociatedWithThisOutputConnection")%>"
- class="btn btn-primary" role="button" data-toggle="tooltip"><span class="glyphicon glyphicon-repeat" aria-hidden="true"></span></a>
+ class="btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-repeat fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.ReIngestAll")%></a>
<a href="javascript:void(0)"
onclick='<%="javascript:RemoveAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.RemoveAllDocumentsAssociatedWithThisOutputConnection")%>"
- class="btn btn-warning" role="button" data-toggle="tooltip"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
- </a>
+ class="btn btn-warning" role="button" data-toggle="tooltip"><i class="fa fa-remove fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.RemoveAll")%></a>
</div>
</div>
</form>
Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewtransformation.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewtransformation.jsp?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewtransformation.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewtransformation.jsp Tue Feb 21 19:48:46 2017
@@ -150,14 +150,14 @@ try
<div class="btn-group">
<a href='<%="viewtransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.Refresh")%>"
- class="link btn btn-success" role="button" data-toggle="tooltip"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span></a>
+ class="link btn btn-success" role="button" data-toggle="tooltip"><i class="fa fa-refresh fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.Refresh")%></a>
<a href='<%="edittransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.EditThisTransformationConnection")%>"
- class="link btn btn-primary" role="button" data-toggle="tooltip"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
+ class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.Edit")%></a>
<a href="javascript:void(0);"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.DeleteThisTransformationConnection")%>"
- class="btn btn-danger" role="button" data-toggle="tooltip"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
+ class="btn btn-danger" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.Delete")%></a>
</div>
</div>
</form>
Modified: manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1783925&r1=1783924&r2=1783925&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original)
+++ manifoldcf/branches/CONNECTORS-1196/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Tue Feb 21 19:48:46 2017
@@ -93,7 +93,7 @@ listoutputs.View=View
listoutputs.Edit=Edit
listoutputs.Delete=Delete
listoutputs.DeleteOutputConnection=Delete output connection
-listoutputs.AddAnOutputConnection=Add an output connection
+listoutputs.Add=Add
listoutputs.uninstalled=(uninstalled)
editoutput.ApacheManifoldCFEditOutputConnection=Apache ManifoldCF: Edit Output Connection
@@ -131,9 +131,9 @@ viewoutput.Edit=Edit
viewoutput.DeleteThisOutputConnection=Delete this output connection
viewoutput.Delete=Delete
viewoutput.ReIngestAllDocumentsAssociatedWithThisOutputConnection=Re-index all documents associated with this output connection
-viewoutput.ReIngestAllAssociatedDocuments=Re-index all associated documents
+viewoutput.ReIngestAll=Re-index all
viewoutput.RemoveAllDocumentsAssociatedWithThisOutputConnection=Remove all document output records associated with this output connection
-viewoutput.RemoveAllAssociatedDocuments=Remove all associated records
+viewoutput.RemoveAll=Remove all
viewoutput.Deleteoutputconnection=Delete output connection
viewoutput.Thiscommandwillforce=This command will force every document associated with output\nconnection
viewoutput.toberecrawled=to be re-indexed the next time the document is crawled.\nDo you want to continue?
@@ -155,7 +155,7 @@ listtransformations.View=View
listtransformations.Edit=Edit
listtransformations.Delete=Delete
listtransformations.DeleteTransformationConnection=Delete transformation connection
-listtransformations.AddATransformationConnection=Add a transformation connection
+listtransformations.Add=Add
listtransformations.uninstalled=(uninstalled)
edittransformation.ApacheManifoldCFEditTransformationConnection=Apache ManifoldCF: Edit Transformation Connection
@@ -217,7 +217,7 @@ listauthorities.Description=Description
listauthorities.AuthorityType=Authority Type
listauthorities.Max=Max
listauthorities.AddaNewConnection=Add a new connection
-listauthorities.AddNewConnection=Add a new connection
+listauthorities.AddNewConnection=Add
listauthorities.View=View
listauthorities.Edit=Edit
listauthorities.Delete=Delete
@@ -1064,4 +1064,4 @@ editjob.AddANotification=Add a notificat
viewjob.NotificationsColon=Notifications:
viewjob.NotificationDescription=Description
viewjob.NotificationConnectionName=Connection name
-viewjob.NoNotificationConnections=No notification connections
\ No newline at end of file
+viewjob.NoNotificationConnections=No notification connections