manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kish...@apache.org
Subject svn commit: r1787255 - in /manifoldcf/branches/CONNECTORS-1196-2/framework: crawler-ui/src/main/webapp/ crawler-ui/src/main/webapp/css/ crawler-ui/src/main/webapp/less/ ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/
Date Thu, 16 Mar 2017 21:41:50 GMT
Author: kishore
Date: Thu Mar 16 21:41:50 2017
New Revision: 1787255

URL: http://svn.apache.org/viewvc?rev=1787255&view=rev
Log:
Update button text for all UI pages.

Modified:
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/css/style.css
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/documentstatus.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editjob.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editnotification.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/forms.less
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listauthorities.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listconnections.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listgroups.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listjobs.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listnotifications.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listoutputs.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listtransformations.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/queuestatus.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/resultreport.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/simplereport.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewconnection.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewjob.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewnotification.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewoutput.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/css/style.css?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/css/style.css (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/css/style.css Thu Mar 16 21:41:50 2017
@@ -888,6 +888,7 @@ a:focus {
  * ---------------
  */
 .form-control {
+  width: auto !important;
   border-radius: 0px !important;
   box-shadow: none;
   border-color: #d2d6de;
@@ -944,6 +945,7 @@ a:focus {
   line-height: 3;
 }
 .input-group select {
+  width: auto !important;
   border-radius: 0px !important;
   box-shadow: none;
   border-color: #d2d6de;

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/documentstatus.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/documentstatus.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/documentstatus.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/documentstatus.jsp Thu Mar 16 21:41:50 2017
@@ -373,15 +373,15 @@ try
   if (statusConnection.length() > 0 && statusJobIdentifiers.length > 0)
   {
 %>
-            <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>
+            <a class="btn btn-primary" role="button" onClick="javascript:Go()" 
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%></a>
 <%
   }
   else
   {
 %>
-            <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>
+            <a class="btn btn-primary" role="button" onClick="javascript:Continue()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%></a>
 <%
   }
 %>
@@ -516,13 +516,13 @@ try
       if (startRow == 0)
       {
 %>
-            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Previous")%></a></li>
+            <li><a href="#"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Previous")%></a></li>
 <%
       }
       else
       {
 %>
-            <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="Previous page">Previous</a></li>
+            <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' title="Previous page" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Previous")%></a></li>
 <%
       }
 %>
@@ -531,13 +531,13 @@ try
       if (hasMoreRows == false)
       {
 %>
-            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Next")%></a></li>
+            <li><a href="#"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Next")%></a></li>
 <%
       }
       else
       {
 %>
-            <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="Next page">Next</a></li>
+            <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' title="Next page"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Next")%></a></li>
 <%
       }
 %>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editjob.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editjob.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editjob.jsp Thu Mar 16 21:41:50 2017
@@ -1866,10 +1866,8 @@ function isRegularExpression(value)
   if (connectionName.length() > 0 && outputPresent)
   {
 %>
-              <input type="button" class="btn btn-primary"
-                     value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.Save")%>"
-                     onClick="javascript:Save()"
-                     alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.SaveThisJob")%>"/>
+              <a class="btn btn-primary" onClick="javascript:Save()"
+                      title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.SaveThisJob")%>" data-toggle="tooltip"><i class="fa fa-save fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.Save")%></a>
 <%
   }
   else
@@ -1877,18 +1875,14 @@ function isRegularExpression(value)
     if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editjob.Connection")) && tabSequenceInt == -1)
     {
 %>
-              <input type="button" class="btn btn-primary"
-                     value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.Continue")%>"
-                     onClick="javascript:Continue()"
-                     alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.ContinueToNextScreen")%>"/>
+              <a class="btn btn-primary" onClick="javascript:Continue()" 
+                      title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.ContinueToNextScreen")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.Continue")%></a>
 <%
     }
   }
 %>
-              <input type="button" class="btn btn-primary"
-                     value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.cancel")%>"
-                     onClick="javascript:Cancel()"
-                     alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.CancelJobEditing")%>"/>
+              <a class="btn btn-primary" onClick="javascript:Cancel()" 
+                      title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.CancelJobEditing")%>" data-toggle="tooltip"><i class="fa fa-times-circle-o fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editjob.cancel")%></a>
 
             </div>
           </div>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editnotification.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editnotification.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editnotification.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editnotification.jsp Thu Mar 16 21:41:50 2017
