--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Wed Sep 16 14:55:54 2009 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Thu Sep 17 14:30:16 2009 +0000
@@ -1,56 +1,38 @@
-
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
 <%@page import="java.util.Collection"%>
 <%@page import="de.intevation.gnv.artifactdatabase.objects.ArtifactObject"%>
 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModel"%>
 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModelFactory"%>
 <%@page import="java.util.Iterator"%>
 <%Object ui = request.getAttribute("ui");
+  Object staticui = request.getAttribute("staticui");
   boolean furthertargets = true;
       
   Object furthertargetsObject = request.getAttribute("furthertargets");
   if (furthertargetsObject != null){
       furthertargets = ((Boolean)furthertargetsObject).booleanValue();
   }
-  Object diagramm = request.getAttribute("diagramm");
-  String action = (ui == null ? "selectArtifactFactory.do" : "next.do");
 %>
-<div id="basefilter">
-	<form id="fisSelectionForm" action="<%=action%>" method="post">
-	   <fieldset>
-	   
-	<%
-	  
-	  SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request);
-	  Collection<ArtifactObject> artifactFactories = sm.getArtifactFactories();
-	  if (artifactFactories != null && ui == null){
-	%>
-	       <legend>FIS</legend>
-	       <select name="artifactFactory">
-	<%
-	      Iterator<ArtifactObject> it = artifactFactories.iterator();
-	      while (it.hasNext()){
-	          ArtifactObject ao = it.next();
-	      
-	%>
-	    
-	           <option value="<%=ao.getId()%>" <%=(ao.isSelected() ? "selected=\"selected\"" : "")%> ><%=ao.getName()%></option>
-	<%
-	      }
-	%>
-	       </select>
-	<%
-	}
-	%>
-	
-	    
-	    <%=ui != null ? ui.toString() : "" %>
-	    
-	       <input type="submit" value="<%=furthertargets ? "Auswählen" : "Zeichen"%>" />
-	    </fieldset>
-	</form>
-</div>
-<%if (diagramm != null){ %>
-<div id="diagram">
-    <%=diagramm.toString()%>
-</div>
-<%}%>
\ No newline at end of file
+    <div>
+    <jsp:include page="includes/display_fis_inc.jsp"></jsp:include>
+    <%if (staticui != null){ %>
+        <%=staticui.toString()%>
+    <%}%>
+    
+    <%if (ui != null){%>
+    <div id="timeseriesfilter">
+        <form id="fisSelectionForm" action="next.do" method="post">
+           <fieldset>
+            <%=ui != null ? ui.toString() : "" %>
+            <br/>
+            <%if(furthertargets){%>
+            <input type="submit" value="<bean:message key="gnviewer.select.button"/>"/>
+            <%}else{%>
+            <input type="submit" value="<bean:message key="gnviewer.draw.button"/>"/>
+            <%}%>
+            </fieldset>
+        </form>
+    </div>
+    <%}%>
+    </div>
+    <jsp:include page="includes/display_diagramm_inc.jsp"></jsp:include>
\ No newline at end of file