Projekt

Obecné

Profil

« Předchozí | Další » 

Revize dad52d7e

Přidáno uživatelem Pavel Fidranský před více než 6 roky(ů)

modified showGraph JSP to use JSTL and EL

Zobrazit rozdíly:

sources/src/main/webapp/showGraph.jsp
57 57
	</head>
58 58

  
59 59
	<body>
60
		<%
61
		String getProtocol = request.getScheme();
62
		String getDomain = request.getServerName();
63
		String getPort = Integer.toString(request.getServerPort());
64
		String getPath = getProtocol + "://" + getDomain + ":" + getPort + "/";
65
		String getURI = request.getRequestURI();
66

  
67
		// logged-in user
68
		boolean logged_user = false;
69
		if (request.getSession().getAttribute("logged_user") == "1") {
70
			logged_user = true;
71
		}
72

  
73
		// saved diagram
74
		boolean diagram_id_hash_set = false;
75
		if (request.getParameter("diagram_id") != null && request.getParameter("diagram_hash") != null) {
76
			diagram_id_hash_set = true;
77
		}
78

  
79
		String diagram_url = "";
80
		if (logged_user && diagram_id_hash_set) {
81
			diagram_url = "?diagram_id=" + request.getParameter("diagram_id") + "&diagram_hash=" + request.getParameter("diagram_hash");
82
		}
83
		%>
60
		<c:set var="HOME_URL" value="${initParam.HOME_URL}"/>
61
		<c:set var="isLoggedIn" value="${sessionScope.isLoggedIn}"/>
62
		<c:set var="user" value="${sessionScope.user}"/>
84 63

  
85 64
		<div class="wrapper">
86 65
			<header class="header" id="header">
......
148 127
							<hr class="navbar-separator">
149 128
						</li>
150 129
						<li>
151
							<a href="<%=getServletContext().getInitParameter("HOME_URL")%><%=diagram_url%>" class="btn btn-block back-to-upload" id="view_back_to_upload" title="Back to upload"></a>
130
							<a href="${HOME_URL}" class="btn btn-block back-to-upload" id="view_back_to_upload" title="Back to upload"></a>
152 131
						</li>
153 132
						<li>
154 133
							<hr class="navbar-separator">
......
166 145
								<img src="images/png_save.png" id="applyLayoutImg" alt="Save diagram as PNG.">
167 146
							</button>
168 147
						</li>
169
						<c:if test="${show_icon_save}">
148
						<c:if test="${isLoggedIn}">
170 149
							<li>
171 150
								<button class="btn save-diagram" id="btnSaveDiagramToDb" title="Save diagram.">
172 151
									<img src="images/icon_save.png" id="applyLayoutImg" alt="Save diagram">
......
177 156
							<hr class="navbar-separator">
178 157
						</li>
179 158
						<li>
180
							<a href="<%=getServletContext().getInitParameter("HOME_URL")%>graph<%=diagram_url%>" class="btn btn-block view-refresh-diagram" id="view_refresh_diagram" title="Refresh diagram"></a>
159
							<a href="${HOME_URL}graph?diagramId=${param.diagramId}" class="btn btn-block view-refresh-diagram" id="view_refresh_diagram" title="Refresh diagram"></a>
181 160
						</li>
182 161
						<li>
183 162
							<hr class="navbar-separator">
184 163
						</li>
185 164
						<li>
186
							<a href="<%=getServletContext().getInitParameter("HOME_URL")%>graph<%=diagram_url%>" class="btn btn-block view-refresh-reset-diagram" id="view_refresh_reset_diagram" onclick="reset_diagram(<%=request.getParameter("diagram_id")%>,'<%=request.getParameter("diagram_hash")%>'); return false;" title="Refresh diagram - reset position"></a>
165
							<button class="btn btn-block view-refresh-reset-diagram" id="view_refresh_reset_diagram" title="Refresh diagram - reset position"></a>
187 166
						</li>
188 167
					</ul>
189 168
				</nav>
......
233 212

  
234 213
		<script>
235 214
		var app = new App;
236
		app.HOME_URL = '<%=getPath%>imiger/';
215
		app.HOME_URL = '${HOME_URL}';
237 216

  
238 217
		$(document).ready(function() {
239
			var loaderFn = app.diagramLoader('<%=request.getParameter("diagramId")%>', '<%=request.getParameter("diagram_hash")%>');
218
			var loaderFn = app.diagramLoader('${param.diagramId}');
240 219

  
241 220
			app.run(loaderFn);
242 221
		});

Také k dispozici: Unified diff