← Back to team overview

slub.team team mailing list archive

[Merge] lp:~slub.team/goobi-production/remove-unused-jsp-files into lp:goobi-production

 

Ralf Claussnitzer has proposed merging lp:~slub.team/goobi-production/remove-unused-jsp-files into lp:goobi-production.

Requested reviews:
  intranda team (intranda)
  zeutschel (zeutschel)
  Saxon State Library Team (slub.team)
Related bugs:
  Bug #1031763 in Goobi.Production: "remove unused JSP files"
  https://bugs.launchpad.net/goobi-production/+bug/1031763

For more details, see:
https://code.launchpad.net/~slub.team/goobi-production/remove-unused-jsp-files/+merge/117644
-- 
https://code.launchpad.net/~slub.team/goobi-production/remove-unused-jsp-files/+merge/117644
Your team Saxon State Library Team is requested to review the proposed merge of lp:~slub.team/goobi-production/remove-unused-jsp-files into lp:goobi-production.
=== removed file 'lib/json-simple-1.1.1.jar'
Binary files lib/json-simple-1.1.1.jar	2012-06-12 08:39:45 +0000 and lib/json-simple-1.1.1.jar	1970-01-01 00:00:00 +0000 differ
=== removed file 'newpages/error.jsp'
--- newpages/error.jsp	2011-12-20 08:07:09 +0000
+++ newpages/error.jsp	1970-01-01 00:00:00 +0000
@@ -1,147 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@ page
-	import="java.util.List,java.io.PrintWriter,org.apache.myfaces.shared_tomahawk.util.ExceptionUtils"
-	isErrorPage="true"%>
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<%-- ########################################
-
-												Startseite
-
-	#########################################--%>
-
-<html>
-<f:view locale="#{SpracheForm.locale}">
-	<%@include file="inc/head.jsp"%>
-	<body>
-
-	<htm:table cellspacing="5" cellpadding="0" styleClass="layoutTable"
-		align="center">
-		<jsp:include page="/newpages/inc/tbl_Kopf.jsp" />
-		<htm:tr>
-			<jsp:include page="/newpages/inc/tbl_Navigation.jsp" />
-			<htm:td valign="top" styleClass="layoutInhalt">
-
-				<%-- ++++++++++++++++     Inhalt      ++++++++++++++++ --%>
-
-				<%-- Breadcrumb --%>
-				<h:panelGrid columns="1" styleClass="layoutInhaltKopf">
-					<h:panelGroup>
-						<h:outputText value="#{msgs.fehler}" />
-					</h:panelGroup>
-				</h:panelGrid>
-				<%-- // Breadcrumb --%>
-				<x:div forceId="true" id="mydiv">
-					<h:form id="myform" style="margin:3px">
-						<%-- Überschrift --%>
-						<htm:h3>
-							<h:outputText value="#{msgs.esIstEinFehlerAufgetreten}" />
-						</htm:h3>
-
-						<%
-						   if (exception != null) {
-						                        List exceptions = ExceptionUtils.getExceptions(exception);
-						                        Throwable throwable = (Throwable) exceptions.get(exceptions.size() - 1);
-						                        String customaryMessage = exception.getMessage();
-						                        if(customaryMessage==null){
-						                        	customaryMessage="";
-						                        }else{
-						                        	customaryMessage = customaryMessage + "<hr/>";
-						                        }
-						                        String exceptionMessage = ExceptionUtils.getExceptionMessage(exceptions);
-						%>
-
-						<htm:p style="color:red;font-weight:bold;">
-							<%=customaryMessage + exceptionMessage%>
-						</htm:p>
-
-						<a href="#"
-							onclick="toggle('trace1');toggle('trace2'); return false;">
-						<span style="display: inline;" id="buttonOff"> + </span> <span
-							id="buttonOn" style="display: none;"> - </span> Stack Trace</a>
-						<%
-						   PrintWriter pw = new PrintWriter(out);
-						%>
-						<x:div id="trace1" forceId="true"
-							style="border: grey 1px solid; background-color:#EFEFEF;margin:20px;display: none">
-							<pre>
-							<%
-							   throwable.printStackTrace(pw);
-							%>
-							</pre>
-						</x:div>
-						<%
-						   throwable = (Throwable) exceptions.get(0);
-						%>
-						<x:div id="trace2" forceId="true"
-							style="border: grey 1px solid; background-color:#EFEFEF;margin:20px;display: none">
-							<pre>
-							<%
-							   throwable.printStackTrace(pw);
-							%>
-							</pre>
-						</x:div>
-
-						<%
-						   } else {
-						%>
-						<h:outputText value="#{msgs.unbekannterFehler}" />
-						<%
-						   }
-						%>
-
-					</h:form>
-				</x:div>
-				<%-- ++++++++++++++++    // Inhalt      ++++++++++++++++ --%>
-
-			</htm:td>
-		</htm:tr>
-		<jsp:include page="/newpages/inc/tbl_Fuss.jsp" />
-	</htm:table>
-
-	<script language="javascript" type="text/javascript">
-function toggle(id) {
-    var style = document.getElementById(id).style;
-    if ("block" == style.display) {
-        style.display = "none";
-        document.getElementById("buttonOff").style.display = "inline";
-        document.getElementById("buttonOn").style.display = "none";
-    } else {
-        style.display = "block";
-        document.getElementById("buttonOff").style.display = "none";
-        document.getElementById("buttonOn").style.display = "inline";
-    }
-}
-</script>
-
-	</body>
-</f:view>
-
-</html>
-

=== removed file 'newpages/inc/ProgressChart.jsp'
--- newpages/inc/ProgressChart.jsp	2011-12-20 08:07:09 +0000
+++ newpages/inc/ProgressChart.jsp	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi"; prefix="si"%>
-<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax"; prefix="a4j"%>
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<h:panelGrid id="pcid3" columns="4" columnClasses="standardTable_ColumnLeft,standardTable_Column,standardTable_ColumnRight" rowClasses="rowTop">
-	<%-- SelectManyMenu Workflow --%>
-
-	<h:selectManyListbox id="input5" value="#{form.selectedSteps}">
-		<si:selectItems value="#{form.selectableSteps}" var="item" itemLabel="#{item}" itemValue="#{item}"/>
-	</h:selectManyListbox>
-
-	<h:selectOneMenu id="pcid10" style="height:20px" value="#{form.timeUnit}" converter="StatisticsTimeUnitConverter">
-		<si:selectItems id="pcid11" value="#{form.selectableTimeUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-	</h:selectOneMenu>
-
-	<h:panelGroup id="pcid12" style="height:20px">
-		<h:selectBooleanCheckbox id="pcid13" value="#{form.referenceCurve}" title="#{msgs.refCurve}">
-		</h:selectBooleanCheckbox>
-		<h:outputLabel id="pcid14" value="#{msgs.refCurve}" for="pcid13" />
-	</h:panelGroup>
-
-	<h:commandButton id="pcid20" value="#{msgs.rerender}" >
-			<a4j:support id="vwid13" event="onclick" reRender="vzid36" />
-	</h:commandButton>
-	
-</h:panelGrid>
-
-<h:panelGroup id="pcid16">
-	<x:graphicImage forceId="true" id="vzid36" rendered="#{ProjekteForm.projectProgressImage != ''}"
-		value="#{HelperForm.servletPathWithHostAsUrl}/pages/imagesTemp/#{ProjekteForm.projectProgressImage}" />
-
-</h:panelGroup>
-
-<%--
-<h:panelGroup id="propErrorDisplay">
-	<x:aliasBean alias="#{goobiObject}" value="#{form}">
-		<f:subview id="pcid18">
-			<%@include file="../inc/prop_errors.jsp"%>
-		</f:subview>
-	</x:aliasBean>
-</h:panelGroup>
- --%>
\ No newline at end of file

=== removed file 'newpages/inc/Step_Filter.jsp'
--- newpages/inc/Step_Filter.jsp	2011-12-20 08:07:09 +0000
+++ newpages/inc/Step_Filter.jsp	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi"; prefix="si"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<h:panelGrid id="myFilterGrid" width="100%" columnClasses="standardTable_ColumnRight" rowClasses="standardTable_Row_bottom" columns="1">
-	<h:panelGroup id="myFilter">
-		<h:outputText value="#{msgs.selectFilter}" />
-		<%-- Filter Liste --%>
-		<x:selectOneMenu forceId="true" id="select" style="width:15%;height:20px" value="#{Form.filter}" onclick="setFilter();">
-			<si:selectItems id="pcid11" value="#{Form.user.filters}" var="item" itemLabel="#{item}" itemValue="#{item}" />
-		</x:selectOneMenu>
-
-		<%--Filter zur User-Liste hinzufuegen --%>
-		<h:commandLink id="newFilterubid11" action="#{Form.addFilterToUser}" title="#{msgs.addFilter}" style="margin-left:5px">
-			<h:graphicImage id="newFilterubid12" alt="Filter" value="/newpages/images/buttons/save1.gif" />
-		</h:commandLink>
-
-		<%-- remove filter from list --%>
-		<h:commandLink id="removeFilterubid11" action="#{Form.removeFilterFromUser}" title="#{msgs.removeFilter}" style="margin-left:5px">
-			<h:graphicImage id="removeFilterubid12" alt="Filter" value="/newpages/images/buttons/waste1_20px.gif" />
-		</h:commandLink>
-	</h:panelGroup>
-</h:panelGrid>
-<h:panelGrid id="aslsid2" width="100%" columnClasses="standardTable_Column,standardTable_ColumnRight" rowClasses="standardTable_Row_bottom"
-	columns="2">
-	<h:outputText id="aslsid3" value="#{msgs.treffer}: #{Form.page.totalResults}" rendered="#{showHits}" />
-	<h:outputText id="aslsid3_alt" value="" rendered="#{!showHits}" />
-
-	<h:panelGroup id="aslsid4">
-
-		<h:outputText id="aslsid5" value="#{msgs.nurEigeneAufgabenAnzeigen}:"  rendered="#{showUserRelatedFilter}" />
-
-		<x:selectBooleanCheckbox id="check1" forceId="true" value="#{Form.nurEigeneSchritte}" rendered="#{showUserRelatedFilter}" onchange="document.getElementById('check2').checked=false; document.getElementById('FilterAlle').click()" style="margin-right:40px" />
-
-		<h:outputText id="aslsid6" value="#{msgs.nurOffeneAufgabenAnzeigen}:"  rendered="#{showUserRelatedFilter}" />
-		<x:selectBooleanCheckbox id="check2" forceId="true" value="#{Form.nurOffeneSchritte}" rendered="#{showUserRelatedFilter}" onchange="document.getElementById('check1').checked=false; document.getElementById('FilterAlle').click()" style="margin-right:40px" />
-
-		<h:outputText id="aslsid7" value="#{msgs.filter}: " />
-
-		<x:inputText style="width:20%" forceId="true" id="filterfield" value="#{Form.filter}"
-			onkeypress="return submitEnter('FilterAlle',event)" />
-		<x:commandButton type="submit" id="FilterAlle" forceId="true" style="display:none" action="#{Form.FilterAlleStart}" />
-
-		<h:commandLink id="aslsid9" action="#{Form.FilterAlleStart}" title="#{msgs.filterAnwenden}" style="margin-left:5px">
-			<h:graphicImage id="aslsid10" alt="reload" value="/newpages/images/buttons/reload.gif" />
-		</h:commandLink>
-
-		<h:outputLink id="aslsid11" target="_blank" value="http://wiki.goobi.org/index.php/Filter_f%C3%BCr_Vorg%C3%A4nge";>
-			<h:graphicImage id="aslsid12" alt="help" title="#{msgs.hilfeZumFilter}" value="/newpages/images/buttons/help.png" style="margin-left:5px" />
-		</h:outputLink>
-		
-
-	</h:panelGroup>
-
-</h:panelGrid>
-<script type="text/javascript"><!--
-function setFilter() {
-	var myFilter = document.getElementById('select').value;
-	document.getElementById('filterfield').value = myFilter;
-}
--->
-</script>
-<%-- 
-<h:panelGrid id="myFilterGrid" width="100%" columnClasses="standardTable_ColumnRight" rowClasses="standardTable_Row_bottom" columns="1">
-	<h:panelGroup id="myFilter">
-		<h:outputText value="#{msgs.selectFilter}" />
-	
-		<x:selectOneMenu forceId="true" id="select" style="width:15%;height:20px" value="#{Form.user.filter}" onclick="setFilter();">
-			<si:selectItems id="pcid11" value="#{Form.user.filters}" var="item" itemLabel="#{item.value}" itemValue="#{item}" />
-		</x:selectOneMenu>
-
-		<h:commandLink id="newFilterubid11" action="#{Form.user.addFilter}" title="#{msgs.addFilter}" style="margin-left:5px">
-			<h:graphicImage id="newFilterubid12" alt="Filter" value="/images/buttons/reload.gif" />
-		</h:commandLink>
-
-		<h:commandLink id="removeFilterubid11" action="#{Form.user.removeFilter}" title="#{msgs.removeFilter}" style="margin-left:5px">
-			<h:graphicImage id="removeFilterubid12" alt="Filter" value="/images/buttons/reload.gif" />
-		</h:commandLink>
-	</h:panelGroup>
-</h:panelGrid>
---%>

