[jboss-svn-commits] JBL Code SVN: r12243 - in labs/jbossforums/branches/forums101P26/forums/src: bin/portal-forums-war/default_graphics/images and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 30 17:16:20 EDT 2007
Author: unibrew
Date: 2007-05-30 17:16:20 -0400 (Wed, 30 May 2007)
New Revision: 12243
Added:
labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_poll_bar.gif
labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_poll_lcap.gif
labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_poll_rcap.gif
Modified:
labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml
Log:
[JBFORUMS-192] Polls rethemed.
Modified: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2007-05-30 17:18:54 UTC (rev 12242)
+++ labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2007-05-30 21:16:20 UTC (rev 12243)
@@ -505,20 +505,19 @@
.forumPollTable .buttonCell {
padding-top: 6px;
text-align: right;
- border: 0px
+ border: 0px;
}
.forumPollTable .linkCell {
padding: 1px;
padding-right: 6px;
text-align: right;
- border: 0px
+ border: 0px;
}
.forumPollTable td {
white-space: nowrap;
}
-
.forumPollTable .totalCell {
background-color: #f4f3f3;
padding: 1px;
@@ -526,6 +525,16 @@
text-align: right;
}
+.forumPollTableGraph {
+ padding: 0px;
+ width: 0%;
+}
+
+.forumPollTableGraph td {
+ padding: 0px;
+ width: 0%;
+}
+
/* ------------------- Forms ------------------------------- */
.forumtablestyle .categorylabel {
Added: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_poll_bar.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_poll_bar.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_poll_lcap.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_poll_lcap.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_poll_rcap.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_poll_rcap.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties 2007-05-30 17:18:54 UTC (rev 12242)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties 2007-05-30 21:16:20 UTC (rev 12243)
@@ -46,6 +46,9 @@
admin_arrowdown_disa=images/forum_ico_adminarrowdown_disa.gif
admin_newcategory=images/forum_but_addnewcategory.gif
admin_newforum=images/forum_but_addnewforum.gif
+voting_graphic_0=images/forum_poll_bar.gif
+vote_lcap=images/forum_poll_lcap.gif
+vote_rcap=images/forum_poll_rcap.gif
@@ -114,14 +117,14 @@
#topic_mod_move=images/topic_move.gif
#topic_mod_delete=images/topic_delete.gif
-voting_graphic_0=images/voting_bar.gif
-voting_graphic_1=images/voting_bar.gif
-voting_graphic_2=images/voting_bar.gif
-voting_graphic_3=images/voting_bar.gif
-voting_graphic_4=images/voting_bar.gif
+#voting_graphic_0=images/voting_bar.gif
+#voting_graphic_1=images/voting_bar.gif
+#voting_graphic_2=images/voting_bar.gif
+#voting_graphic_3=images/voting_bar.gif
+#voting_graphic_4=images/voting_bar.gif
-vote_lcap=images/vote_lcap.gif
-vote_rcap=images/vote_rcap.gif
+#vote_lcap=images/vote_lcap.gif
+#vote_rcap=images/vote_rcap.gif
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml 2007-05-30 17:18:54 UTC (rev 12242)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml 2007-05-30 21:16:20 UTC (rev 12243)
@@ -22,63 +22,55 @@
*/
-->
-<div xmlns="http://www.w3.org/1999/xhtml"
+<td xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
- xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:t="http://myfaces.apache.org/tomahawk"
xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
- class="bb"
->
-<tr>
- <td class="row2" colspan="2"><br clear="all"/>
- <h:form>
- <input type="hidden" name="t" value="#{t}"/>
- <table cellspacing="0" cellpadding="4" border="0" align="center">
- <tr>
- <td align="center"><span class="gen"><b>#{poll.title}</b></span></td>
- </tr>
- <tr>
- <td align="center">
- <table cellspacing="0" cellpadding="2" border="0">
- <c:forEach items="#{poll.options}" var="optionrow" varStatus="status">
- <tr>
- <forums:isAllowed fragment="acl://votePoll" contextData="#{poll}">
- <td>
- <input type="radio" name="vote" value="#{(status.index)}"/>
-  
- </td>
- </forums:isAllowed>
- <td>
- <span class="gen">#{optionrow.question}</span>
- </td>
- </tr>
- </c:forEach>
- </table>
- </td>
- </tr>
- <forums:isAllowed fragment="acl://votePoll" contextData="#{poll}">
- <tr>
- <td align="center">
- <h:commandButton action="#{pollController.vote}" value="${resource.Submit_vote}" styleClass="liteoption"/>
- </td>
- </tr>
+ colspan="2">
+
+<h:form>
+ <input type="hidden" name="t" value="5" />
+ <table cellspacing="0" cellpadding="0" border="0" class="forumPollTable">
+ <tr>
+ <td colspan="2" class="questionCell">#{poll.title}</td>
+ </tr>
+
+ <c:forEach items="#{poll.options}" var="optionrow" varStatus="status">
+ <tr>
+ <forums:isAllowed fragment="acl://votePoll" contextData="#{poll}">
+ <td class="radioCell">
+ <input type="radio" name="vote" value="#{(status.index)}"/>
+ </td>
</forums:isAllowed>
- <tr>
- <td align="center"><span class="gensmall">
- <b>
- <!-- view results link -->
- <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}" styleClass="gensmall">
- <f:param name="t" value="${t}"/>
- <f:param name="results" value="1"/>
- <h:outputText value="${resource.View_results}"/>
- </h:outputLink>
- </b></span>
- </td>
- </tr>
- </table>
- </h:form>
- </td>
-</tr>
-</div>
\ No newline at end of file
+ <td class="answerCell">
+ #{optionrow.question}
+ </td>
+ </tr>
+ </c:forEach>
+
+ <forums:isAllowed fragment="acl://votePoll" contextData="#{poll}">
+ <tr>
+ <td class="buttonCell" colspan="2">
+ <h:commandButton action="#{pollController.vote}"
+ value="${resource.Submit_vote}"
+ styleClass="buttonMed"/>
+ </td>
+ </tr>
+ </forums:isAllowed>
+
+ <tr>
+ <td class="linkCell" colspan="2">
+ <!-- view results link -->
+ <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
+ <f:param name="t" value="${t}"/>
+ <f:param name="results" value="1"/>
+ <h:outputText value="${resource.View_results}"/>
+ </h:outputLink>
+ </td>
+ </tr>
+ </table>
+</h:form>
+</td>
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml 2007-05-30 17:18:54 UTC (rev 12242)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_result.xhtml 2007-05-30 21:16:20 UTC (rev 12243)
@@ -22,84 +22,67 @@
*/
-->
-<div xmlns="http://www.w3.org/1999/xhtml"
+<td xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
- xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:t="http://myfaces.apache.org/tomahawk"
xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
- class="bb"
->
-<tr>
- <td class="row2" colspan="2"><br clear="all"/>
- <table cellspacing="0" cellpadding="4" border="0" align="center">
- <!-- title -->
- <tr>
- <td align="center"><span class="gen"><b>#{poll.title}</b></span></td>
- </tr>
- <!-- option results -->
- <tr>
- <td align="center">
- <table cellspacing="0" cellpadding="2" border="0">
- <c:forEach items="#{poll.options}" var="optionrow" varStatus="status">
- <tr>
- <td><span class="gen">#{optionrow.question}</span></td>
- <td>
- <table cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td>
- <img src="#{forums:themeURL('resourcePollVotingLBar')}" width="4" height="12" alt=""/>
- </td>
- <td>
- <img src="#{forums:themeURL('resourcePollVotingBar')}"
- width="#{(forums:votePercent(poll,optionrow))*205}"
- height="12"
- alt=""/>
- </td>
- <td>
- <img src="#{forums:themeURL('resourcePollVotingRBar')}" width="4" height="12" alt=""/>
- </td>
- </tr>
- </table>
- </td>
- <td align="center">
- <b>
- <span class="gen">
-  ${forums:percentStr(forums:votePercent(poll,optionrow))} 
- </span>
- </b>
- </td>
- <td align="center">
- <span class="gen">[ #{optionrow.votes} ]</span>
- </td>
- </tr>
- </c:forEach>
- </table>
- </td>
- </tr>
- <!-- total result -->
- <tr>
- <td colspan="4" align="center">
- <span class="gen"><b>${resource.Total_votes} : #{poll.votesSum}</b></span>
- </td>
- </tr>
- <forums:isAllowed fragment="acl://votePoll" contextData="#{poll}">
- <!-- switch back to the voting screen -->
- <tr>
- <td align="center"><span class="gensmall">
- <b>
- <!-- view results link -->
- <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}" styleClass="gensmall">
- <f:param name="t" value="${t}"/>
- <h:outputText value="${resource.View_ballot}"/>
- </h:outputLink>
- </b>
- </span>
- </td>
- </tr>
- </forums:isAllowed>
- </table>
- </td>
-</tr>
-</div>
\ No newline at end of file
+ colspan="2">
+
+<table cellspacing="0" cellpadding="0" border="0" class="forumPollTable">
+
+ <!-- title -->
+ <tr>
+ <td class="questionCell" colspan="6">#{poll.title}</td>
+ </tr>
+
+ <!-- option results -->
+ <c:forEach items="#{poll.options}" var="optionrow" varStatus="status">
+ <tr>
+ <td>#{optionrow.question}</td>
+ <td>
+ <table cellspacing="0" cellpadding="0" border="0" class="forumPollTableGraph">
+ <tr>
+ <td>
+ <img src="#{forums:themeURL('resourcePollVotingLBar')}"
+ width="4"
+ height="12" />
+ </td>
+ <td>
+ <img src="#{forums:themeURL('resourcePollVotingBar')}"
+ width="#{(forums:votePercent(poll,optionrow))*205}"
+ height="12" />
+ </td>
+ <td>
+ <img src="#{forums:themeURL('resourcePollVotingRBar')}" width="4" height="12" />
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td>${forums:percentStr(forums:votePercent(poll,optionrow))}</td>
+ <td>[ #{optionrow.votes} ]</td>
+ </tr>
+ </c:forEach>
+
+ <!-- total result -->
+ <tr>
+ <td class="totalCell" colspan="6">Total Votes : #{poll.votesSum}</td>
+ </tr>
+
+ <!-- switch back to the voting screen -->
+ <forums:isAllowed fragment="acl://votePoll" contextData="#{poll}">
+ <tr>
+ <td class="linkCell" colspan="6">
+ <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
+ <f:param name="t" value="${t}"/>
+ <h:outputText value="${resource.View_ballot}"/>
+ </h:outputLink>
+ </td>
+ </tr>
+ </forums:isAllowed>
+
+</table>
+
+</td>
More information about the jboss-svn-commits
mailing list