Author: kishore
Date: Wed Mar 15 22:50:08 2017
New Revision: 1787105
URL: http://svn.apache.org/viewvc?rev=1787105&view=rev
Log:
Updated button text for mapper,output,authority.
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/editgroup.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editmapper.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editoutput.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/edittransformation.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/javascript/app.js
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/buttons.less
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/listgroups.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listmappers.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/login.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewgroup.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewmapper.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=1787105&r1=1787104&r2=1787105&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 22:50:08 2017
@@ -146,14 +146,14 @@ h6,
}
/* General Links */
a {
- color: #3c8dbc;
+ color: #0275d8;
}
a:hover,
a:active,
a:focus {
outline: none;
text-decoration: none;
- color: #72afd2;
+ color: #299bfd;
}
/*
* Component: Main Header
@@ -894,7 +894,7 @@ a:focus {
color: #555;
}
.form-control:focus {
- border-color: #3c8dbc !important;
+ border-color: #0275d8 !important;
box-shadow: none !important;
}
.form-control::-moz-placeholder {
@@ -920,17 +920,17 @@ a:focus {
box-shadow: none;
}
.form-group.has-warning label {
- color: #f39c12;
+ color: #ffd500;
}
.form-group.has-warning .form-control {
- border-color: #f39c12 !important;
+ border-color: #ffd500 !important;
box-shadow: none;
}
.form-group.has-error label {
- color: #dd4b39;
+ color: #d9534f;
}
.form-group.has-error .form-control {
- border-color: #dd4b39 !important;
+ border-color: #d9534f !important;
box-shadow: none;
}
/* Input group */
@@ -952,7 +952,7 @@ a:focus {
width: auto;
}
.input-group select:focus {
- border-color: #3c8dbc !important;
+ border-color: #0275d8 !important;
box-shadow: none !important;
}
.input-group select::-moz-placeholder {
@@ -1061,7 +1061,7 @@ a:focus {
}
.progress-bar-light-blue,
.progress-bar-primary {
- background-color: #3c8dbc;
+ background-color: #0275d8;
}
.progress-striped .progress-bar-light-blue,
.progress-striped .progress-bar-primary {
@@ -1091,7 +1091,7 @@ a:focus {
}
.progress-bar-yellow,
.progress-bar-warning {
- background-color: #f39c12;
+ background-color: #ffd500;
}
.progress-striped .progress-bar-yellow,
.progress-striped .progress-bar-warning {
@@ -1101,7 +1101,7 @@ a:focus {
}
.progress-bar-red,
.progress-bar-danger {
- background-color: #dd4b39;
+ background-color: #d9534f;
}
.progress-striped .progress-bar-red,
.progress-striped .progress-bar-danger {
@@ -1123,16 +1123,16 @@ a:focus {
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.16), 0 0 2px 0 rgba(0, 0, 0, 0.12);
}
.box.box-primary {
- border-top-color: #3c8dbc;
+ border-top-color: #0275d8;
}
.box.box-info {
border-top-color: #00c0ef;
}
.box.box-danger {
- border-top-color: #dd4b39;
+ border-top-color: #d9534f;
}
.box.box-warning {
- border-top-color: #f39c12;
+ border-top-color: #ffd500;
}
.box.box-success {
border-top-color: #00a65a;
@@ -1184,12 +1184,12 @@ a:focus {
color: #444444;
}
.box.box-solid.box-primary {
- border: 1px solid #3c8dbc;
+ border: 1px solid #0275d8;
}
.box.box-solid.box-primary > .box-header {
color: #ffffff;
- background: #3c8dbc;
- background-color: #3c8dbc;
+ background: #0275d8;
+ background-color: #0275d8;
}
.box.box-solid.box-primary > .box-header a,
.box.box-solid.box-primary > .box-header .btn {
@@ -1208,24 +1208,24 @@ a:focus {
color: #ffffff;
}
.box.box-solid.box-danger {
- border: 1px solid #dd4b39;
+ border: 1px solid #d9534f;
}
.box.box-solid.box-danger > .box-header {
color: #ffffff;
- background: #dd4b39;
- background-color: #dd4b39;
+ background: #d9534f;
+ background-color: #d9534f;
}
.box.box-solid.box-danger > .box-header a,
.box.box-solid.box-danger > .box-header .btn {
color: #ffffff;
}
.box.box-solid.box-warning {
- border: 1px solid #f39c12;
+ border: 1px solid #ffd500;
}
.box.box-solid.box-warning > .box-header {
color: #ffffff;
- background: #f39c12;
- background-color: #f39c12;
+ background: #ffd500;
+ background-color: #ffd500;
}
.box.box-solid.box-warning > .box-header a,
.box.box-solid.box-warning > .box-header .btn {
@@ -1508,49 +1508,289 @@ a:focus {
background-color: #e7e7e7 !important;
}
.btn-primary {
- background-color: #3c8dbc;
- border-color: #367fa9;
+ color: #ffffff;
+ background-color: #0275d8;
+ border-color: #0267bf;
+}
+.btn-primary:focus,
+.btn-primary.focus {
+ color: #ffffff;
+ background-color: #025aa5;
+ border-color: #012340;
+}
+.btn-primary:hover {
+ color: #ffffff;
+ background-color: #025aa5;
+ border-color: #014682;
}
-.btn-primary:hover,
.btn-primary:active,
-.btn-primary.hover {
- background-color: #367fa9;
+.btn-primary.active,
+.open > .dropdown-toggle.btn-primary {
+ color: #ffffff;
+ background-color: #025aa5;
+ border-color: #014682;
+}
+.btn-primary:active:hover,
+.btn-primary.active:hover,
+.open > .dropdown-toggle.btn-primary:hover,
+.btn-primary:active:focus,
+.btn-primary.active:focus,
+.open > .dropdown-toggle.btn-primary:focus,
+.btn-primary:active.focus,
+.btn-primary.active.focus,
+.open > .dropdown-toggle.btn-primary.focus {
+ color: #ffffff;
+ background-color: #014682;
+ border-color: #012340;
+}
+.btn-primary:active,
+.btn-primary.active,
+.open > .dropdown-toggle.btn-primary {
+ background-image: none;
+}
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled.focus,
+.btn-primary[disabled].focus,
+fieldset[disabled] .btn-primary.focus {
+ background-color: #0275d8;
+ border-color: #0267bf;
+}
+.btn-primary .badge {
+ color: #0275d8;
+ background-color: #ffffff;
}
.btn-success {
+ color: #ffffff;
background-color: #00a65a;
border-color: #008d4c;
}
-.btn-success:hover,
+.btn-success:focus,
+.btn-success.focus {
+ color: #ffffff;
+ background-color: #00733e;
+ border-color: #000d07;
+}
+.btn-success:hover {
+ color: #ffffff;
+ background-color: #00733e;
+ border-color: #004f2b;
+}
.btn-success:active,
-.btn-success.hover {
- background-color: #008d4c;
+.btn-success.active,
+.open > .dropdown-toggle.btn-success {
+ color: #ffffff;
+ background-color: #00733e;
+ border-color: #004f2b;
+}
+.btn-success:active:hover,
+.btn-success.active:hover,
+.open > .dropdown-toggle.btn-success:hover,
+.btn-success:active:focus,
+.btn-success.active:focus,
+.open > .dropdown-toggle.btn-success:focus,
+.btn-success:active.focus,
+.btn-success.active.focus,
+.open > .dropdown-toggle.btn-success.focus {
+ color: #ffffff;
+ background-color: #004f2b;
+ border-color: #000d07;
+}
+.btn-success:active,
+.btn-success.active,
+.open > .dropdown-toggle.btn-success {
+ background-image: none;
+}
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled.focus,
+.btn-success[disabled].focus,
+fieldset[disabled] .btn-success.focus {
+ background-color: #00a65a;
+ border-color: #008d4c;
+}
+.btn-success .badge {
+ color: #00a65a;
+ background-color: #ffffff;
}
.btn-info {
+ color: #ffffff;
background-color: #00c0ef;
border-color: #00acd6;
}
-.btn-info:hover,
+.btn-info:focus,
+.btn-info.focus {
+ color: #ffffff;
+ background-color: #0097bc;
+ border-color: #004556;
+}
+.btn-info:hover {
+ color: #ffffff;
+ background-color: #0097bc;
+ border-color: #007a98;
+}
+.btn-info:active,
+.btn-info.active,
+.open > .dropdown-toggle.btn-info {
+ color: #ffffff;
+ background-color: #0097bc;
+ border-color: #007a98;
+}
+.btn-info:active:hover,
+.btn-info.active:hover,
+.open > .dropdown-toggle.btn-info:hover,
+.btn-info:active:focus,
+.btn-info.active:focus,
+.open > .dropdown-toggle.btn-info:focus,
+.btn-info:active.focus,
+.btn-info.active.focus,
+.open > .dropdown-toggle.btn-info.focus {
+ color: #ffffff;
+ background-color: #007a98;
+ border-color: #004556;
+}
.btn-info:active,
-.btn-info.hover {
- background-color: #00acd6;
+.btn-info.active,
+.open > .dropdown-toggle.btn-info {
+ background-image: none;
+}
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled.focus,
+.btn-info[disabled].focus,
+fieldset[disabled] .btn-info.focus {
+ background-color: #00c0ef;
+ border-color: #00acd6;
+}
+.btn-info .badge {
+ color: #00c0ef;
+ background-color: #ffffff;
}
.btn-danger {
- background-color: #dd4b39;
- border-color: #d73925;
+ color: #ffffff;
+ background-color: #d9534f;
+ border-color: #d43f3a;
+}
+.btn-danger:focus,
+.btn-danger.focus {
+ color: #ffffff;
+ background-color: #c9302c;
+ border-color: #761c19;
+}
+.btn-danger:hover {
+ color: #ffffff;
+ background-color: #c9302c;
+ border-color: #ac2925;
}
-.btn-danger:hover,
.btn-danger:active,
-.btn-danger.hover {
- background-color: #d73925;
+.btn-danger.active,
+.open > .dropdown-toggle.btn-danger {
+ color: #ffffff;
+ background-color: #c9302c;
+ border-color: #ac2925;
+}
+.btn-danger:active:hover,
+.btn-danger.active:hover,
+.open > .dropdown-toggle.btn-danger:hover,
+.btn-danger:active:focus,
+.btn-danger.active:focus,
+.open > .dropdown-toggle.btn-danger:focus,
+.btn-danger:active.focus,
+.btn-danger.active.focus,
+.open > .dropdown-toggle.btn-danger.focus {
+ color: #ffffff;
+ background-color: #ac2925;
+ border-color: #761c19;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open > .dropdown-toggle.btn-danger {
+ background-image: none;
+}
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled.focus,
+.btn-danger[disabled].focus,
+fieldset[disabled] .btn-danger.focus {
+ background-color: #d9534f;
+ border-color: #d43f3a;
+}
+.btn-danger .badge {
+ color: #d9534f;
+ background-color: #ffffff;
}
.btn-warning {
- background-color: #f39c12;
- border-color: #e08e0b;
+ color: #ffffff;
+ background-color: #ffd500;
+ border-color: #e6c000;
+}
+.btn-warning:focus,
+.btn-warning.focus {
+ color: #ffffff;
+ background-color: #ccaa00;
+ border-color: #665500;
+}
+.btn-warning:hover {
+ color: #ffffff;
+ background-color: #ccaa00;
+ border-color: #a88d00;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open > .dropdown-toggle.btn-warning {
+ color: #ffffff;
+ background-color: #ccaa00;
+ border-color: #a88d00;
+}
+.btn-warning:active:hover,
+.btn-warning.active:hover,
+.open > .dropdown-toggle.btn-warning:hover,
+.btn-warning:active:focus,
+.btn-warning.active:focus,
+.open > .dropdown-toggle.btn-warning:focus,
+.btn-warning:active.focus,
+.btn-warning.active.focus,
+.open > .dropdown-toggle.btn-warning.focus {
+ color: #ffffff;
+ background-color: #a88d00;
+ border-color: #665500;
}
-.btn-warning:hover,
.btn-warning:active,
-.btn-warning.hover {
- background-color: #e08e0b;
+.btn-warning.active,
+.open > .dropdown-toggle.btn-warning {
+ background-image: none;
+}
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled.focus,
+.btn-warning[disabled].focus,
+fieldset[disabled] .btn-warning.focus {
+ background-color: #ffd500;
+ border-color: #e6c000;
+}
+.btn-warning .badge {
+ color: #ffd500;
+ background-color: #ffffff;
}
.btn-outline {
border: 1px solid #fff;
@@ -1637,10 +1877,10 @@ a:focus {
background-color: #fff;
}
.callout.callout-danger {
- border-color: #c23321;
+ border-color: #c9302c;
}
.callout.callout-warning {
- border-color: #c87f0a;
+ border-color: #ccaa00;
}
.callout.callout-info {
border-color: #0097bc;
@@ -1682,10 +1922,10 @@ a:focus {
}
.alert-danger,
.alert-error {
- border-color: #d73925;
+ border-color: #d43f3a;
}
.alert-warning {
- border-color: #e08e0b;
+ border-color: #e6c000;
}
.alert-info {
border-color: #00acd6;
@@ -1719,7 +1959,7 @@ a:focus {
border-color: transparent;
}
.nav-tabs > li.active {
- border-top-color: #3c8dbc;
+ border-top-color: #0275d8;
}
.nav-tabs > li.active > a,
.nav-tabs > li.active:hover > a {
@@ -1901,11 +2141,11 @@ table.text-center th {
}
.modal-primary .modal-header,
.modal-primary .modal-footer {
- border-color: #307095;
+ border-color: #025aa5;
}
.modal-warning .modal-header,
.modal-warning .modal-footer {
- border-color: #c87f0a;
+ border-color: #ccaa00;
}
.modal-info .modal-header,
.modal-info .modal-footer {
@@ -1917,7 +2157,7 @@ table.text-center th {
}
.modal-danger .modal-header,
.modal-danger .modal-footer {
- border-color: #c23321;
+ border-color: #c9302c;
}
.spinner > div {
width: 18px;
@@ -2122,14 +2362,14 @@ table.text-center th {
.alert-error,
.label-danger,
.modal-danger .modal-body {
- background-color: #dd4b39 !important;
+ background-color: #d9534f !important;
}
.bg-yellow,
.callout.callout-warning,
.alert-warning,
.label-waring,
.modal-warning .modal-body {
- background-color: #f39c12 !important;
+ background-color: #ffd500 !important;
}
.bg-aqua,
.callout.callout-info,
@@ -2144,7 +2384,7 @@ table.text-center th {
.bg-light-blue,
.label-primary,
.modal-primary .modal-body {
- background-color: #3c8dbc !important;
+ background-color: #0275d8 !important;
}
.bg-green,
.callout.callout-success,
@@ -2166,7 +2406,7 @@ table.text-center th {
background-color: #01ff70 !important;
}
.bg-orange {
- background-color: #ff851b !important;
+ background-color: #f0ad4e !important;
}
.bg-fuchsia {
background-color: #f012be !important;
@@ -2187,12 +2427,12 @@ table.text-center th {
.bg-red-active,
.modal-danger .modal-header,
.modal-danger .modal-footer {
- background-color: #d33724 !important;
+ background-color: #d43a36 !important;
}
.bg-yellow-active,
.modal-warning .modal-header,
.modal-warning .modal-footer {
- background-color: #db8b0b !important;
+ background-color: #e0bb00 !important;
}
.bg-aqua-active,
.modal-info .modal-header,
@@ -2205,7 +2445,7 @@ table.text-center th {
.bg-light-blue-active,
.modal-primary .modal-header,
.modal-primary .modal-footer {
- background-color: #357ca5 !important;
+ background-color: #0265ba !important;
}
.bg-green-active,
.modal-success .modal-header,
@@ -2225,7 +2465,7 @@ table.text-center th {
background-color: #00e765 !important;
}
.bg-orange-active {
- background-color: #ff7701 !important;
+ background-color: #eea236 !important;
}
.bg-fuchsia-active {
background-color: #db0ead !important;
@@ -2241,10 +2481,10 @@ table.text-center th {
filter: alpha(opacity=65);
}
.text-red {
- color: #dd4b39 !important;
+ color: #d9534f !important;
}
.text-yellow {
- color: #f39c12 !important;
+ color: #ffd500 !important;
}
.text-aqua {
color: #00c0ef !important;
@@ -2256,7 +2496,7 @@ table.text-center th {
color: #111111 !important;
}
.text-light-blue {
- color: #3c8dbc !important;
+ color: #0275d8 !important;
}
.text-green {
color: #00a65a !important;
@@ -2277,7 +2517,7 @@ table.text-center th {
color: #01ff70 !important;
}
.text-orange {
- color: #ff851b !important;
+ color: #f0ad4e !important;
}
.text-fuchsia {
color: #f012be !important;
@@ -2332,12 +2572,12 @@ table.text-center th {
color: #fff;
}
.bg-light-blue-gradient {
- background: #3c8dbc !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0,
#3c8dbc), color-stop(1, #67a8ce)) !important;
- background: -ms-linear-gradient(bottom, #3c8dbc, #67a8ce) !important;
- background: -moz-linear-gradient(center bottom, #3c8dbc 0%, #67a8ce 100%)
!important;
- background: -o-linear-gradient(#67a8ce, #3c8dbc) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#67a8ce',
endColorstr='#3c8dbc', GradientType=0) !important;
+ background: #0275d8 !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0,
#0275d8), color-stop(1, #1a94fd)) !important;
+ background: -ms-linear-gradient(bottom, #0275d8, #1a94fd) !important;
+ background: -moz-linear-gradient(center bottom, #0275d8 0%, #1a94fd 100%)
!important;
+ background: -o-linear-gradient(#1a94fd, #0275d8) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1a94fd',
endColorstr='#0275d8', GradientType=0) !important;
color: #fff;
}
.bg-blue-gradient {
@@ -2359,12 +2599,12 @@ table.text-center th {
color: #fff;
}
.bg-yellow-gradient {
- 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;
+ 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;
color: #fff;
}
.bg-purple-gradient {
@@ -2386,12 +2626,12 @@ table.text-center th {
color: #fff;
}
.bg-red-gradient {
- background: #dd4b39 !important;
- background: -webkit-gradient(linear, left bottom, left top, color-stop(0,
#dd4b39), color-stop(1, #e47365)) !important;
- background: -ms-linear-gradient(bottom, #dd4b39, #e47365) !important;
- background: -moz-linear-gradient(center bottom, #dd4b39 0%, #e47365 100%)
!important;
- background: -o-linear-gradient(#e47365, #dd4b39) !important;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e47365',
endColorstr='#dd4b39', GradientType=0) !important;
+ background: #d9534f !important;
+ background: -webkit-gradient(linear, left bottom, left top, color-stop(0,
#d9534f), color-stop(1, #e27c79)) !important;
+ background: -ms-linear-gradient(bottom, #d9534f, #e27c79) !important;
+ background: -moz-linear-gradient(center bottom, #d9534f 0%, #e27c79 100%)
!important;
+ background: -o-linear-gradient(#e27c79, #d9534f) !important;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e27c79',
endColorstr='#d9534f', GradientType=0) !important;
color: #fff;
}
.bg-black-gradient {
@@ -2553,7 +2793,7 @@ table.text-center th {
.formtable td input[type="password"]:focus,
.displaytable td select:focus,
.formtable td select:focus {
- border-color: #3c8dbc !important;
+ border-color: #0275d8 !important;
box-shadow: none;
}
.displaytable td input[type="submit"],
@@ -2566,8 +2806,9 @@ table.text-center th {
-webkit-box-shadow: none;
box-shadow: none;
border: 1px solid transparent;
- background-color: #3c8dbc;
- border-color: #367fa9;
+ color: #ffffff;
+ background-color: #0275d8;
+ border-color: #0267bf;
color: #fff;
}
.displaytable td input[type="submit"].uppercase,
@@ -2637,25 +2878,197 @@ table.text-center th {
cursor: inherit;
display: block;
}
+.displaytable td input[type="submit"]:focus,
+.formtable td input[type="submit"]:focus,
+.displaytable td input[type="reset"]:focus,
+.formtable td input[type="reset"]:focus,
+.displaytable td input[type="button"]:focus,
+.formtable td input[type="button"]:focus,
+.displaytable td input[type="submit"].focus,
+.formtable td input[type="submit"].focus,
+.displaytable td input[type="reset"].focus,
+.formtable td input[type="reset"].focus,
+.displaytable td input[type="button"].focus,
+.formtable td input[type="button"].focus {
+ color: #ffffff;
+ background-color: #025aa5;
+ border-color: #012340;
+}
.displaytable td input[type="submit"]:hover,
.formtable td input[type="submit"]:hover,
.displaytable td input[type="reset"]:hover,
.formtable td input[type="reset"]:hover,
.displaytable td input[type="button"]:hover,
-.formtable td input[type="button"]:hover,
+.formtable td input[type="button"]:hover {
+ color: #ffffff;
+ background-color: #025aa5;
+ border-color: #014682;
+}
+.displaytable td input[type="submit"]:active,
+.formtable td input[type="submit"]:active,
+.displaytable td input[type="reset"]:active,
+.formtable td input[type="reset"]:active,
+.displaytable td input[type="button"]:active,
+.formtable td input[type="button"]:active,
+.displaytable td input[type="submit"].active,
+.formtable td input[type="submit"].active,
+.displaytable td input[type="reset"].active,
+.formtable td input[type="reset"].active,
+.displaytable td input[type="button"].active,
+.formtable td input[type="button"].active,
+.open > .dropdown-toggle.displaytable td input[type="submit"],
+.open > .dropdown-toggle.formtable td input[type="submit"],
+.open > .dropdown-toggle.displaytable td input[type="reset"],
+.open > .dropdown-toggle.formtable td input[type="reset"],
+.open > .dropdown-toggle.displaytable td input[type="button"],
+.open > .dropdown-toggle.formtable td input[type="button"] {
+ color: #ffffff;
+ background-color: #025aa5;
+ border-color: #014682;
+}
+.displaytable td input[type="submit"]:active:hover,
+.formtable td input[type="submit"]:active:hover,
+.displaytable td input[type="reset"]:active:hover,
+.formtable td input[type="reset"]:active:hover,
+.displaytable td input[type="button"]:active:hover,
+.formtable td input[type="button"]:active:hover,
+.displaytable td input[type="submit"].active:hover,
+.formtable td input[type="submit"].active:hover,
+.displaytable td input[type="reset"].active:hover,
+.formtable td input[type="reset"].active:hover,
+.displaytable td input[type="button"].active:hover,
+.formtable td input[type="button"].active:hover,
+.open > .dropdown-toggle.displaytable td input[type="submit"]:hover,
+.open > .dropdown-toggle.formtable td input[type="submit"]:hover,
+.open > .dropdown-toggle.displaytable td input[type="reset"]:hover,
+.open > .dropdown-toggle.formtable td input[type="reset"]:hover,
+.open > .dropdown-toggle.displaytable td input[type="button"]:hover,
+.open > .dropdown-toggle.formtable td input[type="button"]:hover,
+.displaytable td input[type="submit"]:active:focus,
+.formtable td input[type="submit"]:active:focus,
+.displaytable td input[type="reset"]:active:focus,
+.formtable td input[type="reset"]:active:focus,
+.displaytable td input[type="button"]:active:focus,
+.formtable td input[type="button"]:active:focus,
+.displaytable td input[type="submit"].active:focus,
+.formtable td input[type="submit"].active:focus,
+.displaytable td input[type="reset"].active:focus,
+.formtable td input[type="reset"].active:focus,
+.displaytable td input[type="button"].active:focus,
+.formtable td input[type="button"].active:focus,
+.open > .dropdown-toggle.displaytable td input[type="submit"]:focus,
+.open > .dropdown-toggle.formtable td input[type="submit"]:focus,
+.open > .dropdown-toggle.displaytable td input[type="reset"]:focus,
+.open > .dropdown-toggle.formtable td input[type="reset"]:focus,
+.open > .dropdown-toggle.displaytable td input[type="button"]:focus,
+.open > .dropdown-toggle.formtable td input[type="button"]:focus,
+.displaytable td input[type="submit"]:active.focus,
+.formtable td input[type="submit"]:active.focus,
+.displaytable td input[type="reset"]:active.focus,
+.formtable td input[type="reset"]:active.focus,
+.displaytable td input[type="button"]:active.focus,
+.formtable td input[type="button"]:active.focus,
+.displaytable td input[type="submit"].active.focus,
+.formtable td input[type="submit"].active.focus,
+.displaytable td input[type="reset"].active.focus,
+.formtable td input[type="reset"].active.focus,
+.displaytable td input[type="button"].active.focus,
+.formtable td input[type="button"].active.focus,
+.open > .dropdown-toggle.displaytable td input[type="submit"].focus,
+.open > .dropdown-toggle.formtable td input[type="submit"].focus,
+.open > .dropdown-toggle.displaytable td input[type="reset"].focus,
+.open > .dropdown-toggle.formtable td input[type="reset"].focus,
+.open > .dropdown-toggle.displaytable td input[type="button"].focus,
+.open > .dropdown-toggle.formtable td input[type="button"].focus {
+ color: #ffffff;
+ background-color: #014682;
+ border-color: #012340;
+}
.displaytable td input[type="submit"]:active,
.formtable td input[type="submit"]:active,
.displaytable td input[type="reset"]:active,
.formtable td input[type="reset"]:active,
.displaytable td input[type="button"]:active,
.formtable td input[type="button"]:active,
-.displaytable td input[type="submit"].hover,
-.formtable td input[type="submit"].hover,
-.displaytable td input[type="reset"].hover,
-.formtable td input[type="reset"].hover,
-.displaytable td input[type="button"].hover,
-.formtable td input[type="button"].hover {
- background-color: #367fa9;
+.displaytable td input[type="submit"].active,
+.formtable td input[type="submit"].active,
+.displaytable td input[type="reset"].active,
+.formtable td input[type="reset"].active,
+.displaytable td input[type="button"].active,
+.formtable td input[type="button"].active,
+.open > .dropdown-toggle.displaytable td input[type="submit"],
+.open > .dropdown-toggle.formtable td input[type="submit"],
+.open > .dropdown-toggle.displaytable td input[type="reset"],
+.open > .dropdown-toggle.formtable td input[type="reset"],
+.open > .dropdown-toggle.displaytable td input[type="button"],
+.open > .dropdown-toggle.formtable td input[type="button"] {
+ background-image: none;
+}
+.displaytable td input[type="submit"].disabled:hover,
+.formtable td input[type="submit"].disabled:hover,
+.displaytable td input[type="reset"].disabled:hover,
+.formtable td input[type="reset"].disabled:hover,
+.displaytable td input[type="button"].disabled:hover,
+.formtable td input[type="button"].disabled:hover,
+.displaytable td input[type="submit"][disabled]:hover,
+.formtable td input[type="submit"][disabled]:hover,
+.displaytable td input[type="reset"][disabled]:hover,
+.formtable td input[type="reset"][disabled]:hover,
+.displaytable td input[type="button"][disabled]:hover,
+.formtable td input[type="button"][disabled]:hover,
+fieldset[disabled] .displaytable td input[type="submit"]:hover,
+fieldset[disabled] .formtable td input[type="submit"]:hover,
+fieldset[disabled] .displaytable td input[type="reset"]:hover,
+fieldset[disabled] .formtable td input[type="reset"]:hover,
+fieldset[disabled] .displaytable td input[type="button"]:hover,
+fieldset[disabled] .formtable td input[type="button"]:hover,
+.displaytable td input[type="submit"].disabled:focus,
+.formtable td input[type="submit"].disabled:focus,
+.displaytable td input[type="reset"].disabled:focus,
+.formtable td input[type="reset"].disabled:focus,
+.displaytable td input[type="button"].disabled:focus,
+.formtable td input[type="button"].disabled:focus,
+.displaytable td input[type="submit"][disabled]:focus,
+.formtable td input[type="submit"][disabled]:focus,
+.displaytable td input[type="reset"][disabled]:focus,
+.formtable td input[type="reset"][disabled]:focus,
+.displaytable td input[type="button"][disabled]:focus,
+.formtable td input[type="button"][disabled]:focus,
+fieldset[disabled] .displaytable td input[type="submit"]:focus,
+fieldset[disabled] .formtable td input[type="submit"]:focus,
+fieldset[disabled] .displaytable td input[type="reset"]:focus,
+fieldset[disabled] .formtable td input[type="reset"]:focus,
+fieldset[disabled] .displaytable td input[type="button"]:focus,
+fieldset[disabled] .formtable td input[type="button"]:focus,
+.displaytable td input[type="submit"].disabled.focus,
+.formtable td input[type="submit"].disabled.focus,
+.displaytable td input[type="reset"].disabled.focus,
+.formtable td input[type="reset"].disabled.focus,
+.displaytable td input[type="button"].disabled.focus,
+.formtable td input[type="button"].disabled.focus,
+.displaytable td input[type="submit"][disabled].focus,
+.formtable td input[type="submit"][disabled].focus,
+.displaytable td input[type="reset"][disabled].focus,
+.formtable td input[type="reset"][disabled].focus,
+.displaytable td input[type="button"][disabled].focus,
+.formtable td input[type="button"][disabled].focus,
+fieldset[disabled] .displaytable td input[type="submit"].focus,
+fieldset[disabled] .formtable td input[type="submit"].focus,
+fieldset[disabled] .displaytable td input[type="reset"].focus,
+fieldset[disabled] .formtable td input[type="reset"].focus,
+fieldset[disabled] .displaytable td input[type="button"].focus,
+fieldset[disabled] .formtable td input[type="button"].focus {
+ background-color: #0275d8;
+ border-color: #0267bf;
+}
+.displaytable td input[type="submit"] .badge,
+.formtable td input[type="submit"] .badge,
+.displaytable td input[type="reset"] .badge,
+.formtable td input[type="reset"] .badge,
+.displaytable td input[type="button"] .badge,
+.formtable td input[type="button"] .badge {
+ color: #0275d8;
+ background-color: #ffffff;
}
/*
* Skin: Black
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editgroup.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editgroup.jsp?rev=1787105&r1=1787104&r2=1787105&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editgroup.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editgroup.jsp
Wed Mar 15 22:50:08 2017
@@ -265,11 +265,11 @@ try
<div class="box-footer clearfix">
<div class="btn-group">
<a href="javascript:void(0);" onClick="javascript:Save()"
-
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editgroup.SaveThisAuthorityGroup")%>"
- class="btn btn-primary" role="button"><span
class="glyphicon glyphicon-floppy-disk"
aria-hidden="true"></span><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editgroup.Save")%></a>
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editgroup.SaveThisAuthorityGroup")%>"
+ class="btn btn-primary" role="button"
data-toggle="tooltip"><i class="fa fa-save
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editgroup.Save")%></a>
<a href="javascript:void(0);" onClick="javascript:Cancel()"
-
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editgroup.CancelAuthorityGroupEditing")%>"
- class="btn btn-primary" role="button"><span
class="glyphicon glyphicon-ban-circle"
aria-hidden="true"></span><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editgroup.Cancel")%></a>
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editgroup.CancelAuthorityGroupEditing")%>"
+ class="btn btn-primary" role="button"
data-toggle="tooltip"><i class="fa fa-times-circle-o
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editgroup.Cancel")%></a>
</div>
</div>
</form>
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editmapper.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editmapper.jsp?rev=1787105&r1=1787104&r2=1787105&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editmapper.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editmapper.jsp
Wed Mar 15 22:50:08 2017
@@ -447,6 +447,7 @@ try
</label>
</div>
</div>
+ </div>
<%
}
else
@@ -494,10 +495,9 @@ try
if (className.length() > 0)
{
%>
- <input type="button" class="btn btn-primary"
-
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Save")%>"
- onClick="javascript:Save()"
-
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.SaveThisMappingConnection")%>"/>
+ <a class="btn btn-primary" role="button"
onClick="javascript:Save()"
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.SaveThisMappingConnection")%>"
+ data-toggle="tooltip"><i class="fa fa-save
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Save")%></a>
<%
}
else
@@ -505,18 +505,14 @@ try
if
(tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editmapper.Type")))
{
%>
- <input type="button" class="btn btn-primary"
-
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Continue")%>"
- onClick="javascript:Continue()"
-
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.ContinueToNextPage")%>"/>
+ <a class="btn btn-primary" role="button"
onClick="javascript:Continue()"
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.ContinueToNextPage")%>"
data-toggle="tooltip"><i class="fa fa-play
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Continue")%></a>
<%
}
}
%>
- <input type="button" class="btn btn-primary"
-
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Cancel")%>"
- onClick="javascript:Cancel()"
-
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.CancelMappingEditing")%>"/>
+ <a class="btn btn-primary" role="button"
onClick="javascript:Cancel()"
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.CancelMappingEditing")%>"
data-toggle="tooltip"><i class="fa fa-times-circle-o
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editmapper.Cancel")%></a>
</div>
</div>
</div>
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editoutput.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1787105&r1=1787104&r2=1787105&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editoutput.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editoutput.jsp
Wed Mar 15 22:50:08 2017
@@ -384,6 +384,7 @@ try
}
%>
</div>
+ </div>
<%
}
else
@@ -437,13 +438,13 @@ try
{
%>
<a class="btn btn-primary" onClick="javascript:Continue()"
-
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.ContinueToNextPage")%>"><i
class="fa fa-play
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Continue")%></a>
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.ContinueToNextPage")%>"
data-toggle="tooltip"><i class="fa fa-play
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Continue")%></a>
<%
}
}
%>
<a class="btn btn-primary" onClick="javascript:Cancel()"
-
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.CancelOutputConnectionEditing")%>"><i
class="fa fa-times-circle-o
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Cancel")%></a>
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.CancelOutputConnectionEditing")%>"
data-toggle="tooltip"><i class="fa fa-times-circle-o
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editoutput.Cancel")%></a>
</div>
</div>
</div>
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/edittransformation.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/edittransformation.jsp?rev=1787105&r1=1787104&r2=1787105&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/edittransformation.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/edittransformation.jsp
Wed Mar 15 22:50:08 2017
@@ -377,6 +377,7 @@ try
}
%>
</div>
+ </div>
<%
}
else
@@ -436,7 +437,7 @@ try
}
%>
<a class="btn btn-primary" onClick="javascript:Cancel()"
-
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.CancelTransformationConnectionEditing")%>"><i
class="fa fa-times-circle-o
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Cancel")%></a>
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.CancelTransformationConnectionEditing")%>"
data-toggle="tooltip"><i class="fa fa-times-circle-o
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Cancel")%></a>
</div>
</div>
</div>
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/javascript/app.js
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/javascript/app.js?rev=1787105&r1=1787104&r2=1787105&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/javascript/app.js
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/javascript/app.js
Wed Mar 15 22:50:08 2017
@@ -20,8 +20,9 @@
'use strict';
//Make sure jQuery has been loaded before app.js
-if (typeof jQuery === "undefined") {
- throw new Error("ManifoldCF requires jQuery");
+if (typeof jQuery === "undefined")
+{
+ throw new Error("ManifoldCF requires jQuery");
}
/* ManifoldCF
@@ -33,30 +34,28 @@ if (typeof jQuery === "undefined") {
* prevents conflict with other plugins and is a better
* way to organize our code.
*/
-$.ManifoldCF = {};
+$.ManifoldCF={};
/* --------------------
* - ManifoldCF Options -
* --------------------
* Modify these options to suit your implementation
*/
-$.ManifoldCF.options = {
- //Sidebar push menu toggle button selector
- sidebarToggleSelector: "[data-toggle='offcanvas']",
- //Activate sidebar slimscroll if the fixed layout is set (requires
SlimScroll Plugin)
- sidebarSlimScroll: true,
- //BoxRefresh Plugin
- enableBoxRefresh: true,
- BSTooltipSelector: '[data-toggle="tooltip"]',
- //The standard screen sizes that bootstrap uses.
- //If you change these in the variables.less file, change
- //them here too.
- screenSizes: {
- xs: 480,
- sm: 768,
- md: 992,
- lg: 1200
- }
+$.ManifoldCF.options={
+ //Sidebar push menu toggle button selector
+ sidebarToggleSelector: "[data-toggle='offcanvas']",
+ //Activate sidebar slimscroll if the fixed layout is set (requires
SlimScroll Plugin)
+ sidebarSlimScroll: true,
+ BSTooltipSelector: '[data-toggle="tooltip"]',
+ //The standard screen sizes that bootstrap uses.
+ //If you change these in the variables.less file, change
+ //them here too.
+ screenSizes: {
+ xs: 480,
+ sm: 768,
+ md: 992,
+ lg: 1200
+ }
};
/* ------------------
@@ -66,412 +65,424 @@ $.ManifoldCF.options = {
* functions and plugins as specified by the
* options above.
*/
-$(function () {
- //Easy access to options
- var o = $.ManifoldCF.options;
-
- //Set up the object
- _init();
-
- //Activate the layout maker
- $.ManifoldCF.layout.activate();
-
- //Enable sidebar tree view controls
- $.ManifoldCF.tree('.sidebar');
-
- //Activate sidebar push menu
- $.ManifoldCF.pushMenu.activate(o.sidebarToggleSelector);
-
- //Activate Bootstrap tooltip
- $(o.BSTooltipSelector).tooltip();
-
-
- /*
- * INITIALIZE BUTTON TOGGLE
- * ------------------------
- */
- $('.btn-group[data-toggle="btn-toggle"]').each(function () {
- var group = $(this);
- $(this).find(".btn").click(function (e) {
- group.find(".btn.active").removeClass("active");
- $(this).addClass("active");
- e.preventDefault();
- });
-
+$(function ()
+{
+ //Easy access to options
+ var o=$.ManifoldCF.options;
+
+ //Set up the object
+ _init();
+
+ //Activate the layout maker
+ $.ManifoldCF.layout.activate();
+
+ //Enable sidebar tree view controls
+ $.ManifoldCF.tree('.sidebar');
+
+ //Activate sidebar push menu
+ $.ManifoldCF.pushMenu.activate(o.sidebarToggleSelector);
+
+ //Activate Bootstrap tooltip
+ $(o.BSTooltipSelector).tooltip({
+ trigger: 'hover',
+ container: 'body'
+ });
+
+ /*
+ * INITIALIZE BUTTON TOGGLE
+ * ------------------------
+ */
+ $('.btn-group[data-toggle="btn-toggle"]').each(function ()
+ {
+ var group=$(this);
+ $(this).find(".btn").click(function (e)
+ {
+ group.find(".btn.active").removeClass("active");
+ $(this).addClass("active");
+ e.preventDefault();
});
-});
-
+ });
+});
/* ----------------------------------
* - Initialize the ManifoldCF Object -
* ----------------------------------
* All ManifoldCF functions are implemented below.
*/
-function _init() {
+function _init()
+{
- /* Layout
- * ======
- * Fixes the layout height in case min-height fails.
- *
- * @type Object
- * @usage $.ManifoldCF.layout.activate()
- * $.ManifoldCF.layout.fix()
- * $.ManifoldCF.layout.fixSidebar()
- */
- $.ManifoldCF.layout = {
- activate: function () {
- var _this = this;
- _this.fix();
- _this.fixSidebar();
- $(window, ".wrapper").resize(function () {
- _this.fix();
- _this.fixSidebar();
- });
- },
- fix: function () {
- //Get window height and the wrapper height
- var neg = $('.main-header').outerHeight() +
$('.main-footer').outerHeight();
- var window_height = $(window).height();
- var sidebar_height = $(".sidebar").height();
- //Set the min-height of the content and sidebar based on the
- //the height of the document.
- if ($("body").hasClass("fixed")) {
- $(".content-wrapper, .right-side").css('min-height',
window_height - $('.main-footer').outerHeight());
- } else {
- var postSetWidth;
- if (window_height >= sidebar_height) {
- $(".content-wrapper, .right-side").css('min-height',
window_height - neg);
- postSetWidth = window_height - neg;
- } else {
- $(".content-wrapper, .right-side").css('min-height',
sidebar_height);
- postSetWidth = sidebar_height;
- }
- }
- $('.main-footer').show();
- },
- fixSidebar: function () {
- //Make sure the body tag has the .fixed class
- if (!$("body").hasClass("fixed")) {
- if (typeof $.fn.slimScroll != 'undefined') {
- $(".sidebar").slimScroll({destroy: true}).height("auto");
- }
- return;
- } else if (typeof $.fn.slimScroll == 'undefined' && console) {
- console.error("Error: the fixed layout requires the slimscroll
plugin!");
- }
- //Enable slimscroll for fixed layout
- if ($.ManifoldCF.options.sidebarSlimScroll) {
- if (typeof $.fn.slimScroll != 'undefined') {
- //Destroy if it exists
- $(".sidebar").slimScroll({destroy: true}).height("auto");
- //Add slimscroll
- $(".sidebar").slimscroll({
- height: ($(window).height() -
$(".main-header").height()) + "px",
- color: "rgba(255,255,255,0.8)",
- size: "5px"
- });
- }
- }
+ /* Layout
+ * ======
+ * Fixes the layout height in case min-height fails.
+ *
+ * @type Object
+ * @usage $.ManifoldCF.layout.activate()
+ * $.ManifoldCF.layout.fix()
+ * $.ManifoldCF.layout.fixSidebar()
+ */
+ $.ManifoldCF.layout={
+ activate: function ()
+ {
+ var _this=this;
+ _this.fix();
+ _this.fixSidebar();
+ $(window,".wrapper").resize(function ()
+ {
+ _this.fix();
+ _this.fixSidebar();
+ });
+ },
+ fix: function ()
+ {
+ //Get window height and the wrapper height
+ var neg=$('.main-header').outerHeight() +
$('.main-footer').outerHeight();
+ var window_height=$(window).height();
+ var sidebar_height=$(".sidebar").height();
+ //Set the min-height of the content and sidebar based on the
+ //the height of the document.
+ if ($("body").hasClass("fixed"))
+ {
+ $(".content-wrapper, .right-side").css('min-height',window_height -
$('.main-footer').outerHeight());
+ } else
+ {
+ var postSetWidth;
+ if (window_height >= sidebar_height)
+ {
+ $(".content-wrapper, .right-side").css('min-height',window_height -
neg);
+ postSetWidth=window_height - neg;
+ } else
+ {
+ $(".content-wrapper, .right-side").css('min-height',sidebar_height);
+ postSetWidth=sidebar_height;
}
- };
-
- /* PushMenu()
- * ==========
- * Adds the push menu functionality to the sidebar.
- *
- * @type Function
- * @usage: $.ManifoldCF.pushMenu("[data-toggle='offcanvas']")
- */
- $.ManifoldCF.pushMenu = {
- activate: function (toggleBtn) {
- //Get the screen sizes
- var screenSizes = $.ManifoldCF.options.screenSizes;
-
- //Enable sidebar toggle
- $(toggleBtn).on('click', function (e) {
- e.preventDefault();
-
- //Enable sidebar push menu
- if ($(window).width() > (screenSizes.sm - 1)) {
- $("body").toggleClass('sidebar-collapse');
- }
- //Handle sidebar push menu for small screens
- else {
- if ($("body").hasClass('sidebar-open')) {
- $("body").removeClass('sidebar-open');
- $("body").removeClass('sidebar-collapse')
- } else {
- $("body").addClass('sidebar-open');
- }
- }
- });
-
- $(".content-wrapper").click(function () {
- //Enable hide menu when clicking on the content-wrapper on
small screens
- if ($(window).width() <= (screenSizes.sm - 1) &&
$("body").hasClass("sidebar-open")) {
- $("body").removeClass('sidebar-open');
- }
- });
-
- //Enable expand on hover for sidebar mini
- if ($.ManifoldCF.options.sidebarExpandOnHover
- || ($('body').hasClass('fixed')
- && $('body').hasClass('sidebar-mini'))) {
- this.expandOnHover();
- }
-
- },
- expandOnHover: function () {
- var _this = this;
- var screenWidth = $.ManifoldCF.options.screenSizes.sm - 1;
- //Expand sidebar on hover
- $('.main-sidebar').hover(function () {
- if ($('body').hasClass('sidebar-mini')
- && $("body").hasClass('sidebar-collapse')
- && $(window).width() > screenWidth) {
- _this.expand();
- }
- }, function () {
- if ($('body').hasClass('sidebar-mini')
- && $('body').hasClass('sidebar-expanded-on-hover')
- && $(window).width() > screenWidth) {
- _this.collapse();
- }
- });
- },
- expand: function () {
-
$("body").removeClass('sidebar-collapse').addClass('sidebar-expanded-on-hover');
- },
- collapse: function () {
- if ($('body').hasClass('sidebar-expanded-on-hover')) {
-
$('body').removeClass('sidebar-expanded-on-hover').addClass('sidebar-collapse');
- }
+ }
+ $('.main-footer').show();
+ },
+ fixSidebar: function ()
+ {
+ //Make sure the body tag has the .fixed class
+ if (!$("body").hasClass("fixed"))
+ {
+ if (typeof $.fn.slimScroll != 'undefined')
+ {
+ $(".sidebar").slimScroll({destroy: true}).height("auto");
}
- };
-
- /* Tree()
- * ======
- * Converts the sidebar into a multilevel
- * tree view menu.
- *
- * @type Function
- * @Usage: $.ManifoldCF.tree('.sidebar')
- */
- $.ManifoldCF.tree = function (menu) {
- var _this = this;
-
- $("li a", $(menu)).on('click', function (e) {
- //Get the clicked link and the next element
- var $this = $(this);
- var checkElement = $this.next();
-
- //Check if the next element is a menu and is visible
- if ((checkElement.is('.treeview-menu')) &&
(checkElement.is(':visible'))) {
- //Close the menu
- checkElement.slideUp('normal', function () {
- checkElement.removeClass('menu-open');
- //Fix the layout in case the sidebar stretches over the
height of the window
- //_this.layout.fix();
- });
- checkElement.parent("li").removeClass("active");
- }
- //If the menu is not visible
- else if ((checkElement.is('.treeview-menu')) &&
(!checkElement.is(':visible'))) {
- //Get the parent menu
- var parent = $this.parents('ul').first();
- //Close all open menus within the parent
- var ul = parent.find('ul:visible').slideUp('normal');
- //Remove the menu-open class from the parent
- ul.removeClass('menu-open');
- //Get the parent li
- var parent_li = $this.parent("li");
-
- //Open the target menu and add the menu-open class
- checkElement.slideDown('normal', function () {
- //Add the class active to the parent li
- checkElement.addClass('menu-open');
- parent.find('li.active').removeClass('active');
- parent_li.addClass('active');
- //Fix the layout in case the sidebar stretches over the
height of the window
- _this.layout.fix();
- });
- }
- //if this isn't a link, prevent the page from being redirected
- if (checkElement.is('.treeview-menu')) {
- e.preventDefault();
- }
- });
- };
-}
-
-/*
- * BOX REFRESH BUTTON
- * ------------------
- * This is a custom plugin to use with the compenet BOX. It allows you to add
- * a refresh button to the box. It converts the box's state to a loading state.
- *
- * @type plugin
- * @usage $("#box-widget").boxRefresh( options );
- */
-(function ($) {
-
- $.fn.boxRefresh = function (options) {
-
- // Render options
- var settings = $.extend({
- //Refressh button selector
- trigger: ".refresh-btn",
- //File source to be loaded (e.g: ajax/src.php)
- source: "",
- //Callbacks
- onLoadStart: function (box) {
- }, //Right after the button has been clicked
- onLoadDone: function (box) {
- } //When the source has been loaded
-
- }, options);
-
- //The overlay
- var overlay = $('<div class="overlay"><div class="fa fa-refresh
fa-spin"></div></div>');
-
- return this.each(function () {
- //if a source is specified
- if (settings.source === "") {
- if (console) {
- console.log("Please specify a source first -
boxRefresh()");
- }
- return;
- }
- //the box
- var box = $(this);
- //the button
- var rBtn = box.find(settings.trigger).first();
-
- //On trigger click
- rBtn.click(function (e) {
- e.preventDefault();
- //Add loading overlay
- start(box);
-
- //Perform ajax call
- box.find(".box-body").load(settings.source, function () {
- done(box);
- });
- });
- });
+ return;
+ } else if (typeof $.fn.slimScroll == 'undefined' && console)
+ {
+ console.error("Error: the fixed layout requires the slimscroll
plugin!");
+ }
+ //Enable slimscroll for fixed layout
+ if ($.ManifoldCF.options.sidebarSlimScroll)
+ {
+ if (typeof $.fn.slimScroll != 'undefined')
+ {
+ //Destroy if it exists
+ $(".sidebar").slimScroll({destroy: true}).height("auto");
+ //Add slimscroll
+ $(".sidebar").slimscroll({
+ height: ($(window).height() - $(".main-header").height()) + "px",
+ color: "rgba(255,255,255,0.8)",
+ size: "5px"
+ });
+ }
+ }
+ }
+ };
- function start(box) {
- //Add overlay and loading img
- box.append(overlay);
+ /* PushMenu()
+ * ==========
+ * Adds the push menu functionality to the sidebar.
+ *
+ * @type Function
+ * @usage: $.ManifoldCF.pushMenu("[data-toggle='offcanvas']")
+ */
+ $.ManifoldCF.pushMenu={
+ activate: function (toggleBtn)
+ {
+ //Get the screen sizes
+ var screenSizes=$.ManifoldCF.options.screenSizes;
+
+ //Enable sidebar toggle
+ $(toggleBtn).on('click',function (e)
+ {
+ e.preventDefault();
- settings.onLoadStart.call(box);
+ //Enable sidebar push menu
+ if ($(window).width() > (screenSizes.sm - 1))
+ {
+ $("body").toggleClass('sidebar-collapse');
}
+ //Handle sidebar push menu for small screens
+ else
+ {
+ if ($("body").hasClass('sidebar-open'))
+ {
+ $("body").removeClass('sidebar-open');
+ $("body").removeClass('sidebar-collapse')
+ } else
+ {
+ $("body").addClass('sidebar-open');
+ }
+ }
+ });
- function done(box) {
- //Remove overlay and loading img
- box.find(overlay).remove();
-
- settings.onLoadDone.call(box);
+ $(".content-wrapper").click(function ()
+ {
+ //Enable hide menu when clicking on the content-wrapper on small
screens
+ if ($(window).width() <= (screenSizes.sm - 1) &&
$("body").hasClass("sidebar-open"))
+ {
+ $("body").removeClass('sidebar-open');
}
+ });
- };
+ //Enable expand on hover for sidebar mini
+ if ($.ManifoldCF.options.sidebarExpandOnHover
+ || ($('body').hasClass('fixed')
+ && $('body').hasClass('sidebar-mini')))
+ {
+ this.expandOnHover();
+ }
+
+ },
+ expandOnHover: function ()
+ {
+ var _this=this;
+ var screenWidth=$.ManifoldCF.options.screenSizes.sm - 1;
+ //Expand sidebar on hover
+ $('.main-sidebar').hover(function ()
+ {
+ if ($('body').hasClass('sidebar-mini')
+ && $("body").hasClass('sidebar-collapse')
+ && $(window).width() > screenWidth)
+ {
+ _this.expand();
+ }
+ },function ()
+ {
+ if ($('body').hasClass('sidebar-mini')
+ && $('body').hasClass('sidebar-expanded-on-hover')
+ && $(window).width() > screenWidth)
+ {
+ _this.collapse();
+ }
+ });
+ },
+ expand: function ()
+ {
+
$("body").removeClass('sidebar-collapse').addClass('sidebar-expanded-on-hover');
+ },
+ collapse: function ()
+ {
+ if ($('body').hasClass('sidebar-expanded-on-hover'))
+ {
+
$('body').removeClass('sidebar-expanded-on-hover').addClass('sidebar-collapse');
+ }
+ }
+ };
-})(jQuery);
+ /* Tree()
+ * ======
+ * Converts the sidebar into a multilevel
+ * tree view menu.
+ *
+ * @type Function
+ * @Usage: $.ManifoldCF.tree('.sidebar')
+ */
+ $.ManifoldCF.tree=function (menu)
+ {
+ var _this=this;
+
+ $("li a",$(menu)).on('click',function (e)
+ {
+ //Get the clicked link and the next element
+ var $this=$(this);
+ var checkElement=$this.next();
+
+ //Check if the next element is a menu and is visible
+ if ((checkElement.is('.treeview-menu')) && (checkElement.is(':visible')))
+ {
+ //Close the menu
+ checkElement.slideUp('normal',function ()
+ {
+ checkElement.removeClass('menu-open');
+ //Fix the layout in case the sidebar stretches over the height of
the window
+ //_this.layout.fix();
+ });
+ checkElement.parent("li").removeClass("active");
+ }
+ //If the menu is not visible
+ else if ((checkElement.is('.treeview-menu')) &&
(!checkElement.is(':visible')))
+ {
+ //Get the parent menu
+ var parent=$this.parents('ul').first();
+ //Close all open menus within the parent
+ var ul=parent.find('ul:visible').slideUp('normal');
+ //Remove the menu-open class from the parent
+ ul.removeClass('menu-open');
+ //Get the parent li
+ var parent_li=$this.parent("li");
+
+ //Open the target menu and add the menu-open class
+ checkElement.slideDown('normal',function ()
+ {
+ //Add the class active to the parent li
+ checkElement.addClass('menu-open');
+ parent.find('li.active').removeClass('active');
+ parent_li.addClass('active');
+ //Fix the layout in case the sidebar stretches over the height of
the window
+ _this.layout.fix();
+ });
+ }
+ //if this isn't a link, prevent the page from being redirected
+ if (checkElement.is('.treeview-menu'))
+ {
+ e.preventDefault();
+ }
+ });
+ };
+}
-$.ManifoldCF.setTitle = function(title,header,activeMenu){
- document.title = title;
+$.ManifoldCF.setTitle=function (title,header,activeMenu)
+{
+ document.title=title;
- $(".content-header #heading").text(header);
+ $(".content-header #heading").text(header);
- activeMenu = typeof activeMenu !== 'undefined' ? activeMenu : 'outputs';
- $("." + activeMenu).addClass("active");
+ activeMenu=typeof activeMenu !== 'undefined'?activeMenu:'outputs';
+ $("." + activeMenu).addClass("active");
- $($.ManifoldCF.options.BSTooltipSelector).tooltip();
- $(".selectpicker").selectpicker();
+ $(".selectpicker").selectpicker();
};
-function displayError(xhr){
- var msg = '<div class="alert alert-danger alert-dismissable">' +
- '<button type="button" class="close" data-dismiss="alert"
aria-hidden="true">Ã</button>' +
- '<h4><i class="icon fa fa-ban"></i> Error!</h4>' +
- 'Sorry but there was an error: ';
- $("#content").html(msg + xhr.status + " " + xhr.statusText + '</div>');
+function displayError(xhr)
+{
+ var msg='<div class="alert alert-danger alert-dismissable">' +
+ '<button type="button" class="close" data-dismiss="alert"
aria-hidden="true">Ã</button>' +
+ '<h4><i class="icon fa fa-ban"></i> Error!</h4>' +
+ 'Sorry but there was an error: ';
+ $("#content").html(msg + xhr.status + " " + xhr.statusText + '</div>');
}
-$.ManifoldCF.loadContent = function(url){
- console.log("URL: " + url);
- $('.spinner,#loader').show();
- $('#content').load(decodeURIComponent(url),function(response, status, xhr){
- $('.spinner,#loader').hide();
- if(status=='error'){
- $(".content-header #heading").text('Error');
- document.title = 'Error';
- displayError(xhr);
- }
- });
-};
+function _preLoadContent()
+{
+ console.log('_preLoadContent');
+ $($.ManifoldCF.options.BSTooltipSelector).tooltip('destroy');
+
+ //Temporary fix for Javascript bug, when loading connector javascript.
+ if (window.checkConfig)
+ {
+ window.checkConfig=null;
+ }
+ if (window.checkConfigForSave)
+ {
+ window.checkConfigForSave=null;
+ }
+}
-$.ManifoldCF.submit=function(form){
- $('.spinner,#loader').show();
- var $form = $(form);
- var action = $form.attr( 'action' )
- console.log("Ajax URL: " + action);
- console.log($form.serialize());
- //History.replaceState({urlPath: encodeURI(action)}, null,
'#execute_'+form.name);
- $.ajax({
- type : $form.attr( 'method' ),
- url : action,
- data : $form.serialize()
- }).done(function(data,textStatus,jqXHR ){
- var page = jqXHR.getResponseHeader("page");
- console.log("page: " + page)
- if(typeof page != 'undefined' )
- History.replaceState({urlPath: encodeURI(page)}, null,
'?p='+page+'#execute');
- else
- History.replaceState({urlPath: encodeURI(action)}, null,
'#execute_'+form.name);
- console.log("textStatus: " + textStatus)
- //Temporary fix for Javascript bug, when loading connector javascript.
- if(window.checkConfig)
- window.checkConfig = null;
- if(window.checkConfigForSave)
- window.checkConfigForSave = null;
- $('#content').html(data);
- }).fail(function(xhr, opts, error){
- displayError(xhr);
- }).always(function(){
- $('.spinner,#loader').hide();
- });
+function _postLoadContent()
+{
+ console.log('_postLoadContent')
+ //Activate Bootstrap tooltip
+ $($.ManifoldCF.options.BSTooltipSelector).tooltip({
+ trigger: 'hover',
+ container: 'body'
+ });
}
-$(function(){
- var
- History = window.History,
- State;
-
- if (History.enabled) {
- State = History.getState();
- // set initial state to first page that was loaded
- History.pushState({urlPath: window.location.pathname}, null,
State.urlPath);
- } else {
- return false;
+$.ManifoldCF.loadContent=function (url)
+{
+ console.log("URL: " + url);
+ _preLoadContent();
+ $('.spinner,#loader').show();
+ $('#content').load(decodeURIComponent(url),function (response,status,xhr)
+ {
+ $('.spinner,#loader').hide();
+ if (status == 'error')
+ {
+ $(".content-header #heading").text('Error');
+ document.title='Error';
+ displayError(xhr);
}
+ _postLoadContent();
+ });
+};
- // Content update and back/forward button handler
- History.Adapter.bind(window, 'statechange', function() {
- var state = History.getState();
- console.log(state);
- if(typeof state != 'undefined' && typeof state.data != 'undefined') {
- if(!state.data.urlPath.startsWith('execute'))
- $.ManifoldCF.loadContent(state.data.urlPath);
- }
- });
+$.ManifoldCF.submit=function (form)
+{
+ $('.spinner,#loader').show();
+ var $form=$(form);
+ var action=$form.attr('action')
+ console.log("Ajax URL: " + action);
+ console.log($form.serialize());
+ _preLoadContent();
+ //History.replaceState({urlPath: encodeURI(action)}, null,
'#execute_'+form.name);
+ $.ajax({
+ type: $form.attr('method'),
+ url: action,
+ data: $form.serialize()
+ }).done(function (data,textStatus,jqXHR)
+ {
+ var page=jqXHR.getResponseHeader("page");
+ console.log("page: " + page)
+ if (typeof page != 'undefined')
+ {
+ History.replaceState({urlPath: encodeURI(page)},null,'?p=' + page +
'#execute');
+ } else
+ {
+ History.replaceState({urlPath: encodeURI(action)},null,'#execute_' +
form.name);
+ }
+ console.log("textStatus: " + textStatus);
+ $('#content').html(data);
+ }).fail(function (xhr,opts,error)
+ {
+ displayError(xhr);
+ }).always(function ()
+ {
+ $('.spinner,#loader').hide();
+ _postLoadContent();
+ });
+}
- // navigation link handler
- $(document.body).on("click",'.link',function(e){
- e.preventDefault();
- var urlPath = $(this).attr('href');
- var title = $(this).text();
- History.pushState({urlPath: encodeURI(urlPath)}, title, '?p=' +
encodeURI(urlPath)+'&_'+new Date().getTime());
- });
+$(function ()
+{
+ var
+ History=window.History,
+ State;
+
+ if (History.enabled)
+ {
+ State=History.getState();
+ // set initial state to first page that was loaded
+ History.pushState({urlPath: window.location.pathname},null,State.urlPath);
+ }
+ else
+ {
+ return false;
+ }
+
+ // Content update and back/forward button handler
+ History.Adapter.bind(window,'statechange',function ()
+ {
+ var state=History.getState();
+ console.log(state);
+ if (typeof state != 'undefined' && typeof state.data != 'undefined')
+ {
+ if (!state.data.urlPath.startsWith('execute'))
+ {
+ $.ManifoldCF.loadContent(state.data.urlPath);
+ }
+ }
+ });
+
+ // navigation link handler
+ $(document.body).on("click",'.link',function (e)
+ {
+ e.preventDefault();
+ var urlPath=$(this).attr('href');
+ var title=$(this).text();
+ History.pushState({urlPath: encodeURI(urlPath)},title,'?p=' +
encodeURI(urlPath) + '&_' + new Date().getTime());
+ });
});
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/buttons.less
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/buttons.less?rev=1787105&r1=1787104&r2=1787105&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/buttons.less
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/buttons.less
Wed Mar 15 22:50:08 2017
@@ -62,39 +62,19 @@
}
}
.btn-primary {
- background-color: @light-blue;
- border-color: darken(@light-blue, 5%);
- &:hover, &:active, &.hover {
- background-color: darken(@light-blue, 5%);
- }
+ .button-variant(@btn-primary-color; @light-blue; darken(@light-blue, 5%));
}
.btn-success {
- background-color: @green;
- border-color: darken(@green, 5%);
- &:hover, &:active, &.hover {
- background-color: darken(@green, 5%);
- }
+ .button-variant(@btn-primary-color; @green; darken(@green, 5%));
}
.btn-info {
- background-color: @aqua;
- border-color: darken(@aqua, 5%);
- &:hover, &:active, &.hover {
- background-color: darken(@aqua, 5%);
- }
+ .button-variant(@btn-primary-color; @aqua; darken(@aqua, 5%));
}
.btn-danger {
- background-color: @red;
- border-color: darken(@red, 5%);
- &:hover, &:active, &.hover {
- background-color: darken(@red, 5%);
- }
+ .button-variant(@btn-primary-color; @red; darken(@red, 5%));
}
.btn-warning {
- background-color: @yellow;
- border-color: darken(@yellow, 5%);
- &:hover, &:active, &.hover {
- background-color: darken(@yellow, 5%);
- }
+ .button-variant(@btn-primary-color; @yellow; darken(@yellow, 5%));
}
.btn-outline {
border: 1px solid #fff;
@@ -153,4 +133,4 @@
font-size: 10px;
font-weight: 400;
}
-}
\ No newline at end of file
+}
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=1787105&r1=1787104&r2=1787105&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 22:50:08 2017
@@ -4,17 +4,17 @@
//COLORS
//--------------------------------------------------------
-@light-blue: #3c8dbc; //Primary
-@red: #dd4b39; //Danger
+@light-blue: #0275d8; //Primary
+@red: #d9534f; //Danger
@green: #00a65a; //Success
@aqua: #00c0ef; //Info
-@yellow: #f39c12; //Warning
+@yellow: #ffd500; //Warning
@blue: #0073b7;
@navy: #001F3F;
@teal: #39CCCC;
@olive: #3D9970;
@lime: #01FF70;
-@orange: #FF851B;
+@orange: #f0ad4e;
@fuchsia: #F012BE;
@purple: #605ca8;
@maroon: #D81B60;
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=1787105&r1=1787104&r2=1787105&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 22:50:08 2017
@@ -101,16 +101,16 @@ 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" aria-hidden="true"></i>View</a>
+ <i class="fa fa-eye fa-fw" aria-hidden="true"></i>View</a>
<a
href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Edit")
+ " " + org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
class="link btn btn-primary btn-xs" role="button"
data-toggle="tooltip">
- <i class="fa fa-pencil-square-o"
aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Edit")%></a>
+ <i class="fa fa-pencil-square-o fa-fw"
aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Edit")%></a>
<a href="javascript:void(0);"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Delete")
+ " " + org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
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(),"listauthorities.Delete")%></a>
+ <i class="fa fa-trash fa-fw"
aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Delete")%></a>
</div>
</td>
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
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=1787105&r1=1787104&r2=1787105&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
Wed Mar 15 22:50:08 2017
@@ -91,20 +91,14 @@ try
<div class="btn-group">
<a
href='<%="viewgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.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(),"listgroups.View")%></a>
<a
href='<%="editgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.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(),"listgroups.Edit")%></a>
<a href="javascript:void(0);"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.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(),"listgroups.Delete")%></a>
</div>
</td>
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
@@ -118,11 +112,8 @@ try
<div class="box-footer clearfix">
<div class="btn-group">
<a href="editgroup.jsp"
-
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.AddNewGroup")%>"
- class="link btn btn-primary" role="button">
- <span class="fa fa-plus-circle" aria-hidden="true"></span>
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.AddaNewGroup")%>
- </a>
+
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>
</div>
<%
}
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listmappers.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listmappers.jsp?rev=1787105&r1=1787104&r2=1787105&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listmappers.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listmappers.jsp
Wed Mar 15 22:50:08 2017
@@ -97,21 +97,15 @@ try
<td>
<div class="btn-group">
<a
href='<%="viewmapper.jsp?connname="+URLEncoder.encode(name)%>'
- title='<%="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(),"listmappers.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(),"listmappers.View")%></a>
<a
href='<%="editmapper.jsp?connname="+URLEncoder.encode(name)%>'
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.Edit")+"
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
- class="link btn btn-primary btn-xs" role="button"
data-toggle="tooltip">
- <span class="fa fa-pencil-square-o"
aria-hidden="true"></span>
- </a>
- <a href="javascript:void()"
+ class="link btn btn-primary btn-xs" role="button"
data-toggle="tooltip"><i class="fa fa-pencil-square-o fa-fw"
aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.Edit")%></a>
+ <a href="javascript:void(0);"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.Delete")+"
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
- class="btn btn-danger btn-xs" role="button"
data-toggle="tooltip">
- <span class="fa fa-trash" aria-hidden="true"></span>
- </a>
+ class="btn btn-danger btn-xs" role="button"
data-toggle="tooltip"><i class="fa fa-trash fa-fw"
aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.Delete")%></a>
</div>
</td>
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
@@ -127,11 +121,8 @@ try
<div class="box-footer clearfix">
<div class="btn-group">
<a href="editmapper.jsp"
-
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.AddNewConnection")%>"
- class="link btn btn-primary" role="button">
- <span class="fa fa-plus-circle" aria-hidden="true"></span>
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.AddaNewConnection")%>
- </a>
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.AddNewConnection")%>"
+ 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(),"listmappers.AddaNewConnection")%></a>
</div>
<%
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/login.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/login.jsp?rev=1787105&r1=1787104&r2=1787105&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/login.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/login.jsp
Wed Mar 15 22:50:08 2017
@@ -33,6 +33,7 @@ response.setContentType("text/html;chars
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta content='width=device-width, initial-scale=1, maximum-scale=1,
user-scalable=no' name='viewport'>
+ <link href="css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet"
type="text/css"/>
<link rel="StyleSheet" href="css/style.css" type="text/css"
media="screen"/>
<title><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.ApacheManifoldCFLogin")%></title>
@@ -49,6 +50,8 @@ response.setContentType("text/html;chars
document.loginform.submit();
}
+ document.onkeypress = loginKeyPress;
+
function loginKeyPress(e)
{
e = e || window.event;
@@ -59,9 +62,6 @@ response.setContentType("text/html;chars
}
return true;
}
-
- document.onkeypress = loginKeyPress;
-
//-->
</script>
</head>
@@ -96,7 +96,7 @@ if (value != null && value.equals("true"
}
%>
<div class="form-group has-feedback">
- <input name="userID" type="text" autofocus="autofocus"
class="form-control"
placeholder="<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%>"/>
+ <input name="userID" type="text" class="form-control"
autofocus="autofocus"
placeholder="<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%>"/>
<span class="glyphicon glyphicon-user
form-control-feedback"></span>
</div>
<div class="form-group has-feedback">
@@ -107,9 +107,8 @@ if (value != null && value.equals("true"
<div class="col-xs-8">
</div>
<div class="col-xs-4">
- <input id="buttonLogin" type="button" class="btn btn-primary
btn-block" onclick='Javascript:login();'
-
value='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'
-
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'/>
+ <button id="buttonLogin" class="btn btn-primary btn-block"
onclick='Javascript:login();'
+
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'><i
class="fa fa-sign-in fa-fw"
aria-hidden="true"></i> <%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%></button>
</div>
</div>
</form>
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewgroup.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewgroup.jsp?rev=1787105&r1=1787104&r2=1787105&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewgroup.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewgroup.jsp
Wed Mar 15 22:50:08 2017
@@ -94,11 +94,11 @@ try
<div class="btn-group">
<a
href='<%="editgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(groupName)%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.EditThisAuthorityGroup")%>"
- 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(),"viewgroup.Edit")%></a>
<a href="javascript:void(0);"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(groupName)+"\")"%>'
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.DeleteThisAuthorityGroup")%>"
- 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-remove fa-fw"
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.Delete")%></a>
</div>
</div>
</form>
