Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 2b29dfb9

Přidáno uživatelem Tomáš Šimandl před více než 6 roky(ů)

joined load graph and start visualization steps on uploadFiles page. Removed saving uploaded file to file system.

Zobrazit rozdíly:

sources/src/main/webapp/uploadFiles.jsp
35 35
						<p class="errorMessage">${errorMessage}</p>
36 36
					</c:if>
37 37

  
38
					<h3>Upload SPADe data:</h5>
38
					<h5>Upload SPADe data:</h5>
39 39

  
40
					<form name="uploadForm" method="post" enctype="multipart/form-data">
40
					<form action="/" method="post" enctype="multipart/form-data">
41 41
						<div class="form-field">
42 42
							<input type="file" name="file">
43 43
						</div>
44 44

  
45
						<input type="submit" value="Upload">
45
						<hr class="verticalSeparator">
46

  
47
						<input type="submit" value="Start visualization">
46 48
					</form>
47 49

  
48
					<c:if test="${not empty componentNames}">
50
					<%--<c:if test="${not empty componentNames}">
49 51
						<hr class="verticalSeparator">
50 52

  
51 53
						<h3>Uploaded components:</h3>
......
62 64
							}
63 65
							%>
64 66
							<c:forEach items="${componentNames}" var="componentName">
65
								<li id="${componentName}">${componentName}                                
67
								<li id="${componentName}">${componentName}
66 68
								<% if (request.getParameter("diagram_id") == null || ( request.getSession().getAttribute("logged_user_id") != null &&
67
										request.getAttribute("diagram_user_id") != null && 
69
										request.getAttribute("diagram_user_id") != null &&
68 70
										request.getAttribute("diagram_user_id").toString().compareTo(request.getSession().getAttribute("logged_user_id").toString()) == 0  )) { %>
69 71
									<a href="delete-component?name=${componentName}<%= request.getAttribute("url_diagram_id") %>"><img src="images/button_cancel.png" alt="delete" class="imgDelete"/></a></li>
70 72
								<% } %>
71 73
							</c:forEach>
72 74
						</ul>
73 75
					</c:if>
74

  
75 76
					<hr class="verticalSeparator">
76 77

  
77 78
					<form name="diagramForm" action="graph" method="post">
78
						<input type="submit" value="Start visualization" ${not empty componentNames ? "" : "disabled='disabled'"}>
79
					<input type="submit" value="Start visualization" ${not empty componentNames ? "" : "disabled='disabled'"}>
79 80
					</form>
81
--%>
80 82
				</div>
81 83
			</main>
82 84
		</div>

Také k dispozici: Unified diff