Mercurial > hg > LGServices

diff src/main/webapp/pages/topicList.jsp @ 43:9dbbbfd474f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new: 1.existing topic in search result. 2.difference-set of book for topic
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Wed, 23 Dec 2015 16:03:32 +0100
parents ba9515f22897
children 6199b0ddac94
line wrap: on
line diff
--- a/src/main/webapp/pages/topicList.jsp	Fri Dec 18 11:50:24 2015 +0100
+++ b/src/main/webapp/pages/topicList.jsp	Wed Dec 23 16:03:32 2015 +0100
@@ -52,7 +52,7 @@
 					<table>
 						<tr>
 							<td>
-								<span>Name (Eng)</span>
+								<span>name(Eng)*</span>
 							</td>
 							<td>
 								<input id="nameEn" name="nameEn" type="text" placeholder="e.g. Local Product"/>
@@ -60,7 +60,7 @@
 						</tr>
 						<tr>
 							<td>
-								<span>name (中文)</span>
+								<span>name(中文)*</span>
 							</td>
 							<td>
 								<input id="nameCh" name="nameCh" type="text" placeholder="e.g. 物產"/>
@@ -68,7 +68,7 @@
 						</tr>
 						<tr>
 							<td>
-								<span>name (Pinyin)</span>
+								<span>name(Pinyin)*</span>
 							</td>
 							<td>
 								<input id="namePinyin" name="namePinyin" type="text" placeholder="e.g. wu chan"/>
@@ -96,7 +96,7 @@
 				action="<%=sessionBean.getApplicationBean().getRootServer()%>/proxy.jsp" >
 				<input name="bean" type="hidden" value="topicListBean" /> 
 				
-				<div class="subTitel">Topic 
+				<div class="subTitel">Topic List
 					<input type="image"
 						onclick="setAction('forceLoadTopics', 'topicListForm');"
 						src="<%=sessionBean.getApplicationBean().getRefreshImage()%>" width="20" height="20"/>
@@ -109,10 +109,7 @@
 				
 				<button id="createTopic" type="button" class="lgButton">Create New Topic</button>		
 				
-				
-				<jsp:include page="../componentes/paginator.jsp">
-					<jsp:param name="formName" value="topicListForm"/>
-				</jsp:include> 
+			
 		
 				<div class="tableDiv double-scroll">
 					<table class="pageTable" >
@@ -139,7 +136,6 @@
 								</table>
 							</td>
 			
-							
 							<td>
 								<table class="sortTable">
 									<tr>
@@ -257,7 +253,7 @@
 							<td><label class="tableTitle">Delete</label></td>
 						</tr>	
 						
-						<% for (LGTopic topic : sessionBean.getTopicListPage().getDisplayTopicList() ) {
+						<% for (LGTopic topic : sessionBean.getTopicListPage().getCompleteTopicList() ) {
 						%>
 						<tr>
 							<td><%=topic.getId() %></td>
@@ -296,10 +292,6 @@
 				</div>
 				
 				
-				<jsp:include page="../componentes/paginator.jsp">
-					<jsp:param name="formName" value="topicListForm"/>
-				</jsp:include> 
-				
 			</form>
 		<% } %>
 		<% } %>