=== removed file 'newpages/inc/box2_Navigation.jsp'
--- newpages/inc/box2_Navigation.jsp	2011-12-20 08:07:09 +0000
+++ newpages/inc/box2_Navigation.jsp	1970-01-01 00:00:00 +0000
@@ -1,278 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<htm:table width="100%" align="center" border="1"
-	cellpadding="3" border="0" cellspacing="0" styleClass="layoutNavigation">
-	<htm:tr>
-		<htm:td valign="top">
-			<h:form id="navform">
-				<%-- ######################################## 
-					
-					Benutzerberechtigungen sind wie folgt:
-					
-					1: Administration - darf alles
-					
-					2: Prozessverwaltung - darf sehr viel (aber keine Benutzerverwaltung, kein Benutzerwechsel und auch kein Administrationsform)
-					
-					3: Benutzer und Prozesse - anscheinend nix anderes als 4
-					
-					4: nur Benutzer: aktuelle Schritte sehen
-									
-				#########################################--%>
-
-				<%-- Startseite --%>
-				<h:commandLink styleClass="mlink" action="newMain"
-					style="#{NavigationForm.aktuell == '0' ? 'font-weight: bold;':'font-weight:normal ;'}">
-					<h:panelGroup rendered="#{NavigationForm.aktuell == '0'}">
-						<f:verbatim>&#8250; </f:verbatim>
-					</h:panelGroup>
-					<h:outputText value="#{msgs.startseite}" />
-					<x:updateActionListener property="#{NavigationForm.aktuell}"
-						value="0" />
-				</h:commandLink>
-
-				<%-- ################            allgemeines             ######################--%>
-
-				<h:outputText styleClass="th_menu" value="- #{msgs.allgemeines} -" />
-				<%-- Bedienungshinweise --%>
-				<h:commandLink styleClass="mlink" action="Bedienung"
-					style="#{NavigationForm.aktuell == '10' ? 'font-weight: bold;':'font-weight:normal ;'}">
-					<h:panelGroup rendered="#{NavigationForm.aktuell == '10'}">
-						<f:verbatim>&#8250; </f:verbatim>
-					</h:panelGroup>
-					<h:outputText value="#{msgs.bedienungshinweise}" />
-					<x:updateActionListener property="#{NavigationForm.aktuell}"
-						value="10" />
-				</h:commandLink>
-
-				<%-- technischer Hintergrund --%>
-				<h:commandLink styleClass="mlink" action="TechnischerHintergrund"
-					style="#{NavigationForm.aktuell == '11' ? 'font-weight: bold;':'font-weight:normal ;'}">
-					<h:panelGroup rendered="#{NavigationForm.aktuell == '11'}">
-						<f:verbatim>&#8250; </f:verbatim>
-					</h:panelGroup>
-					<h:outputText value="#{msgs.technischerHintergrund}" />
-					<x:updateActionListener property="#{NavigationForm.aktuell}"
-						value="11" />
-				</h:commandLink>
-
-				<%-- aktive Benutzer --%>
-				<h:commandLink styleClass="mlink" action="aktiveBenutzerNeu"
-					style="#{NavigationForm.aktuell == '12' ? 'font-weight: bold;':'font-weight:normal ;'}">
-					<h:panelGroup rendered="#{NavigationForm.aktuell == '12'}">
-						<f:verbatim>&#8250; </f:verbatim>
-					</h:panelGroup>
-					<h:outputText value="#{msgs.aktiveBenutzer}" />
-					<x:updateActionListener property="#{NavigationForm.aktuell}"
-						value="12" />
-				</h:commandLink>
-
-				<%-- ################            Workflow              ######################--%>
-
-				<h:panelGroup rendered="#{LoginForm.maximaleBerechtigung > 0}">
-					<h:outputText styleClass="th_menu" value="- #{msgs.workflow} -" />
-
-					<%-- aktuelle Schritte --%>
-					<h:commandLink styleClass="mlink"
-						action="#{AktuelleSchritteForm.FilterAlleStart}"
-						style="#{NavigationForm.aktuell == '20' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '20'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.aktuelleSchritte}" />
-						<x:updateActionListener property="#{AktuelleSchritteForm.filter}"
-							value="" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="20" />
-					</h:commandLink>
-
-					<%-- Prozess suchen --%>
-					<h:commandLink styleClass="mlink" action="ProzessverwaltungSuche"
-						style="#{NavigationForm.aktuell == '21' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '21'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.nachEinemBandSuchen}" />
-						<x:updateActionListener property="#{ProzessverwaltungForm.filter}"
-							value="" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="21" />
-					</h:commandLink>
-
-					<%-- Prozessübersicht --%>
-					<h:commandLink styleClass="mlink"
-						rendered="#{(LoginForm.maximaleBerechtigung == 1) || (LoginForm.maximaleBerechtigung == 2)}"
-						action="#{ProzessverwaltungForm.FilterAktuelleProzesse}"
-						style="#{NavigationForm.aktuell == '22' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '22'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.aktuelleProzesse}" />
-						<x:updateActionListener property="#{ProzessverwaltungForm.filter}"
-							value="" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="22" />
-					</h:commandLink>
-
-					<%-- Prozessvorlagen --%>
-					<h:commandLink styleClass="mlink"
-						rendered="#{(LoginForm.maximaleBerechtigung == 1) || (LoginForm.maximaleBerechtigung == 2)}"
-						action="#{ProzessverwaltungForm.FilterVorlagen}"
-						style="#{NavigationForm.aktuell == '23' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '23'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.prozessvorlagen}" />
-						<x:updateActionListener property="#{ProzessverwaltungForm.filter}"
-							value="" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="23" />
-					</h:commandLink>
-
-				</h:panelGroup>
-
-				<%-- ################            Administration              ######################--%>
-
-				<h:panelGroup rendered="#{LoginForm.maximaleBerechtigung == 1}">
-					<h:outputText styleClass="th_menu"
-						value="- #{msgs.administration} -" />
-
-					<%-- Benutzerverwaltung --%>
-					<h:commandLink styleClass="mlink"
-						action="#{BenutzerverwaltungForm.FilterKein}"
-						style="#{NavigationForm.aktuell == '30' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '30'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.benutzer}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="30" />
-					</h:commandLink>
-
-					<%-- Benutzergruppen --%>
-					<h:commandLink styleClass="mlink"
-						action="#{BenutzergruppenForm.FilterKein}"
-						style="#{NavigationForm.aktuell == '31' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '31'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.benutzergruppen}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="31" />
-					</h:commandLink>
-
-					<%-- Projekte --%>
-					<h:commandLink styleClass="mlink"
-						action="#{ProjekteForm.FilterKein}"
-						style="#{NavigationForm.aktuell == '32' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '32'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.projekte}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="32" />
-					</h:commandLink>
-
-					<%-- Regelsaetze --%>
-					<h:commandLink styleClass="mlink"
-						action="#{RegelsaetzeForm.FilterKein}"
-						style="#{NavigationForm.aktuell == '33' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '33'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.metadaten}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="33" />
-					</h:commandLink>
-
-					<%-- Ldapgruppen --%>
-					<h:commandLink styleClass="mlink"
-						action="#{LdapGruppenForm.FilterKein}"
-						style="#{NavigationForm.aktuell == '34' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '34'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.ldapgruppen}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="34" />
-					</h:commandLink>
-
-					<%-- Administrationsaufgaben --%>
-					<h:commandLink styleClass="mlink" action="Administrationsaufgaben"
-						style="#{NavigationForm.aktuell == '35' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '35'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.scripte}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="35" />
-					</h:commandLink>
-
-				</h:panelGroup>
-
-				<%-- ################            Benutzereinstellungen              ######################--%>
-
-				<h:panelGroup rendered="#{LoginForm.maximaleBerechtigung > 0}">
-					<h:outputText styleClass="th_menu"
-						value="- #{msgs.benutzerdaten} -" />
-
-					<%-- Benutzerkonfiguration --%>
-					<h:commandLink styleClass="mlink" action="Benutzerkonfiguration"
-						style="#{NavigationForm.aktuell == '40' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '40'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.benutzerkonfiguration}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="40" />
-					</h:commandLink>
-
-					<%-- Passwort ändern --%>
-					<h:commandLink styleClass="mlink" action="newPasswortAendern"
-						style="#{NavigationForm.aktuell == '41' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '41'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.passwortAendern}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="41" />
-					</h:commandLink>
-				</h:panelGroup>
-
-			</h:form>
-		</htm:td>
-	</htm:tr>
-	<htm:tr valign="bottom">
-		<htm:td height="50px" valign="bottom">
-			<h:form id="loginform2">
-				<%@include file="Login.jsp"%>
-			</h:form>
-		</htm:td>
-	</htm:tr>
-</htm:table>
-

=== removed file 'newpages/inc/box_Fuss.jsp'
--- newpages/inc/box_Fuss.jsp	2011-12-20 08:07:09 +0000
+++ newpages/inc/box_Fuss.jsp	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<h:form style="margin:0px" id="form1">
-
-	<h:panelGrid columns="3" width="100%" styleClass="layoutFuss">
-		<h:outputLink value="#{HelperForm.applicationWebsiteUrl}">
-			<h:outputText value="#{HelperForm.applicationWebsiteMsg}" />
-		</h:outputLink>
-		<h:outputText value=" | #{msgs.toolentwicklung} | " />
-		<h:commandLink action="Impressum" value="#{msgs.impressum}" id="impress" />
-	</h:panelGrid>
-
-</h:form>
-
-<script language="javascript">
-    function submitEnter(commandId,e)
-{
-        var keycode;
-        if (window.event) keycode = window.event.keyCode;
-        else if (e) keycode = e.which;
-        else return true;
-        
-        if (keycode == 13)
-        {
-                document.getElementById(commandId).click();
-                return false;
-        }
-        else
-        return true;
-}
-</script>

