[jboss-svn-commits] JBL Code SVN: r6388 - in labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views: profile topics
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Sep 23 17:29:18 EDT 2006
Author: unibrew
Date: 2006-09-23 17:29:16 -0400 (Sat, 23 Sep 2006)
New Revision: 6388
Modified:
labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml
labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
Log:
[JBFORUMS-124] Repairing links to user's communicators, e-mail and web page on TopicView and UserProfileView. Porting to Forums22
Modified: labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml 2006-09-23 21:28:42 UTC (rev 6387)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml 2006-09-23 21:29:16 UTC (rev 6388)
@@ -101,13 +101,11 @@
<span class="gen">
<c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_HOMEPAGE')!=null}" >
<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>
+ <a href="${forums:userProperty(profile.poster.user.properties,'INFO_USER_HOMEPAGE')}" style="text-decoration: none;">
+ <img border="0"
+ src="#{forums:themeURL('resourceIconWWWURL')}"
+ alt="${resource.Visit_website}"/>
+ </a>
</b>
</c:if>
</span>
@@ -153,13 +151,11 @@
<b>
<span class="gen">
<c:if test="#{profile.poster.user.fakeEmail!=null}" >
- <h:outputLink value="mailto:${profile.poster.user.fakeEmail}" style="text-decoration: none;">
- <f:verbatim>
+ <a href="mailto:${profile.poster.user.fakeEmail}" style="text-decoration: none;">
<img border="0"
src="#{forums:themeURL('resourceIconEmailURL')}"
alt="${resource.Send_email}"/>
- </f:verbatim>
- </h:outputLink>
+ </a>
</c:if>
</span>
</b>
@@ -172,13 +168,11 @@
<td class="row1" valign="middle">
<span class="gen">
<c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_SKYPE')!=null}" >
- <h:outputLink value="skype:#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_SKYPE')}?add" style="text-decoration: none;">
- <f:verbatim>
+ <a href="skype:#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_SKYPE')}?add" style="text-decoration: none;">
<img border="0"
src="#{forums:themeURL('resourceIconSkypeURL')}"
alt="${resource.L_SKYPE}"/>
- </f:verbatim>
- </h:outputLink>
+ </a>
</c:if>
</span>
</td>
@@ -200,13 +194,11 @@
<td class="row1" valign="middle">
<span class="gen">
<c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_YIM')!=null}" >
- <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>
+ <a href="http://edit.yahoo.com/config/send_webmesg?.target=#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_YIM')}&.src=pg" style="text-decoration: none;">
<img border="0"
src="#{forums:themeURL('resourceIconYIMURL')}"
alt="${resource.YIM}"/>
- </f:verbatim>
- </h:outputLink>
+ </a>
</c:if>
</span>
</td>
@@ -218,13 +210,11 @@
<td class="row1" valign="middle">
<span class="gen">
<c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_AIM')!=null}" >
- <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>
+ <a href="aim:goim?screenname=#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_AIM')}&message=Hello+Are+you+there?" style="text-decoration: none;">
<img border="0"
src="#{forums:themeURL('resourceIconAIMURL')}"
alt="${resource.AIM}"/>
- </f:verbatim>
- </h:outputLink>
+ </a>
</c:if>
</span>
</td>
@@ -243,13 +233,11 @@
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>
- <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>
+ <a href="http://www.icq.com/scripts/search.dll?to=#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_ICQ')}" style="text-decoration: none;">
+ <img border="0"
+ src="#{forums:themeURL('resourceIconICQURL')}"
+ alt="${resource.ICQ}"/>
+ </a>
</c:if>
</td>
</tr>
Modified: labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2006-09-23 21:28:42 UTC (rev 6387)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2006-09-23 21:29:16 UTC (rev 6388)
@@ -229,15 +229,15 @@
<br/>
<!-- TODO: NEED TO BE REIMPLEMENTED
<span class="postdetails">
- ${postrow.poster.user.POSTER_RANK}
- <br/>
- ${postrow.RANK_IMAGE}${postrow.POSTER_AVATAR}
- <br/>
- ${postrow.POSTER_JOINED}
- <br/>
- ${postrow.POSTER_POSTS}
- <br/>
- ${postrow.POSTER_FROM}
+ ${POSTER_RANK}
+ <br />
+ ${RANK_IMAGE}${POSTER_AVATAR}
+ <br />
+ ${POSTER_JOINED}
+ <br />
+ ${POSTER_POSTS}
+ <br />
+ ${POSTER_FROM}
</span>
-->
<br/>
@@ -370,15 +370,15 @@
alt="${resource.Read_profile}"/>
</f:verbatim>
</h:outputLink>
-
- <h:outputLink value="#{forums:outputLink(shared.links['message'],true)}" style="text-decoration: none;">
+ <!-- TODO: WAITING FOR MISSING FUNCTIONALITY -->
+ <!-- <h:outputLink value="#{forums:outputLink(shared.links['message'],true)}" style="text-decoration: none;">
<f:param name="uid" value="#{postrow.poster.user.id}"/>
<f:verbatim>
<img border="0"
src="#{forums:themeURL('resourceIconPMURL')}"
alt="${resource.Private_Message}"/>
</f:verbatim>
- </h:outputLink>
+ </h:outputLink> -->
<c:if test="${postrow.poster.user.fakeEmail ne null}">
<a href="mailto:${postrow.poster.user.fakeEmail}" style="text-decoration: none;">
@@ -397,50 +397,44 @@
</h:outputLink>
</c:if>
<c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_AIM') ne null}">
- <h:outputLink value="aim:goim?screenname=#{forums:userProperty(postrow.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>
+ <a href="aim:goim?screenname=#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_AIM')}&message=Hello+Are+you+there?" style="text-decoration: none;">
+ <img border="0"
+ src="#{forums:themeURL('resourceIconAIMURL')}"
+ alt="${resource.AIM}"/>
+ </a>
</c:if>
<c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_YIM') ne null}">
- <h:outputLink value="http://edit.yahoo.com/config/send_webmesg?.target=#{forums:userProperty(postrow.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>
+ <a href="http://edit.yahoo.com/config/send_webmesg?.target=#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_YIM')}&.src=pg" style="text-decoration: none;">
+ <img border="0"
+ src="#{forums:themeURL('resourceIconYIMURL')}"
+ alt="${resource.YIM}"/>
+ </a>
</c:if>
<c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_SKYPE') ne null}">
<!-- TODO: some more functionality may be added. Like automatic skype instalation and status checker.-->
- <h:outputLink value="skype:#{forums:userProperty(postrow.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>
+ <a href="skype:#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_SKYPE')}?add" style="text-decoration: none;">
+ <img border="0"
+ src="#{forums:themeURL('resourceIconSkypeURL')}"
+ alt="${resource.L_SKYPE}"/>
+ </a>
</c:if>
<c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_MSNM') ne null}">
- <h:outputLink value="#{forums:outputLink(shared.links['user'],true)}" style="text-decoration: none;">
- <f:verbatim>
+ <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}" style="text-decoration: none;">
+ <f:param name="uid"
+ value="#{postrow.poster.user.id}"/>
+ <f:verbatim>
<img border="0"
src="#{forums:themeURL('resourceIconMSNMURL')}"
- alt="${resource.MSNM}"/>
- </f:verbatim>
- </h:outputLink>
+ alt="${resource.Read_profile}"/>
+ </f:verbatim>
+ </h:outputLink>
</c:if>
<c:if test="${forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_ICQ') ne null}">
- <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')}"
- alt="${resource.ICQ}"/>
- </f:verbatim>
- </h:outputLink>
+ <a href="http://www.icq.com/scripts/search.dll?to=#{forums:userProperty(postrow.poster.user.properties,'INFO_USER_IM_ICQ')}" style="text-decoration: none;">
+ <img border="0"
+ src="#{forums:themeURL('resourceIconICQURL')}"
+ alt="${resource.ICQ}"/>
+ </a>
</c:if>
<!-- TODO: Status for ICQ. Might be cool for other communicators too.-->
<!--<script language="JavaScript"
@@ -448,13 +442,13 @@
<!--
if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 && navigator.userAgent.indexOf('6.') == -1 )
- document.write(' ${postrow.ICQ_IMG}');
+ document.write(' ${ICQ_IMG}');
else
- document.write('</td><td> </td><td valign="top" nowrap="nowrap"><div style="position:relative"><div style="position:absolute">${postrow.ICQ_IMG}</div><div style="position:absolute;left:3px;top:-1px">${postrow.ICQ_STATUS_IMG}</div></div>');
+ document.write('</td><td> </td><td valign="top" nowrap="nowrap"><div style="position:relative"><div style="position:absolute">${ICQ_IMG}</div><div style="position:absolute;left:3px;top:-1px">${ICQ_STATUS_IMG}</div></div>');
//-->
<!--</script>
- <noscript>${postrow.ICQ_IMG}</noscript>-->
+ <noscript>${ICQ_IMG}</noscript>-->
</td>
</tr>
</table>
@@ -471,31 +465,33 @@
<!--tr align="center">
<td class="catBottom" colspan="2" height="28">
<table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <h:form>
+ <tr>
+ <h:form>
<td align="center">
<span class="gensmall">
${resource.Display_posts}:
<h:selectOneMenu value="#{topic.postDays}">
<f:selectItem itemValue="0" itemLabel="All Posts" />
- <f:selectItem itemValue="86400000" itemLabel="#{resource.1_Day}" />
- <f:selectItem itemValue="604800000" itemLabel="#{resource.7_Days}" />
- <f:selectItem itemValue="1209600000" itemLabel="#{resource.2_Weeks}" />
- <f:selectItem itemValue="2592000000" itemLabel="#{resource.1_Month}" />
- <f:selectItem itemValue="7776000000" itemLabel="#{resource.3_Months}" />
- <f:selectItem itemValue="15552000000" itemLabel="#{resource.6_Months}" />
- <f:selectItem itemValue="31104000000" itemLabel="#{resource.1_Year}" />
+ <f:selectItem itemValue="86400000" itemLabel="#{resource.period_1_Day}" />
+ <f:selectItem itemValue="604800000" itemLabel="#{resource.period_7_Days}" />
+ <f:selectItem itemValue="1209600000" itemLabel="#{resource.period_2_Weeks}" />
+ <f:selectItem itemValue="2592000000" itemLabel="#{resource.period_1_Month}" />
+ <f:selectItem itemValue="7776000000" itemLabel="#{resource.period_3_Months}" />
+ <f:selectItem itemValue="15552000000" itemLabel="#{resource.period_6_Months}" />
+ <f:selectItem itemValue="31104000000" itemLabel="#{resource.period_1_Year}" />
</h:selectOneMenu>
<h:selectOneMenu>
<f:selectItem itemValue="0" itemLabel="#{resource.L_ASCENDING}" />
<f:selectItem itemValue="1" itemLabel="#{resource.L_DESCENDING}" />
</h:selectOneMenu>
- <h:commandButton value="${resource.Go}" class="liteoption" action="#{topic.topicsConstraint}"/>
+
+ <input type="button" value="${resource.Go}" class="liteoption" />
+
</span>
</td>
</h:form>
</tr>
- </table>
+ </table>
</td>
</tr>-->
@@ -677,21 +673,36 @@
<tr>
<td width="40%" valign="top" nowrap="nowrap" align="left">
<span class="gensmall">
+
<c:choose>
+
<c:when test="#{forums:isWatchingTopic(topic.topic)}">
- <h:commandLink action="#{topicWatch.deActivateWatch}">
+
+ <h:commandLink id="watchDeActivator" action="#{topicWatch.deActivateWatch}" >
+
<f:param name="t" value="#{topic.topic.id}"/>
+
<h:outputText>Stop watching this topic for replies</h:outputText>
+
</h:commandLink>
</c:when>
+
<c:otherwise>
- <h:commandLink action="#{topicWatch.activateWatch}">
+
+ <h:commandLink id="watchActivator" action="#{topicWatch.activateWatch}" >
+
<f:param name="t" value="#{topic.topic.id}"/>
+
<h:outputText>Watch this topic for replies</h:outputText>
+
</h:commandLink>
+
</c:otherwise>
+
</c:choose>
+
</span>
+
<br/>
 
<br/>
More information about the jboss-svn-commits
mailing list