manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kish...@apache.org
Subject svn commit: r1685187 [16/18] - /manifoldcf/trunk/framework/crawler-ui/src/main/webapp/
Date Fri, 12 Jun 2015 22:54:44 GMT
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/style.css
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/style.css?rev=1685187&r1=1685186&r2=1685187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/style.css (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/style.css Fri Jun 12 22:54:43 2015
@@ -20,746 +20,744 @@ limitations under the License.
     Author     : Modified By Eranda Bandaranaike eragroove@gmail.com
 */
 
-body {
-  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  padding: 0;
-  margin: 0;
-  font-size: 12px;
-  color: #444444;
-}
-
-.tabtable {
-  height: 100%;
-  width: 100%;
-  border: 0 solid #FFFFFF;
-  margin: 0;
-  padding: 0;
-  border-collapse: collapse;
-}
-
-.tabspacerrow {
-  height: 3px;
-}
-
-.spacertab {
-  background: #F8F8F8;
-  border-style: solid;
-  border-width: 1px 0 0 1px;
-  border-color: #CCCCCC #CCCCCC #CCCCCC #CCCCCC;
-  margin: 0;
-  padding: 0px 0px 0px 0px;
-  vertical-align: top;
-  height: 3px;
-}
-
-.tabsequencerow {
-  height: 8px;
-  font-size: 8px;
-  line-height: 8px;
-}
-
-.blanksequencetab {
-  background: #F8F8F8;
-  border-style: solid;
-  border-width: 0 0 0 1px;
-  border-color: #CCCCCC #CCCCCC #229DDB #CCCCCC;
-  margin: 0;
-  padding: 2px 10px 3px 10px;
-  vertical-align: top;
-  height: 8px;
-}
-
-.sequencetab {
-  background: #FCFCFC;
-  border-style: solid;
-  border-width: 1px 1px 0 1px;
-  border-color: #CCCCCC #CCCCCC #229DDB #CCCCCC;
-  margin: 0;
-  padding: 2px 10px 3px 10px;
-  height: 8px;
-  vertical-align: top;
-  text-align: center;
-}
-
-.tabrow {
-  height: 20px;
-  font-size: 12px;
-  line-height: 12px;
-}
-
-.tabbodyrow {
-  height: 100%;
-}
-
-.passivetab {
-  background: #FCFCFC;
-  border: solid 1px;
-  border-color: #CCCCCC #CCCCCC #229DDB #CCCCCC;
-  margin: 0;
-  padding: 4px 10px 5px 10px;
-  vertical-align: top;
-  height: 20px;
-}
-
-.passivetab a {
-  text-decoration: none;
-}
-
-.activetab {
-  background: #FFFFFF;
-  border-style: solid;
-  border-width: 1px 1px 0 2px;
-  border-color: #229DDB;
-  margin: 0;
-  padding: 4px 10px 5px 10px;
-  height: 20px;
-  vertical-align: top;
-}
-
-.remaindertab {
-  width: 100%;
-  background: #F8F8F8;
-  border-style: solid;
-  border-width: 1px 1px 1px 0;
-  border-color: #CCCCCC #CCCCCC #229DDB;
-  padding: 18px 10px 2px 10px;
-  height: 28px;
-  vertical-align: top;
-  text-align: right;
-  font-size: 12px;
-  color: #555555;
-}
-
-.tabbody {
-  height: 100%;
-  border-left: #229DDB solid 2px;
-  margin: 0;
-  padding: 10px;
-  vertical-align: top;
-}
-
-.standardbody {
-  background: #404040;
-  padding: 0;
-  margin: 0;
-}
-
-.standardform {
-  height: 100%;
-  padding: 0;
-  margin: 0;
-}
-
-.page {
-  width: 100%;
-  height: 100%;
-  background: #FFFFFF;
-  border-width: 0 !important;
-}
-
-.banner {
-  width: 100%;
-  min-height: 45px;
-  background: #FFFFFF;
-  color: black;
-}
-
-.bannertable {
-  width: 100%;
-  margin: 0;
-  padding: 0;
-  border-style: none;
-  border-width: 0;
-  border-collapse: collapse;
-  border-bottom: 1px solid #DDDDDD;
-  background: #F8F8F8;
-}
-
-.bannerrow {
-  width: 100%;
-  height: 100%;
-}
-
-.headerimage {
-  width: 50px;
-  text-align: left;
-  vertical-align: top;
-  padding: 0;
-  margin: 0;
-}
-
-.headerimage img {
-  margin: 12px;
-}
-
-.headertable {
-  margin: 0;
-  padding: 0;
-  border-style: none;
-  border-width: 0;
-  border-collapse: collapse;
-  width: 100%;
-  height: 100%;
-}
-
-.headerdaterow {
-  width: 100%;
-  text-align: right !important;
-}
-
-.headerrow {
-  width: 100%;
-  height: 100%;
-  vertical-align: middle !important;
-  text-align: left !important;
-}
-
-.headercell {
-  vertical-align: top;
-  width: 100%;
-  height: 100%;
-}
-
-.header {
-  color: black;
-  font-weight: bold;
-  font-size: 20px;
-}
-
-.headerdate {
-  color: black;
-  font-weight: 200;
-  font-size: 10px;
-}
-
-.navigation {
-  width: 17%;
-  height: 100%;
-  vertical-align: top;
-  border-top-width: 0;
-  border-right: solid #C0C0C0 1px;
-}
-
-.menumain {
-  border-color: #E5E5E5;
-  border-width: 1px 0;
-  border-style: solid;
-  padding: 10px;
-  background: #F8F8F8;
-  margin: 0 0 -1px 0;
-}
-
-.menusecond {
-  font-size: 12px;
-  list-style: none;
-  text-indent: 0;
-  margin: 0;
-  padding: 0;
-}
-
-.menuitem {
-  margin-left: 16px;
-  padding: 5px;
-  text-indent: 0;
-  border: dotted #E8E8E8;
-  border-width: 1px 0;
-  margin-bottom: -1px;
-}
-
-.menulink {
-
-  text-decoration: none;
-  color: #202020;
-}
-
-.menulink:link {
-
-  text-decoration: none;
-  color: #202020;
-}
-
-.menulink:active {
-
-  text-decoration: none;
-  color: #202020;
-}
-
-.menulink:visited {
-
-  text-decoration: none;
-  color: #202020;
-}
-
-.darkwindow {
-  width: 100%;
-  height: 100%;
-  color: black;
-  vertical-align: top;
-}
-
-.window {
-  width: 83%;
-  height: 100%;
-  background: #FFFFFF;
-  color: black;
-  vertical-align: top;
-  padding: 10px;
-}
-
-.windowtitle {
-  border-bottom: 1px solid #C5E4FF;
-  font-size: 16px;
-  padding: 0 0 10px 10px;
-}
-
-.datatable {
-  width: 100%;
-  margin: 0 -1px;
-  padding: 0;
-  border-style: none;
-  border-width: 0;
-  border-collapse: collapse;
-}
-
-.headerrow {
-  padding: 0;
-  margin: 0;
-  border-style: none;
-  border-width: 0;
-  vertical-align: middle;
-}
-
-.datarow {
-  padding: 0;
-  margin: 0;
-  border: 0;
-  background-color: #F0F0F0;
-  vertical-align: top;
-}
-
-.evendatarow {
-  margin: 0;
-  padding: 0;
-  border-style: none;
-  border-width: 0;
-  vertical-align: top;
-}
-
-.odddatarow {
-  padding: 0;
-  margin: 0;
-  border-style: none;
-  border-width: 0;
-  vertical-align: top;
-  background-color: #FAFAFA;
-}
-
-.columnheader {
-  padding: 8px;
-  border: solid 1px;
-  border-color: #C5E4FF #EEEEEE #EEEEEE #CCCCCC;
-  font-size: 13px;
-  font-weight: 700;
-}
-
-.columnheader:first-child, .evendatarow:first-child, .odddatarow:first-child {
-  border-left-width: 0;
-}
-
-.columnheader:last-child, .evendatarow:last-child, .odddatarow:last-child {
-  border-right-width: 0;
-}
-
-.columncell {
-  margin: 0;
-  padding: 7px;
-  font-size: 12px;
-  border: 1px solid #EEEEEE;
-
-}
-
-.columncell a {
-  border: solid 1px #CCCCCC;
-  padding: 1px 4px;
-  margin: 0;
-  display: block;
-  float: left;
-  text-decoration: none;
-  margin-left: -1px;
-  background: #EEEEEE;
-  font-size: 11px;
-}
-
-.columncell a:hover {
-  background: #DDDDDD;
-}
-
-.reportcolumnheader {
-  padding: 0 5px;
-  margin: 0;
-  color: #404040;
-  font-size: 10px;
-
-}
-
-.reportcolumncell {
-  padding: 0 5px;
-  margin: 0;
-  border: 0;
-  color: black;
-  font-size: 8px;
+body
+{
+    font-family: "Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
+    padding: 0;
+    margin: 0;
+    font-size: 12px;
+    color: #444;
+}
+.tabtable
+{
+    height: 100%;
+    width: 100%;
+    border: 0 solid #fff;
+    margin: 0;
+    padding: 0;
+    border-collapse: collapse;
+}
+
+.tabspacerrow
+{
+    height: 3px;
+}
+
+.spacertab
+{
+    background: #f8f8f8;
+    border-style: solid;
+    border-width: 1px 0 0 1px;
+    border-color: #ccc #ccc #ccc #ccc;
+    margin: 0;
+    padding: 0px 0px 0px 0px;
+    vertical-align: top;
+    height: 3px;
+}
+
+.tabsequencerow
+{
+    height: 8px;
+    font-size: 8px;
+    line-height: 8px;
+}
+
+.blanksequencetab
+{
+    background: #f8f8f8;
+    border-style: solid;
+    border-width: 0 0 0 1px;
+    border-color: #ccc #ccc #229ddb #ccc;
+    margin: 0;
+    padding: 2px 10px 3px 10px;
+    vertical-align: top;
+    height: 8px;
+}
+
+.sequencetab
+{
+    background: #fcfcfc;
+    border-style: solid;
+    border-width: 1px 1px 0 1px;
+    border-color: #ccc #ccc #229ddb #ccc;
+    margin: 0;
+    padding: 2px 10px 3px 10px;
+    height: 8px;
+    vertical-align: top;
+	text-align: center;
+}
+
+.tabrow
+{
+    height: 20px;
+    font-size: 12px;
+    line-height: 12px;
+}
+
+.tabbodyrow
+{
+    height: 100%;
+}
+
+.passivetab
+{
+    background: #fcfcfc;
+    border: solid 1px;
+    border-color: #ccc #ccc #229ddb #ccc;
+    margin: 0;
+    padding: 4px 10px 5px 10px;
+    vertical-align: top;
+    height: 20px;
+}
+.passivetab a{
+    text-decoration: none;
+}
+.activetab
+{
+    background: #fff;
+    border-style: solid;
+    border-width: 1px 1px 0 2px;
+    border-color: #229ddb;
+    margin: 0;
+    padding: 4px 10px 5px 10px;
+    height: 20px;
+    vertical-align: top;
+}
+
+.remaindertab
+{
+    width: 100%;
+    background: #f8f8f8;
+    border-style: solid;
+    border-width: 1px 1px 1px 0;
+    border-color: #ccc #ccc #229ddb;
+    padding: 18px 10px 2px 10px;
+    height: 28px;
+    vertical-align: top;
+    text-align: right;
+	font-size: 12px;
+    color: #555;
+}
+
+.tabbody
+{
+    height: 100%;
+    border-left: #229ddb solid 2px;
+    margin: 0;
+    padding: 10px;
+    vertical-align: top;
+}
+
+.standardbody
+{
+    background: #404040;
+    padding: 0;
+    margin: 0;
+}
+
+.standardform
+{
+    height: 100%;
+    padding: 0;
+    margin: 0;
+}
+
+.page
+{
+    width: 100%;
+    height: 100%;
+    background: #fff;
+    border-width: 0 !important;
+}
+
+.banner
+{
+    width: 100%;
+    min-height: 45px;
+    background: #fff;
+    color: black;
+}
+
+.bannertable
+{
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    border-style: none;
+    border-width: 0;
+    border-collapse: collapse;
+    border-bottom: 1px solid #ddd;
+    background: #f8f8f8;
+}
+
+.bannerrow
+{
+	width: 100%;
+	height: 100%;
+}
+
+.headerimage
+{
+    width: 50px;
+    text-align: left;
+    vertical-align: top;
+    padding: 0;
+    margin: 0;
+}
+.headerimage img{
+    margin: 12px;
+}
+
+.headertable
+{
+    margin: 0;
+    padding: 0;
+    border-style: none;
+    border-width: 0;
+    border-collapse: collapse;
+	width: 100%;
+	height: 100%;
+}
+
+.headerdaterow
+{
+	width: 100%;
+	text-align: right !important;
+}
+
+.headerrow
+{
+	width: 100%;
+	height: 100%;
+	vertical-align: middle !important;
+	text-align: left !important;
+}
+
+.headercell
+{
+	vertical-align: top;
+	width: 100%;
+	height: 100%;
+}
+
+.header
+{
+    color: black;
+    font-weight: bold;
+    font-size: 20px;
+}
+
+.headerdate
+{
+    color: black;
+    font-weight: 200;
+    font-size: 10px;
+}
+
+.navigation
+{
+    width: 17%;
+    height: 100%;
+    vertical-align: top;
+    border-top-width: 0;
+    border-right: solid #c0c0c0 1px;
+}
+
+.menumain
+{
+    border-color: #E5E5E5;
+    border-width: 1px 0;
+    border-style: solid;
+    padding: 10px;
+    background: #f8f8f8;
+    margin: 0 0 -1px 0;
+}
+
+.menusecond
+{
+    font-size: 12px;
+    list-style: none;
+    text-indent: 0;
+    margin: 0;
+    padding: 0;
+}
+
+.menuitem
+{
+    margin-left: 16px;
+    padding: 5px;
+    text-indent: 0;
+    border: dotted #e8e8e8;
+    border-width: 1px 0;
+    margin-bottom: -1px;
+}
+
+.menulink
+{
+
+    text-decoration: none;
+    color: #202020;
+}
+
+.menulink:link
+{
+
+    text-decoration: none;
+    color: #202020;
+}
+
+.menulink:active
+{
+
+    text-decoration: none;
+    color: #202020;
+}
+
+.menulink:visited
+{
+
+    text-decoration: none;
+    color: #202020;
+}
+
+.darkwindow
+{
+    width: 100%;
+    height: 100%;
+    color: black;
+    vertical-align: top;
+}
+
+.window
+{
+    width: 83%;
+    height: 100%;
+    background: #fff;
+    color: black;
+    vertical-align: top;
+    padding: 10px;
+}
+
+.windowtitle
+{
+    border-bottom: 1px solid #c5e4ff;
+    font-size: 16px;
+    padding: 0 0 10px 10px;
+}
+
+.datatable
+{
+    width: 100%;
+    margin: 0 -1px;
+    padding: 0;
+    border-style: none;
+    border-width: 0;
+    border-collapse: collapse;
+}
+
+.headerrow
+{
+    padding: 0;
+    margin: 0;
+    border-style: none;
+    border-width: 0;
+    vertical-align: middle;
+}
+
+.datarow
+{
+    padding: 0;
+    margin: 0;
+    border: 0;
+    background-color: #f0f0f0;
+    vertical-align: top;
+}
+
+.evendatarow
+{
+    margin: 0;
+    padding: 0;
+    border-style: none;
+    border-width: 0;
+    vertical-align: top;
+}
+
+.odddatarow
+{
+    padding: 0;
+    margin: 0;
+    border-style: none;
+    border-width: 0;
+    vertical-align: top;
+    background-color: #fafafa;
+}
+
+.columnheader
+{
+    padding: 8px;
+    border: solid 1px;
+    border-color: #c5e4ff #eee #eee #ccc;
+    font-size: 13px;
+    font-weight: 700;
+}
+.columnheader:first-child, .evendatarow:first-child, .odddatarow:first-child{
+    border-left-width: 0;
+}
+.columnheader:last-child, .evendatarow:last-child, .odddatarow:last-child{
+    border-right-width: 0;
+}
+
+.columncell
+{
+    margin: 0;
+    padding: 7px;
+    font-size: 12px;
+    border: 1px solid #eee;
+
+}
+.columncell a{
+    border: solid 1px #ccc;
+    padding: 1px 4px;
+    margin: 0;
+    display: block;
+    float: left;
+    text-decoration: none;
+    margin-left: -1px;
+    background: #eee;
+    font-size: 11px;
+}
+.columncell a:hover{
+    background: #ddd;
+}
+
+.reportcolumnheader
+{
+    padding:0 5px;
+    margin: 0;
+    color: #404040;
+    font-size: 10px;
+
+}
+
+.reportcolumncell
+{
+    padding:0 5px;
+    margin: 0;
+    border: 0;
+    color: black;
+    font-size: 8px;
+
+}
+
+.reportfootertable
+{
+    width: 100%;
+    padding: 0;
+    margin: 0;
+    border: 0;
+    border-collapse: collapse;
+}
+
+.reportfooterrow
+{
+	width: 100%;
+    padding: 0;
+    margin: 0;
+    border: 0;
+    background-color: #f0f0f0;
+    vertical-align: center;
+}
+
+.reportfootercell
+{
+    padding-left: 5px;
+	padding-right:5px;
+	padding-top: 5px;
+	padding-bottom: 5px;
+	margin: 0
+    border: 0;
+    color: black;
+    font-size: 10px;
+}
+
+.formtable
+{
+    width: 100%;
+    padding: 0;
+    margin: 0;
+    border: 0;
+    border-collapse: collapse;
+}
+
+.formheaderrow
+{
+    margin: 0;
+    padding: 0;
+    border: 0;
+    background-color: #f9f9f9;
+    vertical-align: middle;
+}
+
+.formcolumnheader
+{
+    padding: 5px;
+    color: #404040;
+    font-size: 10px;
+
+}
+
+.evenformrow
+{
+    padding: 0;
+    margin: 0;
+    border: 0;
+    background-color: #f8f8f8;
+    vertical-align: top;
+}
+
+.oddformrow
+{
+    padding: 0;
+    margin: 0;
+    border: 0;
+    background-color: #f8f8f8;
+    vertical-align: top;
+}
+
+.formrow
+{
+    padding: 0;
+    margin: 0;
+    border-style: none;
+    border-width: 0;
+    vertical-align: top;
+    background-color: #f6f6f6;
+}
+
+.formcolumncell
+{
+    padding:5px;
+    margin: 0;
+    border-style: none;
+    border-width: 0;
+    color: black;
+    font-size: 8px;
+}
+
+.formcolumncell input[type="button"]
+{
+    min-height: 22px;
+    padding: 0 10px;
+}
+
+.formcolumnmessage
+{
+    padding:0 5px;
+    margin: 0;
+    border-style: none;
+    border-width: 0;
+    color: black;
+    font-size: 8px;
+    text-align: center;
+}
+
+.formseparator
+{
+    padding: 0;
+    margin:0;
+    border-bottom: solid 1px #eee;
+    color: #808080;
+    font-size: 5px;
+}
+
+.formseparator hr
+{
+    display: none;
+}
+
+.displaytable
+{
+    width: 100%;
+    padding: 0;
+    margin: 0;
+    border: 0;
+    border-collapse: collapse;
+}
+
+.description
+{
+    padding-left: 0;
+	padding-right:5px;
+	padding-top: 0;
+	padding-bottom: 0;
+	margin-left: 0;
+	margin-right: 0;
+	margin-top: 5px;
+	margin-bottom: 0;
+	border: 0;
+    color: #404040;
+    font-size: 12px;
+    text-align: left;
+}
+
+.description input[type="button"], .formcolumncell input[type="button"]
+{
+    min-height: 30px;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    padding: 10px;
+    border: #6FB3E0 2px solid;
+    background-color: #6FB3E0 !important;
+    color: #fff;
+}
+
+.description a input[type="button"]{
+    border: none;
+    background: none transparent;
+    margin: -4px;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    padding: 0 10px;
+}
+
+.message
+{
+    padding: 10px 0;
+    margin: 0;
+    border-style: none;
+    border-width: 0;
+    font-size: 14px;
+}
+
+.message a
+{
+    padding: 10px;
+    border-right: #6FB3E0 2px solid;
+    background-color: #6FB3E0 !important;
+    text-decoration: none;
+    color: #fff;
+    cursor: pointer;
+    margin: 0 5px 0 0;
+}
+
+.message input[type="button"], .formcolumncell input[type="button"]
+{
+    min-height: 30px;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    padding: 10px;
+    border: #6FB3E0 2px solid;
+    background-color: #6FB3E0 !important;
+    color: #fff;
+}
+
+.message a input[type="button"]{
+    border: none;
+    background: none transparent;
+    margin: -4px;
+    font-size: 14px;
+    color: #fff;
+    cursor: pointer;
+    padding: 0 10px;
+}
+
+.value
+{
+    width: 100%;
+    padding-left: 0;
+    padding-right: 0;
+	padding-top: 0;
+	padding-bottom: 0;
+    margin-left: 0;
+	margin-right: 0;
+	margin-top: 5px;
+	margin-bottom: 0;
+    border: 0;
+    color: black;
+    font-size: 12px;
+    text-align: left;
+}
+
+.value input[type="text"], .value input[type="password"]
+{
+    border: 1px solid #bbb;
+    padding: 5px;
+    margin-top: 10px;
+}
+
+.boxcell
+{
+    margin: 0 2px;
+    padding: 0;
+    border: solid 1px #e0e0e0;
+}
+
+.separator
+{
+    padding: 5px 0;
+    color: #f0f0f0;
+    font-size: 5px;
+    border-bottom: dotted 1px #eee;
+}
+.separator hr{
+    display: none;
+}
+
+.lightseparator
+{
+    padding: 0;
+    margin: 1px 5px;
+    border-width: 1px;
+    border-color: #808080;
+    color: #808080;
+    font-size: 5px;
+    background-color: #e0e0e0;
+}
+.lightseparator hr{
+    display: none;
+}
+.schedulepulldown, .value select
+{
+    margin-top: 10px;
+    font-size: 12px;
+    border: solid #bbb 1px;
+}
+H1, H2, H3, H4, H5, H6, P, UL, OL, DIR, MENU, DIV, 
+DT, DD, ADDRESS, BLOCKQUOTE, PRE, BR, HR, FORM, DL { 
+    display: block }
+
+B, STRONG, I, EM, CITE, VAR, TT, CODE, KBD, SAMP, 
+IMG, SPAN { display: inline }
+
+LI { display: list-item }
+
+H1, H2, H3, H4 { margin-top: 1em; margin-bottom: 1em }
+H5, H6 { margin-top: 1em }
+H1 { text-align: center }
+H1, H2, H4, H6 { font-weight: bold }
+H3, H5 { font-style: italic }
+
+H1 { font-size: xx-large }
+H2 { font-size: x-large }
+H3 { font-size: large }
+
+B, STRONG { font-weight: bolder }  /* relative to the parent */
+I, CITE, EM, VAR, ADDRESS, BLOCKQUOTE { font-style: italic }
+PRE, TT, CODE, KBD, SAMP { font-family: monospace }
+
+PRE { white-space: pre }
+
+ADDRESS { margin-left: 3em }
+BLOCKQUOTE { margin-left: 3em; margin-right: 3em }
+
+UL, DIR { list-style: disc }
+OL { list-style: decimal }
+MENU { margin: 0 }              /* tight formatting */
+LI { margin-left: 3em }
 
-}
-
-.reportfootertable {
-  width: 100%;
-  padding: 0;
-  margin: 0;
-  border: 0;
-  border-collapse: collapse;
-}
-
-.reportfooterrow {
-  width: 100%;
-  padding: 0;
-  margin: 0;
-  border: 0;
-  background-color: #F0F0F0;
-  vertical-align: center;
-}
-
-.reportfootercell {
-  padding-left: 5px;
-  padding-right: 5px;
-  padding-top: 5px;
-  padding-bottom: 5px;
-  margin: 0 border : 0;
-  color: black;
-  font-size: 10px;
-}
-
-.formtable {
-  width: 100%;
-  padding: 0;
-  margin: 0;
-  border: 0;
-  border-collapse: collapse;
-}
-
-.formheaderrow {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  background-color: #F9F9F9;
-  vertical-align: middle;
-}
-
-.formcolumnheader {
-  padding: 5px;
-  color: #404040;
-  font-size: 10px;
-
-}
-
-.evenformrow {
-  padding: 0;
-  margin: 0;
-  border: 0;
-  background-color: #F8F8F8;
-  vertical-align: top;
-}
-
-.oddformrow {
-  padding: 0;
-  margin: 0;
-  border: 0;
-  background-color: #F8F8F8;
-  vertical-align: top;
-}
-
-.formrow {
-  padding: 0;
-  margin: 0;
-  border-style: none;
-  border-width: 0;
-  vertical-align: top;
-  background-color: #F6F6F6;
-}
-
-.formcolumncell {
-  padding: 5px;
-  margin: 0;
-  border-style: none;
-  border-width: 0;
-  color: black;
-  font-size: 8px;
-}
-
-.formcolumncell input[type="button"] {
-  min-height: 22px;
-  padding: 0 10px;
-}
-
-.formcolumnmessage {
-  padding: 0 5px;
-  margin: 0;
-  border-style: none;
-  border-width: 0;
-  color: black;
-  font-size: 8px;
-  text-align: center;
-}
-
-.formseparator {
-  padding: 0;
-  margin: 0;
-  border-bottom: solid 1px #EEEEEE;
-  color: #808080;
-  font-size: 5px;
-}
-
-.formseparator hr {
-  display: none;
-}
-
-.displaytable {
-  width: 100%;
-  padding: 0;
-  margin: 0;
-  border: 0;
-  border-collapse: collapse;
-}
-
-.description {
-  padding-left: 0;
-  padding-right: 5px;
-  padding-top: 0;
-  padding-bottom: 0;
-  margin-left: 0;
-  margin-right: 0;
-  margin-top: 5px;
-  margin-bottom: 0;
-  border: 0;
-  color: #404040;
-  font-size: 12px;
-  text-align: left;
-}
-
-.description input[type="button"], .formcolumncell input[type="button"] {
-  min-height: 30px;
-  font-size: 14px;
-  color: #FFFFFF;
-  cursor: pointer;
-  padding: 10px;
-  border: #6FB3E0 2px solid;
-  background-color: #6FB3E0 !important;
-  color: #FFFFFF;
-}
-
-.description a input[type="button"] {
-  border: none;
-  background: none transparent;
-  margin: -4px;
-  font-size: 14px;
-  color: #FFFFFF;
-  cursor: pointer;
-  padding: 0 10px;
-}
-
-.message {
-  padding: 10px 0;
-  margin: 0;
-  border-style: none;
-  border-width: 0;
-  font-size: 14px;
-}
-
-.message a {
-  padding: 10px;
-  border-right: #6FB3E0 2px solid;
-  background-color: #6FB3E0 !important;
-  text-decoration: none;
-  color: #FFFFFF;
-  cursor: pointer;
-  margin: 0 5px 0 0;
-}
-
-.message input[type="button"], .formcolumncell input[type="button"] {
-  min-height: 30px;
-  font-size: 14px;
-  color: #FFFFFF;
-  cursor: pointer;
-  padding: 10px;
-  border: #6FB3E0 2px solid;
-  background-color: #6FB3E0 !important;
-  color: #FFFFFF;
-}
-
-.message a input[type="button"] {
-  border: none;
-  background: none transparent;
-  margin: -4px;
-  font-size: 14px;
-  color: #FFFFFF;
-  cursor: pointer;
-  padding: 0 10px;
-}
-
-.value {
-  width: 100%;
-  padding-left: 0;
-  padding-right: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  margin-left: 0;
-  margin-right: 0;
-  margin-top: 5px;
-  margin-bottom: 0;
-  border: 0;
-  color: black;
-  font-size: 12px;
-  text-align: left;
-}
-
-.value input[type="text"], .value input[type="password"] {
-  border: 1px solid #BBBBBB;
-  padding: 5px;
-  margin-top: 10px;
-}
-
-.boxcell {
-  margin: 0 2px;
-  padding: 0;
-  border: solid 1px #E0E0E0;
-}
-
-.separator {
-  padding: 5px 0;
-  color: #F0F0F0;
-  font-size: 5px;
-  border-bottom: dotted 1px #EEEEEE;
-}
-
-.separator hr {
-  display: none;
-}
-
-.lightseparator {
-  padding: 0;
-  margin: 1px 5px;
-  border-width: 1px;
-  border-color: #808080;
-  color: #808080;
-  font-size: 5px;
-  background-color: #E0E0E0;
-}
-
-.lightseparator hr {
-  display: none;
-}
-
-.schedulepulldown, .value select {
-  margin-top: 10px;
-  font-size: 12px;
-  border: solid #BBBBBB 1px;
-}
-
-H1, H2, H3, H4, H5, H6, P, UL, OL, DIR, MENU, DIV,
-DT, DD, ADDRESS, BLOCKQUOTE, PRE, BR, HR, FORM, DL {
-  display: block
-}
-
-B, STRONG, I, EM, CITE, VAR, TT, CODE, KBD, SAMP,
-IMG, SPAN {
-  display: inline
-}
-
-LI {
-  display: list-item
-}
-
-H1, H2, H3, H4 {
-  margin-top: 1em;
-  margin-bottom: 1em
-}
-
-H5, H6 {
-  margin-top: 1em
-}
-
-H1 {
-  text-align: center
-}
-
-H1, H2, H4, H6 {
-  font-weight: bold
-}
-
-H3, H5 {
-  font-style: italic
-}
-
-H1 {
-  font-size: xx-large
-}
-
-H2 {
-  font-size: x-large
-}
-
-H3 {
-  font-size: large
-}
-
-B, STRONG {
-  font-weight: bolder
-}
-
-/* relative to the parent */
-I, CITE, EM, VAR, ADDRESS, BLOCKQUOTE {
-  font-style: italic
-}
-
-PRE, TT, CODE, KBD, SAMP {
-  font-family: monospace
-}
-
-PRE {
-  white-space: pre
-}
-
-ADDRESS {
-  margin-left: 3em
-}
-
-BLOCKQUOTE {
-  margin-left: 3em;
-  margin-right: 3em
-}
-
-UL, DIR {
-  list-style: disc
-}
-
-OL {
-  list-style: decimal
-}
-
-MENU {
-  margin: 0
-}
-
-/* tight formatting */
-LI {
-  margin-left: 3em
-}
-
-DT {
-  margin-bottom: 0
-}
-
-DD {
-  margin-top: 0;
-  margin-left: 3em
-}
+DT { margin-bottom: 0 }
+DD { margin-top: 0; margin-left: 3em }
 

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1685187&r1=1685186&r2=1685187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewauthority.jsp Fri Jun 12 22:54:43 2015
@@ -2,24 +2,24 @@
 
 <%
 
-  /* $Id$ */
+/* $Id$ */
 
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* 
+* http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 %>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -28,251 +28,199 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.ApacheManifoldCFViewAuthorityConnectionStatus")%>
-  </title>
-
-  <script type="text/javascript">
-    <!--
-
-    function Delete(connectionName) {
-      if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewauthority.DeleteConnection")%> '" + connectionName + "'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewauthority.qmark")%>")) {
-        document.viewconnection.op.value = "Delete";
-        document.viewconnection.connname.value = connectionName;
-        document.viewconnection.submit();
-      }
-    }
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+	<title>
+		<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.ApacheManifoldCFViewAuthorityConnectionStatus")%>
+	</title>
+
+	<script type="text/javascript">
+	<!--
+
+	function Delete(connectionName)
+	{
+		if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewauthority.DeleteConnection")%> '"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewauthority.qmark")%>"))
+		{
+			document.viewconnection.op.value="Delete";
+			document.viewconnection.connname.value=connectionName;
+			document.viewconnection.submit();
+		}
+	}
 