=== removed file 'newpages/inc/box_Navigation.jsp'
--- newpages/inc/box_Navigation.jsp	2011-12-20 08:07:09 +0000
+++ newpages/inc/box_Navigation.jsp	1970-01-01 00:00:00 +0000
@@ -1,293 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<htm:table width="100%" align="center" border="1" bgcolor="yellow"
-	cellpadding="3" border="0" cellspacing="0">
-	<htm:tr>
-		<htm:td valign="top">
-			 <h:form id="naviForm2">
-				<%-- ######################################## 
-					
-					Benutzerberechtigungen sind wie folgt:
-					
-					1: Administration - darf alles
-					
-					2: Prozessverwaltung - darf sehr viel (aber keine Benutzerverwaltung, kein Benutzerwechsel und auch kein Administrationsform)
-					
-					3: Benutzer und Prozesse - anscheinend nix anderes als 4
-					
-					4: nur Benutzer: aktuelle Schritte sehen
-									
-				#########################################--%>
-
-				<%-- Startseite --%>
-				<h:commandLink styleClass="mlink" action="newMain"
-					style="#{NavigationForm.aktuell == '0' ? 'font-weight: bold;':'font-weight:normal ;'}">
-					<h:panelGroup rendered="#{NavigationForm.aktuell == '0'}">
-						<f:verbatim>&#8250; </f:verbatim>
-					</h:panelGroup>
-					<h:outputText value="#{msgs.startseite}" />
-					<x:updateActionListener property="#{NavigationForm.aktuell}"
-						value="0" />
-				</h:commandLink>
-
-				<%-- ################            allgemeines             ######################--%>
-
-				<h:outputText styleClass="th_menu" value="- #{msgs.allgemeines} -" />
-				<%-- Bedienungshinweise
-				<h:commandLink styleClass="mlink" action="Bedienung"
-					style="#{NavigationForm.aktuell == '10' ? 'font-weight: bold;':'font-weight:normal ;'}">
-					<h:panelGroup rendered="#{NavigationForm.aktuell == '10'}">
-						<f:verbatim>&#8250; </f:verbatim>
-					</h:panelGroup>
-					<h:outputText value="#{msgs.bedienungshinweise}" />
-					<x:updateActionListener property="#{NavigationForm.aktuell}"
-						value="10" />
-				</h:commandLink> 
-				--%>
-
-				<%-- technischer Hintergrund --%>
-				<h:commandLink styleClass="mlink" action="TechnischerHintergrund"
-					style="#{NavigationForm.aktuell == '11' ? 'font-weight: bold;':'font-weight:normal ;'}">
-					<h:panelGroup rendered="#{NavigationForm.aktuell == '11'}">
-						<f:verbatim>&#8250; </f:verbatim>
-					</h:panelGroup>
-					<h:outputText value="#{msgs.technischerHintergrund}" />
-					<x:updateActionListener property="#{NavigationForm.aktuell}"
-						value="11" />
-				</h:commandLink>
-
-				<%-- aktive Benutzer --%>
-				<h:commandLink styleClass="mlink" action="aktiveBenutzerNeu"
-					style="#{NavigationForm.aktuell == '12' ? 'font-weight: bold;':'font-weight:normal ;'}">
-					<h:panelGroup rendered="#{NavigationForm.aktuell == '12'}">
-						<f:verbatim>&#8250; </f:verbatim>
-					</h:panelGroup>
-					<h:outputText value="#{msgs.aktiveBenutzer}" />
-					<x:updateActionListener property="#{NavigationForm.aktuell}"
-						value="12" />
-				</h:commandLink>
-
-				<%-- ################            Workflow              ######################--%>
-
-				<h:panelGroup rendered="#{LoginForm.maximaleBerechtigung > 0}">
-					<h:outputText styleClass="th_menu" value="- #{msgs.workflow} -" />
-
-					<%-- aktuelle Schritte --%>
-					<h:commandLink styleClass="mlink"
-						action="#{AktuelleSchritteForm.FilterAlleStart}"
-						style="#{NavigationForm.aktuell == '20' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '20'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.aktuelleSchritte}" />
-						<x:updateActionListener property="#{AktuelleSchritteForm.filter}"
-							value="" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="20" />
-					</h:commandLink>
-
-					<%-- Prozess suchen --%>
-					<h:commandLink styleClass="mlink" action="ProzessverwaltungSuche"
-						style="#{NavigationForm.aktuell == '21' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '21'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.nachEinemBandSuchen}" />
-						<x:updateActionListener property="#{ProzessverwaltungForm.filter}"
-							value="" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="21" />
-					</h:commandLink>
-
-					<%-- Prozessübersicht --%>
-					<h:commandLink styleClass="mlink"
-						rendered="#{(LoginForm.maximaleBerechtigung == 1) || (LoginForm.maximaleBerechtigung == 2)}"
-						action="#{ProzessverwaltungForm.FilterAktuelleProzesse}"
-						style="#{NavigationForm.aktuell == '22' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '22'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.aktuelleProzesse}" />
-						<x:updateActionListener property="#{ProzessverwaltungForm.filter}"
-							value="" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="22" />
-					</h:commandLink>
-
-					<%-- neuen Vorgang anlegen --%>
-					<h:commandLink styleClass="mlink"
-						rendered="#{(LoginForm.maximaleBerechtigung == 1) || (LoginForm.maximaleBerechtigung == 2)}"
-						action="#{ProzessverwaltungForm.NeuenVorgangAnlegen}"
-						style="#{NavigationForm.aktuell == '23' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '23'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.neuenVorgangAnlegen}" />
-						<x:updateActionListener property="#{ProzessverwaltungForm.filter}"
-							value="" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="23" />
-					</h:commandLink>
-					
-					<%-- Prozessvorlagen --%>
-					<h:commandLink styleClass="mlink"
-						rendered="#{(LoginForm.maximaleBerechtigung == 1) || (LoginForm.maximaleBerechtigung == 2)}"
-						action="#{ProzessverwaltungForm.FilterVorlagen}"
-						style="#{NavigationForm.aktuell == '24' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '24'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.prozessvorlagen}" />
-						<x:updateActionListener property="#{ProzessverwaltungForm.filter}"
-							value="" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="24" />
-					</h:commandLink>
-
-				</h:panelGroup>
-
-				<%-- ################            Administration              ######################--%>
-
-				<h:panelGroup rendered="#{LoginForm.maximaleBerechtigung == 1}">
-					<h:outputText styleClass="th_menu"
-						value="- #{msgs.administration} -" />
-
-					<%-- Benutzerverwaltung --%>
-					<h:commandLink styleClass="mlink"
-						action="#{BenutzerverwaltungForm.FilterKein}"
-						style="#{NavigationForm.aktuell == '30' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '30'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.benutzer}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="30" />
-					</h:commandLink>
-
-					<%-- Benutzergruppen --%>
-					<h:commandLink styleClass="mlink"
-						action="#{BenutzergruppenForm.FilterKein}"
-						style="#{NavigationForm.aktuell == '31' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '31'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.benutzergruppen}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="31" />
-					</h:commandLink>
-
-					<%-- Projekte --%>
-					<h:commandLink styleClass="mlink"
-						action="#{ProjekteForm.FilterKein}"
-						style="#{NavigationForm.aktuell == '32' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '32'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.projekte}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="32" />
-					</h:commandLink>
-
-					<%-- Regelsaetze --%>
-					<h:commandLink styleClass="mlink"
-						action="#{RegelsaetzeForm.FilterKein}"
-						style="#{NavigationForm.aktuell == '33' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '33'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.metadaten}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="33" />
-					</h:commandLink>
-
-					<%-- Ldapgruppen --%>
-					<h:commandLink styleClass="mlink"
-						action="#{LdapGruppenForm.FilterKein}"
-						style="#{NavigationForm.aktuell == '34' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '34'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.ldapgruppen}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="34" />
-					</h:commandLink>
-
-					<%-- Administrationsaufgaben --%>
-					<h:commandLink styleClass="mlink" action="Administrationsaufgaben"
-						style="#{NavigationForm.aktuell == '35' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '35'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.scripte}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="35" />
-					</h:commandLink>
-
-				</h:panelGroup>
-
-				<%-- ################            Benutzereinstellungen              ######################--%>
-
-				<h:panelGroup rendered="#{LoginForm.maximaleBerechtigung > 0}">
-					<h:outputText styleClass="th_menu"
-						value="- #{msgs.benutzerdaten} -" />
-
-					<%-- Benutzerkonfiguration --%>
-					<h:commandLink styleClass="mlink" action="Benutzerkonfiguration"
-						style="#{NavigationForm.aktuell == '40' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '40'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.benutzerkonfiguration}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="40" />
-					</h:commandLink>
-
-					<%-- Passwort ändern --%>
-					<h:commandLink styleClass="mlink" action="newPasswortAendern"
-						style="#{NavigationForm.aktuell == '41' ? 'font-weight: bold;':'font-weight:normal ;'}">
-						<h:panelGroup rendered="#{NavigationForm.aktuell == '41'}">
-							<f:verbatim>&#8250; </f:verbatim>
-						</h:panelGroup>
-						<h:outputText value="#{msgs.passwortAendern}" />
-						<x:updateActionListener property="#{NavigationForm.aktuell}"
-							value="41" />
-					</h:commandLink>
-				</h:panelGroup>
-
-			</h:form>
-		</htm:td>
-	</htm:tr>
-	<htm:tr valign="bottom">
-		<htm:td height="5%" valign="bottom">
-			<h:form id="loginform">
-				<%@include file="Login.jsp"%>
-			</h:form>
-		</htm:td>
-	</htm:tr>
-</htm:table>

=== removed file 'newpages/inc/box_head.jsp'
--- newpages/inc/box_head.jsp	2012-04-24 13:22:01 +0000
+++ newpages/inc/box_head.jsp	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta http-equiv="pragma" content="no-cache"/>
-	<meta http-equiv="cache-control" content="no-cache"/>
-	<meta name="date" content="1970-01-01T00:00:00+01:00"/>
-	<x:stylesheet path="/css/generator3.css"/>
-	<x:stylesheet path="/css/box_navigation.css"/>
-	<x:stylesheet path="/css/box_styles.css"/>
-
-	<f:loadBundle basename="messages" var="msgs" />
-	<title><h:outputText value="#{HelperForm.applicationHeaderTitle} 1.19" /></title>
-</head>
\ No newline at end of file