@@ -426,10 +426,8 @@ try
     if (className.length() > 0)
     {
 %>
-            <input type="button" class="btn btn-primary"
-                    value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Save")%>"
-                    onClick="javascript:Save()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.SaveThisNotificationConnection")%>"/>
+            <a role="button" class="btn btn-primary" onClick="javascript:Save()" 
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.SaveThisNotificationConnection")%>" data-toggle="tooltip"><i class="fa fa-save fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Save")%></a>
 
 <%
     }
@@ -438,19 +436,15 @@ try
       if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editnotification.Type")))
       {
 %>
-            <input type="button" class="btn btn-primary"
-                    value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Continue")%>"
-                    onClick="javascript:Continue()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.ContinueToNextPage")%>"/>
+            <a role="button" class="btn btn-primary" onClick="javascript:Continue()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.ContinueToNextPage")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Continue")%></a>
 
 <%
       }
     }
 %>
-            <input type="button" class="btn btn-primary"
-                    value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Cancel")%>"
-                    onClick="javascript:Cancel()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.CancelNotificationConnectionEditing")%>"/>
+            <a role="button" class="btn btn-primary" onClick="javascript:Cancel()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.CancelNotificationConnectionEditing")%>" data-toggle="tooltip"><i class="fa fa-times-circle-o fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editnotification.Cancel")%></a>
           </div>
         </div>
       </form>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/forms.less
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/forms.less?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/forms.less (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/forms.less Thu Mar 16 21:41:50 2017
@@ -3,6 +3,7 @@
  * ---------------
  */
 .form-control {
+  width:auto !important;
   .border-radius(@input-radius)!important;  
   box-shadow: none;
   border-color: @gray;
@@ -89,4 +90,4 @@
 
 .icheck > label {
   padding-left: 0;
-}
\ No newline at end of file
+}

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listauthorities.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listauthorities.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listauthorities.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listauthorities.jsp Thu Mar 16 21:41:50 2017
@@ -125,9 +125,9 @@ try
         </div>
         <div class="box-footer clearfix">
           <div class="btn-group">
-            <a href="editauthority.jsp" title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.AddaNewConnection")%>"
+            <a href="editauthority.jsp" title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.AddNewConnection")%>"
                     class="link btn btn-primary" role="button">
-              <i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.AddNewConnection")%></a>
+              <i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.AddaNewConnection")%></a>
           </div>
 
 <%

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listconnections.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listconnections.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listconnections.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listconnections.jsp Thu Mar 16 21:41:50 2017
@@ -109,7 +109,7 @@ try
                   <a href="javascript:void(0);"
                           onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
                           title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.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" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.Delete")%></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(),"listconnections.Delete")%></a>
                 </div>
               </td>
               <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
@@ -127,7 +127,7 @@ try
           <div class="btn-group">
             <a href="editconnection.jsp" class="link btn btn-primary" role="button" 
                     title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.AddAConnection")%>"
-                    data-toggle="tooltip"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Add")%></a>
+                    data-toggle="tooltip"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.AddNewConnection")%></a>
           </div>
 
 <%

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listgroups.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listgroups.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listgroups.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listgroups.jsp Thu Mar 16 21:41:50 2017
@@ -113,7 +113,7 @@ try
           <div class="btn-group">
             <a href="editgroup.jsp"
                     title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.AddNewGroup")%>"
-                    class="link btn btn-primary" role="button"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.Add")%></a>
+                    class="link btn btn-primary" role="button"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.AddaNewGroup")%></a>
           </div>
 <%
 }

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listjobs.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listjobs.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listjobs.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listjobs.jsp Thu Mar 16 21:41:50 2017
@@ -112,24 +112,16 @@ try
                 <div class="btn-group">
                   <a href='<%="viewjob.jsp?jobid="+jd.getID()%>'
                           title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Viewjob")+" "+jd.getID()%>'