-    //-->
-  </script>
+	//-->
+	</script>
 
 </head>
 
 <body class="standardbody">
 
-<table class="page">
-  <tr>
-    <td colspan="2" class="banner">
-      <jsp:include page="banner.jsp" flush="true"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="navigation">
-      <jsp:include page="navigation.jsp" flush="true"/>
-    </td>
-    <td class="window">
-      <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.ViewAuthorityConnectionStatus")%>
-      </p>
-
-      <form class="standardform" name="viewconnection" action="execute.jsp" method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="authority"/>
-        <input type="hidden" name="connname" value=""/>
-
-        <%
-          try {
-            IAuthorityConnectionManager manager = AuthorityConnectionManagerFactory.make(threadContext);
-            IAuthorityConnectorManager connectorManager = AuthorityConnectorManagerFactory.make(threadContext);
-            IAuthorityConnectorPool authorityConnectorPool = AuthorityConnectorPoolFactory.make(threadContext);
-            String connectionName = variableContext.getParameter("connname");
-            IAuthorityConnection connection = manager.load(connectionName);
-            if (connection == null) {
-              throw new ManifoldCFException("No such authority: '" + connectionName + "'");
-            } else {
-              String description = connection.getDescription();
-              if (description == null)
-                description = "";
-              String className = connection.getClassName();
-              String connectorName = connectorManager.getDescription(className);
-              if (connectorName == null)
-                connectorName = className + Messages.getString(pageContext.getRequest().getLocale(), "viewauthority.uninstalled");
-              int maxCount = connection.getMaxConnections();
-              String prereq = connection.getPrerequisiteMapping();
-              String authDomain = connection.getAuthDomain();
-              if (authDomain == null)
-                authDomain = "";
-              String groupName = connection.getAuthGroup();
-              if (groupName == null)
-                groupName = "";
-
-              ConfigParams parameters = connection.getConfigParams();
-
-              // Do stuff so we can call out to display the parameters
-              //String JSPFolder = AuthorityConnectorFactory.getJSPFolder(threadContext,className);
-              //threadContext.save("Parameters",parameters);
-
-              // Now, test the connection.
-              String connectionStatus;
-              try {
-                IAuthorityConnector c = authorityConnectorPool.grab(connection);
-                if (c == null) {
-                  connectionStatus = Messages.getString(pageContext.getRequest().getLocale(), "viewauthority.Connectorisnotinstalled");
-                } else {
-                  try {
-                    connectionStatus = c.check();
-                  } finally {
-                    authorityConnectorPool.release(connection, c);
-                  }
-                }
-              } catch (ManifoldCFException e) {
-                connectionStatus = Messages.getString(pageContext.getRequest().getLocale(), "viewauthority.Threwexception") + " '" + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage()) + "'";
-              }
-        %>
-        <table class="displaytable">
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.NameColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1"><%="<!--connection=" + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName) + "-->"%>
-              <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%>
-              </nobr>
-            </td>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.DescriptionColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.AuthorityTypeColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1">
-              <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%>
-              </nobr>
-            </td>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.MaxConnectionsColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.AuthorityGroupColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1">
-              <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName)%>
-              </nobr>
-            </td>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.AuthorizationDomainColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1">
-              <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authDomain)%>
-              </nobr>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.PrerequisiteUserMappingColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="3">
-              <%
-                if (prereq != null) {
-              %>
-              <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(prereq)%>
-              </nobr>
-              <%
-              } else {
-              %>
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.NoPrerequisites")%>
-              </nobr>
-              <%
-                }
-              %>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="4">
-              <%
-                AuthorityConnectorFactory.viewConfiguration(threadContext, className, new org.apache.manifoldcf.ui.jsp.JspWrapper(out, adminprofile), pageContext.getRequest().getLocale(), parameters);
-              %>
-
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.ConnectionStatusColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="message" colspan="4">
-              <nobr>
-                <a href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.Refresh")%>
-                </a></nobr>
-              <nobr>
-                <a href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.EditThisAuthorityConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.Edit")%>
-                </a></nobr>
-              <nobr>
-                <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.DeleteThisAuthorityConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewauthority.Delete")%>
-                </a></nobr>
-            </td>
-          </tr>
-        </table>
-
-        <%
-          }
-        } catch (ManifoldCFException e) {
-          e.printStackTrace();
-          variableContext.setParameter("text", e.getMessage());
-          variableContext.setParameter("target", "listauthorities.jsp");
-        %>
-        <jsp:forward page="error.jsp"/>
-        <%
-          }
-        %>
-      </form>
-    </td>
-  </tr>
-</table>
+    <table class="page">
+      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
+      <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
+       <td class="window">
+	<p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.ViewAuthorityConnectionStatus")%></p>
+	<form class="standardform" name="viewconnection" action="execute.jsp" method="POST">
+		<input type="hidden" name="op" value="Continue"/>
+		<input type="hidden" name="type" value="authority"/>
+		<input type="hidden" name="connname" value=""/>
+
+<%
+    try
+    {
+	IAuthorityConnectionManager manager = AuthorityConnectionManagerFactory.make(threadContext);
+	IAuthorityConnectorManager connectorManager = AuthorityConnectorManagerFactory.make(threadContext);
+	IAuthorityConnectorPool authorityConnectorPool = AuthorityConnectorPoolFactory.make(threadContext);
+	String connectionName = variableContext.getParameter("connname");
+	IAuthorityConnection connection = manager.load(connectionName);
+	if (connection == null)
+	{
+		throw new ManifoldCFException("No such authority: '"+connectionName+"'");
+	}
+	else
+	{
+		String description = connection.getDescription();
+		if (description == null)
+			description = "";
+		String className = connection.getClassName();
+		String connectorName = connectorManager.getDescription(className);
+		if (connectorName == null)
+			connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.uninstalled");
+		int maxCount = connection.getMaxConnections();
+		String prereq = connection.getPrerequisiteMapping();
+		String authDomain = connection.getAuthDomain();
+		if (authDomain == null)
+			authDomain = "";
+		String groupName = connection.getAuthGroup();
+		if (groupName == null)
+			groupName = "";
+
+		ConfigParams parameters = connection.getConfigParams();
+
+		// Do stuff so we can call out to display the parameters
+		//String JSPFolder = AuthorityConnectorFactory.getJSPFolder(threadContext,className);
+		//threadContext.save("Parameters",parameters);
+
+		// Now, test the connection.
+		String connectionStatus;
+		try
+		{
+			IAuthorityConnector c = authorityConnectorPool.grab(connection);
+			if (c == null)
+			{
+				connectionStatus = Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.Connectorisnotinstalled");
+			}
+			else
+			{
+				try
+				{
+					connectionStatus = c.check();
+				}
+				finally
+				{
+					authorityConnectorPool.release(connection,c);
+				}
+			}
+		}
+		catch (ManifoldCFException e)
+		{
+			connectionStatus = Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.Threwexception")+" '"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
+		}
+%>
+		<table class="displaytable">
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.NameColon")%></nobr></td>
+				<td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.DescriptionColon")%></nobr></td>
+				<td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorityTypeColon")%></nobr></td>
+				<td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.MaxConnectionsColon")%></nobr></td>
+				<td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorityGroupColon")%></nobr></td>
+				<td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorizationDomainColon")%></nobr></td>
+				<td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authDomain)%></nobr></td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.PrerequisiteUserMappingColon")%></nobr></td>
+				<td class="value" colspan="3">
+<%
+		if (prereq != null)
+		{
+%>
+					<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(prereq)%></nobr>
+<%
+		}
+		else
+		{
+%>
+					<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.NoPrerequisites")%></nobr>
+<%
+		}
+%>
+				</td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td colspan="4">
+<%
+		AuthorityConnectorFactory.viewConfiguration(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters);
+%>
+
+				</td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.ConnectionStatusColon")%></nobr></td>
+				<td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+		<tr><td class="message" colspan="4">
+			<nobr><a href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%></a></nobr>
+			<nobr><a href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.EditThisAuthorityConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Edit")%></a></nobr>
+			<nobr><a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.DeleteThisAuthorityConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Delete")%></a></nobr>
+		</td></tr>
+		</table>
+
+<%
+	}
+    }
+    catch (ManifoldCFException e)
+    {
+	e.printStackTrace();
+	variableContext.setParameter("text",e.getMessage());
+	variableContext.setParameter("target","listauthorities.jsp");
+%>
+	<jsp:forward page="error.jsp"/>
+<%
+    }
+%>
+	    </form>
+       </td>
+      </tr>
+    </table>
 
 </body>
 

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1685187&r1=1685186&r2=1685187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewconnection.jsp Fri Jun 12 22:54:43 2015
@@ -2,24 +2,24 @@
 
 <%
 
