--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Tue Apr 13 12:10:15 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Tue Apr 13 16:44:30 2010 +0000
@@ -28,8 +28,63 @@
     if (furthertargetsObject != null){
         furthertargets = ((Boolean)furthertargetsObject).booleanValue();
     }
+
+    Object exceptionMessage = request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID);
+    exceptionMessage = (exceptionMessage != null ? exceptionMessage.toString().replaceAll(" ", ".").replaceAll(":",".").toLowerCase() : null);
+    exceptionMessage = (exceptionMessage != null && exceptionMessage.toString().endsWith(".") ? exceptionMessage.toString().substring(0,exceptionMessage.toString().length()-1) : exceptionMessage);
+    
+    boolean showmapviewercallBody = request.getAttribute("MAPVIEWERCALL") != null;
+
+    String exceptionProject = (String) request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_PROJECT);
+    exceptionProject        = exceptionProject != null ? exceptionProject.toLowerCase() : null;
+    exceptionProject        = exceptionProject != null ? exceptionProject.replaceAll(" ", ".") : null;
 %>
-    <div>
+
+    <%-- div container for project loading/saving and error messages related to this --%>
+    <div id="project"> 
+        <table>
+            <tr>
+                <td>
+                    <form id="storeProject" action="<%=response.encodeURL("store.do")%>" method="post">
+                        <input type="submit" name="storeProject" value="<bean:message key="gnviewer.project.save"/>"/>
+                    </form>
+                </td>
+                <td>
+                    <form id="loadProject" action="<%=response.encodeURL("load.do")%>" method="post" enctype="multipart/form-data">
+                        <input type="submit" name="loadProject"  value="<bean:message key="gnviewer.project.load"/>"/>
+                        <input type="file"   name="document"     accept="application/xml"/>
+                    </form>
+                </td>
+            </tr>
+        </table>
+        <%if (exceptionProject != null) {%>
+            <div class="projectException">
+                <bean:message key="<%=exceptionProject%>"/>
+                <br/>
+                <a href="<%=response.encodeURL("describe.do?uid="+System.currentTimeMillis())%>" title="<bean:message key="application.reload"/>">
+                    <bean:message key="application.reload"/>
+                </a>
+            </div>
+        <%}%>
+            
+        <br/>
+         <%if (showmapviewercallBody){ %>
+            <jsp:include page="includes/display_mapviewercall_inc.jsp" />
+        <%}%>
+    </div>
+    <div class="errormsg" id="load_error">
+         <%if (exceptionMessage != null){ %>
+            <bean-el:message key="<%=exceptionMessage.toString()%>"/>
+            <p class="reload">
+                <a href="<%=response.encodeURL("describe.do?uid="+System.currentTimeMillis())%>" title="<bean:message key="application.reload"/>">
+                    <bean:message key="application.reload"/>
+                </a>
+            </p>
+         <%}%>
+    </div>
+
+    <%-- the parameter panel is following --%>
+    <div id="parameterPanel">
     <%if (staticui == null){ %>
         <jsp:include page="includes/display_fis_inc.jsp"></jsp:include>
     <%} else {%>
@@ -60,10 +115,24 @@
             </form>
         </div>
     <%}%>
-    </div>
 
-    <%-- render export options if existing for this state --%>
-    <jsp:include page="includes/display_export_inc.jsp"></jsp:include>
+        <%-- render export options if existing for this state --%>
+        <jsp:include page="includes/display_export_inc.jsp"></jsp:include>
+
+        <%if (chart != null) {%>
+            <jsp:include page="/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp"></jsp:include>
+        <%}%>
+
+        
+        <%if (histogram != null) {%>
+            <jsp:include page="/WEB-INF/jsp/includes/display_histogram_options_inc.jsp"></jsp:include>
+        <%}%>
+
+        <%-- render wms options --%>
+        <%if (wms != null) {%>
+            <jsp:include page="/WEB-INF/jsp/includes/display_wms_options_inc.jsp"></jsp:include>
+        <%}%>
+    </div>
 
     <%if (chart != null) {%>
     <%-- render chart options if existing for this state --%>
@@ -79,8 +148,3 @@
     <%if (histogram != null) {%>
         <jsp:include page="includes/display_histogram_inc.jsp"></jsp:include>
     <%}%>
-
-    <%-- render wms options --%>
-    <%if (wms != null) {%>
-        <jsp:include page="/WEB-INF/jsp/includes/display_wms_options_inc.jsp"></jsp:include>
-    <%}%>