-                          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.getBodyString(pageContext.getRequest().getLocale(),"listjobs.View")%></a>
                   <a href='<%="editjob.jsp?jobid="+jd.getID()%>'
                           title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Editjob")+" "+jd.getID()%>'
-                          class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip">
-                    <span class="fa fa-pencil-square-o" aria-hidden="true"></span>
-                  </a>
+                          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.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Edit")%></a>
                   <a href='<%="javascript:Delete(\""+jd.getID()+"\")"%>'
                           title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.DeleteJob")+" "+jd.getID()%>'
-                          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.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Delete")%></a>
                   <a href='<%="editjob.jsp?origjobid="+jd.getID()%>'
                           title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.CopyJob")+" "+jd.getID()%>'
-                          class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip">
-                    <span class="fa fa-clipboard" aria-hidden="true"></span>
-                  </a>
+                          class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-clipboard fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Copy")%></a>
                 </div>
               </td>
               <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(jd.getDescription())%></td>
@@ -144,12 +136,8 @@ try
         </div>
         <div class="box-footer clearfix">
           <div class="btn-group">
-            <a href="editjob.jsp"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Addajob")%>"
-                    class="link btn btn-primary" role="button">
-              <span class="fa fa-plus-circle" aria-hidden="true"></span>
-              <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.AddaNewJob")%>
-            </a>
+            <a href="editjob.jsp" title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Addajob")%>"
+                    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(),"listjobs.AddaNewJob")%></a>
           </div>
 
 <%

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listnotifications.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listnotifications.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listnotifications.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listnotifications.jsp Thu Mar 16 21:41:50 2017
@@ -98,20 +98,14 @@ try
                 <div class="btn-group">
                   <a href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
                           title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.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.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.View")%></a>
                   <a href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
                           title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.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>
+                          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.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Edit")%></a>
                   <a href="javascript:void(0);"
                           onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
                           title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.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.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Delete")%></a>
                 </div>
               </td>
               <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
@@ -126,12 +120,8 @@ try
         </div>
         <div class="box-footer clearfix">
           <div class="btn-group">
-            <a href="editnotification.jsp"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.AddANotificationConnection")%>"
-                    class="link btn btn-primary" role="button">
-              <span class="fa fa-plus-circle" aria-hidden="true"></span>
-              <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.AddaNewNotificationConnection")%>
-            </a>
+            <a href="editnotification.jsp" title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.AddANotificationConnection")%>"
+                    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(),"listnotifications.AddaNewNotificationConnection")%></a>
           </div>
 
 <%

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listoutputs.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listoutputs.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listoutputs.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listoutputs.jsp Thu Mar 16 21:41:50 2017
@@ -122,10 +122,8 @@ try
         </div>
         <div class="box-footer clearfix">
           <div class="btn-group">
-            <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>
+            <a href="editoutput.jsp" title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.AddAnOutputConnection")%>"
+                    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.AddaNewOutputConnection")%></a>
           </div>
 
 <%

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listtransformations.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listtransformations.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listtransformations.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listtransformations.jsp Thu Mar 16 21:41:50 2017
@@ -123,7 +123,8 @@ try
         </div>
         <div class="box-footer clearfix">
           <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>
+                  title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.AddATransformationConnection")%>" 
+                  data-toggle="tooltip"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.AddaNewTransformationConnection")%></a>
         </div>
       </form>
     </div>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp Thu Mar 16 21:41:50 2017
@@ -643,19 +643,15 @@ try
   if (reportConnection.length() > 0)
   {
 %>
-            <a name="MainButton"><input class="btn btn-primary" type="button"
-                    value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Go")%>"
-                    onClick="javascript:Go()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.ExecuteThisQuery")%>"/></a>
+            <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Go()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.ExecuteThisQuery")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Go")%></a>
 <%
   }
   else
   {
 %>
-            <a name="MainButton"><input class="btn btn-primary" type="button"
-                    value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Continue")%>"
-                    onClick="javascript:Continue()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Continue")%>"/></a>
+            <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Continue()" 
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Continue")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Continue")%></a>
 <%
   }
 %>
