Author: kishore
Date: Sun Feb 19 21:03:15 2017
New Revision: 1783695
URL: http://svn.apache.org/viewvc?rev=1783695&view=rev
Log:
Updated simplereport and jobstatus to new UI
Added:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/sidebar.jsp
(with props)
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/simplereport.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/unauthorized.jsp
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp?rev=1783695&r1=1783694&r2=1783695&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp
Sun Feb 19 21:03:15 2017
@@ -1,3 +1,4 @@
+<%@ page import="org.apache.manifoldcf.core.util.URLDecoder" %>
<% response.setHeader("Pragma","No-cache");
response.setDateHeader("Expires",0);
response.setHeader("Cache-Control", "no-cache");
@@ -36,7 +37,17 @@ if (password == null)
adminprofile.login(threadContext,userID,password);
if (adminprofile.getLoggedOn())
- response.sendRedirect("index.jsp");
+{
+ String nextUri = request.getParameter("nextUrl");
+ if (nextUri == null)
+ {
+ response.sendRedirect("index.jsp");
+ }
+ else
+ {
+ response.sendRedirect(URLDecoder.decode(nextUri));
+ }
+}
else
{
// Go back to login page, but with signal that login failed
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/showjobstatus.jsp?rev=1783695&r1=1783694&r2=1783695&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
Sun Feb 19 21:03:15 2017
@@ -48,90 +48,84 @@ try
JobStatus[] jobs = manager.getAllStatus(true,maxCount);
%>
-<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(),"showjobstatus.ApacheManifoldCFStatusOfAllJobs")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"showjobstatus.ApacheManifoldCFStatusOfAllJobs")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"showjobstatus.StatusOfJobs")%>',
+ 'jobs'
+ );
-function Start(jobID)
-{
- document.liststatuses.op.value="Start";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function Start(jobID)
+ {
+ document.liststatuses.op.value="Start";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function StartMinimal(jobID)
-{
- document.liststatuses.op.value="StartMinimal";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function StartMinimal(jobID)
+ {
+ document.liststatuses.op.value="StartMinimal";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function Abort(jobID)
-{
- document.liststatuses.op.value="Abort";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function Abort(jobID)
+ {
+ document.liststatuses.op.value="Abort";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function Restart(jobID)
-{
- document.liststatuses.op.value="Restart";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function Restart(jobID)
+ {
+ document.liststatuses.op.value="Restart";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function RestartMinimal(jobID)
-{
- document.liststatuses.op.value="RestartMinimal";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function RestartMinimal(jobID)
+ {
+ document.liststatuses.op.value="RestartMinimal";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function Pause(jobID)
-{
- document.liststatuses.op.value="Pause";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function Pause(jobID)
+ {
+ document.liststatuses.op.value="Pause";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function Resume(jobID)
-{
- document.liststatuses.op.value="Resume";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function Resume(jobID)
+ {
+ document.liststatuses.op.value="Resume";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
//-->
- </script>
-
-</head>
-
-<body class="standardbody">
+</script>
+<div class="row">
+ <div class="col-md-12">
+ <div class="box box-primary">
+ <form class="standardform" name="liststatuses" action="execute.jsp"
method="POST">
+ <input type="hidden" name="op" value="Continue"/>
+ <input type="hidden" name="type" value="jobstatus"/>
+ <input type="hidden" name="jobid" value=""/>
- <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(),"showjobstatus.StatusOfJobs")%></p>
- <form class="standardform" name="liststatuses" action="execute.jsp"
method="POST">
- <input type="hidden" name="op" value="Continue"/>
- <input type="hidden" name="type" value="jobstatus"/>
- <input type="hidden" name="jobid" value=""/>
-
- <table class="datatable">
+ <div class="box-body">
+ <table class="table table-bordered">
<tr>
- <td class="separator" colspan="8"><hr/></td>
- </tr>
- <tr class="headerrow">
- <td class="columnheader"></td><td
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%></td><td
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%></td><td
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%></td><td
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%></td><td
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%></td><td
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%></td><td
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%></td>
+ <th>Action</th>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%></th>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%></th>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%></th>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%></th>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%></th>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%></th>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%></th>
</tr>
<%
int i = 0;
@@ -210,17 +204,21 @@ function Resume(jobID)
endTime = new Date(js.getEndTime()).toString();
}
%>
- <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
- <td class="columncell">
- <nobr>
+ <tr>
+ <td>
+
<%
if (status == JobStatus.JOBSTATUS_NOTYETRUN ||
status == JobStatus.JOBSTATUS_COMPLETED ||
status == JobStatus.JOBSTATUS_ERROR)
{
%>
- <a href='<%="javascript:Start(\""+js.getJobID()+"\")"%>'
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+"
"+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%></a>
- <a
href='<%="javascript:StartMinimal(\""+js.getJobID()+"\")"%>'
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+"
"+js.getJobID()+"
"+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%></a>
+ <a href='<%="javascript:Start(\""+js.getJobID()+"\")"%>'
+
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+"
"+js.getJobID()%>'
+ class="btn btn-success btn-xs" role="button"><span
class="fa fa-play"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%></a>
+ <a href='<%="javascript:StartMinimal(\""+js.getJobID()+"\")"%>'
+
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+"
"+js.getJobID()+"
"+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'
+ class="btn btn-success btn-xs" role="button"><span
class="fa fa-compress"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%></a>
<%
}
if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -230,8 +228,12 @@ function Resume(jobID)
status == JobStatus.JOBSTATUS_STARTING)
{
%>
- <a href='<%="javascript:Restart(\""+js.getJobID()+"\")"%>'
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+"
"+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%></a>
- <a
href='<%="javascript:RestartMinimal(\""+js.getJobID()+"\")"%>'
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+"
"+js.getJobID()+"
"+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%></a>
+ <a href='<%="javascript:Restart(\""+js.getJobID()+"\")"%>'
+
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+"
"+js.getJobID()%>'
+ class="btn btn-success btn-xs" role="button"><span
class="fa fa-play"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%></a>
+ <a
href='<%="javascript:RestartMinimal(\""+js.getJobID()+"\")"%>'
+
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+"
"+js.getJobID()+"
"+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'
+ class="btn btn-success btn-xs" role="button"><span
class="fa fa-compress"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%></a>
<%
}
if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -239,7 +241,9 @@ function Resume(jobID)
status == JobStatus.JOBSTATUS_WINDOWWAIT)
{
%>
- <a href='<%="javascript:Pause(\""+js.getJobID()+"\")"%>'
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Pausejob")+"
"+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%></a>
+ <a href='<%="javascript:Pause(\""+js.getJobID()+"\")"%>'
+
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Pausejob")+"
"+js.getJobID()%>'
+ class="btn btn-success btn-xs" role="button"><span
class="fa fa-pause"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%></a>
<%
}
if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -252,33 +256,42 @@ function Resume(jobID)
status == JobStatus.JOBSTATUS_RESTARTING)
{
%>
- <a href='<%="javascript:Abort(\""+js.getJobID()+"\")"%>'
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Abortjob")+"
"+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%></a>
+ <a href='<%="javascript:Abort(\""+js.getJobID()+"\")"%>'
+
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Abortjob")+"
"+js.getJobID()%>'
+ class="btn btn-success btn-xs" role="button"><span
class="fa fa-stop"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%></a>
<%
}
if (status == JobStatus.JOBSTATUS_PAUSED)
{
%>
- <a href='<%="javascript:Resume(\""+js.getJobID()+"\")"%>'
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Resumejob")+"
"+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%></a>
+ <a href='<%="javascript:Resume(\""+js.getJobID()+"\")"%>'
+
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Resumejob")+"
"+js.getJobID()%>'
+ class="btn btn-success btn-xs" role="button"><span
class="fa fa-play"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%></a>
<%
}
%>
- </nobr>
+
</td>
- <td
class="columncell"><%="<!--jobid="+js.getJobID()+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%></td><td
class="columncell"><%=statusName%></td><td
class="columncell"><%=startTime%></td><td class="columncell"><%=endTime%></td>
- <td class="columncell"><%=(js.getQueueCountExact()?"":">
")%><%=new Long(js.getDocumentsInQueue()).toString()%></td>
- <td
class="columncell"><%=(js.getOutstandingCountExact()?"":"> ")%><%=new
Long(js.getDocumentsOutstanding()).toString()%></td>
- <td class="columncell"><%=(js.getProcessedCountExact()?"":">
")%><%=new Long(js.getDocumentsProcessed()).toString()%></td>
+ <td><%="<!--jobid=" + js.getJobID() + "-->"%><span jobid="<%=
js.getJobID()
%>"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%></span></td>
+ <td><%=statusName%></td>
+ <td><%=startTime%></td>
+ <td><%=endTime%></td>
+ <td><%=(js.getQueueCountExact()?"":"> ")%><%=new
Long(js.getDocumentsInQueue()).toString()%></td>
+ <td><%=(js.getOutstandingCountExact()?"":"> ")%><%=new
Long(js.getDocumentsOutstanding()).toString()%></td>
+ <td><%=(js.getProcessedCountExact()?"":"> ")%><%=new
Long(js.getDocumentsProcessed()).toString()%></td>
</tr>
<%
}
%>
-
- <tr>
- <td class="separator" colspan="8"><hr/></td>
- </tr>
- <tr><td class="message" colspan="8"><a href="showjobstatus.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.RefreshStatus")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%></a></td></tr>
</table>
-
+ </div>
+ <div class="box-footer clearfix">
+ <div class="btn-group">
+ <a href="showjobstatus.jsp"
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.RefreshStatus")%>"
+ class="link btn btn-primary" role="button"><span class="fa
fa-refresh"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%></a>
+ </div>
+
<%
}
catch (ManifoldCFException e)
@@ -287,16 +300,12 @@ catch (ManifoldCFException e)
variableContext.setParameter("text",e.getMessage());
variableContext.setParameter("target","index.jsp");
%>
- <jsp:forward page="error.jsp"/>
+<jsp:forward page="error.jsp"/>
<%
}
%>
- </form>
- </td>
- </tr>
- </table>
-
-
-</body>
-
-</html>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
Added:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/sidebar.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/sidebar.jsp?rev=1783695&view=auto
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/sidebar.jsp
(added)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/sidebar.jsp
Sun Feb 19 21:03:15 2017
@@ -0,0 +1,194 @@
+<%@ include file="adminHeaders.jsp" %>
+
+<%
+
+/* $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.
+*/
+%>
+
+<section class="sidebar">
+ <ul class="sidebar-menu">
+ <li class="header">MAIN NAVIGATION</li>
+ <li class="outputs treeview">
+ <a href="#">
+ <i class="glyphicon glyphicon-export"></i>
+
<span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.Outputs")%></span>
+ <i class="fa fa-angle-left pull-right"></i>
+ </a>
+ <ul class="treeview-menu">
+ <li>
+ <a class="link" href="listtransformations.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Listtransformationconnections")%>">
+ <i class="glyphicon glyphicon-list"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.ListTransformationConnections")%>
+ </a>
+ </li>
+ <li>
+ <a class="link" href="listoutputs.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Listoutputconnections")%>">
+ <i class="glyphicon glyphicon-list"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.ListOutputConnections")%>
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="authorities treeview">
+ <a href="#">
+ <i class="glyphicon glyphicon-user"></i>
+
<span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.Authorities")%></span>
+ <i class="fa fa-angle-left pull-right"></i>
+ </a>
+ <ul class="treeview-menu">
+ <li>
+ <a class="link" href="listgroups.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Listauthoritygroups")%>">
+ <i class="glyphicon glyphicon-list"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.ListAuthorityGroups")%>
+ </a>
+ </li>
+ <li>
+ <a class="link" href="listmappers.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Listusermappings")%>">
+ <i class="glyphicon glyphicon-list"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.ListUserMappings")%>
+ </a>
+ </li>
+ <li>
+ <a class="link" href="listauthorities.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Listauthorities")%>">
+ <i class="glyphicon glyphicon-list"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.ListAuthorityConnections")%>
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="repositories treeview">
+ <a href="#">
+ <i class="glyphicon glyphicon-import"></i>
+
<span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.Repositories")%></span>
+ <i class="fa fa-angle-left pull-right"></i>
+ </a>
+ <ul class="treeview-menu">
+ <li>
+ <a class="link" href="listconnections.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Listrepositoryconnections")%>">
+ <i class="glyphicon glyphicon-list"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.ListRepositoryConnections")%>
+ </a>
+ </li>
+ <li>
+ <a class="link" href="listnotifications.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Listnotificationconnections")%>">
+ <i class="glyphicon glyphicon-list"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.ListNotificationConnections")%>
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="jobs treeview">
+ <a href="#">
+ <i class="fa fa-laptop"></i>
+
<span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.Jobs")%></span>
+ <i class="fa fa-angle-left pull-right"></i>
+ </a>
+ <ul class="treeview-menu">
+ <li>
+ <a class="link" href="listjobs.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Listjobs")%>">
+ <i class="glyphicon glyphicon-list"></i>
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.ListAllJobs")%>
+ </a>
+ </li>
+ <li>
+ <a class="link" href="showjobstatus.jsp"
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Managejobs")%>">
+ <i class="glyphicon glyphicon-list"></i>
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.StatusAndJobManagement")%>
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="statusreports treeview">
+ <a href="#">
+ <i class="fa fa-table"></i>
+
<span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.StatusReports")%></span>
+ <i class="fa fa-angle-left pull-right"></i>
+ </a>
+ <ul class="treeview-menu">
+ <li>
+ <a class="link" href="documentstatus.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Documentstatus")%>">
+ <i class="fa fa-file-text"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.DocumentStatus")%>
+ </a>
+ </li>
+ <li>
+ <a class="link" href="queuestatus.jsp"
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Queuestatus")%>">
+ <i class="glyphicon glyphicon-list"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.QueueStatus")%>
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="historyreports treeview">
+ <a href="#">
+ <i class="fa fa-history"></i>
+
<span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.HistoryReports")%></span>
+ <i class="fa fa-angle-left pull-right"></i>
+ </a>
+ <ul class="treeview-menu">
+ <li>
+ <a class="link" href="simplereport.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Simplehistory")%>">
+ <i class="fa fa-history"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.SimpleHistory")%>
+ </a>
+ </li>
+ <li>
+ <a class="link" href="maxactivityreport.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Maximumactivity")%>">
+ <i class="fa fa-circle-o"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.MaximumActivity")%>
+ </a>
+ </li>
+ <li>
+ <a class="link" href="maxbandwidthreport.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Maximumbandwidth")%>">
+ <i class="fa fa-bar-chart"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.MaximumBandwidth")%>
+ </a>
+ </li>
+ <li>
+ <a class="link" href="resultreport.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Resulthistogram")%>">
+ <i class="fa fa-area-chart"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.ResultHistogram")%>
+ </a>
+ </li>
+ </ul>
+ </li>
+ <li class="miscellaneous treeview">
+ <a href="#">
+ <i class="glyphicon glyphicon-info-sign"></i>
+
<span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.Miscellaneous")%></span>
+ <i class="fa fa-angle-left pull-right"></i>
+ </a>
+ <ul class="treeview-menu">
+ <li>
+ <a
href="<%="http://manifoldcf.apache.org/release/trunk/"+Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.Locale")+"/end-user-documentation.html"%>"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Help")%>">
+ <i class="fa fa-book"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.Help")%>
+ </a>
+ </li>
+ <li>
+ <a href="logout.jsp"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.LogOut")%>">
+ <i class="glyphicon glyphicon-log-out"></i>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.LogOut")%>
+ </a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+</section>
Propchange:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/sidebar.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/simplereport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/simplereport.jsp?rev=1783695&r1=1783694&r2=1783695&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/simplereport.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/simplereport.jsp
Sun Feb 19 21:03:15 2017
@@ -228,127 +228,112 @@ try
%>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<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(),"simplereport.ApacheManifoldCFSimpleHistoryReport")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
-function Go()
-{
- if (!isInteger(report.rowcount.value))
- {
-
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"simplereport.EnterALegalNumberForRowsPerPage")%>");
- report.rowcount.focus();
- return;
- }
- if (!isRegularExpression(report.reportentitymatch.value))
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"simplereport.ApacheManifoldCFSimpleHistoryReport")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"simplereport.SimpleHistoryReport")%>',
+ 'historyreports'
+ );
+
+ function Go()
{
-
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"simplereport.EntityMatchMustBeAValidRegularExpression")%>");
- report.reportentitymatch.focus();
- return;
+ if (!isInteger(report.rowcount.value))
+ {
+
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"simplereport.EnterALegalNumberForRowsPerPage")%>");
+ report.rowcount.focus();
+ return;
+ }
+ if (!isRegularExpression(report.reportentitymatch.value))
+ {
+
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"simplereport.EntityMatchMustBeAValidRegularExpression")%>");
+ report.reportentitymatch.focus();
+ return;
+ }
+ if (!isRegularExpression(report.reportresultcodematch.value))
+ {
+
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"simplereport.ResultCodeMatchMustBeAValidRegularExpression")%>");
+ report.reportresultcodematch.focus();
+ return;
+ }
+
+ document.report.op.value="Report";
+ document.report.action=document.report.action + "#MainButton";
+ $.ManifoldCF.submit(document.report);
}
- if (!isRegularExpression(report.reportresultcodematch.value))
+
+ function Continue()
{
-
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"simplereport.ResultCodeMatchMustBeAValidRegularExpression")%>");
- report.reportresultcodematch.focus();
- return;
+ if (!isRegularExpression(report.reportentitymatch.value))
+ {
+
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"simplereport.EntityMatchMustBeAValidRegularExpression")%>");
+ report.reportentitymatch.focus();
+ return;
+ }
+ if (!isRegularExpression(report.reportresultcodematch.value))
+ {
+
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"simplereport.ResultCodeMatchMustBeAValidRegularExpression")%>");
+ report.reportresultcodematch.focus();
+ return;
+ }
+ document.report.op.value="Continue";
+ document.report.action=document.report.action + "#MainButton";
+ $.ManifoldCF.submit(document.report);
}
- document.report.op.value="Report";
- document.report.action = document.report.action + "#MainButton";
- document.report.submit();
-}
-
-function Continue()
-{
- if (!isRegularExpression(report.reportentitymatch.value))
+ function ColumnClick(colname)
{
-
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"simplereport.EntityMatchMustBeAValidRegularExpression")%>");
- report.reportentitymatch.focus();
- return;
+ document.report.clickcolumn.value=colname;
+ Go();
}
- if (!isRegularExpression(report.reportresultcodematch.value))
+
+ function SetPosition(amt)
{
-
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"simplereport.ResultCodeMatchMustBeAValidRegularExpression")%>");
- report.reportresultcodematch.focus();
- return;
+ if (amt < 0)
+ amt=0;
+ document.report.startrow.value=amt;
+ Go();
}
- document.report.op.value="Continue";
- document.report.action = document.report.action + "#MainButton";
- document.report.submit();
-}
-
-function ColumnClick(colname)
-{
- document.report.clickcolumn.value = colname;
- Go();
-}
-
-function SetPosition(amt)
-{
- if (amt < 0)
- amt = 0;
- document.report.startrow.value = amt;
- Go();
-}
-function isRegularExpression(value)
-{
- try
+ function isRegularExpression(value)
{
- var foo = "teststring";
- foo.search(value.replace(/\(\?i\)/,""));
- return true;
+ try
+ {
+ var foo="teststring";
+ foo.search(value.replace(/\(\?i\)/,""));
+ return true;
+ }
+ catch (e)
+ {
+ return false;
+ }
+
}
- catch (e)
+
+ function isInteger(value)
{
- return false;
+ var anum=/(^\d+$)/;
+ return anum.test(value);
}
-}
-
-function isInteger(value)
-{
- var anum=/(^\d+$)/;
- return anum.test(value);
-}
-
//-->
- </script>
-
-
-</head>
+</script>
-<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(),"simplereport.SimpleHistoryReport")%></p>
-
- <form class="standardform" name="report" action="execute.jsp"
method="POST">
- <input type="hidden" name="op" value="Continue"/>
- <input type="hidden" name="type" value="simplereport"/>
- <table class="displaytable">
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
+<div class="row">
+ <div class="col-md-12">
+ <form class="standardform" name="report" action="execute.jsp"
method="POST">
+ <input type="hidden" name="op" value="Continue"/>
+ <input type="hidden" name="type" value="simplereport"/>
+
+ <div class="box box-primary">
+ <div class="box-body">
+ <table class="table table-bordered">
<tr>
- <td class="description"
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Connection")%></td><td
class="value" colspan="1">
- <select name="reportconnection" size="3">
- <option
<%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Connection")%></th>
+ <td colspan="1">
+ <select name="reportconnection" class="form-control">
+ <option <%=(reportConnection.length() ==
0)?"selected=\"selected\"":""%>value="">--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>--</option>
<%
int i = 0;
while (i < connList.length)
@@ -369,9 +354,11 @@ function isInteger(value)
if (reportConnection.length() > 0)
{
%>
- <td class="description"
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Activities")%></td><td
class="value" colspan="1">
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Activities")%></th>
+ <td colspan="1">
<input type="hidden" name="reportactivities_posted"
value="true"/>
- <select multiple="true" name="reportactivities" size="3">
+
+ <select multiple="true" class="selectpicker"
name="reportactivities">
<%
i = 0;
while (i < activityList.length)
@@ -389,20 +376,18 @@ function isInteger(value)
else
{
%>
- <td class="value" colspan="2"></td>
+ <td colspan="2"></td>
<%
}
%>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.StartTime")%></td>
- <td class="value" colspan="3">
- <select class="schedulepulldown" name='reportstarthour'
size="3">
- <option value=""
<%=(startHour.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.StartTime")%></th>
+ <td colspan="3">
+ <div class="input-group">
+ <select class="schedulepulldown" name='reportstarthour'>
+ <option value=""
<%=(startHour.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 24)
@@ -420,43 +405,45 @@ function isInteger(value)
if (q == 0)
q = 12;
%>
- <option value='<%=k%>'
<%=(startHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+"
"+ampm%></option>
-<%
+ <option value='<%=k%>'
<%=(startHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+"
"+ampm%></option>
+<%
k++;
}
%>
- </select>
- <nobr/>:<nobr/>
- <select class="schedulepulldown" name='reportstartminute'
size="3">
- <option value=""
<%=(startMinute.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
+ </select>
+ <span class="label">:</span>
+ <select class="schedulepulldown" name='reportstartminute'>
+ <option value=""
<%=(startMinute.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 60)
{
%>
- <option value='<%=k%>'
<%=(startMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
+ <option value='<%=k%>'
<%=(startMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
<%
k++;
}
%>
-
</select><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.on")%>
- <select class="schedulepulldown" name='reportstartmonth'
size="3">
- <option value=""
<%=(startMonth.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
- <option value="0"
<%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.January")%></option>
- <option value="1"
<%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.February")%></option>
- <option value="2"
<%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.March")%></option>
- <option value="3"
<%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.April")%></option>
- <option value="4"
<%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.May")%></option>
- <option value="5"
<%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.June")%></option>
- <option value="6"
<%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.July")%></option>
- <option value="7"
<%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.August")%></option>
- <option value="8"
<%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.September")%></option>
- <option value="9"
<%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.October")%></option>
- <option value="10"
<%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.November")%></option>
- <option value="11"
<%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.December")%></option>
- </select><nobr/>
- <select class="schedulepulldown" name='reportstartday'
size="3">
- <option value=""
<%=(startDay.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
+ </select>
+ <span
class="label"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.on")%></span>
+ <select class="schedulepulldown" name='reportstartmonth'>
+ <option value=""
<%=(startMonth.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>--</option>
+ <option value="0"
<%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.January")%></option>
+ <option value="1"
<%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.February")%></option>
+ <option value="2"
<%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.March")%></option>
+ <option value="3"
<%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.April")%></option>
+ <option value="4"
<%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.May")%></option>
+ <option value="5"
<%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.June")%></option>
+ <option value="6"
<%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.July")%></option>
+ <option value="7"
<%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.August")%></option>
+ <option value="8"
<%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.September")%></option>
+ <option value="9"
<%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.October")%></option>
+ <option value="10"
<%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.November")%></option>
+ <option value="11"
<%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.December")%></option>
+ </select>
+ <span class="label">-</span>
+ <select class="schedulepulldown" name='reportstartday'>
+ <option value=""
<%=(startDay.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 31)
@@ -472,26 +459,34 @@ function isInteger(value)
else
suffix = "th";
%>
- <option value='<%=Integer.toString(k)%>'
<%=(startDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
+ <option value='<%=Integer.toString(k)%>'
<%=(startDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
<%
k++;
}
%>
- </select><nobr/>,<nobr/>
- <select class="schedulepulldown" name='reportstartyear'
size="3">
- <option value=""
<%=(startYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
- <% for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
- String selected =
(startYear.equals(""+year))?"selected=\"selected\"":""; %>
- <option value="<%= year %>" <%= selected %>><%= year
%></option>
- <% } %>
- </select>
+ </select>
+ <span class="label">,</span>
+ <select class="schedulepulldown" name='reportstartyear'>
+ <option value=""
<%=(startYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>--</option>
+<%
+ for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++)
+ {
+ String selected = (startYear.equals(""+year))?"selected=\"selected\"":"";
+%>
+ <option value="<%= year %>" <%= selected %>><%= year
%></option>
+<%
+ }
+%>
+ </select>
+ </div>
</td>
</tr>
<tr>
- <td
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.EndTime")%></td>
- <td class="value" colspan="3">
- <select class="schedulepulldown" name='reportendhour' size="3">
- <option value=""
<%=(endHour.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.EndTime")%></th>
+ <td colspan="3">
+ <div class="input-group">
+ <select class="schedulepulldown" name='reportendhour'>
+ <option value=""
<%=(endHour.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 24)
@@ -509,42 +504,45 @@ function isInteger(value)
if (q == 0)
q = 12;
%>
- <option value='<%=k%>'
<%=(endHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+"
"+ampm%></option>
-<%
+ <option value='<%=k%>'
<%=(endHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+"
"+ampm%></option>
+<%
k++;
}
%>
- </select><nobr/>:<nobr/>
- <select class="schedulepulldown" name='reportendminute'
size="3">
- <option value=""
<%=(endMinute.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
+ </select>
+ <span class="label">:</span>
+ <select class="schedulepulldown" name='reportendminute'>
+ <option value=""
<%=(endMinute.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 60)
{
%>
- <option value='<%=k%>'
<%=(endMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
+ <option value='<%=k%>'
<%=(endMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
<%
k++;
}
%>
-
</select><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.on")%>
- <select class="schedulepulldown" name='reportendmonth'
size="3">
- <option value=""
<%=(endMonth.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
- <option value="0"
<%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.January")%></option>
- <option value="1"
<%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.February")%></option>
- <option value="2"
<%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.March")%></option>
- <option value="3"
<%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.April")%></option>
- <option value="4"
<%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.May")%></option>
- <option value="5"
<%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.June")%></option>
- <option value="6"
<%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.July")%></option>
- <option value="7"
<%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.August")%></option>
- <option value="8"
<%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.September")%></option>
- <option value="9"
<%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.October")%></option>
- <option value="10"
<%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.November")%></option>
- <option value="11"
<%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.December")%></option>
- </select><nobr/>
- <select class="schedulepulldown" name='reportendday' size="3">
- <option value=""
<%=(endDay.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
+ </select>
+ <span
class="label"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.on")%></span>
+ <select class="schedulepulldown" name='reportendmonth'>
+ <option value="" <%=(endMonth.length() ==
0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>--</option>
+ <option value="0"
<%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.January")%></option>
+ <option value="1"
<%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.February")%></option>
+ <option value="2"
<%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.March")%></option>
+ <option value="3"
<%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.April")%></option>
+ <option value="4"
<%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.May")%></option>
+ <option value="5"
<%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.June")%></option>
+ <option value="6"
<%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.July")%></option>
+ <option value="7"
<%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.August")%></option>
+ <option value="8"
<%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.September")%></option>
+ <option value="9"
<%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.October")%></option>
+ <option value="10"
<%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.November")%></option>
+ <option value="11"
<%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.December")%></option>
+ </select>
+ <span class="label">-</span>
+ <select class="schedulepulldown" name='reportendday'>
+ <option value=""
<%=(endDay.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 31)
@@ -560,53 +558,62 @@ function isInteger(value)
else
suffix = "th";
%>
- <option value='<%=Integer.toString(k)%>'
<%=(endDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
+ <option value='<%=Integer.toString(k)%>'
<%=(endDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
<%
k++;
}
%>
- </select><nobr/>,<nobr/>
- <select class="schedulepulldown" name='reportendyear' size="3">
- <option value=""
<%=(endYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
- <% for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
- String selected =
(endYear.equals(""+year))?"selected=\"selected\"":""; %>
- <option value="<%= year %>" <%= selected %>><%= year
%></option>
- <% } %>
- </select>
+ </select>
+ <span class="label">,</span>
+ <select class="schedulepulldown" name='reportendyear'>
+ <option value=""
<%=(endYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>--</option>
+<%
+ for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++)
+ {
+ String selected = (endYear.equals(""+year))?"selected=\"selected\"":"";
+%>
+ <option value="<%= year %>" <%= selected %>><%= year
%></option>
+<%
+ }
+%>
+ </select>
+ </div>
</td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.EntityMatch")%></nobr></td>
- <td class="value"><input type="text" name="reportentitymatch"
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(entityMatch)%>'/></td>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.ResultCodeMatch")%></nobr></td>
- <td class="value"><input type="text"
name="reportresultcodematch"
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(resultCodeMatch)%>'/></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.EntityMatch")%></nobr></th>
+ <th><input type="text" name="reportentitymatch"
class="form-control"
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(entityMatch)%>'/></th>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.ResultCodeMatch")%></nobr></th>
+ <td><input type="text" class="form-control"
name="reportresultcodematch"
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(resultCodeMatch)%>'/></td>
</tr>
- <td class="message" colspan="4">
+ </table>
+ </div>
+ <div class="box-footer clearfix">
+ <div class="btn-group">
+
<%
if (reportConnection.length() > 0)
{
%>
- <a name="MainButton"><input type="button"
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Go")%>"
onClick="javascript:Go()"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.ExecuteThisQuery")%>"/></a>
+ <a name="MainButton"><input class="btn btn-primary" type="button"
+
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Go")%>"
+ onClick="javascript:Go()"
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.ExecuteThisQuery")%>"/></a>
<%
}
else
{
%>
- <a name="MainButton"><input type="button"
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Continue")%>"
onClick="javascript:Continue()"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Continue")%>"/></a>
+ <a name="MainButton"><input class="btn btn-primary" type="button"
+
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Continue")%>"
+ onClick="javascript:Continue()"
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.Continue")%>"/></a>
<%
}
%>
- </td>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- </table>
+ </div>
+ </div>
+ </div>
<%
if (reportConnection.length() > 0)
{
@@ -656,121 +663,127 @@ function isInteger(value)
IResultSet set =
connMgr.genHistorySimple(reportConnection,criteria,sortOrder,startRow,rowCount+1);
%>
- <input type="hidden" name="clickcolumn" value=""/>
- <input type="hidden" name="startrow"
value='<%=Integer.toString(startRow)%>'/>
- <input type="hidden" name="sortorder"
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sortOrder.toString())%>'/>
-
- <table class="displaytable">
- <tr class="headerrow">
- <td class="reportcolumnheader"><a href="javascript:void(0);"
onclick='javascript:ColumnClick("starttime");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.StartTime")%></nobr></a></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);"
onclick='javascript:ColumnClick("activity");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Activity")%></nobr></a></td>
- <td
class="reportcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Identifier")%></nobr></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);"
onclick='javascript:ColumnClick("resultcode");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.ResultCode")%></nobr></a></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);"
onclick='javascript:ColumnClick("bytes");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Bytes")%></nobr></a></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);"
onclick='javascript:ColumnClick("elapsedtime");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Time")%></nobr></a></td>
- <td
class="reportcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.ResultDescription")%></nobr></td>
- </tr>
+ <input type="hidden" name="clickcolumn" value=""/>
+ <input type="hidden" name="startrow"
value='<%=Integer.toString(startRow)%>'/>
+ <input type="hidden" name="sortorder"
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sortOrder.toString())%>'/>
+
+ <div class="box box-primary">
+ <div class="box-body">
+ <table class="table table-bordered">
+ <tr>
+ <th><a href="javascript:void(0);"
onclick='javascript:ColumnClick("starttime");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.StartTime")%></nobr></a></th>
+ <th><a href="javascript:void(0);"
onclick='javascript:ColumnClick("activity");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Activity")%></nobr></a></th>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Identifier")%></nobr></th>
+ <th><a href="javascript:void(0);"
onclick='javascript:ColumnClick("resultcode");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.ResultCode")%></nobr></a></th>
+ <th><a href="javascript:void(0);"
onclick='javascript:ColumnClick("bytes");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Bytes")%></nobr></a></th>
+ <th><a href="javascript:void(0);"
onclick='javascript:ColumnClick("elapsedtime");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Time")%></nobr></a></th>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.ResultDescription")%></nobr></th>
+ </tr>
+<%
+ zz = 0;
+
+ boolean hasMoreRows = (set.getRowCount() > rowCount);
+ int iterCount = hasMoreRows?rowCount:set.getRowCount();
+ while (zz < iterCount)
+ {
+ IResultRow row = set.getRow(zz);
+ String startTimeString =
org.apache.manifoldcf.ui.util.Formatter.formatTime(Converter.asLong(row.getValue("starttime")));
+ String resultCode = "";
+ Object resultCodeObject = row.getValue("resultcode");
+ if (resultCodeObject != null)
+ resultCode = resultCodeObject.toString();
+ String resultDescription = "";
+ Object resultDescriptionObject = row.getValue("resultdesc");
+ resultDescriptionObject = row.getValue("resultdesc");
+ if (resultDescriptionObject != null)
+ resultDescription = resultDescriptionObject.toString();
+ String[] identifierBreakdown =
org.apache.manifoldcf.ui.util.Formatter.formatString(row.getValue("identifier").toString(),64,true,true);
+%>
+ <tr>
+
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(startTimeString)%></nobr></td>
+
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("activity").toString())%></nobr></td>
+ <td>
<%
- zz = 0;
-
- boolean hasMoreRows = (set.getRowCount() > rowCount);
- int iterCount = hasMoreRows?rowCount:set.getRowCount();
- while (zz < iterCount)
- {
- IResultRow row = set.getRow(zz);
- String startTimeString =
org.apache.manifoldcf.ui.util.Formatter.formatTime(Converter.asLong(row.getValue("starttime")));
- String resultCode = "";
- Object resultCodeObject = row.getValue("resultcode");
- if (resultCodeObject != null)
- resultCode = resultCodeObject.toString();
- String resultDescription = "";
- Object resultDescriptionObject = row.getValue("resultdesc");
- resultDescriptionObject = row.getValue("resultdesc");
- if (resultDescriptionObject != null)
- resultDescription = resultDescriptionObject.toString();
- String[] identifierBreakdown =
org.apache.manifoldcf.ui.util.Formatter.formatString(row.getValue("identifier").toString(),64,true,true);
-%>
- <tr <%="class=\""+((zz%2==0)?"evendatarow":"odddatarow")+"\""%>>
- <td
class="reportcolumncell"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(startTimeString)%></nobr></td>
- <td
class="reportcolumncell"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("activity").toString())%></nobr></td>
- <td class="reportcolumncell">
-<%
- int q = 0;
- while (q < identifierBreakdown.length)
- {
+ int q = 0;
+ while (q < identifierBreakdown.length)
+ {
%>
<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(identifierBreakdown[q++])%></nobr><br/>
<%
- }
+ }
%>
</td>
- <td
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(resultCode)%></td>
- <td
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("bytes").toString())%></td>
- <td
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("elapsedtime").toString())%></td>
- <td
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(resultDescription)%></td>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(resultCode)%></td>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("bytes").toString())%></td>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("elapsedtime").toString())%></td>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(resultDescription)%></td>
</tr>
<%
zz++;
}
%>
</table>
- <table class="reportfootertable">
- <tr class="reportfooterrow">
- <td class="reportfootercell">
- <nobr>
+ </div>
+ <div class="box-footer clearfix">
+ <ul class="pagination pagination-sm no-margin pull-left">
<%
if (startRow == 0)
{
%>
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Previous")%>
+ <li><a
href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Previous")%></a></li>
<%
}
else
{
%>
- <a href="javascript:void(0);"
onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Previous")%></a>
+ <li>
+ <a href="javascript:void(0);"
onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Previous")%></a>
+ </li>
<%
}
-%>
- </nobr>
- <nobr>
-<%
if (hasMoreRows == false)
{
%>
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Next")%>
+ <li><a
href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Next")%></a></li>
<%
}
else
{
%>
- <a href="javascript:void(0);"
onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Next")%></a>
+ <li>
+ <a href="javascript:void(0);"
onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"simplereport.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Next")%>
+ </a>
+ </li>
<%
}
%>
- </nobr>
- </td>
- <td class="reportfootercell">
-
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Rows")%></nobr>
-
<nobr><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></nobr>
- </td>
- <td class="reportfootercell">
-
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.RowsPerPage")%></nobr>
- <nobr><input type="text" name="rowcount" size="5"
value='<%=Integer.toString(rowCount)%>'/></nobr>
- </td>
- </tr>
- </table>
-
+ </ul>
+ <ul class="pagination pagination-sm no-margin pull-right">
+ <li class="pad">
+ <span class="label
label-primary"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.Rows")%><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></span>
+ </li>
+ <li class="form-inline">
+ <div class="input-group input-group-sm">
+ <span
class="input-group-addon"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.RowsPerPage")%></span>
+ <input type="text" class="form-control" name="rowcount"
size="5" value='<%=Integer.toString(rowCount)%>'/>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
<%
}
else
{
%>
- <table class="displaytable"><tr><td
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.PleaseSelectAConnection")%></td></tr></table>
-<%
- }
-%>
- </form>
+ <div class="callout
callout-info"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.PleaseSelectAConnection")%></div>
+ <%
+ }
+ %>
+
+ </form>
<%
}
catch (ManifoldCFException e)
@@ -779,14 +792,9 @@ catch (ManifoldCFException e)
variableContext.setParameter("text",e.getMessage());
variableContext.setParameter("target","index.jsp");
%>
- <jsp:forward page="error.jsp"/>
+<jsp:forward page="error.jsp"/>
<%
}
%>
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
+ </div>
+</div>
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/unauthorized.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/unauthorized.jsp?rev=1783695&r1=1783694&r2=1783695&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/unauthorized.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/unauthorized.jsp
Sun Feb 19 21:03:15 2017
@@ -22,43 +22,26 @@
*/
%>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<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(),"error.Unauthorized")%>
- </title>
-
-</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(),"error.Unauthorized")%></p>
+<script type="text/javascript">
+ <!--
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.Unauthorized")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.Unauthorized")%>'
+ );
+ //-->
+</script>
<%
// These have to be fetched from request rather than variableContext since
error
// forwards screw up the multipart wrapper
String target = variableContext.getParameter("target");
%>
- <table class="displaytable">
- <tr><td
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.UnauthorizedAccess")%></td></tr>
- <tr><td class="separator"><hr/></td></tr>
- <tr><td class="message"><a
href='<%=org.apache.manifoldcf.core.util.URLEncoder.encode(target)%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>">OK</a></td></tr>
- </table>
-
- </td>
- </tr>
- </table>
-</body>
-</html>
+<div class="alert alert-danger">
+ <h4><i class="icon fa fa-ban"></i> Error!</h4>
+ <%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.Unauthorized")%>
+</div>
+<a class="btn btn-primary btn-sm"
+ href='<%=org.apache.manifoldcf.core.util.URLEncoder.encode(target)%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>">OK</a>
