modifications to ensure that Venice can operate without certain personal

information prompted for at registration time, if certain sites should elect
to omit that information
This commit is contained in:
Eric J. Bowersox
2004-07-10 22:54:15 +00:00
parent 5c0f841ab7
commit f0bf5e31ee
9 changed files with 431 additions and 348 deletions

View File

@@ -17,6 +17,7 @@
--%>
<%@ page import = "java.util.Iterator" %>
<%@ page import = "java.util.List" %>
<%@ page import = "com.silverwrist.util.*" %>
<%@ page import = "com.silverwrist.venice.core.*" %>
<%@ page import = "com.silverwrist.venice.ui.view.MembersView" %>
<%@ taglib uri="/tlds/util" prefix="util" %>
@@ -36,43 +37,43 @@
</util:xlink>
]</util:font><p>
<% } // end if %>
<util:font color="content.fg" size="subhead"><B>Find members of community "<comm:name/>":</B></util:font><P>
<util:form action="comm/members.js.vs" type="servlet"><DIV CLASS="content">
<INPUT TYPE="HIDDEN" NAME="cc" VALUE="<comm:ID/>">
<INPUT TYPE="HIDDEN" NAME="sl" VALUE="0">
<INPUT TYPE="HIDDEN" NAME="ofs" VALUE="0">
<util:font color="content.fg" size="subhead"><b>Find members of community "<comm:name/>":</b></util:font><p />
<util:form action="comm/members.js.vs" type="servlet"><div class="content">
<input type="hidden" name="cc" value="<comm:ID/>" />
<input type="hidden" name="sl" value="0" />
<input type="hidden" name="ofs" value="0" />
<util:font color="content.fg" size="content">
Display all community members whose&nbsp;&nbsp;
<SELECT NAME="field" SIZE=1>
<OPTION VALUE="<%= SearchMode.FIELD_USER_NAME %>"
<% if (view.testField(SearchMode.FIELD_USER_NAME)) { %>SELECTED<% } %> >user name</OPTION>
<OPTION VALUE="<%= SearchMode.FIELD_USER_DESCRIPTION %>"
<% if (view.testField(SearchMode.FIELD_USER_DESCRIPTION)) { %>SELECTED<% } %> >description</OPTION>
<OPTION VALUE="<%= SearchMode.FIELD_USER_GIVEN_NAME %>"
<% if (view.testField(SearchMode.FIELD_USER_GIVEN_NAME)) { %>SELECTED<% } %> >first name</OPTION>
<OPTION VALUE="<%= SearchMode.FIELD_USER_FAMILY_NAME %>"
<% if (view.testField(SearchMode.FIELD_USER_FAMILY_NAME)) { %>SELECTED<% } %> >last name</OPTION>
</SELECT><BR>
<select name="field" size="1">
<option value="<%= SearchMode.FIELD_USER_NAME %>"
<% if (view.testField(SearchMode.FIELD_USER_NAME)) { %>selected="selected"<% } %> >user name</option>
<option value="<%= SearchMode.FIELD_USER_DESCRIPTION %>"
<% if (view.testField(SearchMode.FIELD_USER_DESCRIPTION)) { %>selected="selected"<% } %> >description</option>
<option value="<%= SearchMode.FIELD_USER_GIVEN_NAME %>"
<% if (view.testField(SearchMode.FIELD_USER_GIVEN_NAME)) { %>selected="selected"<% } %> >first name</option>
<option value="<%= SearchMode.FIELD_USER_FAMILY_NAME %>"
<% if (view.testField(SearchMode.FIELD_USER_FAMILY_NAME)) { %>selected="selected"<% } %> >last name</option>
</select><br />
<SELECT NAME="mode" SIZE=1>
<OPTION VALUE="<%= SearchMode.SEARCH_PREFIX %>"
<% if (view.testMode(SearchMode.SEARCH_PREFIX)) { %>SELECTED<% } %> >starts with the string</OPTION>
<OPTION VALUE="<%= SearchMode.SEARCH_SUBSTRING %>"
<% if (view.testMode(SearchMode.SEARCH_SUBSTRING)) { %>SELECTED<% } %> >contains the string</OPTION>
<OPTION VALUE="<%= SearchMode.SEARCH_REGEXP %>"
<% if (view.testMode(SearchMode.SEARCH_REGEXP)) { %>SELECTED<% } %> >matches the regular
expression</OPTION>
</SELECT>
<select name="mode" size="1">
<option value="<%= SearchMode.SEARCH_PREFIX %>"
<% if (view.testMode(SearchMode.SEARCH_PREFIX)) { %>selected="selected"<% } %> >starts with the string</option>
<option value="<%= SearchMode.SEARCH_SUBSTRING %>"
<% if (view.testMode(SearchMode.SEARCH_SUBSTRING)) { %>selected="selected"<% } %> >contains the string</option>
<option value="<%= SearchMode.SEARCH_REGEXP %>"
<% if (view.testMode(SearchMode.SEARCH_REGEXP)) { %>selected="selected"<% } %> >matches the regular
expression</option>
</select>
<SPAN CLASS="cinput"><INPUT TYPE=TEXT CLASS="cinput" NAME="term" SIZE=32 MAXLENGTH=255
VALUE="<%= view.getTerm() %>"></SPAN><BR>
<span class="cinput"><input type="text" class="cinput" name="term" size="32" maxlength="255"
value="<%= view.getTerm() %>" /></span><br />
<util:button id="search" type="input"/>
</util:font>
</DIV></util:form>
</div></util:form>
<% List results = view.getResults(); %>
<% if (results!=null) { %>
<HR>
<hr />
<%
int dcount = results.size();
// Determine the number of results to display and whether to display a "next" button
@@ -84,28 +85,28 @@
} // end if
%>
<TABLE WIDTH="100%" BORDER=0 ALIGN=CENTER><TR VALIGN=MIDDLE>
<TD WIDTH="50%" ALIGN=LEFT CLASS="content"><util:font color="content.fg" size="content">
<table width="100%" border="0" align="center"><tr valign="middle">
<td width="50%" align="left" class="content"><util:font color="content.fg" size="content">
<%-- The community members/search results header --%>
<FONT SIZE=+1><B>
<font size="+1"><b>
<% if (view.getSimple()) { %>Community Members:<% } else { %>Search Results:<% } %>
</B></FONT>
</b></font>
(Displaying <%= view.getOffset() + 1 %>-<%= view.getOffset() + dcount %> of
<%= view.getFindCount() %>)
</util:font></TD>
</util:font></td>
<TD WIDTH="50%" ALIGN=RIGHT CLASS="content">
<td width="50%" align="right" class="content">
<% if (go_next || (view.getOffset()>0)) { %>
<%-- The navigational form that allows us to page through the results --%>
<util:comment>Navigational Form</util:comment>
<util:form action="comm/members.js.vs" type="servlet"><DIV CLASS="content">
<INPUT TYPE="HIDDEN" NAME="cc" VALUE="<comm:ID/>">
<INPUT TYPE="HIDDEN" NAME="sl" VALUE="<%= view.getSimple() ? 1 : 0 %>">
<INPUT TYPE=HIDDEN NAME="ofs" VALUE="<%= view.getOffset() %>">
<INPUT TYPE=HIDDEN NAME="field" VALUE="<%= view.getField() %>">
<INPUT TYPE=HIDDEN NAME="mode" VALUE="<%= view.getMode() %>">
<INPUT TYPE=HIDDEN NAME="term" VALUE="<%= view.getTerm() %>">
<INPUT TYPE=HIDDEN NAME="fcount" VALUE="<%= view.getFindCount() %>">
<util:form action="comm/members.js.vs" type="servlet"><div class="content">
<input type="hidden" name="cc" value="<comm:ID/>" />
<input type="hidden" name="sl" value="<%= view.getSimple() ? 1 : 0 %>" />
<input type="hidden" name="ofs" value="<%= view.getOffset() %>" />
<input type="hidden" name="field" value="<%= view.getField() %>" />
<input type="hidden" name="mode" value="<%= view.getMode() %>" />
<input type="hidden" name="term" value="<%= view.getTerm() %>" />
<input type="hidden" name="fcount" value="<%= view.getFindCount() %>" />
<% if (view.getOffset()>0) { %>
<util:button id="previous" type="input"/>
<% } else { %>
@@ -117,33 +118,50 @@
<% } else { %>
<util:button id="_null_"/>
<% } // end if %>
</DIV></util:form>
</div></util:form>
<% } else { %>&nbsp;<% } %>
</TD>
</TR></TABLE><BR>
</td>
</tr></table><br />
<%-- Display the results of the search --%>
<TABLE BORDER=0 ALIGN=LEFT CELLPADDING=0 CELLSPACING=4>
<table border="0" align="left" cellpadding="0" cellspacing="4">
<% for (int i=0; i<dcount; i++) { %>
<TR VALIGN=TOP>
<TD ALIGN=CENTER WIDTH=14><util:stdbullet/></TD>
<TD ALIGN=LEFT CLASS="content"><util:font color="content.fg" size="content">
<% UserFound uf = (UserFound)(results.get(i)); %>
<tr valign="top">
<td align="center" width="14"><util:stdbullet/></td>
<td align="left" class="content"><util:font color="content.fg" size="content">
<%
UserFound uf = (UserFound)(results.get(i));
String fullname = uf.getGivenName() + " " + uf.getFamilyName();
fullname = fullname.trim();
if (StringUtil.isStringEmpty(fullname))
fullname = uf.getName();
String whence = "";
if (!(StringUtil.isStringEmpty(uf.getLocality())))
{ // figure out the right locality
if (!(StringUtil.isStringEmpty(uf.getRegion())))
whence = uf.getLocality() + ", " + uf.getRegion();
else
whence = uf.getLocality();
} // end if
else if (!(StringUtil.isStringEmpty(uf.getRegion())))
whence = uf.getRegion();
%>
<util:xlink>
<util:href type="servlet">user/<%= uf.getName() %></util:href>
<util:text><%= uf.getName() %></util:text>
</util:xlink><BR>
<util:escape><%= uf.getGivenName() %> <%= uf.getFamilyName() %></util:escape>,
from <util:escape><%= uf.getLocality() %>, <%= uf.getRegion() %></util:escape>
<%= uf.getCountry() %>
</util:xlink><br />
<util:escape><%= fullname %></util:escape>, from <util:escape><%= whence %></util:escape>
<% if (!(uf.getCountry().equals("XX"))) { %><%= uf.getCountry() %><% } %>
<% if (view.isCommunityAdmin(uf)) { %>
&nbsp;<util:image src="tag_host.gif" fixup="true" alt="Host!" width="40" height="20"/>
<% } // end if %>
<% if (uf.getDescription()!=null) { %>
<BR><EM><util:escape><%= uf.getDescription() %></util:escape></EM>
<br /><i><util:escape><%= uf.getDescription() %></util:escape></i>
<% } // end if %>
</util:font></TD>
</TR>
</util:font></td>
</tr>
<% } // end for %>
</TABLE><BR CLEAR=LEFT>
</table><br clear="left" />
<% } // end if %>
<%-- EOF --%>