From 3eac7bb289492cdff7fc74519ff6a3fdb1336d09 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Mon, 20 Mar 2006 16:22:15 +0000
Subject: [PATCH] . Forums details pages (forums-details, forum-details and
 topic-details) now use externalised action definitions . Forums details pages
 changed to display actions in right aligned actions panel (like doc+space
 details pages)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2557 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../web-client-config-forum-actions.xml       | 23 ++++++++++++-
 source/web/jsp/forums/forum-details.jsp       | 32 ++++++------------
 source/web/jsp/forums/forums-details.jsp      | 33 +++++++------------
 source/web/jsp/forums/topic-details.jsp       | 33 +++++++------------
 4 files changed, 54 insertions(+), 67 deletions(-)

diff --git a/config/alfresco/web-client-config-forum-actions.xml b/config/alfresco/web-client-config-forum-actions.xml
index 0104d18534..a2dd3781e7 100644
--- a/config/alfresco/web-client-config-forum-actions.xml
+++ b/config/alfresco/web-client-config-forum-actions.xml
@@ -4,7 +4,7 @@
       <actions>
          
          <!-- Forums overrides the checkin document action - as it has more complex evaluation
-              logic which takes into account any child forums attached to a node. -->
+              logic which takes into account any child forums attached to the node. -->
          <!-- Checkin document -->
          <action id="checkin_doc">
             <evaluator>org.alfresco.web.action.evaluator.ForumsCheckinDocEvaluator</evaluator>
@@ -136,6 +136,27 @@
             <action idref="preview_space" />
          </action-group>
          
+         <!-- Actions Menu for Forums Details page -->
+         <action-group id="forums_details_actions">
+            <action idref="cut_node" />
+            <action idref="copy_node" />
+            <action idref="delete_space" />
+         </action-group>
+         
+         <!-- Actions Menu for Forum Details page -->
+         <action-group id="forum_details_actions">
+            <action idref="cut_node" />
+            <action idref="copy_node" />
+            <action idref="delete_space" />
+         </action-group>
+         
+         <!-- Actions Menu for Topic Details page -->
+         <action-group id="topic_details_actions">
+            <action idref="cut_node" />
+            <action idref="copy_node" />
+            <action idref="delete_space" />
+         </action-group>
+         
       </actions>
    </config>
 
diff --git a/source/web/jsp/forums/forum-details.jsp b/source/web/jsp/forums/forum-details.jsp
index 813872a888..ea774fa2cd 100644
--- a/source/web/jsp/forums/forum-details.jsp
+++ b/source/web/jsp/forums/forum-details.jsp
@@ -74,28 +74,8 @@
                               <div class="mainSubText"><h:outputText value="#{msg.forum_details_description}" /></div>
                            </td>
                            
-                           <td align=right width=80>
-                              <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.actions}" image="/images/icons/menu.gif"
-                                    menuStyleClass="moreActionsMenu" style="white-space:nowrap">
-                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                    <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" actionListener="#{ClipboardBean.cutNode}">
-                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                    </a:actionLink>
-                                 </r:permissionEvaluator>
-                                 <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" actionListener="#{ClipboardBean.copyNode}">
-                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                 </a:actionLink>
-                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                    <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
-                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                    </a:actionLink>
-                                 </r:permissionEvaluator>
-                              </a:menu>
-                           </td>
-                           
                            <%-- Navigation --%>
-                           <td class="separator" width=1></td>
-                           <td style="padding-left:4px" width=80>
+                           <td align="right">
                               <a:actionLink value="#{msg.previous_item}" image="/images/icons/nav_prev.gif" showLink="false" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
@@ -164,10 +144,11 @@
                                     </tr>
                                  </table>
                               </a:panel>
+                           </td>
                            
                            <td valign="top">
                               <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
+                              <table cellpadding="1" cellspacing="1" border="0" width="100%">
                                  <tr>
                                     <td align="center">
                                        <h:commandButton value="#{msg.close}" action="#{SpaceDetailsBean.closeDialog}" styleClass="wizardButton" />
@@ -175,6 +156,13 @@
                                  </tr>
                               </table>
                               <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                              
+                              <div style="padding:4px"></div>
+                              
+                              <%-- Actions Panel --%>
+                              <a:panel label="#{msg.actions}" id="actions-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" style="text-align:center" progressive="true">
+                                 <r:actions id="actions_forum" value="forum_details_actions" context="#{SpaceDetailsBean.space}" verticalSpacing="3" style="white-space:nowrap" />
+                              </a:panel>
                            </td>
                         </tr>
                      </table>