=== removed file 'newpages/inc_Prozessverwaltung/Context_Prozesse_Liste.jsp'
--- newpages/inc_Prozessverwaltung/Context_Prozesse_Liste.jsp	2012-04-24 13:22:01 +0000
+++ newpages/inc_Prozessverwaltung/Context_Prozesse_Liste.jsp	1970-01-01 00:00:00 +0000
@@ -1,800 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-<%@ taglib uri="http://www.jenia.org/jsf/dynamic"; prefix="jd"%>
-<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax"; prefix="a4j"%>
-<%@ taglib uri="http://richfaces.org/rich"; prefix="rich"%>
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<a4j:loadBundle basename="messages" var="msgs" />
-
-<htm:h4>
-	<h:outputText value="#{msgs.prozessvorlagen}"
-		rendered="#{ProzessverwaltungForm.modusAnzeige=='vorlagen'}" />
-	<h:outputText value="#{msgs.aktuelleProzesse}"
-		rendered="#{ProzessverwaltungForm.modusAnzeige=='aktuell'}" />
-</htm:h4>
-
-<%-- Neu-Schaltknopf --%>
-<h:commandLink action="#{ProzessverwaltungForm.Neu}" immediate="true"
-	rendered="#{(LoginForm.maximaleBerechtigung == 1) || (LoginForm.maximaleBerechtigung == 2)}"
-	id="new">
-	<h:outputText value="#{msgs.einenNeuenProzessAnlegen}"
-		rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen'}" />
-	<h:outputText value="#{msgs.eineNeueProzessvorlageAnlegen}"
-		rendered="#{(LoginForm.maximaleBerechtigung == 1) && (ProzessverwaltungForm.modusAnzeige=='vorlagen')}" />
-</h:commandLink>
-
-
-<%-- +++++++++++++++++  Anzeigefilter ++++++++++++++++++++++++ --%>
-<x:aliasBeansScope>
-	<x:aliasBean alias="#{Form}" value="#{ProzessverwaltungForm}" />
-	<x:aliasBean alias="#{showHits}" value="#{true}" />
-	<f:subview id="sub1">
-		<jsp:include page="/newpages/inc/Process_Filter.jsp" />
-	</f:subview>
-</x:aliasBeansScope>
-
-<%-- +++++++++++++++++  // Anzeigefilter ++++++++++++++++++++++++ --%>
-
-
-<rich:contextMenu attached="false" id="menu" disableDefaultMenu="false"
-	submitMode="ajax">
-	<%-- Bearbeiten-Schaltknopf --%>
-	<rich:menuItem
-		rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen'}">
-		<h:commandLink action="ProzessverwaltungBearbeiten"
-			title="#{msgs.metadatenBearbeiten}">
-			<h:graphicImage value="/newpages/images/buttons/goInto.gif"
-				style="margin-right:5px" />
-			<h:outputText value="#{msgs.prozessBearbeiten}" />
-			<x:updateActionListener
-				property="#{ProzessverwaltungForm.modusBearbeiten}" value="" />
-			<a4j:actionparam name="#{msgs.prozessBearbeiten}"
-				assignTo="#{ProzessverwaltungForm.myProcessId}" value="{processid}" />
-		</h:commandLink>
-	</rich:menuItem>
-
-	<%-- Bearbeiten-Schaltknopf: Vorlagen --%>
-	<rich:menuItem
-		rendered="#{(LoginForm.maximaleBerechtigung == 1) && (ProzessverwaltungForm.modusAnzeige=='vorlagen')}">
-		<h:commandLink action="ProzessverwaltungBearbeiten"
-			title="#{msgs.metadatenBearbeiten}">
-			<h:graphicImage value="/newpages/images/buttons/goInto.gif"
-				style="margin-right:5px" />
-			<h:outputText value="#{msgs.prozessBearbeiten}" />
-			<x:updateActionListener
-				property="#{ProzessverwaltungForm.modusBearbeiten}" value="" />
-			<a4j:actionparam name="#{msgs.prozessBearbeiten}"
-				assignTo="#{ProzessverwaltungForm.myProcessId}" value="{processid}" />
-		</h:commandLink>
-	</rich:menuItem>
-
-	<%-- Metadaten bearbeiten read-only --%>
-	<rich:menuItem
-		rendered="#{(LoginForm.maximaleBerechtigung != 1) && (LoginForm.maximaleBerechtigung != 2) && ProzessverwaltungForm.modusAnzeige!='vorlagen'}">
-		<h:commandLink action="#{Metadaten.XMLlesen}"
-			title="#{msgs.metadatenBearbeiten}">
-			<h:graphicImage value="/newpages/images/buttons/view1.gif"
-				style="margin-right:10px" />
-			<h:outputText value="#{msgs.metadatenBearbeiten}" />
-			<f:param name="nurLesen" value="true" />
-			<f:param name="ProzesseID" value="{processid}" />
-			<f:param name="BenutzerID" value="#{LoginForm.myBenutzer.id}" />
-			<f:param name="zurueck" value="ProzessverwaltungAlle" />
-			<a4j:actionparam name="#{msgs.metadatenBearbeiten}"
-				assignTo="#{ProzessverwaltungForm.myProcessId}" value="{processid}" />
-		</h:commandLink>
-
-	</rich:menuItem>
-	<%-- Metadaten-Schaltknopf --%>
-	<rich:menuItem
-		rendered="#{(LoginForm.maximaleBerechtigung != 1) && (LoginForm.maximaleBerechtigung != 2) && ProzessverwaltungForm.modusAnzeige!='vorlagen'}">
-		<h:commandLink action="#{Metadaten.XMLlesen}"
-			title="#{msgs.metadatenBearbeiten}">
-			<h:graphicImage value="/newpages/images/buttons/view1.gif"
-				style="margin-right:10px" />
-			<h:outputText value="#{msgs.metadatenBearbeiten}" />
-			<f:param name="nurLesen" value="true" />
-			<f:param name="ProzesseID" value="#{processid}" />
-			<f:param name="BenutzerID" value="#{LoginForm.myBenutzer.id}" />
-			<f:param name="zurueck" value="ProzessverwaltungAlle" />
-			<a4j:actionparam name="#{msgs.metadatenBearbeiten}"
-				assignTo="#{ProzessverwaltungForm.myProcessId}" value="{processid}" />
-		</h:commandLink>
-	</rich:menuItem>
-
-	<rich:menuGroup value="Upload/Download">
-		<%-- Download-Schaltknopf --%>
-		<rich:menuItem
-			rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen'}">
-			<h:commandLink action="#{ProzessverwaltungForm.DownloadToHome}"
-				title="#{msgs.imHomeVerzeichnisVerlinken}">
-				<h:graphicImage value="/newpages/images/buttons/load_down2.gif"
-					style="margin-right:2px" />
-				<h:outputText value="#{msgs.imHomeVerzeichnisVerlinken}" />
-				<a4j:actionparam name="#{msgs.imHomeVerzeichnisVerlinken}"
-					assignTo="#{ProzessverwaltungForm.myProcessId}" value="{processid}" />
-			</h:commandLink>
-		</rich:menuItem>
-		<%-- Download-Schaltknopf --%>
-		<rich:menuItem
-			rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' }">
-			<h:commandLink action="#{ProzessverwaltungForm.DownloadToHome}"
-				title="#{msgs.imHomeVerzeichnisVerlinkenTrotzBearbeitung}"
-				onclick="if (!confirm('#{msgs.warningAdminBeforeLinking}')) return">
-				<h:graphicImage value="/newpages/images/buttons/load_down3.gif"
-					style="margin-right:2px" />
-				<h:outputText value="#{msgs.imHomeVerzeichnisVerlinken}" />
-				<a4j:actionparam name="#{msgs.imHomeVerzeichnisVerlinken}"
-					assignTo="#{ProzessverwaltungForm.myProcessId}" value="{processid}" />
-			</h:commandLink>
-		</rich:menuItem>
-
-		<%-- Upload-Schaltknopf --%>
-		<rich:menuItem
-			rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen'}">
-			<h:commandLink action="#{ProzessverwaltungForm.UploadFromHome}"
-				title="#{msgs.ausHomeverzeichnisEntfernen}"
-				onclick="if (!confirm('#{msgs.ausHomeverzeichnisEntfernen}?')) return">
-				<h:graphicImage value="/newpages/images/buttons/load_up2.gif"
-					style="margin-right:2px" />
-				<h:outputText value="#{msgs.ausHomeverzeichnisEntfernen}" />
-				<a4j:actionparam name="#{msgs.ausHomeverzeichnisEntfernen}"
-					assignTo="#{ProzessverwaltungForm.myProcessId}" value="{processid}" />
-			</h:commandLink>
-		</rich:menuItem>
-
-	</rich:menuGroup>
-
-		<%-- XML Export-Schaltknopf --%>
-		<rich:menuItem
-			rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen'}">
-			<h:commandLink action="#{ProzessverwaltungForm.CreateXML}"
-				title="#{msgs.createXML}">
-				<h:graphicImage alt="sorta" value="/newpages/images/buttons/xml.gif"
-					style="margin-right:2px" />
-				<h:outputText value="#{msgs.createXML}" />
-				<a4j:actionparam name="#{msgs.createXML}"
-					assignTo="#{ProzessverwaltungForm.myProcessId}" value="{processid}" />
-			</h:commandLink>
-		</rich:menuItem>
-
-		<%-- Mets-Export-Schaltknopf --%>
-		<rich:menuItem
-			rendered="#{(ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1))}">
-			<h:commandLink action="#{ProzessverwaltungForm.ExportMets}"
-				title="#{msgs.exportMets}">
-				<h:graphicImage value="/newpages/images/buttons/mets.png"
-					style="margin-right:2px" />
-				<h:outputText value="#{msgs.exportMets}" />
-				<a4j:actionparam name="#{msgs.exportMets}"
-					assignTo="#{ProzessverwaltungForm.myProcessId}" value="{processid}" />
-			</h:commandLink>
-		</rich:menuItem>
-
-		<%-- Mets-Export-Schaltknopf greyed --%>
-		<rich:menuItem
-			rendered="#{(ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1))}">
-			<h:graphicImage value="/newpages/images/buttons/metsGreyed.png"
-				style="margin-right:2px" title="#{msgs.exportMets}" />
-			<h:outputText value="#{msgs.exportMets}" />
-		</rich:menuItem>
-
-		<%-- PDF-Export-Schaltknopf --%>
-		<rich:menuItem
-			rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1)}">
-			<a4j:actionparam name="#{msgs.exportPdf}"
-				assignTo="#{ProzessverwaltungForm.myProcessId}" value="{processid}">
-				<h:commandLink action="#{ProzessverwaltungForm.ExportPdf}"
-					title="#{msgs.exportPdf}">
-					<h:graphicImage value="/newpages/images/buttons/pdf.png"
-						style="margin-right:2px" />
-					<h:outputText value="#{msgs.exportPdf}" />
-				</h:commandLink>
-			</a4j:actionparam>
-		</rich:menuItem>
-
-		<%-- PDF-Export-Schaltknopf greyed --%>
-		<rich:menuItem
-			rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1)}">
-			<h:graphicImage value="/newpages/images/buttons/pdfGreyed.png"
-				style="margin-right:2px" title="#{msgs.exportPdf}" />
-			<h:outputText value="#{msgs.exportPdf}" />
-		</rich:menuItem>
-
-		<%-- DMS-Export-Schaltknopf --%>
-		<rich:menuItem
-			rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1)}">
-			<h:commandLink action="#{ProzessverwaltungForm.ExportDMS}"
-				title="#{msgs.importDms}">
-				<h:graphicImage value="/newpages/images/buttons/dms.png"
-					style="margin-right:0px" />
-				<h:outputText value="#{msgs.importDms}" />
-				<a4j:actionparam name="#{msgs.importDms}"
-					assignTo="#{ProzessverwaltungForm.myProcessId}" value="{processid}" />
-			</h:commandLink>
-		</rich:menuItem>
-
-		<%-- DMS-Export-Schaltknopf greyed --%>
-		<rich:menuItem
-			rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1)}">
-			<h:graphicImage value="/newpages/images/buttons/dmsGreyed.png"
-				style="margin-right:2px" style="margin-right:2px"
-				title="#{msgs.importDms}" />
-			<h:outputText value="#{msgs.importDms}" />
-		</rich:menuItem>
-
-</rich:contextMenu>
-
-
-<h:panelGrid columns="2" columnClasses="top, top">
-
-	<rich:dataTable id="auflistung" styleClass="standardTable" width="100%"
-		cellspacing="1px" cellpadding="1px" headerClass="standardTable_Header"
-		rowClasses="standardTable_Row1,standardTable_Row2,standardTable_Row1,standardTable_Row2"
-		value="#{ProzessverwaltungForm.page.listReload}" var="item">
-		<%-- +++++++++++++++++  SelectionBoxes ++++++++++++++++++++++++ --%>
-		<rich:column
-			rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && ProzessverwaltungForm.anzeigeAnpassen['selectionBoxes']}">
-			<f:facet name="header">
-				<x:div>
-					<%-- Header --%>
-					<h:outputText value="#{msgs.auswahl2}" />
-					<h:commandLink action="#{ProzessverwaltungForm.SelectionAll}"
-						id="selectall" title="#{msgs.alleAuswaehlen}"
-						style="margin-left:10px">
-						<h:graphicImage value="/newpages/images/check_true.gif" />
-					</h:commandLink>
-					<h:commandLink action="#{ProzessverwaltungForm.SelectionNone}"
-						id="selectnone" title="#{msgs.auswahlEntfernen}"
-						style="margin-left:5px">
-						<h:graphicImage value="/newpages/images/check_false.gif" />
-					</h:commandLink>
-				</x:div>
-			</f:facet>
-			<a4j:commandLink reRender="myself1" id="myself1">
-				<h:graphicImage value="/newpages/images/check_true.gif"
-					style="margin-right:4px" rendered="#{item.selected}" />
-				<h:graphicImage value="/newpages/images/check_false.gif"
-					style="margin-right:4px" rendered="#{!item.selected}" />
-				<x:updateActionListener value="#{item.selected?false:true}"
-					property="#{item.selected}" />
-				<a4j:ajaxListener type="org.ajax4jsf.ajax.ForceRender" />
-			</a4j:commandLink>
-		</rich:column>
-		<%-- +++++++++++++++++  ProzessID ++++++++++++++++++++++++ --%>
-		<rich:column
-			rendered="#{ProzessverwaltungForm.anzeigeAnpassen['processId']}">
-			<f:facet name="header">
-				<h:outputText value="#{msgs.id}" />
-			</f:facet>
-			<h:outputText value="#{item.id}" />
-		</rich:column>
-		<rich:column rendered="true" id="ajaxcolumn" style="text-align:left">
-			<f:facet name="header">
-				<x:div>
-					<%-- Header --%>
-					<h:outputText value="#{msgs.prozessTitel}" />
-					<%-- Sortierung Asc --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort1"
-						rendered="#{ProzessverwaltungForm.sortierung=='titelAsc'}">
-						<h:graphicImage value="/newpages/images/sorting/asc.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}" value="titelDesc" />
-					</h:commandLink>
-					<%-- Sortierung Desc --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort2"
-						rendered="#{ProzessverwaltungForm.sortierung=='titelDesc'}">
-						<h:graphicImage value="/newpages/images/sorting/desc.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}" value="titelAsc" />
-					</h:commandLink>
-					<%-- Sortierung none --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort3"
-						rendered="#{ProzessverwaltungForm.sortierung!='titelDesc' && ProzessverwaltungForm.sortierung!='titelAsc'}">
-						<h:graphicImage value="/newpages/images/sorting/none.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}" value="titelAsc" />
-					</h:commandLink>
-				</x:div>
-			</f:facet>
-
-
-			<a4j:commandLink reRender="auflistungIntern,myself23" id="myself23"
-				style="color:black">
-				<h:graphicImage value="/newpages/images/plus.gif"
-					style="margin-right:4px" rendered="#{!item.panelAusgeklappt}" />
-				<h:graphicImage value="/newpages/images/minus.gif"
-					style="margin-right:4px" rendered="#{item.panelAusgeklappt}" />
-				<x:updateActionListener value="#{item.panelAusgeklappt?false:true}"
-					property="#{item.panelAusgeklappt}" />
-				<h:outputText value="#{item.titel}" />
-				<a4j:ajaxListener type="org.ajax4jsf.ajax.ForceRender" />
-			</a4j:commandLink>
-
-			<h:panelGroup id="auflistungIntern">
-				<x:dataTable id="prozessdetails2" styleClass="standardTable"
-					width="90%" style="margin-left:12px;margin-top:5px"
-					cellspacing="1px" cellpadding="1px"
-					headerClass="standardTable_Header" rowClasses="standardTable_Row1"
-					rendered="#{item.panelAusgeklappt}"
-					columnClasses="standardTable_ColumnSchmal,standardTable_Column,standardTable_ColumnCentered"
-					var="step" value="#{item.schritteList}">
-
-					<x:column>
-						<f:facet name="header">
-							<h:outputText value="#{msgs.nr}" />
-						</f:facet>
-						<h:outputText value="#{step.reihenfolge}" />
-					</x:column>
-
-					<x:column>
-						<f:facet name="header">
-							<h:outputText value="#{msgs.titel}" />
-						</f:facet>
-						<h:outputText value="#{step.titelLokalisiert}" />
-					</x:column>
-
-					<x:column>
-						<f:facet name="header">
-							<h:outputText value="#{msgs.status}" />
-						</f:facet>
-						<h:graphicImage
-							value="#{step.bearbeitungsstatusEnum.smallImagePath}"
-							title="#{step.bearbeitungsstatusEnum.title}"
-							rendered="#{step.bearbeitungsstatusEnum == 'OPEN' || step.bearbeitungsstatusEnum == 'LOCKED'}" />
-						<h:graphicImage
-							value="#{step.bearbeitungsstatusEnum.smallImagePath}"
-							title="#{step.bearbeitungsstatusEnum.title}: #{step.bearbeitungsbenutzer!=null && step.bearbeitungsbenutzer.id!=0?step.bearbeitungsbenutzer.nachVorname:''} (#{step.bearbeitungszeitpunkt !=null?step.bearbeitungszeitpunktAsFormattedString:''})  - #{step.editTypeEnum.title}"
-							rendered="#{step.bearbeitungsstatusEnum == 'DONE' || step.bearbeitungsstatusEnum == 'INWORK'}" />
-					</x:column>
-
-				</x:dataTable>
-			</h:panelGroup>
-		</rich:column>
-
-
-		<%-- +++++++++++++++++  Vorgangsdatum ++++++++++++++++++++++++ --%>
-
-		<rich:column style="text-align:center"
-			rendered="#{ProzessverwaltungForm.anzeigeAnpassen['processDate']}">
-			<f:facet name="header">
-				<x:div>
-					<%-- Header --%>
-					<h:outputText value="#{msgs.vorgangsdatum}" />
-					<%-- Sortierung Asc --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort4"
-						rendered="#{ProzessverwaltungForm.sortierung=='vorgangsdatumAsc'}">
-						<h:graphicImage value="/newpages/images/sorting/asc.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}"
-							value="vorgangsdatumDesc" />
-					</h:commandLink>
-					<%-- Sortierung Desc --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort5"
-						rendered="#{ProzessverwaltungForm.sortierung=='vorgangsdatumDesc'}">
-						<h:graphicImage value="/newpages/images/sorting/desc.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}"
-							value="vorgangsdatumAsc" />
-					</h:commandLink>
-					<%-- Sortierung none --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort6"
-						rendered="#{ProzessverwaltungForm.sortierung!='vorgangsdatumDesc' && ProzessverwaltungForm.sortierung!='vorgangsdatumAsc'}">
-						<h:graphicImage value="/newpages/images/sorting/none.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}"
-							value="vorgangsdatumAsc" />
-					</h:commandLink>
-				</x:div>
-			</f:facet>
-			<h:outputText value="#{item.erstellungsdatum}" />
-		</rich:column>
-		<%-- +++++++++++++++++  Status ++++++++++++++++++++++++ --%>
-		<rich:column style="text-align:center">
-			<f:facet name="header">
-				<x:div>
-					<%-- Header --%>
-					<h:outputText value="#{msgs.status}" />
-					<%-- Sortierung Asc --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort7"
-						rendered="#{ProzessverwaltungForm.sortierung=='fortschrittAsc'}">
-						<h:graphicImage value="/newpages/images/sorting/asc.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}"
-							value="fortschrittDesc" />
-					</h:commandLink>
-					<%-- Sortierung Desc --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort8"
-						rendered="#{ProzessverwaltungForm.sortierung=='fortschrittDesc'}">
-						<h:graphicImage value="/newpages/images/sorting/desc.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}"
-							value="fortschrittAsc" />
-					</h:commandLink>
-					<%-- Sortierung none --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort9"
-						rendered="#{ProzessverwaltungForm.sortierung!='fortschrittDesc' && ProzessverwaltungForm.sortierung!='fortschrittAsc'}">
-						<h:graphicImage value="/newpages/images/sorting/none.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}"
-							value="fortschrittAsc" />
-					</h:commandLink>
-				</x:div>
-			</f:facet>
-			<h:graphicImage value="/newpages/images/fortschritt/ende_links.gif"
-				rendered="true" />
-			<h:graphicImage value="/newpages/images/fortschritt/gr.gif"
-				style="width:#{item.fortschritt3 * 0.8}px;height:10px" />
-			<h:graphicImage value="/newpages/images/fortschritt/ge.gif"
-				style="width:#{item.fortschritt2 * 0.8}px;height:10px" />
-			<h:graphicImage value="/newpages/images/fortschritt/rt.gif"
-				style="width:#{item.fortschritt1 * 0.8}px;height:10px" />
-			<h:graphicImage value="/newpages/images/fortschritt/ende_rechts.gif"
-				rendered="true" />
-		</rich:column>
-
-
-
-
-		<rich:column style="text-align:center">
-			<f:facet name="header">
-				<x:div>
-					<%-- Header --%>
-					<h:outputText value="#{msgs.projekt}" />
-					<%-- Sortierung Asc --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort10"
-						rendered="#{ProzessverwaltungForm.sortierung=='projektAsc'}">
-						<h:graphicImage value="/newpages/images/sorting/asc.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}"
-							value="projektDesc" />
-					</h:commandLink>
-					<%-- Sortierung Desc --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort11"
-						rendered="#{ProzessverwaltungForm.sortierung=='projektDesc'}">
-						<h:graphicImage value="/newpages/images/sorting/desc.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}" value="projektAsc" />
-					</h:commandLink>
-					<%-- Sortierung none --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort12"
-						rendered="#{ProzessverwaltungForm.sortierung!='projektDesc' && ProzessverwaltungForm.sortierung!='projektAsc'}">
-						<h:graphicImage value="/newpages/images/sorting/none.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}" value="projektAsc" />
-					</h:commandLink>
-				</x:div>
-			</f:facet>
-			<h:outputText value="#{item.projekt.titel}" />
-		</rich:column>
-
-		<rich:column style="text-align:center"
-			rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && ProzessverwaltungForm.anzeigeAnpassen['lockings']}">
-			<f:facet name="header">
-				<x:div>
-					<%-- Header --%>
-					<h:outputText value="#{msgs.sperrungen}" />
-					<%-- Sortierung Asc --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort13"
-						rendered="#{ProzessverwaltungForm.sortierung=='sperrungenAsc'}">
-						<h:graphicImage value="/newpages/images/sorting/asc.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}"
-							value="sperrungenDesc" />
-					</h:commandLink>
-					<%-- Sortierung Desc --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort14"
-						rendered="#{ProzessverwaltungForm.sortierung=='sperrungenDesc'}">
-						<h:graphicImage value="/newpages/images/sorting/desc.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}"
-							value="sperrungenAsc" />
-					</h:commandLink>
-					<%-- Sortierung none --%>
-					<h:commandLink action="#{ProzessverwaltungForm.FilterAlleStart}"
-						id="sort15"
-						rendered="#{ProzessverwaltungForm.sortierung!='sperrungenDesc' && ProzessverwaltungForm.sortierung!='sperrungenAsc'}">
-						<h:graphicImage value="/newpages/images/sorting/none.gif"
-							style="vertical-align:middle;margin-left:5px" />
-						<x:updateActionListener
-							property="#{ProzessverwaltungForm.sortierung}"
-							value="sperrungenAsc" />
-					</h:commandLink>
-				</x:div>
-			</f:facet>
-			<h:outputText value="#{item.benutzerGesperrt.nachVorname}"
-				rendered="#{item.benutzerGesperrt != null}" />
-		</rich:column>
-
-		<%-- +++++++++++++++++  Swapped out ++++++++++++++++++++++++ --%>
-		<rich:column style="text-align:center"
-			rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && ProzessverwaltungForm.anzeigeAnpassen['swappedOut']}">
-			<f:facet name="header">
-				<x:div>
-					<%-- Header --%>
-					<h:outputText value="#{msgs.ausgelagert}" />
-				</x:div>
-			</f:facet>
-			<h:graphicImage value="/newpages/images/check_true.gif"
-				rendered="#{item.swappedOutGui}" />
-			<h:graphicImage value="/newpages/images/check_false.gif"
-				rendered="#{!item.swappedOutGui}" />
-		</rich:column>
-
-		<rich:column style="text-align:center" width="223px"
-			styleClass="action">
-			<f:facet name="header">
-				<h:outputText value="#{msgs.auswahl}" styleClass="action" />
-			</f:facet>
-
-
-			<%-- Bearbeiten-Schaltknopf: konkrete Prozesse --%>
-			<h:commandLink action="ProzessverwaltungBearbeiten" id="action10"
-				rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen'}"
-				title="#{msgs.prozessBearbeiten}">
-				<h:graphicImage value="/newpages/images/buttons/goInto.gif"
-					style="margin-right:5px" />
-				<x:updateActionListener
-					property="#{ProzessverwaltungForm.myProzess}" value="#{item}" />
-				<x:updateActionListener
-					property="#{ProzessverwaltungForm.modusBearbeiten}" value="" />
-			</h:commandLink>
-
-			<%-- Bearbeiten-Schaltknopf: Vorlagen --%>
-			<h:commandLink action="ProzessverwaltungBearbeiten" id="action11"
-				rendered="#{(LoginForm.maximaleBerechtigung == 1) && (ProzessverwaltungForm.modusAnzeige=='vorlagen')}"
-				title="#{msgs.prozessBearbeiten}">
-				<h:graphicImage value="/newpages/images/buttons/goInto.gif"
-					style="margin-right:5px" />
-				<x:updateActionListener
-					property="#{ProzessverwaltungForm.myProzess}" value="#{item}" />
-				<x:updateActionListener
-					property="#{ProzessverwaltungForm.modusBearbeiten}" value="" />
-			</h:commandLink>
-
-			<%-- tif-Header-Schaltknopf --%>
-			<h:commandLink action="#{ProzessverwaltungForm.DownloadTiffHeader}"
-				id="action12" title="#{msgs.dateiMitTiffHeaderSpeichern}"
-				rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && 0==1}">
-				<h:graphicImage value="/newpages/images/buttons/tif.gif"
-					style="margin-right:1px" />
-				<x:updateActionListener
-					property="#{ProzessverwaltungForm.myProzess}" value="#{item}" />
-			</h:commandLink>
-
-			<%-- Multi-Tiff-Export-Schaltknopf --%>
-			<h:commandLink action="#{ProzessverwaltungForm.DownloadMultiTiff}"
-				id="action13" title="#{msgs.multiTiffDownloaden}"
-				rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && LoginForm.maximaleBerechtigung == 1 && 0==1}">
-				<h:graphicImage value="/newpages/images/buttons/view3.gif"
-					style="margin-right:3px" />
-				<x:updateActionListener
-					property="#{ProzessverwaltungForm.myProzess}" value="#{item}" />
-			</h:commandLink>
-
-			<%-- Metadaten-Schaltknopf --%>
-			<h:commandLink action="#{Metadaten.XMLlesen}" id="action14"
-				title="#{msgs.metadatenBearbeiten}"
-				rendered="#{(LoginForm.maximaleBerechtigung != 1) && (LoginForm.maximaleBerechtigung != 2) && item.benutzerGesperrt == null && ProzessverwaltungForm.modusAnzeige!='vorlagen'}">
-				<h:graphicImage value="/newpages/images/buttons/view1.gif"
-					style="margin-right:10px" />
-				<f:param name="nurLesen" value="true" />
-				<f:param name="ProzesseID" value="#{item.id}" />
-				<f:param name="BenutzerID" value="#{LoginForm.myBenutzer.id}" />
-				<f:param name="zurueck" value="ProzessverwaltungAlle" />
-			</h:commandLink>
-
-			<h:panelGroup
-				rendered="#{(LoginForm.maximaleBerechtigung == 1) || (LoginForm.maximaleBerechtigung == 2)}">
-
-				<%-- Metadaten-Schaltknopf --%>
-				<h:commandLink action="#{Metadaten.XMLlesen}" id="action15"
-					title="#{msgs.metadatenBearbeiten}"
-					rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen'}">
-					<h:graphicImage value="/newpages/images/buttons/view1.gif"
-						style="margin-right:10px" />
-					<f:param name="ProzesseID" value="#{item.id}" />
-					<f:param name="BenutzerID" value="#{LoginForm.myBenutzer.id}" />
-					<f:param name="zurueck" value="ProzessverwaltungAlle" />
-				</h:commandLink>
-
-				<%-- Download-Schaltknopf --%>
-				<h:commandLink action="#{ProzessverwaltungForm.DownloadToHome}"
-					id="action16" title="#{msgs.imHomeVerzeichnisVerlinken}"
-					rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && !item.imageFolderInUse}">
-					<h:graphicImage value="/newpages/images/buttons/load_down2.gif"
-						style="margin-right:2px" />
-					<x:updateActionListener
-						property="#{ProzessverwaltungForm.myProzess}" value="#{item}" />
-				</h:commandLink>
-
-				<%-- Download-Schaltknopf --%>
-				<h:commandLink action="#{ProzessverwaltungForm.DownloadToHome}"
-					id="action17"
-					title="#{msgs.imHomeVerzeichnisVerlinkenTrotzBearbeitung}"
-					onclick="if (!confirm('#{msgs.warningAdminBeforeLinking}')) return"
-					rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && item.imageFolderInUse}">
-					<h:graphicImage value="/newpages/images/buttons/load_down3.gif"
-						style="margin-right:2px" />
-					<x:updateActionListener
-						property="#{ProzessverwaltungForm.myProzess}" value="#{item}" />
-				</h:commandLink>
-
-				<%-- Upload-Schaltknopf --%>
-				<h:commandLink action="#{ProzessverwaltungForm.UploadFromHome}"
-					id="action18" title="#{msgs.ausHomeverzeichnisEntfernen}"
-					onclick="if (!confirm('#{msgs.ausHomeverzeichnisEntfernen}?')) return"
-					rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen'}">
-					<h:graphicImage value="/newpages/images/buttons/load_up2.gif"
-						style="margin-right:2px" />
-					<x:updateActionListener
-						property="#{ProzessverwaltungForm.myProzess}" value="#{item}" />
-				</h:commandLink>
-				<%-- XML Export-Schaltknopf --%>
-				<h:commandLink id="ubid119"
-					action="#{ProzessverwaltungForm.CreateXML}"
-					title="#{msgs.createXML}"
-					rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen'}">
-					<h:graphicImage id="ubid120" alt="sorta"
-						value="/newpages/images/buttons/xml.gif" style="margin-right:2px" />
-					<x:updateActionListener
-						property="#{ProzessverwaltungForm.myProzess}" value="#{item}" />
-				</h:commandLink>
-
-
-				<%-- Mets-Export-Schaltknopf --%>
-				<h:commandLink action="#{ProzessverwaltungForm.ExportMets}"
-					id="action19" title="#{msgs.exportMets}"
-					rendered="#{(ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1)) && item.tifDirectoryExists}">
-					<h:graphicImage value="/newpages/images/buttons/mets.png"
-						style="margin-right:2px" />
-					<x:updateActionListener
-						property="#{ProzessverwaltungForm.myProzess}" value="#{item}" />
-				</h:commandLink>
-
-				<%-- Mets-Export-Schaltknopf greyed --%>
-				<h:graphicImage
-					rendered="#{(ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1)) && !item.tifDirectoryExists}"
-					value="/newpages/images/buttons/metsGreyed.png"
-					style="margin-right:2px" title="#{msgs.exportMets}" />
-
-				<%-- PDF-Export-Schaltknopf --%>
-				<h:commandLink action="#{ProzessverwaltungForm.ExportPdf}"
-					id="action20" title="#{msgs.exportPdf}"
-					rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1) && item.tifDirectoryExists}">
-					<h:graphicImage value="/newpages/images/buttons/pdf.png"
-						style="margin-right:2px" />
-					<x:updateActionListener
-						property="#{ProzessverwaltungForm.myProzess}" value="#{item}" />
-				</h:commandLink>
-
-				<%-- PDF-Export-Schaltknopf greyed --%>
-				<h:graphicImage
-					rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1) && !item.tifDirectoryExists}"
-					value="/newpages/images/buttons/pdfGreyed.png"
-					style="margin-right:2px" title="#{msgs.exportPdf}" />
-
-				<%-- DMS-Export-Schaltknopf --%>
-				<h:commandLink action="#{ProzessverwaltungForm.ExportDMS}"
-					id="action21" title="#{msgs.importDms}"
-					rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1) && item.tifDirectoryExists}">
-					<h:graphicImage value="/newpages/images/buttons/dms.png"
-						style="margin-right:0px" />
-					<x:updateActionListener
-						property="#{ProzessverwaltungForm.myProzess}" value="#{item}" />
-				</h:commandLink>
-
-				<%-- PDF-Export-Schaltknopf greyed --%>
-				<h:graphicImage
-					rendered="#{ProzessverwaltungForm.modusAnzeige!='vorlagen' && (LoginForm.maximaleBerechtigung == 2 || LoginForm.maximaleBerechtigung == 1) && !item.tifDirectoryExists}"
-					value="/newpages/images/buttons/dmsGreyed.png"
-					style="margin-right:2px" title="#{msgs.importDms}" />
-
-				<%-- ProzessKopie-Schaltknopf --%>
-				<h:commandLink action="#{ProzesskopieForm.Prepare}"
-					title="#{item.containsUnreachableSteps?msgs.prozessvorlageMitUnvollstaendigenSchrittdetails:msgs.eineKopieDieserProzessvorlageAnlegen}"
-					rendered="#{ProzessverwaltungForm.modusAnzeige=='vorlagen'}">
-					<h:graphicImage value="/newpages/images/buttons/star_blue.gif"
-						style="margin-right:3px"
-						rendered="#{!item.containsUnreachableSteps}" />
-					<h:graphicImage value="/newpages/images/buttons/star_red.gif"
-						style="margin-right:3px"
-						rendered="#{item.containsUnreachableSteps}" />
-					<x:updateActionListener
-						property="#{ProzesskopieForm.prozessVorlage}" value="#{item}" />
-				</h:commandLink>
-
-
-				<%-- PDF-Export-Schaltknopf greyed --%>
-				<h:graphicImage value="/newpages/images/buttons/dmsGreyed.png"
-					style="margin-right:2px" title="#{msgs.importDms}">
-					<rich:componentControl event="onclick" for="menu" operation="show">
-						<f:param value="#{item.id}" name="processid" />
-					</rich:componentControl>
-				</h:graphicImage>
-
-			</h:panelGroup>
-		</rich:column>
-
-
-
-
-
-
-
-
-
-
-	</rich:dataTable>
-
-
-</h:panelGrid>
-
-
-
-<htm:table width="100%" border="0">
-	<htm:tr valign="top">
-
-		<htm:td align="center">
-			<%-- ===================== Datascroller für die Ergebnisse ====================== --%>
-			<x:aliasBean alias="#{mypage}" value="#{ProzessverwaltungForm.page}">
-				<jsp:include page="/newpages/inc/datascroller.jsp" />
-			</x:aliasBean>
-			<%-- ===================== // Datascroller für die Ergebnisse ====================== --%>
-
-		</htm:td>
-	</htm:tr>
-</htm:table>