-  /* $Id$ */
+/* $Id$ */
 
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* 
+* http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 %>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -28,291 +28,225 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.ApacheManifoldCFViewRepositoryConnectionStatus")%>
-  </title>
-
-  <script type="text/javascript">
-    <!--
-
-    function Delete(connectionName) {
-      if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.DeleteConnection")%> '" + connectionName + "'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.qmark")%>")) {
-        document.viewconnection.op.value = "Delete";
-        document.viewconnection.connname.value = connectionName;
-        document.viewconnection.submit();
-      }
-    }
-
-    function ClearHistory(connectionName) {
-      if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.Thiscommandwillclearallhistoryrelatedto")%> '" + connectionName + "' <%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.period")%>")) {
-        document.viewconnection.op.value = "ClearHistory";
-        document.viewconnection.connname.value = connectionName;
-        document.viewconnection.submit();
-      }
-    }
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+	<title>
+		<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ApacheManifoldCFViewRepositoryConnectionStatus")%>
+	</title>
+
+	<script type="text/javascript">
+	<!--
+
+	function Delete(connectionName)
+	{
+		if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.DeleteConnection")%> '"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.qmark")%>"))
+		{
+			document.viewconnection.op.value="Delete";
+			document.viewconnection.connname.value=connectionName;
+			document.viewconnection.submit();
+		}
+	}
+
+	function ClearHistory(connectionName)
+	{
+		if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.Thiscommandwillclearallhistoryrelatedto")%> '"+connectionName+"' <%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.period")%>"))
+		{
+			document.viewconnection.op.value="ClearHistory";
+			document.viewconnection.connname.value=connectionName;
+			document.viewconnection.submit();
+		}
+	}
 
