Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv1498/src/webapp/editors/community
Modified Files:
import.jsp import_success.jsp
Log Message:
CMSC-1265 Community: improve import and export options of community users
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-1265
Index: import.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/import.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- import.jsp 23 Feb 2009 09:11:50 -0000 1.4
+++ import.jsp 3 Mar 2009 06:23:55 -0000 1.5
@@ -1,8 +1,7 @@
<%...@include file="globals.jsp"
-%><%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html"%>
-<fmt:setBundle basename="cmsc-community" scope="request" />
-<mm:content type="text/html" encoding="UTF-8" expires="0">
-<cmscedit:head title="ewsletter.subscription.manage.newsletteroverview"/>
+%><%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html"
+%><fmt:setBundle basename="cmsc-community" scope="request" /><mm:content
type="text/html" encoding="UTF-8" expires="0"><!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<cmscedit:head title="community.data.title"/>
<script language="javascript">
function checkid(chk){
var i=0;
@@ -65,7 +64,7 @@
<div class="editor">
<div class="body">
- <div style="color:red;"><c:if test="${not empty
requestScope.warning}">Please check the input data.</c:if></div>
+ <div style="color:red;"></div>
<html:form
action="/editors/community/ReferenceImportExportAction"
enctype="multipart/form-data">
<tr>
@@ -94,15 +93,11 @@
<input type="hidden" name="groupId" value="${groupId}"/>
<input type="button" value="Import" id="bn"
onclick="checkid(level);" />
</html:form>
+ <c:if test="${not empty invalidMessage}">
<div style="margin:4px;color:red;">
- <html:messages id="file" message="false">
- <bean:write name="file" />
- <br>
- </html:messages>
- </div>
-
+ <fmt:message key="${invalidMessage}"/>
</div>
-
+ </c:if>
</div>
</div>
</mm:content>
Index: import_success.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/import_success.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- import_success.jsp 23 Feb 2009 09:11:50 -0000 1.5
+++ import_success.jsp 3 Mar 2009 06:23:55 -0000 1.6
@@ -1,10 +1,9 @@
<%...@include file="globals.jsp"
%><%@ taglib uri="http://jakarta.apache.org/struts/tags-html"; prefix="html"
-%><%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg" %>
-<fmt:setBundle basename="cmsc-community" scope="request" />
+%><%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg"
+%><fmt:setBundle basename="cmsc-community" scope="request" /><!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<mm:content type="text/html" encoding="UTF-8" expires="0">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en">
<head>
<title>
@@ -33,19 +32,16 @@
<div class="side_block_green">
<div class="header">
<div class="title">
- <fmt:message key="community.datafile.import.success"/>
+ <fmt:message key="datafile.import.success.title"/>
</div>
-
<div class="header_end"></div>
</div>
<div class="body">
<p>
- ${confirm_userNum} users are added or overwritten successfully.
- </p>
- <p>
- <fmt:message key="community.datafile.import.success"/>
+ <fmt:message key="datafile.import.success">
+ <fmt:param>${confirm_userNum}</fmt:param>
+ </fmt:message>
</p>
-
</div>
<div class="side_block_end"></div>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
