[jboss-svn-commits] JBL Code SVN: r13192 - in labs/jbossforums/branches/forums101P26/forums/src: main/org/jboss/portlet/forums/theme and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 6 18:44:05 EDT 2007
Author: unibrew
Date: 2007-07-06 18:44:05 -0400 (Fri, 06 Jul 2007)
New Revision: 13192
Added:
labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_ico_dialog_error.gif
labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_ico_dialog_question.gif
labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_ico_dialog_warning.gif
labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forums_ico_feed.gif
Modified:
labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java
labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/action/DeletePost.java
labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
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/moderator/delete_topic.xhtml
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml
labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml
Log:
[JBFORUMS-244] DeleteTopicView rethemed + small corrections to DeletePostView.
Added: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_ico_dialog_error.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_ico_dialog_error.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_ico_dialog_question.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_ico_dialog_question.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_ico_dialog_warning.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forum_ico_dialog_warning.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forums_ico_feed.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossforums/branches/forums101P26/forums/src/bin/portal-forums-war/default_graphics/images/forums_ico_feed.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java 2007-07-06 20:25:23 UTC (rev 13191)
+++ labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java 2007-07-06 22:44:05 UTC (rev 13192)
@@ -386,6 +386,21 @@
/**
* DOCUMENT_ME
*/
+ public String resourceIconDialogWarningURL;
+
+ /**
+ * DOCUMENT_ME
+ */
+ public String resourceIconDialogErrorURL;
+
+ /**
+ * DOCUMENT_ME
+ */
+ public String resourceIconDialogQuestionURL;
+
+ /**
+ * DOCUMENT_ME
+ */
public String resourceIconModerateURL;
/**
@@ -499,6 +514,9 @@
resourceIconUnlockURL = xprops.getResourceURL("unlock");
resourceIconLockURL = xprops.getResourceURL("lock");
resourceIconModerateURL = xprops.getResourceURL("moderate");
+ resourceIconDialogWarningURL = xprops.getResourceURL("icon_dialog_warning");
+ resourceIconDialogQuestionURL = xprops.getResourceURL("icon_dialog_question");
+ resourceIconDialogErrorURL = xprops.getResourceURL("icon_dialog_error");
resourceSpacerURL = xprops.getResourceURL("spacer");
resourceHeadStylesheetURL = xprops.getResourceURL("head_stylesheet");
resourceIconSpacerURL = xprops.getResourceURL("spacer");
Modified: labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/action/DeletePost.java
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/action/DeletePost.java 2007-07-06 20:25:23 UTC (rev 13191)
+++ labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/action/DeletePost.java 2007-07-06 22:44:05 UTC (rev 13192)
@@ -40,6 +40,7 @@
{
private int postId;
+ private Post post;
public int getPostId()
{
@@ -51,6 +52,16 @@
this.postId=postId;
}
+ public Post getPost()
+ {
+ return this.post;
+ }
+
+ public void setPost(Post post)
+ {
+ this.post=post;
+ }
+
//----------------------------------------------------------------------------------------------------------------------------------
/**
*
@@ -82,6 +93,10 @@
postId = Integer.parseInt(p);
}
this.postId = postId;
+ if (postId!=-1)
+ {
+ post = getForumsModule().findPostById(new Integer(postId));
+ }
}
//actions---------------------------------------------------------------------------------------------------------------------------------
Modified: labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java 2007-07-06 20:25:23 UTC (rev 13191)
+++ labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java 2007-07-06 22:44:05 UTC (rev 13192)
@@ -40,6 +40,8 @@
import org.jboss.portlet.forums.model.Forum;
import org.jboss.portlet.forums.model.Topic;
import org.jboss.portlet.forums.ui.Constants;
+import org.jboss.portlet.forums.feeds.FeedConstants;
+import org.jboss.portlet.forums.ui.PortalUtil;
import org.jboss.portlet.forums.ui.BaseController;
import org.jboss.portlet.forums.ui.JSFUtil;
import org.jboss.portlet.forums.ui.ForumUtil;
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-07-06 20:25:23 UTC (rev 13191)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-07-06 22:44:05 UTC (rev 13192)
@@ -480,6 +480,8 @@
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.
Confirm_delete_poll=Are you sure you want to delete this poll?
Flood_Error=You cannot make another post so soon after your last; please try again in a short while.
@@ -535,7 +537,7 @@
Attach_signature=Attach signature (signatures can be changed in profile)
Notify=Notify me when a reply is posted
-Delete_post=Delete this post
+Delete_post=Delete Post
Stored=Your message has been entered successfully.
Deleted=Your message has been deleted successfully.
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-07-06 20:25:23 UTC (rev 13191)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/WEB-INF/classes/default_graphics/theme.properties 2007-07-06 22:44:05 UTC (rev 13192)
@@ -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
+icon_dialog_error=images/forum_ico_dialog_error.gif
+icon_dialog_question=images/forum_ico_dialog_question.gif
+icon_dialog_warning=images/forum_ico_dialog_warning.gif
voting_graphic_0=images/forum_poll_bar.gif
vote_lcap=images/forum_poll_lcap.gif
vote_rcap=images/forum_poll_rcap.gif
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml 2007-07-06 20:25:23 UTC (rev 13191)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml 2007-07-06 22:44:05 UTC (rev 13192)
@@ -25,65 +25,110 @@
<div 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"
+ class="forumscontainer"
>
<ui:composition template="/views/common/common.xhtml">
<ui:define name="mainContent">
<forums:isAllowedChoose>
<forums:isAllowedWhen fragment="acl://moderateForum" contextData="#{moderator.forum}">
- <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0">
- <tr>
- <th class="thHead" height="25" valign="middle"><span class="tableTitle">${resource.Topic_delete_message}</span></th>
- </tr>
- <tr>
- <td class="row1" align="center">
- <h:form>
+<c:choose>
+
+ <c:when test="#{topic.initialized && topic.topic!=null && topic.topic.id!=-1}">
+ <div class="dialog">
+ <table cellpadding="0" cellspacing="0" border="0" width="100%">
+ <tr>
+ <td class="icon">
+ <img src="#{forums:themeURL('resourceIconDialogWarningURL')}" border="0" />
+ </td>
+ <td class="title" width="100%">
+ ${resource.Delete_topic}
+ </td>
+ </tr>
+ <tr>
+ <td class="icon"></td>
+ <td>
+ <h:outputFormat value="#{resource.Topic_deletion_info}">
+ <f:param value="#{topic.topic.subject}"/>
+ <f:param value="#{topic.topic.replies+1}"/>
+ </h:outputFormat>
+ <br/>
+ ${resource.Topic_delete_confirm}
+ </td>
+ </tr>
+ <tr>
+ <td class="buttons" colspan="2">
+ <h:form>
<input type="hidden" name="f" value="#{moderator.forum.id}"/>
- <span class="gen"><br/>
- ${resource.Topic_delete_confirm}
- <br/><br/>
- <h:commandButton type="submit" value="${resource.Yes}" styleClass="mainoption" action="#{moderator.deleteTopic}">
+ <h:commandButton type="submit"
+ value="${resource.Yes}"
+ styleClass="buttonMed"
+ action="#{moderator.deleteTopic}">
<f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
-   
- <h:commandButton type="button" value="${resource.No}" styleClass="liteoption" onclick="javascript:history.back();">
+ <h:commandButton type="button"
+ value="${resource.No}"
+ styleClass="buttonMed"
+ onclick="javascript:history.back();">
<f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
- </span>
- </h:form>
- </td>
- </tr>
- </table>
-
+ </h:form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </c:when>
+
+ <c:otherwise>
+ <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.Not_Moderator}
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </c:otherwise>
+
+</c:choose>
</forums:isAllowedWhen>
<forums:isAllowedOtherwise>
- <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.Not_Moderator}</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.Not_Moderator}
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
</forums:isAllowedOtherwise>
</forums:isAllowedChoose>
</ui:define>
</ui:composition>
-
-</div>
\ No newline at end of file
+</div>
Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml 2007-07-06 20:25:23 UTC (rev 13191)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/delete_post.xhtml 2007-07-06 22:44:05 UTC (rev 13192)
@@ -25,40 +25,54 @@
<div 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"
+ class="forumscontainer"
>
<ui:composition template="/views/common/common.xhtml">
<ui:define name="mainContent">
-
- <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0">
- <tr>
- <th class="thHead" height="25" valign="middle"><span class="tableTitle">${resource.Information}</span></th>
- </tr>
- <tr>
- <td class="row1" align="center">
- <h:form>
- <span class="gen"><br/>
- ${resource.Confirm_delete}
- <br/><br/>
+<div class="dialog">
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+ <tr>
+ <td class="icon">
+ <img src="#{forums:themeURL('resourceIconDialogWarningURL')}" border="0" />
+ </td>
+ <td class="title" width="100%">
+ ${resource.Delete_post}
+ </td>
+ </tr>
+ <tr>
+ <td class="icon"></td>
+ <td>
+ <h:outputFormat value="#{resource.Post_deletion_info}">
+ <f:param value="${deletePost.post.message.subject}"/>
+ </h:outputFormat>
+ <br/>
+ ${resource.Confirm_delete}
+ </td>
+ </tr>
+ <tr>
+ <td class="buttons" colspan="2">
+ <h:form>
<input type="hidden" name="t" value="#{param['t']}"/>
- <input type="hidden" name="f" value="#{param['f']}"/>
+ <input type="hidden" name="f" value="#{param['f']}"/>
<h:inputHidden value="#{deletePost.postId}" />
- <h:commandButton type="submit" value="${resource.Yes}" styleClass="mainoption" action="#{deletePost.confirmDelete}"/>
-   
- <h:commandButton type="button" value="${resource.No}" styleClass="liteoption" onclick="javascript:history.back();"/>
- </span>
- </h:form>
- </td>
- </tr>
- </table>
-
-
+ <h:commandButton type="submit"
+ value="${resource.Yes}"
+ styleClass="buttonMed"
+ action="#{deletePost.confirmDelete}"/>
+ <h:commandButton type="button"
+ value="${resource.No}"
+ styleClass="buttonMed"
+ onclick="javascript:history.back();"/>
+ </h:form>
+ </td>
+ </tr>
+</table>
+</div>
</ui:define>
</ui:composition>
-
-</div>
\ No newline at end of file
+</div>
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-07-06 20:25:23 UTC (rev 13191)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/topics/viewtopic_poll_ballot.xhtml 2007-07-06 22:44:05 UTC (rev 13192)
@@ -32,7 +32,7 @@
colspan="2">
<h:form>
- <input type="hidden" name="t" value="5" />
+ <input type="hidden" name="t" value="#{t}" />
<table cellspacing="0" cellpadding="0" border="0" class="forumPollTable">
<tr>
<td colspan="2" class="questionCell">#{poll.title}</td>
More information about the jboss-svn-commits
mailing list