=== removed file 'newpages/inc_statistic/StatisticCorrection.jsp'
--- newpages/inc_statistic/StatisticCorrection.jsp	2011-12-20 08:07:09 +0000
+++ newpages/inc_statistic/StatisticCorrection.jsp	1970-01-01 00:00:00 +0000
@@ -1,151 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi"; prefix="si"%>
-<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax"; prefix="a4j"%>
-
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<htm:table cellpadding="3" cellspacing="0" width="100%" styleClass="eingabeBoxen">
-	<htm:tr>
-		<htm:td styleClass="eingabeBoxen_row1">
-			<h:outputText id="uaid2" value="#{msgs.defineStatisticalQuestion}" />
-		</htm:td>
-	</htm:tr>
-	<htm:tr>
-		<htm:td styleClass="eingabeBoxen_row2">
-
-			<h:panelGrid id="uaid3" columns="8"
-				columnClasses="standardTable_ColumnRight,standardTable_Column,standardTable_ColumnRight,standardTable_Column,standardTable_ColumnRight,standardTable_Column, standardTable_Column">
-
-				<h:outputLabel id="uaid4" for="from" value="#{msgs.zeitraum} #{msgs.from}" style="width:150px" />
-				<h:panelGroup id="uaid5">
-					<x:inputCalendar id="from" style="width:110px" value="#{Form.statisticsManager3.sourceDateFrom}" renderAsPopup="true"
-						renderPopupButtonAsImage="true" popupTodayString="#{msgs.heute}" popupWeekString="#{msgs.kw}" imageLocation="/newpages/images/calendarImages/"
-						popupButtonImageUrl="/newpages/images/calendarImages/calendar.gif" />
-				</h:panelGroup>
-
-				<h:outputLabel id="uaid6" for="to" value="#{msgs.to}" />
-				<h:panelGroup id="uaid7">
-					<x:inputCalendar id="to" style="width:110px" value="#{Form.statisticsManager3.sourceDateTo}" renderAsPopup="true" renderPopupButtonAsImage="true"
-						popupTodayString="#{msgs.heute}" popupWeekString="#{msgs.kw}" imageLocation="/newpages/images/calendarImages/"
-						popupButtonImageUrl="/newpages/images/calendarImages/calendar.gif" />
-				</h:panelGroup>
-
-				<h:outputText id="uaid8" style="font-weight:bold" value=" - #{msgs.orLast} - " />
-
-				<h:inputText id="uaid9" style="width:130px;text-align:right" required="false" value="#{Form.statisticsManager3.sourceNumberOfTimeUnitsAsString}" />
-
-				<h:selectOneMenu id="uaid10" style="width:130px" value="#{Form.statisticsManager3.sourceTimeUnit}" converter="StatisticsTimeUnitConverter">
-					<si:selectItems id="uaid11" value="#{Form.statisticsManager3.allTimeUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:panelGroup id="uaid12" style="margin-bottom:0px">
-					<h:selectBooleanCheckbox id="uaid13" value="#{Form.statisticsManager3.showAverage}" title="#{msgs.showAverage}">
-					</h:selectBooleanCheckbox>
-					<h:outputLabel for="uaid13" id="uaid14" value="#{msgs.showAverage}" />
-				</h:panelGroup>
-
-				<h:outputText id="uaid15" value="#{msgs.einheit}" style="width:150px" />
-
-				<h:selectOneMenu id="uaid16" style="width:130px" value="#{Form.statisticsManager3.targetTimeUnit}" converter="StatisticsTimeUnitConverter">
-					<si:selectItems id="uaid17" value="#{Form.statisticsManager3.allTimeUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:outputText id="uaid18" value="#{msgs.anzeige}" />
-
-				<h:selectOneMenu id="uaid19" style="width:130px" value="#{Form.statisticsManager3.targetCalculationUnit}"
-					converter="StatisticsCalculationUnitConverter">
-					<si:selectItems id="uaid20" value="#{Form.statisticsManager3.allCalculationUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:outputText id="uaid21" value="#{msgs.ausgabe}" />
-
-				<h:selectOneMenu id="uaid22" style="width:130px" value="#{Form.statisticsManager3.targetResultOutput}" converter="StatisticsResultOutputConverter">
-					<si:selectItems id="uaid23" value="#{Form.statisticsManager3.allResultOutputs}" var="out" itemLabel="#{out.title}" itemValue="#{out}" />
-				</h:selectOneMenu>
-
-				<h:panelGroup id="uaid241" style="margin-bottom:0px">
-					<h:outputText>
-					</h:outputText>
-				</h:panelGroup>
-
-				<%-- the following is an alternating couple to make the columns match --%>
-				<h:panelGroup id="uaid242" style="margin-bottom:0px" rendered="#{!Form.statisticsManager3.renderLoopOption}">
-					<h:outputText>
-					</h:outputText>
-				</h:panelGroup>
-
-				<h:panelGroup id="uaid25" style="margin-bottom:0px" rendered="#{Form.statisticsManager3.renderLoopOption}">
-					<h:selectBooleanCheckbox id="uaid26_2" value="#{Form.statisticsManager3.includeLoops}" title="#{msgs.includeLoops}">
-					</h:selectBooleanCheckbox>
-					<h:outputLabel for="uaid26_2" id="uaid27_2" value="#{msgs.includeLoops}" />
-				</h:panelGroup>
-
-			</h:panelGrid>
-
-			<x:commandButton id="myStatisticButton" style="margin:5px" title="#{msgs.calculateStatistics}" value="#{msgs.calculateStatistics} "
-				action="#{Form.statisticsManager3.calculate}">
-				<x:updateActionListener property="#{Form.showStatistics}" value="true" />
-			</x:commandButton>
-
-
-			<br />
-
-		</htm:td>
-	</htm:tr>
-
-</htm:table>
-
-
-<h:panelGroup rendered="#{Form.statisticsManager3 != null && !Form.statisticsManager3.statisticMode.isSimple && Form.showStatistics}">
-	<x:dataList id="uaid29" var="element" rendered="#{Form.statisticsManager3.renderingElements!=null}"
-		value="#{Form.statisticsManager3.renderingElements}" layout="ordered list" rowCountVar="rowCount" rowIndexVar="rowIndex">
-
-		<htm:h4 style="margin-top:20px">
-			<h:outputText id="uaid30" value="#{element.title}" />
-		</htm:h4>
-
-		<h:panelGroup id="uaid33">
-
-			<h:graphicImage style="margin-bottom:15px" url="#{HelperForm.servletPathWithHostAsUrl}/pages/imagesTemp/#{element.imageUrl}" alt="#{element.title}"
-				title="#{element.title}"
-				rendered="#{element.dataTable.showableInChart && (Form.statisticsManager3.targetResultOutput=='chart' || Form.statisticsManager3.targetResultOutput=='chartAndTable')}" />
-
-			<h:outputText id="uaid34" value="#{element.htmlTableRenderer.rendering}" escape="false"
-				rendered="#{element.dataTable.showableInTable && (Form.statisticsManager3.targetResultOutput== 'table' || Form.statisticsManager3.targetResultOutput=='chartAndTable')}" />
-			
-			<h:commandLink action="#{Form.CreateExcel}" title="#{msgs.createExcel}" rendered="#{element.dataTable.showableInTable && (Form.statisticsManager3.targetResultOutput== 'table' || Form.statisticsManager3.targetResultOutput=='chartAndTable')}">
-				<h:graphicImage value="/newpages/images/buttons/excel20.png" />
-				<h:outputText value="  #{msgs.createExcel}" />
-				<x:updateActionListener value="#{element}" property="#{Form.myCurrentTable}" />
-			</h:commandLink>
-		</h:panelGroup>
-	</x:dataList>
-
-</h:panelGroup>
-
-