@@ -783,7 +779,7 @@ try
     if (startRow == 0)
     {
 %>
-            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Previous")%></a></li>
+            <li><a href="#"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Previous")%></a></li>
 <%
     }
     else
@@ -792,14 +788,14 @@ try
             <li>
               <a href="javascript:void(0);"
                       onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
-                      alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Previous")%></a>
+                      title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.PreviousPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Previous")%></a>
             </li>
 <%
     }
     if (hasMoreRows == false)
     {
 %>
-            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Next")%></a></li>
+            <li><a href="#"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Next")%></a></li>
 <%
     }
     else
@@ -808,7 +804,7 @@ try
             <li>
               <a href="javascript:void(0);"
                       onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
-                      alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Next")%></a>
+                      title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.NextPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Next")%></a>
             </li>
 <%
     }

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp Thu Mar 16 21:41:50 2017
@@ -646,18 +646,15 @@ try
   if (reportConnection.length() > 0)
   {
 %>
-            <a name="MainButton"><input class="btn btn-primary" type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Go")%>" 
-                    onClick="javascript:Go()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.ExecuteThisQuery")%>"/></a>
+            <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Go()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.ExecuteThisQuery")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Go")%></a>
 <%
   }
   else
   {
 %>
-            <a name="MainButton"><input class="btn btn-primary" type="button"
-                    value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Continue")%>"
-                    onClick="javascript:Continue()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Continue")%>"/></a>
+            <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Continue()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Continue")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Continue")%></a>
 <%
   }
 %>
@@ -781,7 +778,7 @@ try
     if (startRow == 0)
     {
 %>
-            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Previous")%></a></li>
+            <li><a href="#"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Previous")%></a></li>
 <%
     }
     else
@@ -789,14 +786,14 @@ try
 %>
             <li><a href="javascript:void(0);" 
                     onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Previous")%></a>
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.PreviousPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Previous")%></a>
             </li>
 <%
     }
     if (hasMoreRows == false)
     {
 %>
-            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Next")%></a></li>
+            <li><a href="#"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Next")%></a></li>
 <%
     }
     else
@@ -804,7 +801,7 @@ try
 %>
             <li><a href="javascript:void(0);" 
                     onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Next")%></a></li>
+                    titile="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NextPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Next")%></a></li>
 <%
     }
 %>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/queuestatus.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/queuestatus.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/queuestatus.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/queuestatus.jsp Thu Mar 16 21:41:50 2017
@@ -418,19 +418,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(),"queuestatus.Go")%>"
-                    onClick="javascript:Go()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.ExecuteThisQuery")%>"/></a>
+            <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Go()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.ExecuteThisQuery")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.Go")%></a>
 <%
   }
   else
   {
 %>
-            <a name="MainButton"><input class="btn btn-primary btn-sm" type="button"
-                    value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.Continue")%>"
-                    onClick="javascript:Continue()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.Continue")%>"/></a>
+            <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Continue()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.Continue")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.Continue")%></a>
 <%
   }
 %>
@@ -561,7 +557,7 @@ try
       if (startRow == 0)
       {
 %>
-                <li><a hred="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Previous")%></a></li>
+                <li><a hred="#"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Previous")%></a></li>
 <%
       }
       else
@@ -570,14 +566,14 @@ try
                 <li>
                   <a href="javascript:void(0);"
                           onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
-                          alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Previous")%></a>
+                          title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.PreviousPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Previous")%></a>
                 </li>
 <%
       }
       if (hasMoreRows == false)
       {
 %>
-                <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Next")%></a></li>
+                <li><a href="#"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Next")%></a></li>
 <%
       }
       else
@@ -586,7 +582,7 @@ try
                 <li>
                   <a href="javascript:void(0);"
                           onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