diff --git a/source/web/jsp/forums/forums-details.jsp b/source/web/jsp/forums/forums-details.jsp
index 0469529cdc..dfe6a59141 100644
--- a/source/web/jsp/forums/forums-details.jsp
+++ b/source/web/jsp/forums/forums-details.jsp
@@ -74,28 +74,8 @@
                               <div class="mainSubText"><h:outputText value="#{msg.forums_details_description}" /></div>
                            </td>
                            
-                           <td align=right width=80>
-                              <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.actions}" image="/images/icons/menu.gif"
-                                    menuStyleClass="moreActionsMenu" style="white-space:nowrap">
-                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                    <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" actionListener="#{ClipboardBean.cutNode}">
-                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                    </a:actionLink>
-                                 </r:permissionEvaluator>
-                                 <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" actionListener="#{ClipboardBean.copyNode}">
-                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                 </a:actionLink>
-                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                    <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
-                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                    </a:actionLink>
-                                 </r:permissionEvaluator>
-                              </a:menu>
-                           </td>
-                           
                            <%-- Navigation --%>
-                           <td class="separator" width=1></td>
-                           <td style="padding-left:4px" width=80>
+                           <td align=right>
                               <a:actionLink value="#{msg.previous_item}" image="/images/icons/nav_prev.gif" showLink="false" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
@@ -164,10 +144,11 @@
                                     </tr>
                                  </table>
                               </a:panel>
+                           </td>
                            
                            <td valign="top">
                               <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
+                              <table cellpadding="1" cellspacing="1" border="0" width="100%">
                                  <tr>
                                     <td align="center">
                                        <h:commandButton value="#{msg.close}" action="#{SpaceDetailsBean.closeDialog}" styleClass="wizardButton" />
@@ -175,7 +156,15 @@
                                  </tr>
                               </table>
                               <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                              
+                              <div style="padding:4px"></div>
+                              
+                              <%-- Actions Panel --%>
+                              <a:panel label="#{msg.actions}" id="actions-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" style="text-align:center" progressive="true">
+                                 <r:actions id="actions_forums" value="forums_details_actions" context="#{SpaceDetailsBean.space}" verticalSpacing="3" style="white-space:nowrap" />
+                              </a:panel>
                            </td>
+
                         </tr>
                      </table>
                   </td>
diff --git a/source/web/jsp/forums/topic-details.jsp b/source/web/jsp/forums/topic-details.jsp
index 744726ff1e..2e5f592eb3 100644
--- a/source/web/jsp/forums/topic-details.jsp
+++ b/source/web/jsp/forums/topic-details.jsp
@@ -73,29 +73,10 @@
                               <div class="mainSubText"><h:outputText value="#{msg.location}" />: <r:nodePath value="#{SpaceDetailsBean.space.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.topic_details_description}" /></div>
                            </td>
-                           
-                           <td align=right width=80>
-                              <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.actions}" image="/images/icons/menu.gif"
-                                    menuStyleClass="moreActionsMenu" style="white-space:nowrap">
-                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                    <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" actionListener="#{ClipboardBean.cutNode}">
-                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                    </a:actionLink>
-                                 </r:permissionEvaluator>
-                                 <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" actionListener="#{ClipboardBean.copyNode}">
-                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                 </a:actionLink>
-                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                    <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" action="dialog:deleteTopic" actionListener="#{BrowseBean.setupSpaceAction}">
-                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                    </a:actionLink>
-                                 </r:permissionEvaluator>
-                              </a:menu>
-                           </td>
+
                            
                            <%-- Navigation --%>
-                           <td class="separator" width=1></td>
-                           <td style="padding-left:4px" width=80>
+                           <td align="right">
                               <a:actionLink value="#{msg.previous_item}" image="/images/icons/nav_prev.gif" showLink="false" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
                                  <f:param name="id" value="#{SpaceDetailsBean.id}" />
                               </a:actionLink>
@@ -164,10 +145,11 @@
                                     </tr>
                                  </table>
                               </a:panel>
+                           </td>
                            
                            <td valign="top">
                               <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                              <table cellpadding="1" cellspacing="1" border="0">
+                              <table cellpadding="1" cellspacing="1" border="0" width="100%">
                                  <tr>
                                     <td align="center">
                                        <h:commandButton value="#{msg.close}" action="#{SpaceDetailsBean.closeDialog}" styleClass="wizardButton" />
@@ -175,6 +157,13 @@
                                  </tr>
                               </table>
                               <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
+                              
+                              <div style="padding:4px"></div>
+                              
+                              <%-- Actions Panel --%>
+                              <a:panel label="#{msg.actions}" id="actions-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" style="text-align:center" progressive="true">
+                                 <r:actions id="actions_topic" value="topic_details_actions" context="#{SpaceDetailsBean.space}" verticalSpacing="3" style="white-space:nowrap" />
+                              </a:panel>
                            </td>
                         </tr>
                      </table>