Mercurial > dive4elements > gnv-client
diff gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp @ 571:f2ba58011a2d
Added histogram option panel. Show chart/histogram options panel after the user selected chart or histogram. Moved options panel beneath action panel.
gnv/trunk@699 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 23 Feb 2010 10:36:02 +0000 |
| parents | 9602f4bffc07 |
| children | 2f3d885fed09 |
line wrap: on
line diff
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp Mon Feb 22 18:04:55 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp Tue Feb 23 10:36:02 2010 +0000 @@ -8,7 +8,6 @@ <%@page import="java.net.URLEncoder"%> <% // fetch diagramm parameter from request if the user clicked 'draw' - Object diagramm = request.getAttribute("diagramm"); SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request); String target = "chart"; @@ -32,15 +31,9 @@ } %> -<%-- show chart options if output mode 'chart' is supported --%> -<% if (supportChart) { %> - <jsp:include page="/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp"></jsp:include> -<%}%> - <%-- diagramm is not null if the user clicked the 'draw' button --%> -<%if (diagramm != null) { %> - <div id="diagram"> - <img src='<%=response.encodeURL("out.do?mimetype="+mimeType+"&target="+target+parameterString+"&uid="+System.currentTimeMillis())%>' alt='<bean:message key="gnviewer.output.options.diagramm.alt"/>'/> - <br/> - </div> -<%}%> +<jsp:include page="/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp"></jsp:include> +<div id="diagram"> + <img src='<%=response.encodeURL("out.do?mimetype="+mimeType+"&target="+target+parameterString+"&uid="+System.currentTimeMillis())%>' alt='<bean:message key="gnviewer.output.options.diagramm.alt"/>'/> + <br/> +</div>