diff --git a/design/admin2/override/templates/admin_preview/feedback_form.tpl b/design/admin2/override/templates/admin_preview/feedback_form.tpl index 1c9f6f2df2e..051881fb12e 100644 --- a/design/admin2/override/templates/admin_preview/feedback_form.tpl +++ b/design/admin2/override/templates/admin_preview/feedback_form.tpl @@ -15,6 +15,14 @@ {attribute_view_gui attribute=$node.data_map.email} + {* Sender name (information collector). *} + {if is_set( $node.data_map.sender_name )} +
+ + {attribute_view_gui attribute=$node.data_map.sender_name} +
+ {/if} + {* Subject (information collector). *}
diff --git a/design/admin2/templates/node/view/full.tpl b/design/admin2/templates/node/view/full.tpl index b258fe9cc7d..18e3428feab 100644 --- a/design/admin2/templates/node/view/full.tpl +++ b/design/admin2/templates/node/view/full.tpl @@ -111,15 +111,6 @@

-
-
- {* Custom content action buttons. *} - {section var=ContentActions loop=$node.object.content_action_list} - - {/section} -
-
-
{* DESIGN: Control bar END *} diff --git a/design/admin2/templates/preview.tpl b/design/admin2/templates/preview.tpl index c83231bcfe5..cd926637b3a 100644 --- a/design/admin2/templates/preview.tpl +++ b/design/admin2/templates/preview.tpl @@ -1,2 +1,22 @@ -{* Content preview in content window. *} -{node_view_gui content_node=$node view='admin_preview'} +{* Content (pre)view in content window. *} +{def $custom_actions = $node.object.content_action_list} +{if $custom_actions} +
+ + + +{/if} + + {node_view_gui content_node=$node view='admin_preview'} + +{if $custom_actions} +
+
+ {* Custom content action buttons. *} + {foreach $custom_actions as $custom_action} + + {/foreach} +
+
+
+{/if} diff --git a/doc/changelogs/4.3/CHANGELOG-4.3.0-to-4.3.1 b/doc/changelogs/4.3/CHANGELOG-4.3.0-to-4.3.1 index 39233aeb44a..e511f89e13a 100644 --- a/doc/changelogs/4.3/CHANGELOG-4.3.0-to-4.3.1 +++ b/doc/changelogs/4.3/CHANGELOG-4.3.0-to-4.3.1 @@ -135,4 +135,5 @@ Changes from 4.3.0 to 4.3.1 (Merged from master (4.4.0beta2) commit 2a9f0b7) - Fixed bug #006380: Workflow cron - Fatal error: Call to a member function on a non-object (Merged from master (4.4.0beta2) commit 2db6f27) - +- Fixed bug #016503: TC-80: Sending information collection form is broken in admin2 + (Merged from master (4.4.0beta2) commit 25627c1)