diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml index cb0321da5c..6e23c9a6bf 100644 --- a/config/alfresco/web-client-config.xml +++ b/config/alfresco/web-client-config.xml @@ -143,7 +143,7 @@ - + @@ -200,21 +200,21 @@ - + - + - - - + + + diff --git a/source/java/org/alfresco/web/bean/ForumsBean.java b/source/java/org/alfresco/web/bean/ForumsBean.java index 99f9afcb6f..f650fa8ee2 100644 --- a/source/java/org/alfresco/web/bean/ForumsBean.java +++ b/source/java/org/alfresco/web/bean/ForumsBean.java @@ -58,7 +58,6 @@ import org.alfresco.web.app.context.UIContextService; import org.alfresco.web.bean.repository.MapNode; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.NodePropertyResolver; -import org.alfresco.web.bean.repository.QNameNodeMap; import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.config.ViewsConfigElement; import org.alfresco.web.ui.common.Utils; @@ -69,7 +68,6 @@ import org.alfresco.web.ui.common.component.data.UIRichList; import org.alfresco.web.ui.common.renderer.data.IRichListRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.util.StringUtils; /** * Bean providing properties and behaviour for the forums screens. @@ -472,7 +470,7 @@ public class ForumsBean implements IContextListener, NodeEventListener // create our Node representation MapNode node = new MapNode(nodeRef, this.nodeService, true); node.addPropertyResolver("icon", this.browseBean.resolverSpaceIcon); - node.addPropertyResolver("smallIcon", this.resolverSmallIcon); + node.addPropertyResolver("smallIcon", this.browseBean.resolverSmallIcon); this.forums.add(node); } @@ -481,7 +479,7 @@ public class ForumsBean implements IContextListener, NodeEventListener // create our Node representation MapNode node = new MapNode(nodeRef, this.nodeService, true); node.addPropertyResolver("icon", this.browseBean.resolverSpaceIcon); - node.addPropertyResolver("smallIcon", this.resolverSmallIcon); + node.addPropertyResolver("smallIcon", this.browseBean.resolverSmallIcon); node.addPropertyResolver("replies", this.resolverReplies); this.topics.add(node); @@ -492,7 +490,7 @@ public class ForumsBean implements IContextListener, NodeEventListener MapNode node = new MapNode(nodeRef, this.nodeService, true); this.browseBean.setupCommonBindingProperties(node); - node.addPropertyResolver("smallIcon", this.resolverSmallIcon); + node.addPropertyResolver("smallIcon", this.browseBean.resolverSmallIcon); node.addPropertyResolver("message", this.resolverContent); node.addPropertyResolver("replyTo", this.resolverReplyTo); @@ -612,15 +610,6 @@ public class ForumsBean implements IContextListener, NodeEventListener // add the forums specific action resolver node.addPropertyResolver("beingDiscussed", this.resolverBeingDiscussed); - - // override the small icon resolver if it's a forum model type - if (type.equals(ForumModel.TYPE_FORUMS) || - type.equals(ForumModel.TYPE_FORUM) || - type.equals(ForumModel.TYPE_TOPIC)) - { - // override icon handling for forum objects - as we have a specific small icon set - node.addPropertyResolver("smallIcon", resolverSmallIcon); - } } @@ -915,24 +904,6 @@ public class ForumsBean implements IContextListener, NodeEventListener } }; - public NodePropertyResolver resolverSmallIcon = new NodePropertyResolver() { - public Object get(Node node) { - QNameNodeMap props = (QNameNodeMap)node.getProperties(); - String icon = (String)props.getRaw("app:icon"); - - if (icon != null) - { - icon = StringUtils.replace(icon, "_large", ""); - } - else - { - icon = BrowseBean.SPACE_SMALL_DEFAULT; - } - - return icon; - } - }; - public NodePropertyResolver resolverBeingDiscussed = new NodePropertyResolver() { public Object get(Node node) { return node.hasAspect(ForumModel.ASPECT_DISCUSSABLE); diff --git a/source/web/images/icons/forum-16.gif b/source/web/images/icons/forum-16.gif new file mode 100644 index 0000000000..7ed3b5d933 Binary files /dev/null and b/source/web/images/icons/forum-16.gif differ diff --git a/source/web/images/icons/forum.gif b/source/web/images/icons/forum.gif index 7ed3b5d933..96e3b3b5b5 100644 Binary files a/source/web/images/icons/forum.gif and b/source/web/images/icons/forum.gif differ diff --git a/source/web/images/icons/forum_large.gif b/source/web/images/icons/forum_large.gif deleted file mode 100644 index 96e3b3b5b5..0000000000 Binary files a/source/web/images/icons/forum_large.gif and /dev/null differ diff --git a/source/web/images/icons/forums-16.gif b/source/web/images/icons/forums-16.gif new file mode 100644 index 0000000000..c5864c242b Binary files /dev/null and b/source/web/images/icons/forums-16.gif differ diff --git a/source/web/images/icons/forums.gif b/source/web/images/icons/forums.gif index c5864c242b..e562606d5e 100644 Binary files a/source/web/images/icons/forums.gif and b/source/web/images/icons/forums.gif differ diff --git a/source/web/images/icons/forums_large.gif b/source/web/images/icons/forums_large.gif deleted file mode 100644 index e562606d5e..0000000000 Binary files a/source/web/images/icons/forums_large.gif and /dev/null differ diff --git a/source/web/images/icons/topic-16.gif b/source/web/images/icons/topic-16.gif new file mode 100644 index 0000000000..e36e8c7ac7 Binary files /dev/null and b/source/web/images/icons/topic-16.gif differ diff --git a/source/web/images/icons/topic_exclamation-16.gif b/source/web/images/icons/topic_exclamation-16.gif new file mode 100644 index 0000000000..005b4752d7 Binary files /dev/null and b/source/web/images/icons/topic_exclamation-16.gif differ diff --git a/source/web/images/icons/topic_exclamation.gif b/source/web/images/icons/topic_exclamation.gif index 005b4752d7..87410f5735 100644 Binary files a/source/web/images/icons/topic_exclamation.gif and b/source/web/images/icons/topic_exclamation.gif differ diff --git a/source/web/images/icons/topic_exclamation_large.gif b/source/web/images/icons/topic_exclamation_large.gif deleted file mode 100644 index 87410f5735..0000000000 Binary files a/source/web/images/icons/topic_exclamation_large.gif and /dev/null differ diff --git a/source/web/images/icons/topic_large.gif b/source/web/images/icons/topic_large.gif deleted file mode 100644 index db9aeb309c..0000000000 Binary files a/source/web/images/icons/topic_large.gif and /dev/null differ diff --git a/source/web/images/icons/topic_question-16.gif b/source/web/images/icons/topic_question-16.gif new file mode 100644 index 0000000000..96da7d9b64 Binary files /dev/null and b/source/web/images/icons/topic_question-16.gif differ diff --git a/source/web/images/icons/topic_question.gif b/source/web/images/icons/topic_question.gif index 96da7d9b64..f0d7003fcf 100644 Binary files a/source/web/images/icons/topic_question.gif and b/source/web/images/icons/topic_question.gif differ diff --git a/source/web/images/icons/topic_question_large.gif b/source/web/images/icons/topic_question_large.gif deleted file mode 100644 index f0d7003fcf..0000000000 Binary files a/source/web/images/icons/topic_question_large.gif and /dev/null differ diff --git a/source/web/jsp/forums/forum.jsp b/source/web/jsp/forums/forum.jsp index 14bdb9ef49..2804320886 100644 --- a/source/web/jsp/forums/forum.jsp +++ b/source/web/jsp/forums/forum.jsp @@ -68,7 +68,7 @@ <%-- actions for topics --%> -