-    //-->
-  </script>
+	//-->
+	</script>
 
 </head>
 
 <body class="standardbody">
 
-<table class="page">
-  <tr>
-    <td colspan="2" class="banner">
-      <jsp:include page="banner.jsp" flush="true"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="navigation">
-      <jsp:include page="navigation.jsp" flush="true"/>
-    </td>
-    <td class="window">
-      <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.ViewRepositoryConnectionStatus")%>
-      </p>
-
-      <form class="standardform" name="viewconnection" action="execute.jsp" method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="connection"/>
-        <input type="hidden" name="connname" value=""/>
-
-        <%
-          try {
-            IConnectorManager connectorManager = ConnectorManagerFactory.make(threadContext);
-            // Get the connection manager handle
-            IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(threadContext);
-            IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
-            String connectionName = variableContext.getParameter("connname");
-            IRepositoryConnection connection = connManager.load(connectionName);
-            if (connection == null) {
-              throw new ManifoldCFException("No such connection: '" + connectionName + "'");
-            } else {
-              String description = connection.getDescription();
-              if (description == null)
-                description = "";
-              String className = connection.getClassName();
-              String connectorName = connectorManager.getDescription(className);
-              if (connectorName == null)
-                connectorName = className + Messages.getString(pageContext.getRequest().getLocale(), "viewconnection.uninstalled");
-              String authorityName = connection.getACLAuthority();
-              if (authorityName == null)
-                authorityName = Messages.getString(pageContext.getRequest().getLocale(), "viewconnection.NoneGlobalAuthority");
-              int maxCount = connection.getMaxConnections();
-              String[] throttles = connection.getThrottles();
-              ConfigParams parameters = connection.getConfigParams();
-
-              // Do stuff so we can call out to display the parameters
-              //String JSPFolder = RepositoryConnectorFactory.getJSPFolder(threadContext,className);
-              //threadContext.save("Parameters",parameters);
-
-              // Now, test the connection.
-              String connectionStatus;
-              try {
-                IRepositoryConnector c = repositoryConnectorPool.grab(connection);
-                if (c == null)
-                  connectionStatus = Messages.getString(pageContext.getRequest().getLocale(), "viewconnection.Connectorisnotinstalled");
-                else {
-                  try {
-                    connectionStatus = c.check();
-                  } finally {
-                    repositoryConnectorPool.release(connection, c);
-                  }
-                }
-              } catch (ManifoldCFException e) {
-                connectionStatus = Messages.getString(pageContext.getRequest().getLocale(), "viewconnection.Threwexception") + " '" + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage()) + "'";
-              }
-        %>
-        <table class="displaytable">
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.NameColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1"><%="<!--connection=" + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName) + "-->"%>
-              <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%>
-              </nobr>
-            </td>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.DescriptionColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.ConnectionTypeColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1">
-              <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%>
-              </nobr>
-            </td>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.MaxConnectionsColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.AuthorityGroupColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="3">
-              <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName)%>
-              </nobr>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.ThrottlingColon")%>
-              </nobr>
-            </td>
-            <td class="boxcell" colspan="3">
-              <table class="formtable">
-                <tr class="formheaderrow">
-                  <td class="formcolumnheader">
-                    <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.Binregularexpression")%>
-                    </nobr>
-                  </td>
-                  <td class="formcolumnheader">
-                    <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.Description")%>
-                    </nobr>
-                  </td>
-                  <td class="formcolumnheader">
-                    <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.Maxavgfetches")%>
-                    </nobr>
-                  </td>
-                </tr>
-                <%
-                  int j = 0;
-                  while (j < throttles.length) {
-                %>
-                <tr class='<%=((j % 2)==0)?"evenformrow":"oddformrow"%>'>
-                  <td class="formcolumncell">
-                    <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(throttles[j])%>
-                    </nobr>
-                  </td>
-                  <td class="formcolumncell">
-                    <%
-                      String tdescription = connection.getThrottleDescription(throttles[j]);
-                      if (tdescription != null && tdescription.length() > 0) {
-                    %>
-                    <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tdescription)%>
-                    </nobr>
-                    <%
-                      }
-                    %>
-                  </td>
-                  <td class="formcolumncell">
-                    <%=new Long((long) ((double) connection.getThrottleValue(throttles[j]) * (double) 60000.0 + 0.5)).toString()%>
-                  </td>
-                </tr>
-                <%
-                    j++;
-                  }
-                  if (j == 0) {
-                %>
-                <tr class="formrow">
-                  <td colspan="3" class="formmessage">
-                    <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.NoThrottles")%>
-                    </nobr>
-                  </td>
-                </tr>
-                <%
-                  }
-                %>
-              </table>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="4">
-              <%
-                RepositoryConnectorFactory.viewConfiguration(threadContext, className, new org.apache.manifoldcf.ui.jsp.JspWrapper(out, adminprofile), pageContext.getRequest().getLocale(), parameters);
-              %>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.ConnectionStatusColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="message" colspan="4">
-              <nobr>
-                <a href='<%="viewconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.Refresh")%>
-                </a></nobr>
-              <nobr>
-                <a href='<%="editconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.EditThisConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.Edit")%>
-                </a></nobr>
-              <nobr>
-                <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Deletethisconnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.Delete")%>
-                </a></nobr>
-              <nobr>
-                <a href="javascript:void()" onclick='<%="javascript:ClearHistory(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.ClearHistoryAssociatedWithThisConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewconnection.ClearAllRelatedHistory")%>
-                </a></nobr>
-            </td>
-          </tr>
-        </table>
-
-        <%
-          }
-        } catch (ManifoldCFException e) {
-          e.printStackTrace();
-          variableContext.setParameter("text", e.getMessage());
-          variableContext.setParameter("target", "listconnections.jsp");
-        %>
-        <jsp:forward page="error.jsp"/>
-        <%
-          }
-        %>
-      </form>
-    </td>
-  </tr>
-</table>
+    <table class="page">
+      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
+      <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
+       <td class="window">
+	<p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ViewRepositoryConnectionStatus")%></p>
+	<form class="standardform" name="viewconnection" action="execute.jsp" method="POST">
+		<input type="hidden" name="op" value="Continue"/>
+		<input type="hidden" name="type" value="connection"/>
+		<input type="hidden" name="connname" value=""/>
+
+<%
+    try
+    {
+	IConnectorManager connectorManager = ConnectorManagerFactory.make(threadContext);
+	// Get the connection manager handle
+	IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(threadContext);
+	IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext);
+	String connectionName = variableContext.getParameter("connname");
+	IRepositoryConnection connection = connManager.load(connectionName);
+	if (connection == null)
+	{
+		throw new ManifoldCFException("No such connection: '"+connectionName+"'");
+	}
+	else
+	{
+		String description = connection.getDescription();
+		if (description == null)
+			description = "";
+		String className = connection.getClassName();
+		String connectorName = connectorManager.getDescription(className);
+		if (connectorName == null)
+			connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.uninstalled");
+		String authorityName = connection.getACLAuthority();
+		if (authorityName == null)
+			authorityName = Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.NoneGlobalAuthority");
+		int maxCount = connection.getMaxConnections();
+		String[] throttles = connection.getThrottles();
+		ConfigParams parameters = connection.getConfigParams();
+
+		// Do stuff so we can call out to display the parameters
+		//String JSPFolder = RepositoryConnectorFactory.getJSPFolder(threadContext,className);
+		//threadContext.save("Parameters",parameters);
+
+		// Now, test the connection.
+		String connectionStatus;
+		try
+		{
+			IRepositoryConnector c = repositoryConnectorPool.grab(connection);
+			if (c == null)
+				connectionStatus = Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Connectorisnotinstalled");
+			else
+			{
+				try
+				{
+					connectionStatus = c.check();
+				}
+				finally
+				{
+					repositoryConnectorPool.release(connection,c);
+				}
+			}
+		}
+		catch (ManifoldCFException e)
+		{
+			connectionStatus = Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Threwexception")+" '"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
+		}
+%>
+		<table class="displaytable">
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.NameColon")%></nobr></td><td class="value" colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.DescriptionColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionTypeColon")%></nobr></td><td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.MaxConnectionsColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.AuthorityGroupColon")%></nobr></td><td class="value" colspan="3"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName)%></nobr></td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ThrottlingColon")%></nobr></td>
+				<td class="boxcell" colspan="3">
+					<table class="formtable">
+						<tr class="formheaderrow">
+							<td class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Binregularexpression")%></nobr></td>
+							<td class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Description")%></nobr></td>
+							<td class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Maxavgfetches")%></nobr></td>
+						</tr>
+<%
+		int j = 0;
+		while (j < throttles.length)
+		{
+%>
+						<tr class='<%=((j % 2)==0)?"evenformrow":"oddformrow"%>'>
+							<td class="formcolumncell">
+								<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(throttles[j])%></nobr>
+							</td>
+							<td class="formcolumncell">
+<%
+			String tdescription = connection.getThrottleDescription(throttles[j]);
+			if (tdescription != null && tdescription.length() > 0)
+			{
+%>
+								<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tdescription)%></nobr>
+<%
+			}
+%>
+							</td>
+							<td class="formcolumncell">
+								<%=new Long((long)((double)connection.getThrottleValue(throttles[j])*(double)60000.0+0.5)).toString()%>
+							</td>
+						</tr>
+<%
+			j++;
+		}
+		if (j == 0)
+		{
+%>
+						<tr class="formrow"><td colspan="3" class="formmessage"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.NoThrottles")%></nobr></td></tr>
+<%
+		}
+%>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td colspan="4">
+<%
+		RepositoryConnectorFactory.viewConfiguration(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters);
+%>
+				</td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionStatusColon")%></nobr></td><td class="value" colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="message" colspan="4">
+					<nobr><a href='<%="viewconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%></a></nobr>
+					<nobr><a href='<%="editconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.EditThisConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Edit")%></a></nobr>
+					<nobr><a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Deletethisconnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Delete")%></a></nobr>
+					<nobr><a href="javascript:void()" onclick='<%="javascript:ClearHistory(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.ClearHistoryAssociatedWithThisConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ClearAllRelatedHistory")%></a></nobr>
+				</td>
+			</tr>
+		</table>
+
+<%
+	}
+    }
+    catch (ManifoldCFException e)
+    {
+	e.printStackTrace();
+	variableContext.setParameter("text",e.getMessage());
+	variableContext.setParameter("target","listconnections.jsp");
+%>
+	<jsp:forward page="error.jsp"/>
+<%
+    }
+%>
+	    </form>
+       </td>
+      </tr>
+    </table>
 
 </body>
 

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp?rev=1685187&r1=1685186&r2=1685187&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewgroup.jsp Fri Jun 12 22:54:43 2015
@@ -2,24 +2,24 @@
 
 <%
 
