diff src/main/webapp/pages/topicPage.jsp @ 95:b27a99201cbe

New feature: new full text search with MySQL ngram parser (5.7.6 above)
author Calvin Yeh <cyeh@mpipw-berlin.mpg.com>
date Mon, 03 Jul 2017 23:48:53 +0200
parents 92ede90bc611
children 6a508b605b5f
line wrap: on
line diff
--- a/src/main/webapp/pages/topicPage.jsp	Mon Jul 03 23:43:44 2017 +0200
+++ b/src/main/webapp/pages/topicPage.jsp	Mon Jul 03 23:48:53 2017 +0200
@@ -10,21 +10,21 @@
 <html>
 <head>
 
-	<jsp:include page="../componentes/headContent.jsp"/>	
-	
+	<jsp:include page="../componentes/headContent.jsp"/>
+
 	<script>
-	
+
 		  $(function() {
-			  $("#showPendingButton").click(function() {  
-				  if($('#pendingBooks').css('display') == 'none'){ 
-					   $('#pendingBooks').show(); 
+			  $("#showPendingButton").click(function() {
+				  if($('#pendingBooks').css('display') == 'none'){
+					   $('#pendingBooks').show();
 					   $("#showPendingButton").text('Hide Missing Books');
-					} else { 
+					} else {
 					   $('#pendingBooks').hide();
 					   $("#showPendingButton").text('Show Missing Books');
 					}
 			  });
-			 
+
 			  	$( "#dialogDataverse" ).dialog({
 			        autoOpen: false,
 			        modal: true,
@@ -34,11 +34,11 @@
 			          effect: "explode",
 			          duration: 1000
 			        }
-				});			
-				
+				});
+
 				$( ".get-studies" ).click(function() {
 					var fileId = $( this ).data('file-id');
-					
+
 					var url0 = "<%=sessionBean.getApplicationBean().getRootServer()%>/methods/getDataverseForm.jsp?fileId=" + fileId;
 
 					$.ajax( url0 )
@@ -49,50 +49,50 @@
 				  	.fail(function() {
 				    	console.error("Error calling: " + query);
 				  	})
-					
-			    });					  
-			  
-			  
+
+			    });
+
+
 			 var dialog = $( "#dialogAddContributors" ).dialog(
 					{autoOpen: false}
-		  	);	  
-			 
+		  	);
+
 			$( "#addContributors" ).button().on( "click", function() {
 			        dialog.dialog( "open" );
-			});	 
-		  }); 
-		  
-		 
-		  
+			});
+		  });
+
+
+
 	</script>
-	
+
 </head>
 
 <body>
-	<jsp:include page="../componentes/template.jsp"/>
-	
-	
+	<jsp:include page="../componentes/template2.jsp"/>
+
+
 
 	<div id="page">
