Author: kishore
Date: Wed Mar 15 23:35:22 2017
New Revision: 1787113
URL: http://svn.apache.org/viewvc?rev=1787113&view=rev
Log:
Updated button text for Repository connection.
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/editconnection.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/variables.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/viewconnection.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=1787113&r1=1787112&r2=1787113&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
Wed Mar 15 23:35:22 2017
@@ -920,10 +920,10 @@ a:focus {
box-shadow: none;
}
.form-group.has-warning label {
- color: #ffd500;
+ color: #f39c12;
}
.form-group.has-warning .form-control {
- border-color: #ffd500 !important;
+ border-color: #f39c12 !important;
box-shadow: none;
}
.form-group.has-error label {
@@ -1091,7 +1091,7 @@ a:focus {
}
.progress-bar-yellow,
.progress-bar-warning {
- background-color: #ffd500;
+ background-color: #f39c12;
}
.progress-striped .progress-bar-yellow,
.progress-striped .progress-bar-warning {
@@ -1132,7 +1132,7 @@ a:focus {
border-top-color: #d9534f;
}
.box.box-warning {
- border-top-color: #ffd500;
+ border-top-color: #f39c12;
}
.box.box-success {
border-top-color: #00a65a;
@@ -1220,12 +1220,12 @@ a:focus {
color: #ffffff;
}
.box.box-solid.box-warning {
- border: 1px solid #ffd500;
+ border: 1px solid #f39c12;
}
.box.box-solid.box-warning > .box-header {
color: #ffffff;
- background: #ffd500;
- background-color: #ffd500;
+ background: #f39c12;
+ background-color: #f39c12;
}
.box.box-solid.box-warning > .box-header a,
.box.box-solid.box-warning > .box-header .btn {
@@ -1737,26 +1737,26 @@ fieldset[disabled] .btn-danger.focus {
}
.btn-warning {
color: #ffffff;
- background-color: #ffd500;
- border-color: #e6c000;
+ background-color: #f39c12;
+ border-color: #e08e0b;
}
.btn-warning:focus,
.btn-warning.focus {
color: #ffffff;
- background-color: #ccaa00;
- border-color: #665500;
+ background-color: #c87f0a;
+ border-color: #674105;
}
.btn-warning:hover {
color: #ffffff;
- background-color: #ccaa00;
- border-color: #a88d00;
+ background-color: #c87f0a;
+ border-color: #a66908;
}
.btn-warning:active,
.btn-warning.active,
.open > .dropdown-toggle.btn-warning {
color: #ffffff;
- background-color: #ccaa00;
- border-color: #a88d00;
+ background-color: #c87f0a;
+ border-color: #a66908;
}
.btn-warning:active:hover,
.btn-warning.active:hover,
@@ -1768,8 +1768,8 @@ fieldset[disabled] .btn-danger.focus {
.btn-warning.active.focus,
.open > .dropdown-toggle.btn-warning.focus {
color: #ffffff;
- background-color: #a88d00;
- border-color: #665500;
+ background-color: #a66908;
+ border-color: #674105;
}
.btn-warning:active,
.btn-warning.active,
@@ -1785,11 +1785,11 @@ fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled.focus,
.btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus {
- background-color: #ffd500;
- border-color: #e6c000;
+ background-color: #f39c12;
+ border-color: #e08e0b;
}
.btn-warning .badge {
- color: #ffd500;
+ color: #f39c12;
background-color: #ffffff;
}
.btn-outline {
@@ -1880,7 +1880,7 @@ fieldset[disabled] .btn-warning.focus {
border-color: #c9302c;
}
.callout.callout-warning {
- border-color: #ccaa00;
+ border-color: #c87f0a;
}
.callout.callout-info {
border-color: #0097bc;
@@ -1925,7 +1925,7 @@ fieldset[disabled] .btn-warning.focus {
border-color: #d43f3a;
}
.alert-warning {
- border-color: #e6c000;
+ border-color: #e08e0b;
}
.alert-info {
border-color: #00acd6;
@@ -2145,7 +2145,7 @@ table.text-center th {
}
.modal-warning .modal-header,
.modal-warning .modal-footer {
- border-color: #ccaa00;
+ border-color: #c87f0a;
}
.modal-info .modal-header,
.modal-info .modal-footer {
@@ -2369,7 +2369,7 @@ table.text-center th {
.alert-warning,
.label-waring,
.modal-warning .modal-body {
- background-color: #ffd500 !important;
+ background-color: #f39c12 !important;
}
.bg-aqua,
.callout.callout-info,
@@ -2432,7 +2432,7 @@ table.text-center th {
.bg-yellow-active,
.modal-warning .modal-header,
.modal-warning .modal-footer {
- background-color: #e0bb00 !important;
+ background-color: #db8b0b !important;
}
.bg-aqua-active,
.modal-info .modal-header,
@@ -2484,7 +2484,7 @@ table.text-center th {
color: #d9534f !important;
}
.text-yellow {
- color: #ffd500 !important;
+ color: #f39c12 !important;
}
.text-aqua {
color: #00c0ef !important;
@@ -2599,12 +2599,12 @@ table.text-center th {
color: #fff;
}
.bg-yellow-gradient {
- background: #ffd500 !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0,
#ffd500), color-stop(1, #ffe252)) !important;
- background: -ms-linear-gradient(bottom, #ffd500, #ffe252) !important;
- background: -moz-linear-gradient(center bottom, #ffd500 0%, #ffe252 100%)
!important;
- background: -o-linear-gradient(#ffe252, #ffd500) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe252',
endColorstr='#ffd500', GradientType=0) !important;
+ background: #f39c12 !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0,
#f39c12), color-stop(1, #f7bc60)) !important;
+ background: -ms-linear-gradient(bottom, #f39c12, #f7bc60) !important;
+ background: -moz-linear-gradient(center bottom, #f39c12 0%, #f7bc60 100%)
!important;
+ background: -o-linear-gradient(#f7bc60, #f39c12) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7bc60',
endColorstr='#f39c12', GradientType=0) !important;
color: #fff;
}
.bg-purple-gradient {
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editconnection.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editconnection.jsp?rev=1787113&r1=1787112&r2=1787113&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editconnection.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editconnection.jsp
Wed Mar 15 23:35:22 2017
@@ -574,10 +574,8 @@ try
if (className.length() > 0)
{
%>
- <input type="button" class="btn btn-primary"
-
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.Save")%>"
- onClick="javascript:Save()"
-
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.SaveThisAuthorityConnection")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Save()"
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.SaveThisAuthorityConnection")%>"
data-toggle="tooltip"><i class="fa fa-save
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.Save")%></a>
<%
}
else
@@ -585,18 +583,14 @@ try
if
(tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editconnection.Type")))
{
%>
- <input type="button" class="btn btn-primary"
-
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.Continue")%>"
- onClick="javascript:Continue()"
-
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.ContinueToNextPage")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Continue()"
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.ContinueToNextPage")%>"
data-toggle="tooltip"><i class="fa fa-play
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.Continue")%></a>
<%
}
}
%>
- <input type="button" class="btn btn-primary"
-
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.Cancel")%>"
- onClick="javascript:Cancel()"
-
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.CancelConnectionEditing")%>"/>
+ <a class="btn btn-primary" onClick="javascript:Cancel()"
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.CancelConnectionEditing")%>"
data-toggle="tooltip"><i class="fa fa-times-circle-o
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editconnection.Cancel")%></a>
</div>
</div>
</form>
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/variables.less
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/variables.less?rev=1787113&r1=1787112&r2=1787113&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/variables.less
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/variables.less
Wed Mar 15 23:35:22 2017
@@ -8,7 +8,7 @@
@red: #d9534f; //Danger
@green: #00a65a; //Success
@aqua: #00c0ef; //Info
-@yellow: #ffd500; //Warning
+@yellow: #f39c12; //Warning
@blue: #0073b7;
@navy: #001F3F;
@teal: #39CCCC;
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=1787113&r1=1787112&r2=1787113&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
Wed Mar 15 23:35:22 2017
@@ -101,7 +101,7 @@ try
<a
href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(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">
- <i class="fa fa-eye fa-fw" aria-hidden="true"></i>View</a>
+ <i class="fa fa-eye fa-fw"
aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.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)%>'
class="link btn btn-primary btn-xs" role="button"
data-toggle="tooltip">
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=1787113&r1=1787112&r2=1787113&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
Wed Mar 15 23:35:22 2017
@@ -101,24 +101,15 @@ try
<td>
<div class="btn-group">
<a
href='<%="viewconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.View")+"
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
-
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.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(),"listconnections.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(),"listconnections.View")%></a>
<a
href='<%="editconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.Edit")+"
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
-
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.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(),"listconnections.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(),"listconnections.Edit")%></a>
<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)%>'
-
alt='<%=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">
- <span class="fa fa-trash" aria-hidden="true"></span>
- </a>
+
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>
</div>
</td>
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
@@ -134,12 +125,9 @@ try
</div>
<div class="box-footer clearfix">
<div class="btn-group">
- <a href="editconnection.jsp"
-
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.AddAConnection")%>"
- class="link btn btn-primary" role="button">
- <span class="fa fa-plus-circle" aria-hidden="true"></span>
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.AddNewConnection")%>
- </a>
+ <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>
</div>
<%
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=1787113&r1=1787112&r2=1787113&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
Wed Mar 15 23:35:22 2017
@@ -205,18 +205,18 @@ try
<div class="btn-group">
<a
href='<%="viewconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.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(),"viewconnection.Refresh")%></a>
<a
href='<%="editconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.EditThisConnection")%>"
- 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(),"viewconnection.Edit")%></a>
<a href="javascript:void(0);"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Deletethisconnection")%>"
- 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(),"viewconnection.Deletethisconnection")%></a>
<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"><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(),"viewconnection.ClearHistory")%></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=1787113&r1=1787112&r2=1787113&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
Wed Mar 15 23:35:22 2017
@@ -22,6 +22,7 @@ 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=.
@@ -317,6 +318,7 @@ 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