-  /* $Id$ */
+/* $Id$ */
 
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+* 
+* http://www.apache.org/licenses/LICENSE-2.0
+* 
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 %>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -28,111 +28,94 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewgroup.ApacheManifoldCFViewGroup")%>
-  </title>
-
-  <script type="text/javascript">
-    <!--
-
-    function Delete(groupName) {
-      document.viewgroup.op.value = "Delete";
-      document.viewgroup.groupname.value = groupName;
-      document.viewgroup.submit();
-    }
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
+	<title>
+		<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.ApacheManifoldCFViewGroup")%>
+	</title>
+
+	<script type="text/javascript">
+	<!--
+
+	function Delete(groupName)
+	{
+		document.viewgroup.op.value="Delete";
+		document.viewgroup.groupname.value=groupName;
+		document.viewgroup.submit();
+	}
 
-    //-->
-  </script>
+	//-->
+	</script>
 
 </head>
 
 <body class="standardbody">
 
-<table class="page">
-  <tr>
-    <td colspan="2" class="banner">
-      <jsp:include page="banner.jsp" flush="true"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="navigation">
-      <jsp:include page="navigation.jsp" flush="true"/>
-    </td>
-    <td class="window">
-      <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewgroup.ViewAuthorityGroup")%>
-      </p>
-
-      <form class="standardform" name="viewgroup" action="execute.jsp" method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="group"/>
-        <input type="hidden" name="groupname" value=""/>
-
-        <%
-          try {
-            // Get the job manager handle
-            IAuthorityGroupManager manager = AuthorityGroupManagerFactory.make(threadContext);
-            String groupName = variableContext.getParameter("groupname");
-            IAuthorityGroup group = manager.load(groupName);
-            if (group == null) {
-              throw new ManifoldCFException("No such group: " + groupName);
-            } else {
-              String description = group.getDescription();
-              if (description == null)
-                description = "";
-        %>
-        <table class="displaytable">
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewgroup.NameColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1"><%="<!--group=" + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName) + "-->"%>
-              <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName)%>
-              </nobr>
-            </td>
-            <td class="description" colspan="1">
-              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewgroup.DescriptionColon")%>
-              </nobr>
-            </td>
-            <td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>
-            </td>
-          </tr>
-          <tr>
-            <td class="separator" colspan="4">
-              <hr/>
-            </td>
-          </tr>
-          <tr>
-            <td class="message" colspan="4">
-              <a href='<%="editgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(groupName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.EditThisAuthorityGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewgroup.Edit")%>
-              </a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(groupName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.DeleteThisAuthorityGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewgroup.Delete")%>
-            </a>
-            </td>
-          </tr>
-        </table>
-
-        <%
-          }
-        } catch (ManifoldCFException e) {
-          e.printStackTrace();
-          variableContext.setParameter("text", e.getMessage());
-          variableContext.setParameter("target", "listgroups.jsp");
-        %>
-        <jsp:forward page="error.jsp"/>
-        <%
-          }
-        %>
-      </form>
-    </td>
-  </tr>
-</table>
+    <table class="page">
+      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
+      <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
+       <td class="window">
+	<p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.ViewAuthorityGroup")%></p>
+
+	<form class="standardform" name="viewgroup" action="execute.jsp" method="POST">
+		<input type="hidden" name="op" value="Continue"/>
+		<input type="hidden" name="type" value="group"/>
+		<input type="hidden" name="groupname" value=""/>
+
+<%
+    try
+    {
+	// Get the job manager handle
+	IAuthorityGroupManager manager = AuthorityGroupManagerFactory.make(threadContext);
+	String groupName = variableContext.getParameter("groupname");
+	IAuthorityGroup group = manager.load(groupName);
+	if (group == null)
+	{
+		throw new ManifoldCFException("No such group: "+groupName);
+	}
+	else
+	{
+		String description = group.getDescription();
+		if (description == null)
+			description = "";
+%>
+		<table class="displaytable">
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.NameColon")%></nobr></td>
+				<td class="value" colspan="1"><%="<!--group="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName)%></nobr></td>
+				<td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.DescriptionColon")%></nobr></td>
+				<td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+			</tr>
+			<tr>
+				<td class="separator" colspan="4"><hr/></td>
+			</tr>
+			<tr>
+				<td class="message" colspan="4">
+					<a href='<%="editgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(groupName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.EditThisAuthorityGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.Edit")%></a>&nbsp;<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(groupName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.DeleteThisAuthorityGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.Delete")%></a>
+				</td>
+			</tr>
+		</table>
+
+<%
+	}
+    }
+    catch (ManifoldCFException e)
+    {
+	e.printStackTrace();
+	variableContext.setParameter("text",e.getMessage());
+	variableContext.setParameter("target","listgroups.jsp");
+%>
+	<jsp:forward page="error.jsp"/>
+<%
+    }
+%>
+	</form>
+       </td>
+      </tr>
+    </table>
 
 </body>
 



Mime
View raw message