-		
+
 		<% if(sessionBean.getUser() == null) { %>
-			<label class="subTitel">You must login!</label>
+        <label class="subTitel">Please login or create a new account above</label>
 		<% } else { %>
-		
+
 			<% if(sessionBean.getTopicPage().getCompleteSectionList() == null || request.getParameter("topicId") != null) {
 				sessionBean.getTopicPage().loadParameters(request, response);
 				sessionBean.getTopicPage().loadTopic(request.getParameter("topicId"));
 			} %>
-			
-			
-			
-				<div id="dialogAddContributors" title="Select a new Contributors:">
+
+
+
+				<div id="dialogAddContributors" title="Select a new Contributors:" style="display:none;">
 					<form name="contributorsForm" id="contributorsForm"
 							action="<%=sessionBean.getApplicationBean().getRootServer()%>/proxy.jsp"
 							method="post">
-							<input name="bean" type="hidden" value="topicBean" /> 
+							<input name="bean" type="hidden" value="topicBean" />
 							<input name="topicId" type="hidden" value="<%=sessionBean.getTopicPage().getTopicId()%>" />
-						
+
 						<table>
 							<% for(VDCUser user : sessionBean.getTopicPage().getSuggestionUserList()) { %>
 								<tr>
@@ -102,7 +102,7 @@
 						</table>
 					</form>
 				</div>
-				
+
 				<!-- Topic Detail -->
 				<div>
 					<label class="subTitel">Topic "<%=sessionBean.getTopicPage().getTopic().getNameEn() %> (<%=sessionBean.getTopicPage().getTopic().getNameCh()%>)"</label>
@@ -111,8 +111,8 @@
 						method="post">
 						<input name="bean" type="hidden" value="topicBean" />
 						<input name="topicId" type="hidden" value="<%=sessionBean.getTopicPage().getTopicId()%>" />
-									
-					
+
+
 					<table class="tableComponent">
 						<tr>
 							<td><label>Topic Id</label></td>
@@ -134,18 +134,18 @@
 							<td><label>Description</label></td>
 							<td>
 								<input type="text" name="description" size="60" maxlength="250" value="<%=sessionBean.getTopicPage().getTopic().getDescription() %>" />
-								<input type="image" title="edit description" onclick="setAction('updateDescription', 'topicForm');" 
-									src="<%=sessionBean.getApplicationBean().getSaveImage()%>" width="15" height="15"/>	
-						
+								<input type="image" title="edit description" onclick="setAction('updateDescription', 'topicForm');"
+									src="<%=sessionBean.getApplicationBean().getSaveImage()%>" width="15" height="15"/>
+
 							</td>
 						</tr>
 						<tr>
 							<td><label>Searching Keywords(separated by ",")</label></td>
 							<td>
 								<input type="text" name="keywords" size="60" maxlength="250" value="<%=sessionBean.getTopicPage().getTopic().getKeywords() %>" />
-								<input type="image" title="edit keywords" onclick="setAction('updateKeywords', 'topicForm');" 
-									src="<%=sessionBean.getApplicationBean().getSaveImage()%>" width="15" height="15"/>	
-						
+								<input type="image" title="edit keywords" onclick="setAction('updateKeywords', 'topicForm');"
+									src="<%=sessionBean.getApplicationBean().getSaveImage()%>" width="15" height="15"/>
+
 							</td>
 						</tr>
 						<tr>
@@ -171,9 +171,9 @@
 													<tr>
 														<td><label><%=contr.getUserName() %></label></td>
 														<td>
-															<input type="image" 
-																onclick="<%=sessionBean.getApplicationBean().getJSConfirmationDelete() %> setAction0('removeContributor', 'topicForm', 'userId',  <%=contr.getId() %>);" 
-																src="<%=sessionBean.getApplicationBean().getDeleteImage()%>"/>																	
+															<input type="image"
+																onclick="<%=sessionBean.getApplicationBean().getJSConfirmationDelete() %> setAction0('removeContributor', 'topicForm', 'userId',  <%=contr.getId() %>);"
+																src="<%=sessionBean.getApplicationBean().getDeleteImage()%>"/>
 														</td>
 													</tr>
 												<% } %>
@@ -189,22 +189,22 @@
 					</table>
 					</form>
 				</div>
-				
-				
-						
-				<div>		
+
+
+
+				<div>
 					<button id="showPendingButton" type="button" class="lgButton" >Show Missing Books</button>
-				
+
 					<form name="topicSectionRelationForm"
 						action="<%=sessionBean.getApplicationBean().getRootServer()%>/proxy.jsp"
 						method="post">
 						<input name="bean" type="hidden" value="topicBean" />
 						<input name="topicId" type="hidden" value="<%=sessionBean.getTopicPage().getTopicId()%>" />
-						
+
 						<div id="pendingBooks" style="display:none">
 							<label class="subTitel"><%=sessionBean.getTopicPage().getPendingBookList().size()%> book(s) not in the topic.</label>
 							<label class="subTitel"><%=sessionBean.getTopicPage().getFilteredSectionListMissingBooks().size() %> book(s) after filtered.</label>
-					
+
 							<div class="tableDiv double-scroll" >
 								<table class="pageTable">
 									<tr>
@@ -217,7 +217,7 @@
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="bookNameFilterMissingBooks" id="bookNameFilterMissingBooks" value="<%= sessionBean.getTopicPage().getBookNameFilterMissingBooks() %>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
@@ -230,12 +230,12 @@
 											<table class="sortTable">
 											<tr>
 												<td><label class="tableTitle">Level 1</label></td>
-												
+
 											</tr>
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="level1FilterMissingBooks" id="level1FilterMissingBooks" value="<%= sessionBean.getTopicPage().getLevel1FilterMissingBooks() %>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
@@ -243,18 +243,18 @@
 												</td>
 											</tr>
 											</table>
-										
+
 										</th>
 										<th>
 											<table class="sortTable">
 											<tr>
 												<td><label class="tableTitle">Level 2</label></td>
-												
+
 											</tr>
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="level2FilterMissingBooks" id="level2FilterMissingBooks" value="<%= sessionBean.getTopicPage().getLevel2FilterMissingBooks() %>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
@@ -262,18 +262,18 @@
 												</td>
 											</tr>
 											</table>
-							
+
 										</th>
 										<th>
 											<table class="sortTable">
 											<tr>
 												<td><label class="tableTitle">Dynasty</label></td>
-												
+
 											</tr>
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="dynastyFilterMissingBooks" id="dynastyFilterMissingBooks" value="<%= sessionBean.getTopicPage().getDynastyFilterMissingBooks() %>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
@@ -281,19 +281,19 @@
 												</td>
 											</tr>
 											</table>
-			
+
 										</th>
-										
+
 										<th>
 											<table class="sortTable">
 											<tr>
 												<td><label class="tableTitle">Period</label></td>
-												
+
 											</tr>
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="periodFilterMissingBooks" id="periodFilterMissingBooks" value="<%= sessionBean.getTopicPage().getPeriodFilterMissingBooks() %>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
@@ -301,7 +301,7 @@
 												</td>
 											</tr>
 											</table>
-										
+
 										</th>
 										<th>
 											<table class="sortTable">
@@ -311,7 +311,7 @@
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="adminTypeFilterMissingBooks" id="adminTypeFilterMissingBooks" value="<%= sessionBean.getTopicPage().getAdminTypeFilterMissingBooks() %>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
@@ -319,22 +319,22 @@
 												</td>
 											</tr>
 											</table>
-											
+
 										</th>
 										<th><label class="tableTitle">Section Name</label></th>
 										<th><label class="tableTitle">Section Pages</label></th>
 										<th><label class="tableTitle">Load Text (Plain)</label></th>
 										<th><label class="tableTitle">Load tagged text in Extraction Interface</label></th>
 										<th><label class="tableTitle">Remove</label></th>
-									</tr>	
-									
+									</tr>
+
 									<!-- pending book list -->
 									<% for(DBBook book : sessionBean.getTopicPage().getFilteredSectionListMissingBooks() ) { %>
 									<tr>
 										<td>
 											<a href="<%=sessionBean.getApplicationBean().getTocInterfaceUrl()%>/check_sections_details.php?book_id=<%=book.getId() %>&amp;count=100&amp;sessionId=<%= session.getId()%>" target="blank">
 												<%=book.getId() %>
-											</a>	
+											</a>
 										</td>
 										<td><label><%= book.getName() %></label></td>
 										<td class="removedContent"><label><%= book.getLevel1() %></label></td>
@@ -348,27 +348,27 @@
 										<td class="removedContent"><label>-</label></td>
 										<td class="removedContent"><label>-</label></td>
 									</tr>
-									
+
 									<% } %>
 								</table>
 							</div>
-						</div>	
-						
+						</div>
+
 						<label class="subTitel"> <%=sessionBean.getTopicPage().getCompleteSectionList().size() %> section(s) in the topic
 							<input type="image"
 								onclick="setAction('forceLoadTopicSectionRelation', 'topicSectionRelationForm');"
 								src="<%=sessionBean.getApplicationBean().getRefreshImage()%>" width="20" height="20"/>
 						</label>
-						
+
 						<label class="label"><%= (StringUtils.isNotEmpty(sessionBean.getTopicPage().getFilteringMessage())) ? sessionBean.getTopicPage().getFilteringMessage() : ""%></label>
-						
+
 						<!-- Sections in Topic -->
 						<% if(sessionBean.getTopicPage().getCompleteSectionList().isEmpty()) { %>
 							<label>(No section in the topic...)</label>
-						
+
 						<% } else { %>
-					
-					
+
+
 						<div class="tableDiv double-scroll">
 							<table class="pageTable">
 								<tr>
@@ -386,7 +386,7 @@
 														<tr><td>
 															<input type="image"
 																onclick="setAction('sortByBookIdDown', 'topicSectionRelationForm');"
-																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>																				
+																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>
 														</td></tr>
 													</table>
 												</td>
@@ -394,14 +394,14 @@
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="bookIdFilter" id="bookIdFilter" value="<%= sessionBean.getTopicPage().getBookIdFilter() %>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
 														src="<%=sessionBean.getApplicationBean().getFilterImage()%>"/>
-												</td>							
-											</tr>								
-										</table>										
+												</td>
+											</tr>
+										</table>
 									</th>
 									<th>
 										<table class="sortTable">
@@ -417,7 +417,7 @@
 														<tr><td>
 															<input type="image"
 																onclick="setAction('sortByBookNameDown', 'topicSectionRelationForm');"
-																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>																				
+																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>
 														</td></tr>
 													</table>
 												</td>
@@ -425,13 +425,13 @@
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="bookNameFilter" id="bookNameFilter" value="<%= sessionBean.getTopicPage().getBookNameFilter() %>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
 														src="<%=sessionBean.getApplicationBean().getFilterImage()%>"/>
-												</td>							
-											</tr>								
+												</td>
+											</tr>
 										</table>
 									</th>
 									<th>
@@ -448,7 +448,7 @@
 														<tr><td>
 															<input type="image"
 																onclick="setAction('sortByLevel1Down', 'topicSectionRelationForm');"
-																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>																				
+																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>
 														</td></tr>
 													</table>
 												</td>
@@ -456,7 +456,7 @@
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="level1Filter" id="level1Filter" value="<%= sessionBean.getTopicPage().getLevel1Filter()%>"/>
-												</td>				
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
@@ -482,7 +482,7 @@
 															<td>
 																<input type="image"
 																onclick="setAction('sortByLevel2Down', 'topicSectionRelationForm');"
-																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>																				
+																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>
 															</td>
 														</tr>
 													</table>
@@ -491,13 +491,13 @@
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="level2Filter" id="level2Filter" value="<%= sessionBean.getTopicPage().getLevel2Filter()%>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
 														src="<%=sessionBean.getApplicationBean().getFilterImage()%>"/>
-												</td>					
-											</tr>					
+												</td>
+											</tr>
 										</table>
 									</th>
 									<th>
@@ -514,7 +514,7 @@
 														<tr><td>
 															<input type="image"
 																onclick="setAction('sortByDynastyDown', 'topicSectionRelationForm');"
-																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>																				
+																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>
 														</td></tr>
 													</table>
 												</td>
@@ -522,7 +522,7 @@
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="dynastyFilter" id="dynastyFilter" value="<%= sessionBean.getTopicPage().getDynastyFilter() %>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
@@ -545,7 +545,7 @@
 														<tr><td>
 															<input type="image"
 																onclick="setAction('sortByPeriodDown', 'topicSectionRelationForm');"
-																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>																				
+																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>
 														</td></tr>
 													</table>
 												</td>
@@ -553,12 +553,12 @@
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="periodFilter" id="periodFilter" value="<%= sessionBean.getTopicPage().getPeriodFilter()%>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
 														src="<%=sessionBean.getApplicationBean().getFilterImage()%>"/>
-												</td>							
+												</td>
 											</tr>
 										</table>
 									</th>
@@ -576,7 +576,7 @@
 														<tr><td>
 															<input type="image"
 																onclick="setAction('sortByAdminTypeDown', 'topicSectionRelationForm');"
-																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>																				
+																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>
 														</td></tr>
 													</table>
 												</td>
@@ -584,12 +584,12 @@
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="adminTypeFilter" id="adminTypeFilter" value="<%= sessionBean.getTopicPage().getAdminTypeFilter()%>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
 														src="<%=sessionBean.getApplicationBean().getFilterImage()%>"/>
-												</td>							
+												</td>
 											</tr>
 										</table>
 									</th>
@@ -607,7 +607,7 @@
 														<tr><td>
 															<input type="image"
 																onclick="setAction('sortBySectionNameDown', 'topicSectionRelationForm');"
-																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>																				
+																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>
 														</td></tr>
 													</table>
 												</td>
@@ -615,7 +615,7 @@
 											<tr>
 												<td>
 													<input type="text" class="filterInput" name="sectionNameFilter" id="sectionNameFilter" value="<%= sessionBean.getTopicPage().getSectionNameFilter()%>"/>
-												</td>									
+												</td>
 												<td>
 													<input type="image"
 														onclick="setAction('filter', 'topicSectionRelationForm');"
@@ -638,25 +638,25 @@
 														<tr><td>
 															<input type="image"
 																onclick="setAction('sortByStartPageDown', 'topicSectionRelationForm');"
-																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>																				
+																src="<%=sessionBean.getApplicationBean().getDownImage()%>"/>
 														</td></tr>
 													</table>
 												</td>
 											</tr>
 										</table>
 									</th>
-									
+
 									<th><label class="tableTitle">Load Text (Plain)</label></th>
 									<th><label class="tableTitle">Load tagged text in Extraction Interface</label></th>
 									<th><label class="tableTitle">Remove</label></th>
-								</tr>	
-								
+								</tr>
+
 								<% for(DBSection section : sessionBean.getTopicPage().getDisplaySectionList() ) { %>
 								<tr>
 									<td>
 										<a href="<%=sessionBean.getApplicationBean().getTocInterfaceUrl()%>/check_sections_details.php?book_id=<%=section.getBook().getId() %>&amp;count=100&amp;sessionId=<%= session.getId()%>" target="blank">
 											<%=section.getBookId()%>
-										</a>	
+										</a>
 									</td>
 									<td><label><%= section.getBook().getName() %></label></td>
 									<td><label><%= section.getBook().getLevel1() %></label></td>
@@ -666,17 +666,17 @@
 									<td><label><%= section.getBook().getAdmin_type() %></label></td>
 									<td><label><%= section.getName() %></label></td>
 									<td><label><%= section.getPages() %></label></td>
-								
+
 									<!-- view text in Ext-Interface -->
 									<td>
 										<!-- pass topicId to extraction interface -->
 										<a	href="#"
-											title="Show Section in Extraction Interface" 
+											title="Show Section in Extraction Interface"
 										 	onclick="sectionInExtractionInterface('<%=section.getId() %>', '<%=section.getName() %>', '<%=section.getBookId() %>', '<%=section.getBook().getName() %>', '<%=sessionBean.getTopicPage().getTopicId() %>', '<%=sessionBean.getUser().getId() %>', '<%=sessionBean.getApplicationBean().getExtractionInterfaceUrl()%>');">
 										 	<img title="Show Section in Extraction Interface" src="<%=sessionBean.getApplicationBean().getShowImage()%>">
 										</a>
 									</td>
-									
+
 									<!-- existing branches (tasks) -->
 									<td style="max-width:300px;">
 										<% if(section.getBranches() != null && !section.getBranches().isEmpty()) { %>
@@ -691,7 +691,7 @@
 														</td>
 														<td style="max-width:150px">
 															<% if (branch.hasContributor(sessionBean.getUser().getId())) { %>
-															
+
 															<table style="width:100%">
 																<tr><td>
 																	<a href="<%=sessionBean.getApplicationBean().getRootServer() %>/pages/branchPage.jsp?branchId=<%=branch.getId() %>" >
@@ -703,10 +703,10 @@
 																	<a onclick="branchInExtractionInterface('<%=branch.getId() %>', '<%=branch.getCurrentLastFileId() %>', '<%=branch.getSectionId() %>', '<%=branch.getSection().getName() %>', '<%=branch.getBook().getId() %>', '<%=branch.getBook().getName() %>', '<%=sessionBean.getUser().getId() %>', '<%=sessionBean.getApplicationBean().getExtractionInterfaceUrl() %>');">
 																		<img title="Show Task in Extraction Interface" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/>
 																	</a>
-																		
+
 																</td></tr>
 															</table>
-																											
+
 															<% } else { %>
 																<label>Contributors: <%=branch.getContributorsNameList() %></label>
 															<% } %>
@@ -715,29 +715,29 @@
 												<% } %>
 											</table>
 										<% } %>
-									</td>						
+									</td>
 									<td>
-				
-										<input type="image" 
-											onclick="<%=sessionBean.getApplicationBean().getJSConfirmationDelete() %> setAction0('deleteSection', 'topicSectionRelationForm', 'sectionId', <%=section.getId() %>);" 
+
+										<input type="image"
+											onclick="<%=sessionBean.getApplicationBean().getJSConfirmationDelete() %> setAction0('deleteSection', 'topicSectionRelationForm', 'sectionId', <%=section.getId() %>);"
 											src="<%=sessionBean.getApplicationBean().getDeleteImage()%>"/>
 									</td>
 								</tr>
-								<% } %>	
-													
+								<% } %>
+
 							</table>
 						</div>
-								
-						
-														
+
+
+
 						<% } %>
 					</form>
 				</div>
-			
-			
+
+
 
 		<% } %>
-	
+
 	</div>
-	
-</body>
\ No newline at end of file
+
+</body>