=== removed file 'newpages/inc_statistic/StatisticProduction.jsp'
--- newpages/inc_statistic/StatisticProduction.jsp	2011-12-20 08:07:09 +0000
+++ newpages/inc_statistic/StatisticProduction.jsp	1970-01-01 00:00:00 +0000
@@ -1,152 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi"; prefix="si"%>
-<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax"; prefix="a4j"%>
-
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<htm:table cellpadding="3" cellspacing="0" width="100%" styleClass="eingabeBoxen">
-	<htm:tr>
-		<htm:td styleClass="eingabeBoxen_row1">
-			<h:outputText id="uaid2" value="#{msgs.defineStatisticalQuestion}" />
-		</htm:td>
-	</htm:tr>
-	<htm:tr>
-		<htm:td styleClass="eingabeBoxen_row2">
-
-			<h:panelGrid id="uaid3" columns="8"
-				columnClasses="standardTable_ColumnRight,standardTable_Column,standardTable_ColumnRight,standardTable_Column,standardTable_ColumnRight,standardTable_Column, standardTable_Column">
-
-				<h:outputLabel id="uaid4" for="from" value="#{msgs.zeitraum} #{msgs.from}" style="width:150px" />
-				<h:panelGroup id="uaid5">
-					<x:inputCalendar id="from" style="width:110px" value="#{Form.statisticsManager1.sourceDateFrom}" renderAsPopup="true"
-						renderPopupButtonAsImage="true" popupTodayString="#{msgs.heute}" popupWeekString="#{msgs.kw}"
-						popupButtonImageUrl="/newpages/images/calendarImages/calendar.gif" imageLocation="/newpages/images/calendarImages/" />
-				</h:panelGroup>
-
-				<h:outputLabel id="uaid6" for="to" value="#{msgs.to}" />
-				<h:panelGroup id="uaid7">
-					<x:inputCalendar id="to" style="width:110px" value="#{Form.statisticsManager1.sourceDateTo}" renderAsPopup="true" renderPopupButtonAsImage="true"
-						popupTodayString="#{msgs.heute}" popupWeekString="#{msgs.kw}" imageLocation="/newpages/images/calendarImages/"
-						popupButtonImageUrl="/newpages/images/calendarImages/calendar.gif" />
-				</h:panelGroup>
-
-				<h:outputText id="uaid8" style="font-weight:bold" value=" - #{msgs.orLast} - " />
-
-				<h:inputText id="uaid9" style="width:130px;text-align:right" required="false" value="#{Form.statisticsManager1.sourceNumberOfTimeUnitsAsString}" />
-
-				<h:selectOneMenu id="uaid10" style="width:130px" value="#{Form.statisticsManager1.sourceTimeUnit}" converter="StatisticsTimeUnitConverter">
-					<si:selectItems id="uaid11" value="#{Form.statisticsManager1.allTimeUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:panelGroup id="uaid12" style="margin-bottom:0px">
-					<h:selectBooleanCheckbox id="uaid13" value="#{Form.statisticsManager1.showAverage}" title="#{msgs.showAverage}">
-					</h:selectBooleanCheckbox>
-					<h:outputLabel for="uaid13" id="uaid14" value="#{msgs.showAverage}" />
-				</h:panelGroup>
-
-				<h:outputText id="uaid15" value="#{msgs.einheit}" style="width:150px" />
-
-				<h:selectOneMenu id="uaid16" style="width:130px" value="#{Form.statisticsManager1.targetTimeUnit}" converter="StatisticsTimeUnitConverter">
-					<si:selectItems id="uaid17" value="#{Form.statisticsManager1.allTimeUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:outputText id="uaid18" value="#{msgs.anzeige}" />
-
-				<h:selectOneMenu id="uaid19" style="width:130px" value="#{Form.statisticsManager1.targetCalculationUnit}"
-					converter="StatisticsCalculationUnitConverter">
-					<si:selectItems id="uaid20" value="#{Form.statisticsManager1.allCalculationUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:outputText id="uaid21" value="#{msgs.ausgabe}" />
-
-				<h:selectOneMenu id="uaid22" style="width:130px" value="#{Form.statisticsManager1.targetResultOutput}" converter="StatisticsResultOutputConverter">
-					<si:selectItems id="uaid23" value="#{Form.statisticsManager1.allResultOutputs}" var="out" itemLabel="#{out.title}" itemValue="#{out}" />
-				</h:selectOneMenu>
-
-				<h:panelGroup id="uaid241" style="margin-bottom:0px">
-					<h:outputText>
-					</h:outputText>
-				</h:panelGroup>
-
-				<%-- the following is an alternating couple to make the columns match --%>
-				<h:panelGroup id="uaid242" style="margin-bottom:0px" rendered="#{!Form.statisticsManager1.renderLoopOption}">
-					<h:outputText>
-					</h:outputText>
-				</h:panelGroup>
-
-				<h:panelGroup id="uaid25" style="margin-bottom:0px" rendered="#{Form.statisticsManager1.renderLoopOption}">
-					<h:selectBooleanCheckbox id="uaid26_2" value="#{Form.statisticsManager1.includeLoops}" title="#{msgs.includeLoops}">
-					</h:selectBooleanCheckbox>
-					<h:outputLabel for="uaid26_2" id="uaid27_2" value="#{msgs.includeLoops}" />
-				</h:panelGroup>
-
-			</h:panelGrid>
-
-			<x:commandButton id="myStatisticButton" style="margin:5px" title="#{msgs.calculateStatistics}" value="#{msgs.calculateStatistics} "
-				action="#{Form.statisticsManager1.calculate}">
-				<x:updateActionListener property="#{Form.showStatistics}" value="true" />
-			</x:commandButton>
-
-
-			<br />
-
-		</htm:td>
-	</htm:tr>
-
-</htm:table>
-
-
-<h:panelGroup rendered="#{Form.statisticsManager1 != null && !Form.statisticsManager1.statisticMode.isSimple && Form.showStatistics}">
-	<x:dataList id="uaid29" var="element" rendered="#{Form.statisticsManager1.renderingElements!=null}"
-		value="#{Form.statisticsManager1.renderingElements}" layout="ordered list" rowCountVar="rowCount" rowIndexVar="rowIndex">
-
-		<htm:h4 style="margin-top:20px">
-			<h:outputText id="uaid30" value="#{element.title}" />
-		</htm:h4>
-
-		<h:panelGroup id="uaid33">
-
-			<h:graphicImage style="margin-bottom:15px" url="#{HelperForm.servletPathWithHostAsUrl}/pages/imagesTemp/#{element.imageUrl}" alt="#{element.title}"
-				title="#{element.title}"
-				rendered="#{element.dataTable.showableInChart && (Form.statisticsManager1.targetResultOutput=='chart' || Form.statisticsManager1.targetResultOutput=='chartAndTable')}" />
-
-			<h:outputText id="uaid34" value="#{element.htmlTableRenderer.rendering}" escape="false"
-				rendered="#{element.dataTable.showableInTable && (Form.statisticsManager1.targetResultOutput== 'table' || Form.statisticsManager1.targetResultOutput=='chartAndTable')}" />
-			
-			<h:commandLink action="#{Form.CreateExcel}" title="#{msgs.createExcel}" rendered="#{element.dataTable.showableInTable && (Form.statisticsManager1.targetResultOutput== 'table' || Form.statisticsManager1.targetResultOutput=='chartAndTable')}" >
-				<h:graphicImage value="/newpages/images/buttons/excel20.png" />
-				<h:outputText value="  #{msgs.createExcel}" />
-				<x:updateActionListener value="#{element}" property="#{Form.myCurrentTable}" />
-			</h:commandLink>
-			
-		</h:panelGroup>
-	</x:dataList>
-
-</h:panelGroup>
-
-