-                          alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Next")%></a>
+                          title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.NextPage")%>" data-toggle="title"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Next")%></a>
                 </li>
 <%
       }

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/resultreport.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/resultreport.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/resultreport.jsp Thu Mar 16 21:41:50 2017
@@ -674,19 +674,15 @@ try
   if (reportConnection.length() > 0)
   {
 %>
-            <a name="MainButton"><input class="btn btn-primary" type="button"
-                    value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Go")%>"
-                    onClick="javascript:Go()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.ExecuteThisQuery")%>"/></a>
+            <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Go()" 
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.ExecuteThisQuery")%>"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Go")%></a>
 <%
   }
   else
   {
 %>
-            <a name="MainButton"><input class="btn btn-primary" type="button"
-                    value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>"
-                    onClick="javascript:Continue()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>"/></a>
+            <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Continue()" 
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%></a>
             <%
               }
             %>
@@ -794,25 +790,27 @@ try
     if (startRow == 0)
     {
 %>
-            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%></a></li>
+            <li><a href="#"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%></a></li>
 <%
     }
     else
     {
 %>
-            <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%></a></li>
+            <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' 
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.PreviousPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%></a></li>
 <%
     }
     if (hasMoreRows == false)
     {
 %>
-            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%></a></li>
+            <li><a href="#"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%></a></li>
 <%
     }
     else
     {
 %>
-            <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%></a></li>
+            <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' 
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.NextPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%></a></li>
 <%
     }
 %>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/showjobstatus.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/showjobstatus.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/showjobstatus.jsp Thu Mar 16 21:41:50 2017
@@ -214,11 +214,11 @@ try
     {
 %>
                 <a href='<%="javascript:Start(\""+js.getJobID()+"\")"%>'
-                        alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()%>'
-                        class="btn btn-success btn-xs" role="button"><span class="fa fa-play" aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%></a>
+                        title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()%>'
+                        class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-play fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%></a>
                 <a href='<%="javascript:StartMinimal(\""+js.getJobID()+"\")"%>'
-                        alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'
-                        class="btn btn-success btn-xs" role="button"><span class="fa fa-compress" aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%></a>
+                        title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'
+                        class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-compress fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%></a>
 <%
     }
     if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -229,11 +229,11 @@ try
     {
 %>
                 <a href='<%="javascript:Restart(\""+js.getJobID()+"\")"%>'
-                        alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()%>'
-                        class="btn btn-success btn-xs" role="button"><span class="fa fa-play" aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%></a>
+                        title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()%>'
+                        class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-play fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%></a>
                 <a href='<%="javascript:RestartMinimal(\""+js.getJobID()+"\")"%>'
-                        alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'
-                        class="btn btn-success btn-xs" role="button"><span class="fa fa-compress" aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%></a>
+                        title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'
+                        class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-compress fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%></a>
 <%
     }
     if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -242,8 +242,8 @@ try
     {
 %>
                 <a href='<%="javascript:Pause(\""+js.getJobID()+"\")"%>'
-                        alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Pausejob")+" "+js.getJobID()%>'
-                        class="btn btn-success btn-xs" role="button"><span class="fa fa-pause" aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%></a>
+                        title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Pausejob")+" "+js.getJobID()%>'
+                        class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-pause fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%></a>
 <%
     }
     if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -257,16 +257,16 @@ try
     {
 %>
                 <a href='<%="javascript:Abort(\""+js.getJobID()+"\")"%>'
-                        alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Abortjob")+" "+js.getJobID()%>'
-                        class="btn btn-success btn-xs" role="button"><span class="fa fa-stop" aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%></a>
+                        title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Abortjob")+" "+js.getJobID()%>'
+                        class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-stop fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%></a>
 <%
     }
     if (status == JobStatus.JOBSTATUS_PAUSED)
     {
 %>
                 <a href='<%="javascript:Resume(\""+js.getJobID()+"\")"%>'
-                        alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Resumejob")+" "+js.getJobID()%>'
-                        class="btn btn-success btn-xs" role="button"><span class="fa fa-play" aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%></a>
+                        title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Resumejob")+" "+js.getJobID()%>'
+                        class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-play fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%></a>
 <%
     }
 %>
