[jboss-svn-commits] JBL Code SVN: r19275 - in labs/jbossforums/branches/forums101P24/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 Mar 27 20:37:33 EDT 2008
Author: unibrew
Date: 2008-03-27 20:37:33 -0400 (Thu, 27 Mar 2008)
New Revision: 19275
Modified:
labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/delete_topics.xhtml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
Log:
[JBFORUMS-214] [JBFORUMS-215] [JBFORUMS-216] HTML/CSS corrections to moderator views in order to make them look better.
Modified: labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2008-03-28 00:36:24 UTC (rev 19274)
+++ labs/jbossforums/branches/forums101P24/forums/src/bin/portal-forums-war/default_graphics/forums_styles.css 2008-03-28 00:37:33 UTC (rev 19275)
@@ -264,6 +264,11 @@
border-bottom:1px solid #233345;
width:250px;
}
+.forumtablestyle .forumheadernarrow {
+ border-left:1px solid #94aebd;
+ border-bottom:1px solid #233345;
+ width:30px;
+}
.forumtablestyle .forumlisticon {
width:10px;
@@ -674,6 +679,7 @@
float:right;
font-size: 11px;
padding-top: 8px;
+ padding-bottom: 8px;
}
.forumpagination ul {
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2008-03-28 00:36:24 UTC (rev 19274)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2008-03-28 00:37:33 UTC (rev 19275)
@@ -216,7 +216,7 @@
Post_Normal=Normal
Confirm_delete=Are you sure you want to delete this post?
Post_deletion_info=This will delete the {0} post.
-Topic_deletion_info=This will delete the {0} topic and the {1} messages beneath it.
+Topic_deletion_info=This will delete the {0} topic and the {1} messages beneath it. Are you sure you want to delete the topic?
Confirm_delete_poll=Are you sure you want to delete this poll?
Empty_subject=You must specify a subject when posting a new topic.
Empty_message=You must enter a message when posting.
@@ -301,8 +301,8 @@
Send_email=Send e-mail
Add_Subscribtion=Add Subscribtion
-Topic_delete_confirm=Delete Topics
+
Not_Moderator=You are not a moderator of this forum.
@@ -314,18 +314,21 @@
#
# Moderator Control Panel
#
-Mod_CP=Moderator Control Panel
-Mod_CP_explain=Using the form below you can perform mass moderation operations on this forum. You can lock, unlock, move or delete any number of topics.
+Mod_CP=Forum Moderation
+Mod_CP_explain=From this panel you can lock, unlock, move or delete a single topic or multiple topics by checking the appropriate select boxes on topics.
L_SELECT=Select
Select=Select
Delete=Delete
Move=Move
Lock=Lock
Unlock=Unlock
-Confirm_move_topic=Are you sure you want to move the selected topic/s?
-Confirm_delete_topic=Are you sure you want to remove the selected topic/s?
-Move_to_forum=Move to forum
+Topic_delete_confirm=Delete Topic(s)
+Topic_move_confirm=Move Topic(s)
+Confirm_move_topic=Selected topic(s) to be moved:
+Confirm_delete_topic=This permanently removes the topic(s) and cannot be undone. Are you sure you want to delete the selected topic(s)?
+Move_to_forum=Select a destination
Leave_shadow_topic=Leave shadow topic in old forum.
+Topics_to_deletion=Selected topic(s) to be deleted:
L_SPLIT_DESTINATION=Destination
L_SPLIT_TOPIC=Split Topic Control Panel
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml 2008-03-28 00:36:24 UTC (rev 19274)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml 2008-03-28 00:37:33 UTC (rev 19275)
@@ -56,8 +56,6 @@
<f:param value="#{topic.topic.subject}"/>
<f:param value="#{topic.topic.replies+1}"/>
</h:outputFormat>
- <br/>
- ${resource.Topic_delete_confirm}
</td>
</tr>
<tr>
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/delete_topics.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/delete_topics.xhtml 2008-03-28 00:36:24 UTC (rev 19274)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/delete_topics.xhtml 2008-03-28 00:37:33 UTC (rev 19275)
@@ -54,6 +54,8 @@
<td>
${resource.Confirm_delete_topic}
<br /><br />
+ ${resource.Topics_to_deletion}
+ <br />
<c:forEach items="#{moderator.allSelectedTopics}" var="topicrow">
#{topicrow.subject}<br />
</c:forEach>
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2008-03-28 00:36:24 UTC (rev 19274)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2008-03-28 00:37:33 UTC (rev 19275)
@@ -220,7 +220,7 @@
</c:forEach>
<tr align="right">
- <td class="buttonrow" colspan="5" height="29">
+ <td class="buttonrow" colspan="5" height="29" style="border-bottom: 0px none;">
<forums:isAllowed fragment="acl://deleteTopics" contextData="#{moderator.forum}">
<h:commandButton action="#{moderator.deleteConfirm}"
class="buttonMed"
@@ -251,7 +251,6 @@
</td>
</tr>
</table>
- <br/>
<!-- PAGINATION -->
<c:if test="#{moderator.pageNavigator.totalPages gt 1}">
@@ -345,7 +344,7 @@
</div>
</c:if>
- <hr />
+ <hr class="forumdashedHR" />
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
Modified: labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml 2008-03-28 00:36:24 UTC (rev 19274)
+++ labs/jbossforums/branches/forums101P24/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml 2008-03-28 00:37:33 UTC (rev 19275)
@@ -42,7 +42,7 @@
<img src="#{forums:themeURL('resourceIconDialogWarningURL')}" border="0" />
</td>
<td class="title" width="100%">
- ${resource.Confirm}<br /><br />
+ ${resource.Topic_move_confirm}<br /><br />
</td>
</tr>
<tr>
@@ -93,13 +93,13 @@
</tr>
<tr>
<td class="buttons" colspan="2">
- <h:commandButton type="submit" value="${resource.Yes}"
+ <h:commandButton type="submit" value="${resource.Move}"
styleClass="buttonMed"
action="#{moderator.moveTopic}">
<f:param name="f"
value="#{moderator.forum.id}"/>
</h:commandButton>
- <h:commandButton type="button" value="${resource.No}"
+ <h:commandButton type="button" value="${resource.Cancel}"
styleClass="buttonMed"
onclick="javascript:history.back();">
<f:param name="f"
More information about the jboss-svn-commits
mailing list