=== removed file 'newpages/inc_statistic/StatisticStorage.jsp'
--- newpages/inc_statistic/StatisticStorage.jsp	2011-12-20 08:07:09 +0000
+++ newpages/inc_statistic/StatisticStorage.jsp	1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi"; prefix="si"%>
-<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax"; prefix="a4j"%>
-
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<htm:table cellpadding="3" cellspacing="0" width="100%" styleClass="eingabeBoxen">
-	<htm:tr>
-		<htm:td styleClass="eingabeBoxen_row1">
-			<h:outputText id="uaid2" value="#{msgs.defineStatisticalQuestion}" />
-		</htm:td>
-	</htm:tr>
-	<htm:tr>
-		<htm:td styleClass="eingabeBoxen_row2">
-
-			<h:panelGrid id="uaid3" columns="8"
-				columnClasses="standardTable_ColumnRight,standardTable_Column,standardTable_ColumnRight,standardTable_Column,standardTable_ColumnRight,standardTable_Column, standardTable_Column">
-
-				<h:outputLabel id="uaid4" for="from" value="#{msgs.zeitraum} #{msgs.from}" style="width:150px" />
-				<h:panelGroup id="uaid5">
-					<x:inputCalendar id="from" style="width:110px" value="#{Form.statisticsManager4.sourceDateFrom}" renderAsPopup="true"
-						renderPopupButtonAsImage="true" popupTodayString="#{msgs.heute}" popupWeekString="#{msgs.kw}"
-						popupButtonImageUrl="/newpages/images/calendarImages/calendar.gif" imageLocation="/newpages/images/calendarImages/" />
-				</h:panelGroup>
-
-				<h:outputLabel id="uaid6" for="to" value="#{msgs.to}" />
-				<h:panelGroup id="uaid7">
-					<x:inputCalendar id="to" style="width:110px" value="#{Form.statisticsManager4.sourceDateTo}" renderAsPopup="true" renderPopupButtonAsImage="true"
-						popupTodayString="#{msgs.heute}" popupWeekString="#{msgs.kw}" popupButtonImageUrl="/newpages/images/calendarImages/calendar.gif"
-						imageLocation="/newpages/images/calendarImages/" />
-				</h:panelGroup>
-
-				<h:outputText id="uaid8" style="font-weight:bold" value=" - #{msgs.orLast} - " />
-
-				<h:inputText id="uaid9" style="width:130px;text-align:right" required="false" value="#{Form.statisticsManager4.sourceNumberOfTimeUnitsAsString}" />
-
-				<h:selectOneMenu id="uaid10" style="width:130px" value="#{Form.statisticsManager4.sourceTimeUnit}" converter="StatisticsTimeUnitConverter">
-					<si:selectItems id="uaid11" value="#{Form.statisticsManager4.allTimeUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:panelGroup id="uaid12" style="margin-bottom:0px">
-					<h:selectBooleanCheckbox id="uaid13" value="#{Form.statisticsManager4.showAverage}" title="#{msgs.showAverage}">
-					</h:selectBooleanCheckbox>
-					<h:outputLabel for="uaid13" id="uaid14" value="#{msgs.showAverage}" />
-				</h:panelGroup>
-
-				<h:outputText id="uaid15" value="#{msgs.einheit}" style="width:150px" />
-
-				<h:selectOneMenu id="uaid16" style="width:130px" value="#{Form.statisticsManager4.targetTimeUnit}" converter="StatisticsTimeUnitConverter">
-					<si:selectItems id="uaid17" value="#{Form.statisticsManager4.allTimeUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:outputText id="uaid18" value="#{msgs.anzeige}" />
-
-				<h:selectOneMenu id="uaid19" style="width:130px" value="#{Form.statisticsManager4.targetCalculationUnit}"
-					converter="StatisticsCalculationUnitConverter">
-					<si:selectItems id="uaid20" value="#{Form.statisticsManager4.allCalculationUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:outputText id="uaid21" value="#{msgs.ausgabe}" />
-
-				<h:selectOneMenu id="uaid22" style="width:130px" value="#{Form.statisticsManager4.targetResultOutput}" converter="StatisticsResultOutputConverter">
-					<si:selectItems id="uaid23" value="#{Form.statisticsManager4.allResultOutputs}" var="out" itemLabel="#{out.title}" itemValue="#{out}" />
-				</h:selectOneMenu>
-
-				<h:panelGroup id="uaid241" style="margin-bottom:0px">
-					<h:outputText>
-					</h:outputText>
-				</h:panelGroup>
-
-				<%-- the following is an alternating couple to make the columns match --%>
-				<h:panelGroup id="uaid242" style="margin-bottom:0px" rendered="#{!Form.statisticsManager4.renderLoopOption}">
-					<h:outputText>
-					</h:outputText>
-				</h:panelGroup>
-
-				<h:panelGroup id="uaid25" style="margin-bottom:0px" rendered="#{Form.statisticsManager4.renderLoopOption}">
-					<h:selectBooleanCheckbox id="uaid26_2" value="#{Form.statisticsManager4.includeLoops}" title="#{msgs.includeLoops}">
-					</h:selectBooleanCheckbox>
-					<h:outputLabel for="uaid26_2" id="uaid27_2" value="#{msgs.includeLoops}" />
-				</h:panelGroup>
-
-			</h:panelGrid>
-
-			<x:commandButton id="myStatisticButton" style="margin:5px" title="#{msgs.calculateStatistics}" value="#{msgs.calculateStatistics} "
-				action="#{Form.statisticsManager4.calculate}">
-				<x:updateActionListener property="#{Form.showStatistics}" value="true" />
-			</x:commandButton>
-
-
-			<br />
-
-		</htm:td>
-	</htm:tr>
-
-</htm:table>
-
-
-<h:panelGroup rendered="#{Form.statisticsManager4 != null && !Form.statisticsManager4.statisticMode.isSimple && Form.showStatistics}">
-	<x:dataList id="uaid29" var="element" rendered="#{Form.statisticsManager4.renderingElements!=null}"
-		value="#{Form.statisticsManager4.renderingElements}" layout="ordered list" rowCountVar="rowCount" rowIndexVar="rowIndex">
-
-		<htm:h4 style="margin-top:20px">
-			<h:outputText id="uaid30" value="#{element.title}" />
-		</htm:h4>
-
-		<h:panelGroup id="uaid33">
-
-			<h:graphicImage style="margin-bottom:15px" url="#{HelperForm.servletPathWithHostAsUrl}/pages/imagesTemp/#{element.imageUrl}" alt="#{element.title}"
-				title="#{element.title}"
-				rendered="#{element.dataTable.showableInChart && (Form.statisticsManager4.targetResultOutput=='chart' || Form.statisticsManager4.targetResultOutput=='chartAndTable')}" />
-
-			<h:outputText id="uaid34" value="#{element.htmlTableRenderer.rendering}" escape="false"
-				rendered="#{element.dataTable.showableInTable && (Form.statisticsManager4.targetResultOutput== 'table' || Form.statisticsManager4.targetResultOutput=='chartAndTable')}" />
-
-			<h:commandLink action="#{Form.CreateExcel}" title="#{msgs.createExcel}" rendered="#{element.dataTable.showableInTable && (Form.statisticsManager4.targetResultOutput== 'table' || Form.statisticsManager4.targetResultOutput=='chartAndTable')}">
-				<h:graphicImage value="/newpages/images/buttons/excel20.png" />
-				<h:outputText value="  #{msgs.createExcel}" />
-				<x:updateActionListener value="#{element}" property="#{Form.myCurrentTable}" />
-			</h:commandLink>
-			
-		</h:panelGroup>
-	</x:dataList>
-
-
-
-
-</h:panelGroup>
-
-