@@ -286,11 +286,10 @@ try
           </table>
         </div>
         <div class="box-footer clearfix">
-          <div class="btn-group">
             <a href="showjobstatus.jsp"
                     title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.RefreshStatus")%>"
-                    class="link btn btn-primary" role="button" data-toggle="tooltip"><span class="fa fa-refresh" aria-hidden="true"></span></a>
-          </div>
+                    class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-refresh fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%></a>
+        </div>
           
 <%
 }
@@ -304,7 +303,6 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-        </div>
       </form>
     </div>
   </div>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/simplereport.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/simplereport.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/simplereport.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/simplereport.jsp Thu Mar 16 21:41:50 2017
@@ -595,19 +595,15 @@ try
   if (reportConnection.length() > 0)
   {
 %>
-            <a name="MainButton"><input class="btn btn-primary" type="button"
-                    value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Go")%>"
-                    onClick="javascript:Go()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.ExecuteThisQuery")%>"/></a>
+            <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Go()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.ExecuteThisQuery")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Go")%></a>
 <%
   }
   else
   {
 %>
-            <a name="MainButton"><input class="btn btn-primary" type="button"
-                    value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Continue")%>"
-                    onClick="javascript:Continue()"
-                    alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Continue")%>"/></a>
+            <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Continue()" 
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Continue")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Continue")%></a>
 <%
   }
 %>
@@ -730,7 +726,7 @@ try
     if (startRow == 0)
     {
 %>
-            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Previous")%></a></li>
+            <li><a href="#"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Previous")%></a></li>
 <%
     }
     else
@@ -738,14 +734,14 @@ try
 %>
             <li>
               <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
-                      alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Previous")%></a>
+                      title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.PreviousPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Previous")%></a>
             </li>
 <%
     }
     if (hasMoreRows == false)
     {
 %>
-            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Next")%></a></li>
+            <li><a href="#"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Next")%></a></li>
 <%
     }
     else
@@ -753,7 +749,7 @@ try
 %>
             <li>
               <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
-                      alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Next")%>
+                      title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.NextPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Next")%>
               </a>
             </li>
 <%

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewconnection.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewconnection.jsp Thu Mar 16 21:41:50 2017
@@ -216,7 +216,7 @@ try
             <a href="javascript:void(0);"
                     onclick='<%="javascript:ClearHistory(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
                     title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.ClearHistoryAssociatedWithThisConnection")%>"
-                    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(),"viewconnection.ClearHistory")%></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(),"viewconnection.ClearAllRelatedHistory")%></a>
           </div>
         </div>
       </form>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewjob.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewjob.jsp Thu Mar 16 21:41:50 2017
@@ -723,16 +723,16 @@ try
           <div class="btn-group">
             <a href='<%="editjob.jsp?origjobid="+jobID%>'
                     title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.CopyThisJob")%>"
-                    class="link btn btn-success" role="button" data-toggle="tooltip"><span class="fa fa-clipboard" aria-hidden="true"></span></a>
+                    class="link btn btn-success" role="button" data-toggle="tooltip"><i class="fa fa-clipboard fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Copy")%></a>
             <a href='<%="editjob.jsp?jobid="+jobID%>'
                     title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.EditThisJob")%>"
-                    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.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Edit")%></a>
             <a href='<%="javascript:Delete(\""+jobID+"\")"%>'
                     title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.DeleteThisJob")%>"
-                    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.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Delete")%></a>
             <a href='<%="javascript:StartOver(\""+jobID+"\")"%>'
                     title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.ResetSeedingThisJob")%>"
-                    class="link btn btn-warning" role="button" data-toggle="tooltip"><span class="fa fa-recycle" aria-hidden="true"></span></a>
+                    class="link btn btn-warning" role="button" data-toggle="tooltip"><i class="fa fa-recycle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ResetSeeding")%></a>
           </div>
         </div>
       </form>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewnotification.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewnotification.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewnotification.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewnotification.jsp Thu Mar 16 21:41:50 2017
