[jboss-svn-commits] JBL Code SVN: r12122 - in labs/jbossforums/branches/forums101P22/forums/src: resources/portal-forums-war/WEB-INF/classes and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu May 24 12:39:05 EDT 2007
Author: unibrew
Date: 2007-05-24 12:39:05 -0400 (Thu, 24 May 2007)
New Revision: 12122
Modified:
labs/jbossforums/branches/forums101P22/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml
Log:
[JBFORUMS-213] UserProfileVie redesigned.
Modified: labs/jbossforums/branches/forums101P22/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2007-05-24 16:38:36 UTC (rev 12121)
+++ labs/jbossforums/branches/forums101P22/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2007-05-24 16:39:05 UTC (rev 12122)
@@ -200,6 +200,15 @@
text-align:left;
}
+.forumtablestyle .secondaryHeader {
+ background-color:#9bb3c1;
+ font-size:10px;
+ font-weight:bold;
+ color:#000000;
+ height: 20px;
+ text-align:left;
+}
+
.forumtablestyle .forumheaderfirst {
border-bottom:1px solid #233345;
height:2em;
@@ -310,6 +319,20 @@
font-weight:bold;
}
+.forumtablestyle .labelCell {
+ background-color: #f4f3f3;
+ width: 0%;
+ white-space: nowrap;
+ font-size:10px;
+ font-weight:bold;
+}
+
+.forumtablestyle .valueCell {
+}
+
+.forumtablestyle .bottomline {
+ border-bottom:1px solid #656565;
+}
.forumsubtablestyle {
clear:both;
}
@@ -343,7 +366,8 @@
}
.forumthreadfooter {
- background-color: #9da7b2;
+ background-color: #9da7b2;
+ height: 0px;
}
.forumpostspacer {
@@ -406,29 +430,25 @@
}
.forumAttachmentTable .header {
- background-color:#233345;
+ background-color:#9bb3c1;
font-size:10px;
font-weight:bold;
- color:#94aebd;
- height: 20px;
+ color:#000000;
text-align:left;
}
.forumAttachmentTable .forumHeaderFirst {
- border-bottom:1px solid #233345;
- height:2em;
+ border-bottom:1px solid #9bb3c1;
}
.forumAttachmentTable .tableHeader {
border-left:1px solid #94aebd;
- border-bottom:1px solid #233345;
- height:2em;
+ border-bottom:1px solid #9bb3c1;
}
.forumAttachmentTable .forumHeaderLast {
border-left:1px solid #94aebd;
- border-bottom:1px solid #233345;
- width:250px;
+ border-bottom:1px solid #9bb3c1;
}
.forumAttachmentTable .labelCell {
@@ -449,6 +469,63 @@
text-align: center;
vertical-align: middle;
}
+
+/* -------------------- Forum Topic Poll styles ------------------------ */
+
+.forumPollTable {
+ clear:both;
+/* border: 1px solid #e6e7e8; */
+/* border-bottom: 0px; */
+ margin: 4px;
+}
+
+.forumPollTable .questionCell {
+ background-color:#9bb3c1;
+ width: 100%;
+ font-size:10px;
+ font-weight:bold;
+ color:#000000;
+ text-align:left;
+}
+
+.forumPollTable .radioCell {
+ background-color: #f4f3f3;
+ width: 0%;
+ white-space: nowrap;
+ font-size:10px;
+ font-weight:bold;
+}
+
+.forumPollTable .answerCell {
+/* background-color: #f4f3f3; */
+ width: 100%;
+ white-space: nowrap;
+}
+
+.forumPollTable .buttonCell {
+ padding-top: 6px;
+ text-align: right;
+ border: 0px
+}
+
+.forumPollTable .linkCell {
+ padding: 1px;
+ padding-right: 6px;
+ text-align: right;
+ border: 0px
+}
+
+.forumPollTable td {
+ white-space: nowrap;
+}
+
+.forumPollTable .totalCell {
+ background-color: #f4f3f3;
+ padding: 1px;
+ padding-right: 12px;
+ text-align: right;
+}
+
/* ------------------- Forms ------------------------------- */
.forumtablestyle .categorylabel {
Modified: labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-05-24 16:38:36 UTC (rev 12121)
+++ labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-05-24 16:39:05 UTC (rev 12122)
@@ -699,7 +699,7 @@
# %s is username
Viewing_user_profile_0=Viewing profile ::
Viewing_user_profile_1=
-L_VIEWING_PROFILE=Viewing profile
+L_VIEWING_PROFILE=View Profile
# %s is username
About_user_0=All about
About_user_1=
Modified: labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml 2007-05-24 16:38:36 UTC (rev 12121)
+++ labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/profile/viewprofile_body.xhtml 2007-05-24 16:39:05 UTC (rev 12122)
@@ -27,260 +27,172 @@
xmlns:c="http://java.sun.com/jstl/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:forums="http://www.jboss.com/products/jbossportal/forums" class="bb">
-
-
- <ui:composition template="/views/common/common.xhtml">
- <ui:define name="mainContent">
-
+ xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
+ class="forumscontainer">
+
+<ui:composition template="/views/common/common.xhtml">
+<ui:define name="mainContent">
<c:choose>
- <c:when test="#{profile.poster!=null && profile.poster.id!=-1}">
- <table width="100%" cellspacing="2" cellpadding="2" border="0"
- align="center">
- <tr>
- <td align="left" valign="middle" width="100%">
- <span class="nav">
-    
- <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}"
- styleClass="nav">
- <h:outputText value="#{shared.mainPageName}"/>
- </h:outputLink>
- </span>
- </td>
- </tr>
- </table>
+
+ <c:when test="#{profile.poster!=null && profile.poster.id!=-1}">
- <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 - NEW FEATURE FOR FORUMS
- <td class="catLeft" width="40%" height="28" align="center"><b><span class="gen">${resource.L_AVATAR}</span></b>
- </td>
- <td class="catRight" width="60%"><b><span class="gen">${resource.L_ABOUT_USER}</span></b></td>
- </tr>-->
- <tr>
- <!--<td class="row1" height="6" valign="top" align="center">${"AVATAR_IMG"}<br/><span
- class="postdetails">${"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">${resource.L_JOINED}: </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}: </span>
- </td>
- <td valign="top">
- <b><span class="gen">${profile.poster.postCount}</span></b>
- <!-- TODO: MISSING STATS - NEW FEATURE FOR FORUMS
- <br/><span
- class="genmed">[${"POST_PERCENT_STATS"} / ${"POST_DAY_STATS"}]</span> <br/><span
- class="genmed"><a href="${"U_SEARCH_USER"}" class="genmed">${resource.L_SEARCH_USER_POSTS}</a></span>-->
- </td>
- </tr>
- <tr>
- <td valign="middle" align="right" nowrap="nowrap">
- <span class="gen">${resource.L_LOCATION}: </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}: </span>
- </td>
- <td>
- <span class="gen">
- <c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_HOMEPAGE')!=null}" >
- <b>
- <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>
- </td>
- </tr>
- <tr>
- <td valign="middle" align="right" nowrap="nowrap">
- <span class="gen">${resource.L_OCCUPATION}: </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}:
+ <div class="forumbread">
+ <ul>
+ <li class="first">
+
+ <h:outputLink value="#{forums:outputLink(shared.links['category'],true)}">
+ <h:outputText value="#{shared.mainPageName}"/>
+ </h:outputLink>
+
+ <ul>
+ <li>
+ > 
+ <h:outputLink value="#{forums:outputLink(shared.links['profile'],true)}">
+ <f:param name="uid" value="${profile.poster.user.id}"/>
+ <h:outputText value="${resource.L_VIEWING_PROFILE}"/>
+ </h:outputLink>
+ </li>
+ </ul>
+
+ </li>
+ </ul>
+ </div>
+
+ <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+ <tr class="header">
+ <td class="forumheaderfirst" colspan="4">
${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">
- <c:if test="#{forums:nullIfEmptyString(profile.poster.user.fakeEmail)!=null}" >
- <a href="mailto:${profile.poster.user.fakeEmail}" style="text-decoration: none;">
- <img border="0"
- src="#{forums:themeURL('resourceIconEmailURL')}"
- alt="${resource.Send_email}"/>
- </a>
- </c:if>
- </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">
- <c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_SKYPE')!=null}" >
- <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}"/>
- </a>
- </c:if>
- </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">
- <c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_YIM')!=null}" >
- <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}"/>
- </a>
- </c:if>
- </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">
- <c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_AIM')!=null}" >
- <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}"/>
- </a>
- </c:if>
- </span>
- </td>
- </tr>
- <tr>
- <td valign="middle" nowrap="nowrap" align="right">
- <span class="gen">${resource.L_ICQ_NUMBER}:</span>
- </td>
- <td class="row1">
- <c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_ICQ')!=null}" >
- <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(' ${resource.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">${resource.ICQ_IMG}</div><div style="position:absolute;left:3px;top:-1px">${resource.ICQ_STATUS_IMG}</div></div></td></tr></table>');
-
- //--></script>
- <a href="http://www.icq.com/scripts/search.dll?to=#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_ICQ')}" style="text-decoration: none;">
+ </td>
+ </tr>
+ <tr>
+ <td class="labelCell" width="10%">
+ ${resource.L_JOINED}: 
+ </td>
+ <td class="valueCell" width="40%">
+ ${profile.poster.user.registrationDate}
+ </td>
+ <td class="labelCell" width="10%">
+ ${resource.L_EMAIL_ADDRESS}:
+ </td>
+ <td class="valueCell" width="40%">
+ <c:if test="#{forums:nullIfEmptyString(profile.poster.user.fakeEmail)!=null}" >
+ <a href="mailto:${profile.poster.user.fakeEmail}"
+ style="text-decoration: none;">
+ <img border="0"
+ src="#{forums:themeURL('resourceIconEmailURL')}"
+ alt="${resource.Send_email}"/>
+ </a>
+ </c:if>
+ </td>
+ </tr>
+ <tr>
+ <td class="labelCell">${resource.L_TOTAL_POSTS}: </td>
+ <td class="valueCell">${profile.poster.postCount}</td>
+ <td class="labelCell">${resource.L_SKYPE}:</td>
+ <td class="valueCell">
+ <c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_SKYPE')!=null}" >
+ <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}"/>
+ </a>
+ </c:if>
+ </td>
+ </tr>
+ <tr>
+ <td class="labelCell">${resource.L_LOCATION}: </td>
+ <td class="valueCell">#{forums:userProperty(profile.poster.user.properties,"INFO_USER_LOCATION")}</td>
+ <td class="labelCell">${resource.L_MESSENGER}:</td>
+ <td class="valueCell">#{forums:userProperty(profile.poster.user.properties,"INFO_USER_IM_MSNM")}</td>
+ </tr>
+ <tr>
+ <td class="labelCell">${resource.L_WEBSITE}: </td>
+ <td class="valueCell">
+ <c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_HOMEPAGE')!=null}" >
+ <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>
+ </c:if>
+ </td>
+ <td class="labelCell">${resource.L_YAHOO}:</td>
+ <td class="valueCell">
+ <c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_YIM')!=null}" >
+ <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}"/>
+ </a>
+ </c:if>
+ </td>
+ </tr>
+ <tr>
+ <td class="labelCell">${resource.L_OCCUPATION}: </td>
+ <td class="valueCell">#{forums:userProperty(profile.poster.user.properties,"INFO_USER_OCCUPATION")}</td>
+ <td class="labelCell">${resource.L_AIM}:</td>
+ <td class="valueCell">
+ <c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_AIM')!=null}" >
+ <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('resourceIconICQURL')}"
- alt="${resource.ICQ}"/>
+ src="#{forums:themeURL('resourceIconAIMURL')}"
+ alt="${resource.AIM}"/>
</a>
- </c:if>
- </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/>
- <ui:include src="/views/jumpbox.xhtml"/>
- </span>
- </td>
- </tr>
- </table>
- </c:when>
+ </c:if>
+ </td>
+ </tr>
+ <tr>
+ <td class="labelCell bottomline">${resource.L_INTERESTS}:</td>
+ <td class="valueCell bottomline">#{forums:userProperty(profile.poster.user.properties,"INFO_USER_INTERESTS")}</td>
+ <td class="labelCell bottomline">${resource.L_ICQ_NUMBER}:</td>
+ <td class="valueCell bottomline">
+ <c:if test="#{forums:userProperty(profile.poster.user.properties,'INFO_USER_IM_ICQ')!=null}" >
+ <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>
+ </table>
+
+ <br />
+
+ <div class="forumlegendjumpboxfloat">
+ <ui:include src="/views/jumpbox.xhtml"/>
+ </div>
+
+ </c:when>
+
<c:otherwise>
- <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
- <tr>
- <td>
- <table width="100%" cellspacing="0" cellpadding="1" border="0">
- <tr>
- <td> </td>
- </tr>
- <tr>
- <td align="center">
- <span class="gen">${resource.No_such_user}</span>
- </td>
- </tr>
- <tr>
- <td> </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
+ <table width="100%" border="0" cellpadding="0" cellspacing="0" class="forumtablestyle">
+ <tr>
+ <td>
+ <table width="100%" cellspacing="0" cellpadding="1" border="0">
+ <tr>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center">
+ ${resource.No_such_user}
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
</c:otherwise>
- </c:choose>
- </ui:define>
- </ui:composition>
-
-</div>
\ No newline at end of file
+</c:choose>
+</ui:define>
+</ui:composition>
+</div>
More information about the jboss-svn-commits
mailing list