=== removed file 'newpages/inc_statistic/StatisticThroughput.jsp'
--- newpages/inc_statistic/StatisticThroughput.jsp	2011-12-20 08:07:09 +0000
+++ newpages/inc_statistic/StatisticThroughput.jsp	1970-01-01 00:00:00 +0000
@@ -1,152 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-<%@ taglib uri="http://sourceforge.net/projects/jsf-comp/easysi"; prefix="si"%>
-<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax"; prefix="a4j"%>
-
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<htm:table cellpadding="3" cellspacing="0" width="100%" styleClass="eingabeBoxen">
-	<htm:tr>
-		<htm:td styleClass="eingabeBoxen_row1">
-			<h:outputText id="uaid2" value="#{msgs.defineStatisticalQuestion}" />
-		</htm:td>
-	</htm:tr>
-	<htm:tr>
-		<htm:td styleClass="eingabeBoxen_row2">
-
-			<h:panelGrid id="uaid3" columns="8"
-				columnClasses="standardTable_ColumnRight,standardTable_Column,standardTable_ColumnRight,standardTable_Column,standardTable_ColumnRight,standardTable_Column, standardTable_Column">
-
-				<h:outputLabel id="uaid4" for="from" value="#{msgs.zeitraum} #{msgs.from}" style="width:150px" />
-				<h:panelGroup id="uaid5">
-					<x:inputCalendar id="from" style="width:110px" value="#{Form.statisticsManager2.sourceDateFrom}" renderAsPopup="true"
-						renderPopupButtonAsImage="true" popupTodayString="#{msgs.heute}" popupWeekString="#{msgs.kw}" imageLocation="/newpages/images/calendarImages/"
-						popupButtonImageUrl="/newpages/images/calendarImages/calendar.gif" />
-				</h:panelGroup>
-
-				<h:outputLabel id="uaid6" for="to" value="#{msgs.to}" />
-				<h:panelGroup id="uaid7">
-					<x:inputCalendar id="to" style="width:110px" value="#{Form.statisticsManager2.sourceDateTo}" renderAsPopup="true" renderPopupButtonAsImage="true"
-						popupTodayString="#{msgs.heute}" popupWeekString="#{msgs.kw}" popupButtonImageUrl="/newpages/images/calendarImages/calendar.gif"
-						imageLocation="/newpages/images/calendarImages/" />
-				</h:panelGroup>
-
-				<h:outputText id="uaid8" style="font-weight:bold" value=" - #{msgs.orLast} - " />
-
-				<h:inputText id="uaid9" style="width:130px;text-align:right" required="false" value="#{Form.statisticsManager2.sourceNumberOfTimeUnitsAsString}" />
-
-				<h:selectOneMenu id="uaid10" style="width:130px" value="#{Form.statisticsManager2.sourceTimeUnit}" converter="StatisticsTimeUnitConverter">
-					<si:selectItems id="uaid11" value="#{Form.statisticsManager2.allTimeUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:panelGroup id="uaid12" style="margin-bottom:0px">
-					<h:selectBooleanCheckbox id="uaid13" value="#{Form.statisticsManager2.showAverage}" title="#{msgs.showAverage}">
-					</h:selectBooleanCheckbox>
-					<h:outputLabel for="uaid13" id="uaid14" value="#{msgs.showAverage}" />
-				</h:panelGroup>
-
-				<h:outputText id="uaid15" value="#{msgs.einheit}" style="width:150px" />
-
-				<h:selectOneMenu id="uaid16" style="width:130px" value="#{Form.statisticsManager2.targetTimeUnit}" converter="StatisticsTimeUnitConverter">
-					<si:selectItems id="uaid17" value="#{Form.statisticsManager2.allTimeUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:outputText id="uaid18" value="#{msgs.anzeige}" />
-
-				<h:selectOneMenu id="uaid19" style="width:130px" value="#{Form.statisticsManager2.targetCalculationUnit}"
-					converter="StatisticsCalculationUnitConverter">
-					<si:selectItems id="uaid20" value="#{Form.statisticsManager2.allCalculationUnits}" var="unit" itemLabel="#{unit.title}" itemValue="#{unit}" />
-				</h:selectOneMenu>
-
-				<h:outputText id="uaid21" value="#{msgs.ausgabe}" />
-
-				<h:selectOneMenu id="uaid22" style="width:130px" value="#{Form.statisticsManager2.targetResultOutput}" converter="StatisticsResultOutputConverter">
-					<si:selectItems id="uaid23" value="#{Form.statisticsManager2.allResultOutputs}" var="out" itemLabel="#{out.title}" itemValue="#{out}" />
-				</h:selectOneMenu>
-
-				<h:panelGroup id="uaid241" style="margin-bottom:0px">
-					<h:outputText>
-					</h:outputText>
-				</h:panelGroup>
-
-				<%-- the following is an alternating couple to make the columns match --%>
-				<h:panelGroup id="uaid242" style="margin-bottom:0px" rendered="#{!Form.statisticsManager2.renderLoopOption}">
-					<h:outputText>
-					</h:outputText>
-				</h:panelGroup>
-
-				<h:panelGroup id="uaid25" style="margin-bottom:0px" rendered="#{Form.statisticsManager2.renderLoopOption}">
-					<h:selectBooleanCheckbox id="uaid26_2" value="#{Form.statisticsManager2.includeLoops}" title="#{msgs.includeLoops}">
-					</h:selectBooleanCheckbox>
-					<h:outputLabel for="uaid26_2" id="uaid27_2" value="#{msgs.includeLoops}" />
-				</h:panelGroup>
-
-			</h:panelGrid>
-
-			<x:commandButton id="myStatisticButton" style="margin:5px" title="#{msgs.calculateStatistics}" value="#{msgs.calculateStatistics} "
-				action="#{Form.statisticsManager2.calculate}">
-				<x:updateActionListener property="#{Form.showStatistics}" value="true" />
-			</x:commandButton>
-
-
-			<br />
-
-		</htm:td>
-	</htm:tr>
-
-</htm:table>
-
-
-<h:panelGroup rendered="#{Form.statisticsManager2 != null && !Form.statisticsManager2.statisticMode.isSimple && Form.showStatistics}">
-	<x:dataList id="uaid29" var="element" rendered="#{Form.statisticsManager2.renderingElements!=null}"
-		value="#{Form.statisticsManager2.renderingElements}" layout="ordered list" rowCountVar="rowCount" rowIndexVar="rowIndex">
-
-		<htm:h4 style="margin-top:20px">
-			<h:outputText id="uaid30" value="#{element.title}" />
-		</htm:h4>
-
-		<h:panelGroup id="uaid33">
-
-			<h:graphicImage style="margin-bottom:15px" url="#{HelperForm.servletPathWithHostAsUrl}/pages/imagesTemp/#{element.imageUrl}" alt="#{element.title}"
-				title="#{element.title}"
-				rendered="#{element.dataTable.showableInChart && (Form.statisticsManager2.targetResultOutput=='chart' || Form.statisticsManager2.targetResultOutput=='chartAndTable')}" />
-
-			<h:outputText id="uaid34" value="#{element.htmlTableRenderer.rendering}" escape="false"
-				rendered="#{element.dataTable.showableInTable && (Form.statisticsManager2.targetResultOutput== 'table' || Form.statisticsManager2.targetResultOutput=='chartAndTable')}" />
-			
-			<h:commandLink action="#{Form.CreateExcel}" title="#{msgs.createExcel}" rendered="#{element.dataTable.showableInTable && (Form.statisticsManager2.targetResultOutput== 'table' || Form.statisticsManager2.targetResultOutput=='chartAndTable')}">
-				<h:graphicImage value="/newpages/images/buttons/excel20.png" />
-				<h:outputText value="  #{msgs.createExcel}" />
-				<x:updateActionListener value="#{element}" property="#{Form.myCurrentTable}" />
-			</h:commandLink>
-			
-		</h:panelGroup>
-	</x:dataList>
-
-</h:panelGroup>
-
-

=== removed file 'newpages/version.jsp'
--- newpages/version.jsp	2011-12-20 08:07:09 +0000
+++ newpages/version.jsp	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%>
-<%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%>
-<%@ taglib uri="http://jsftutorials.net/htmLib"; prefix="htm"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk"; prefix="x"%>
-<%@ taglib uri="http://www.jenia.org/jsf/dynamic"; prefix="jd"%>
-
-<%--
-  ~ This file is part of the Goobi Application - a Workflow tool for the support of
-  ~ mass digitization.
-  ~
-  ~ Visit the websites for more information.
-  ~     - http://gdz.sub.uni-goettingen.de
-  ~     - http://www.goobi.org
-  ~     - http://launchpad.net/goobi-production
-  ~
-  ~ This program is free software; you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 2 of the License, or (at your option) any later
-  ~ version.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE. See the GNU General Public License for more details. You
-  ~ should have received a copy of the GNU General Public License along with this
-  ~ program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  ~ Suite 330, Boston, MA 02111-1307 USA
-  --%>
-
-<%-- ########################################
-
-															Impressum
-
-	#########################################--%>
-
-<html>
-<f:view locale="#{SpracheForm.locale}">
-	<%@include file="inc/head.jsp"%>
-	<body>
-
-	<htm:table cellspacing="5" cellpadding="0" styleClass="layoutTable"
-		align="center">
-		<%@include file="inc/tbl_Kopf.jsp"%>
-		<htm:tr>
-			<%@include file="inc/tbl_Navigation.jsp"%>
-			<htm:td valign="top" styleClass="layoutInhalt">
-
-				<%-- ++++++++++++++++     Inhalt      ++++++++++++++++ --%>
-
-				<%-- Breadcrumb --%>
-				<h:panelGrid width="100%" columns="1" styleClass="layoutInhaltKopf">
-					<h:panelGroup>
-						<h:commandLink value="#{msgs.startseite}" action="newMain" />
-						<f:verbatim> &#8250;&#8250; </f:verbatim>
-						<h:outputText value="Version" />
-					</h:panelGroup>
-				</h:panelGrid>
-				<%-- // Breadcrumb --%>
-
-				<htm:div style="margin: 15">
-					<htm:h3>
-						<h:outputText value="Version" />
-					</htm:h3>
-
-					<%-- globale Warn- und Fehlermeldungen --%>
-					<h:messages globalOnly="true" errorClass="text_red"
-						infoClass="text_blue" showDetail="true" showSummary="true"
-						tooltip="true" />
-
-					<%-- allgemeine Informationen zur Version --%>
-					<h:panelGrid columns="2">
-						<h:outputText value="Version: " />
-						<h:outputText value="0.94" />
-						<h:outputText value="Datum: " />
-						<h:outputText value="24.01.2006" />
-					</h:panelGrid>
-
-					<h:panelGroup>
-						<jd:hideableController for="tab">
-							<f:facet name="show">
-								<h:panelGroup>
-									<h:graphicImage value="images/plus.gif" style="margin-right:5px"/>
-									<h:outputText value="show" />
-								</h:panelGroup>
-							</f:facet>
-							<f:facet name="hide">
-								<h:panelGroup>
-									<h:graphicImage value="images/minus.gif" style="margin-right:5px"/>
-									<h:outputText value="hide" />
-								</h:panelGroup>
-							</f:facet>
-						</jd:hideableController>
-
-						<jd:hideableArea id="tab">
-							<h:outputText value="hideable area" />
-						</jd:hideableArea>
-					</h:panelGroup>
-
-				</htm:div>
-
-
-				<%-- ++++++++++++++++    // Inhalt      ++++++++++++++++ --%>
-
-			</htm:td>
-		</htm:tr>
-		<%@include file="inc/tbl_Fuss.jsp"%>
-	</htm:table>
-
-
-
-
-	</body>
-</f:view>
-
-</html>


Follow ups