@@ -145,14 +145,14 @@ try
           <div class="btn-group">
             <a href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
                     title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.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.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.Refresh")%></a>
             <a href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
                     title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.EditThisNotificationConnection")%>"
-                    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.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.Edit")%></a>
             <a href="javascript:void(0);"
                     onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
                     title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.DeleteThisNotificationConnection")%>"
-                    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.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.Delete")%></a>
           </div>
         </div>
       </form>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewoutput.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewoutput.jsp?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewoutput.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewoutput.jsp Thu Mar 16 21:41:50 2017
@@ -178,11 +178,11 @@ try
             <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"><i class="fa fa-repeat fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.ReIngestAll")%></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.ReIngestAllAssociatedDocuments")%></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"><i class="fa fa-remove fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.RemoveAll")%></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.RemoveAllAssociatedDocuments")%></a>
           </div>
         </div>
       </form>

Modified: manifoldcf/branches/CONNECTORS-1196-2/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-2/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1787255&r1=1787254&r2=1787255&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Thu Mar 16 21:41:50 2017
@@ -22,7 +22,6 @@ editjob.Connection=Connection
 
 viewconnection.NoneGlobalAuthority=None (global authority)
 viewconnection.ClearHistoryAssociatedWithThisConnection=Clear history associated with this connection
-viewconnection.ClearHistory=Clear history
 viewconnection.ClearAllRelatedHistory=Clear all related history
 viewconnection.Thiscommandwillclearallhistoryrelatedto=This command will clear all history related to connection
 viewconnection.period=.
@@ -94,7 +93,7 @@ listoutputs.View=View
 listoutputs.Edit=Edit
 listoutputs.Delete=Delete
 listoutputs.DeleteOutputConnection=Delete output connection
-listoutputs.Add=Add
+listoutputs.AddAnOutputConnection=Add an output connection
 listoutputs.uninstalled=(uninstalled)
 
 editoutput.ApacheManifoldCFEditOutputConnection=Apache ManifoldCF: Edit Output Connection
@@ -132,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.ReIngestAll=Re-index all
+viewoutput.ReIngestAllAssociatedDocuments=Re-index all associated documents
 viewoutput.RemoveAllDocumentsAssociatedWithThisOutputConnection=Remove all document output records associated with this output connection
-viewoutput.RemoveAll=Remove all
+viewoutput.RemoveAllAssociatedDocuments=Remove all associated records
 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?
@@ -156,7 +155,7 @@ listtransformations.View=View
 listtransformations.Edit=Edit
 listtransformations.Delete=Delete
 listtransformations.DeleteTransformationConnection=Delete transformation connection
-listtransformations.Add=Add
+listtransformations.AddATransformationConnection=Add a transformation connection
 listtransformations.uninstalled=(uninstalled)
 
 edittransformation.ApacheManifoldCFEditTransformationConnection=Apache ManifoldCF: Edit Transformation Connection
@@ -209,7 +208,6 @@ listgroups.Edit=Edit
 listgroups.Delete=Delete
 listgroups.AddNewGroup=Add new authority group
 listgroups.AddaNewGroup=Add a new authority group
-listgroups.Add=Add
 
 listauthorities.ApacheManifoldCFListAuthorities=Apache ManifoldCF: List Authorities
 listauthorities.ListOfAuthorityConnections=List of Authority Connections
@@ -219,7 +217,7 @@ listauthorities.Description=Description
 listauthorities.AuthorityType=Authority Type
 listauthorities.Max=Max
 listauthorities.AddaNewConnection=Add a new connection
-listauthorities.AddNewConnection=Add
+listauthorities.AddNewConnection=Add a new connection
 listauthorities.View=View
 listauthorities.Edit=Edit
 listauthorities.Delete=Delete
@@ -318,7 +316,6 @@ listconnections.ConnectionType=Connectio
 listconnections.AuthorityGroup=Authority Group
 listconnections.Max=Max
 listconnections.AddNewConnection=Add new connection
-listconnections.Add=Add
 listconnections.View=View
 listconnections.Edit=Edit
 listconnections.Delete=Delete



Mime
View raw message