From: <jbo...@li...> - 2006-04-19 00:50:07
|
Author: unibrew Date: 2006-04-18 20:49:46 -0400 (Tue, 18 Apr 2006) New Revision: 3777 Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml Log: [JBFORUMS-38] Updating UserView - quite finished Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml =================================================================== --- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2006-04-19 00:05:03 UTC (rev 3776) +++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2006-04-19 00:49:46 UTC (rev 3777) @@ -68,8 +68,8 @@ <value>/views/topics/posting_body.jsf</value> </map-entry> <map-entry> - <key>user</key> - <value>/views/user/viewuser_body.jsf</value> + <key>profile</key> + <value>/views/profile/viewprofile_body.jsf</value> </map-entry> <map-entry> <key>message</key> @@ -165,4 +165,9 @@ <managed-bean-class>org.jboss.portlet.forums.ui.view.ViewJumpbox</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> + <managed-bean> + <managed-bean-name>profile</managed-bean-name> + <managed-bean-class>org.jboss.portlet.forums.ui.view.ViewProfile</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> </faces-config> \ No newline at end of file Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml =================================================================== --- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml 2006-04-19 00:05:03 UTC (rev 3776) +++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml 2006-04-19 00:49:46 UTC (rev 3777) @@ -30,112 +30,225 @@ xmlns:forums="http://www.jboss.com/products/jbossportal/forums" class="bb"> <ui:include src="/views/common/common.xhtml"/> - -<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> - <tr> - <%-- <td align="left"><span class="nav"><a href="${n:out("U_INDEX")}" class="nav">${n:out("L_INDEX")}</a></span></td>--%> - <td align="left" valign="middle" width="100%"><span class="nav"> <a href="${n:out("U_VIEW_MAIN_PAGE")}" class="nav">${n:out("MAIN_PAGE_NAME")}</a> - <!---> <a href="${n:out("U_VIEW_CATEGORY")}" class="nav">${n:out("CATEGORY_NAME")}</a> - -> <a href="${n:out("U_VIEW_FORUM")}" class="nav">${n:out("FORUM_NAME")}</a>--></span></td> - </tr> -</table> - -<table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0" align="center"> - <tr> - <th class="thHead" colspan="2" height="25" nowrap="nowrap">${n:i18n("L_VIEWING_PROFILE")}</th> - </tr> -<%-- <tr> + + <table width="100%" cellspacing="2" cellpadding="2" border="0" + align="center"> + <tr> + <td align="left" valign="middle" width="100%"> + <span class="nav"> + &nbsp;&nbsp;&nbsp; + <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}" + styleClass="nav"> + <h:outputText value="#{shared.mainPageName}"/> + </h:outputLink> + </span> + </td> + </tr> + </table> + + <table class="forumline" width="100%" cellspacing="1" cellpadding="3" + border="0" align="center"> + <tr> + <th class="thHead" colspan="2" height="25" nowrap="nowrap">${resource.L_VIEWING_PROFILE}</th> + </tr> + <!-- <tr> TODO: MISSING AVATAR FEATURE <td class="catLeft" width="40%" height="28" align="center"><b><span class="gen">${n:i18n("L_AVATAR")}</span></b> </td> <td class="catRight" width="60%"><b><span class="gen">${n:i18n("L_ABOUT_USER")}</span></b></td> - </tr>--%> - <tr> - <!--<td class="row1" height="6" valign="top" align="center">${n:out("AVATAR_IMG")}<br/><span + </tr>--> + <tr> + <!--<td class="row1" height="6" valign="top" align="center">${n:out("AVATAR_IMG")}<br/><span class="postdetails">${n:out("POSTER_RANK")}</span></td>--> - <td class="row1" rowspan="3" valign="top"> - <table width="100%" border="0" cellspacing="1" cellpadding="3"> - <tr> - <td valign="middle" align="right" nowrap="nowrap"><span class="gen">${n:i18n("L_JOINED")}: </span> - </td> - <td width="100%"><b><span class="gen">${n:out("JOINED")}</span></b></td> - </tr> - <tr> - <td valign="top" align="right" nowrap="nowrap"><span class="gen">${n:i18n("L_TOTAL_POSTS")}: </span> - </td> - <td valign="top"><b><span class="gen">${n:out("POSTS")}</span></b><%--<br/><span + <td class="row1" rowspan="3" valign="top"> + <table width="100%" border="0" cellspacing="1" cellpadding="3"> + <tr> + <td valign="middle" align="right" nowrap="nowrap"> + <span class="gen">${resource.L_JOINED}:&nbsp;</span> + </td> + <td width="100%"> + <b><span class="gen">${profile.poster.user.registrationDate}</span></b> + </td> + </tr> + <tr> + <td valign="top" align="right" nowrap="nowrap"> + <span class="gen">${resource.L_TOTAL_POSTS}:&nbsp;</span> + </td> + <td valign="top"> + <b><span class="gen">${profile.poster.postCount}</span></b> + <!--<br/><span class="genmed">[${n:out("POST_PERCENT_STATS")} / ${n:out("POST_DAY_STATS")}]</span> <br/><span - class="genmed"><a href="${n:out("U_SEARCH_USER")}" class="genmed">${n:i18n("L_SEARCH_USER_POSTS")}</a></span>--%> - </td> - </tr> - <tr> - <td valign="middle" align="right" nowrap="nowrap"><span class="gen">${n:i18n("L_LOCATION")}: </span> - </td> - <td><b><span class="gen">${n:out("LOCATION")}</span></b></td> - </tr> - <tr> - <td valign="middle" align="right" nowrap="nowrap"><span class="gen">${n:i18n("L_WEBSITE")}: </span> - </td> - <td><span class="gen"><b>${n:out("WWW")}</b></span></td> - </tr> - <tr> - <td valign="middle" align="right" nowrap="nowrap"><span - class="gen">${n:i18n("L_OCCUPATION")}: </span></td> - <td><b><span class="gen">${n:out("OCCUPATION")}</span></b></td> - </tr> - <tr> - <td valign="top" align="right" nowrap="nowrap"><span class="gen">${n:i18n("L_INTERESTS")}:</span></td> - <td><b><span class="gen">${n:out("INTERESTS")}</span></b></td> - </tr> - </table> - </td> - </tr> - <tr> - <td class="catLeft" align="center" height="28"><b><span - class="gen">${n:i18n("L_CONTACT")}: ${n:out("USERNAME")} </span></b></td> - </tr> - <tr> - <td class="row1" valign="top"> - <table width="100%" border="0" cellspacing="1" cellpadding="3"> - <tr> - <td valign="middle" align="right" nowrap="nowrap"><span class="gen">${n:i18n("L_EMAIL_ADDRESS")}:</span> - </td> - <td class="row1" valign="middle" width="100%"><b><span class="gen">${n:out("EMAIL_IMG")}</span></b></td> - </tr> - <tr> - <td valign="middle" nowrap="nowrap" align="right"><span class="gen">${n:i18n("L_SKYPE")}:</span></td> - <td class="row1" valign="middle"<span class="gen">${n:out("SKYPE_IMG")}</span></td> - </tr> - <tr> - <td valign="middle" nowrap="nowrap" align="right"><span class="gen">${n:i18n("L_MESSENGER")}:</span></td> - <td class="row1" valign="middle"><span class="gen">${n:out("MSN_IMG")}</span></td> - </tr> - <tr> - <td valign="middle" nowrap="nowrap" align="right"><span class="gen">${n:i18n("L_YAHOO")}:</span></td> - <td class="row1" valign="middle"><span class="gen">${n:out("YIM_IMG")}</span></td> - </tr> - <tr> - <td valign="middle" nowrap="nowrap" align="right"><span class="gen">${n:i18n("L_AIM")}:</span></td> - <td class="row1" valign="middle"><span class="gen">${n:out("AIM_IMG")}</span></td> - </tr> - <tr> - <td valign="middle" nowrap="nowrap" align="right"><span class="gen">${n:i18n("L_ICQ_NUMBER")}:</span></td> - <td class="row1"><script language="JavaScript" type="text/javascript"><!-- + class="genmed"><a href="${n:out("U_SEARCH_USER")}" class="genmed">${n:i18n("L_SEARCH_USER_POSTS")}</a></span>--> + </td> + </tr> + <tr> + <td valign="middle" align="right" nowrap="nowrap"> + <span class="gen">${resource.L_LOCATION}:&nbsp;</span> + </td> + <td> + <b><span class="gen">#{forums:userProperty(profile.poster.user.properties,"INFO_USER_LOCATION")}</span></b> + </td> + </tr> + <tr> + <td valign="middle" align="right" nowrap="nowrap"> + <span class="gen">${resource.L_WEBSITE}:&nbsp;</span> + </td> + <td> + <span class="gen"> + <b> + <h:outputLink value="${forums:userProperty(profile.poster.user.properties,'INFO_USER_HOMEPAGE')}" style="text-decoration: none;"> + <f:verbatim> + <img border="0" + src="#{forums:themeURL('resourceIconWWWURL')}" + alt="${resource.Visit_website}"/> + </f:verbatim> + </h:outputLink> + </b> + </span> + </td> + </tr> + <tr> + <td valign="middle" align="right" nowrap="nowrap"> + <span class="gen">${resource.L_OCCUPATION}:&nbsp;</span> + </td> + <td> + <b><span class="gen">#{forums:userProperty(profile.poster.user.properties,"INFO_USER_OCCUPATION")}</span></b> + </td> + </tr> + <tr> + <td valign="top" align="right" nowrap="nowrap"> + <span class="gen">${resource.L_INTERESTS}:</span> + </td> + <td> + <b><span class="gen">#{forums:userProperty(profile.poster.user.properties,"INFO_USER_INTERESTS")}</span></b> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td class="catLeft" align="center" height="28"> + <b> + <span class="gen"> + ${resource.L_CONTACT}: + ${profile.poster.user.givenName} + </span> + </b> + </td> + </tr> + <tr> + <td class="row1" valign="top"> + <table width="100%" border="0" cellspacing="1" cellpadding="3"> + <tr> + <td valign="middle" align="right" nowrap="nowrap"> + <span class="gen">${resource.L_EMAIL_ADDRESS}:</span> + </td> + <td class="row1" valign="middle" width="100%"> + <b> + <span class="gen"> + <h:outputLink value="mailto:${profile.poster.user.fakeEmail}" style="text-decoration: none;"> + <f:verbatim> + <img border="0" + src="#{forums:themeURL('resourceIconEmailURL')}" + alt="${resource.Send_email}"/> + </f:verbatim> + </h:outputLink> + </span> + </b> + </td> + </tr> + <tr> + <td valign="middle" nowrap="nowrap" align="right"> + <span class="gen">${resource.L_SKYPE}:</span> + </td> + <td class="row1" valign="middle"> + <span class="gen"> + <h:outputLink value="skype:#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_SKYPE')}?add" style="text-decoration: none;"> + <f:verbatim> + <img border="0" + src="#{forums:themeURL('resourceIconSkypeURL')}" + alt="${resource.L_SKYPE}"/> + </f:verbatim> + </h:outputLink> + </span> + </td> + </tr> + <tr> + <td valign="middle" nowrap="nowrap" align="right"> + <span class="gen">${resource.L_MESSENGER}:</span> + </td> + <td class="row1" valign="middle"> + <span class="gen"> + #{forums:userProperty(profile.poster.user.properties,"INFO_USER_IM_MSNM")} + </span> + </td> + </tr> + <tr> + <td valign="middle" nowrap="nowrap" align="right"> + <span class="gen">${resource.L_YAHOO}:</span> + </td> + <td class="row1" valign="middle"> + <span class="gen"> + <h:outputLink value="http://edit.yahoo.com/config/send_webmesg?.target=#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_YIM')}&.src=pg" style="text-decoration: none;"> + <f:verbatim> + <img border="0" + src="#{forums:themeURL('resourceIconYIMURL')}" + alt="${resource.YIM}"/> + </f:verbatim> + </h:outputLink> + </span> + </td> + </tr> + <tr> + <td valign="middle" nowrap="nowrap" align="right"> + <span class="gen">${resource.L_AIM}:</span> + </td> + <td class="row1" valign="middle"> + <span class="gen"> + <h:outputLink value="aim:goim?screenname=#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_AIM')}&message=Hello+Are+you+there?" style="text-decoration: none;"> + <f:verbatim> + <img border="0" + src="#{forums:themeURL('resourceIconAIMURL')}" + alt="${resource.AIM}"/> + </f:verbatim> + </h:outputLink> + </span> + </td> + </tr> + <tr> + <td valign="middle" nowrap="nowrap" align="right"> + <span class="gen">${resource.L_ICQ_NUMBER}:</span> + </td> + <td class="row1"> + <script language="JavaScript" type="text/javascript"><!-- if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 && navigator.userAgent.indexOf('6.') == -1 ) document.write(' ${n:out("ICQ_IMG")}'); else document.write('<table cellspacing="0" cellpadding="0" border="0"><tr><td nowrap="nowrap"><div style="position:relative;height:18px"><div style="position:absolute">${n:out("ICQ_IMG")}</div><div style="position:absolute;left:3px;top:-1px">${n:out("ICQ_STATUS_IMG")}</div></div></td></tr></table>'); - //--></script><noscript>${n:out("ICQ_IMG")}</noscript></td> - </tr> - </table> - </td> - </tr> -</table> - + //--></script> + <h:outputLink value="http://www.icq.com/scripts/search.dll?to=#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_ICQ')}" style="text-decoration: none;"> + <f:verbatim> + <img border="0" + src="#{forums:themeURL('resourceIconICQURL')}" + alt="${resource.ICQ}"/> + </f:verbatim> + </h:outputLink> + </td> + </tr> + </table> + </td> + </tr> + </table> + <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center"> <tr> - <td align="right"><span class="nav"><br/>${n:out("JUMPBOX")}</span></td> + <td align="right"> + <span class="nav"> + <br/> + <ui:include src="/views/jumpbox.xhtml"/> + </span> + </td> </tr> </table> Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml =================================================================== --- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2006-04-19 00:05:03 UTC (rev 3776) +++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2006-04-19 00:49:46 UTC (rev 3777) @@ -349,7 +349,7 @@ </h:outputLink> </c:if> <c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_ICQ') ne null}"> - <h:outputLink value="http://wwp.icq.com/scripts/search.dll?to=#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_ICQ')}" style="text-decoration: none;"> + <h:outputLink value="http://www.icq.com/scripts/search.dll?to=#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_ICQ')}" style="text-decoration: none;"> <f:verbatim> <img border="0" src="#{forums:themeURL('resourceIconICQURL')}" |