Index: trunk/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/templates/content/edit.tpl
===================================================================
--- trunk/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/templates/content/edit.tpl	(revision 4597)
+++ trunk/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/templates/content/edit.tpl	(working copy)
@@ -1,4 +1,4 @@
-<form enctype="multipart/form-data" id="editform" name="editform" method="post" action={concat("/content/edit/",$object.id,"/",$edit_version,"/",$edit_language|not|choose(concat($edit_language,"/"),''))|ezurl}>
+<form name="editform" id="editform" enctype="multipart/form-data" method="post" action={concat( '/content/edit/', $object.id, '/', $edit_version, '/', $edit_language|not|choose( concat( $edit_language, '/' ), '/' ), $is_translating_content|not|choose( concat( $from_language, '/' ), '' ) )|ezurl}>
 
 {include uri='design:parts/website_toolbar_edit.tpl'}
 
@@ -8,11 +8,22 @@
 
 <div class="content-edit">
 
+{* Current gui locale, to be used for class [attribute] name & description fields *}
+{def $content_language = ezini( 'RegionalSettings', 'Locale' )}
+
     <div class="attribute-header">
-        <h1 class="long">{'Edit %1 - %2'|i18n( 'design/ezwebin/content/edit', , array( $class.name|wash, $object.name|wash ) )}</h1>
+        <h1 class="long">{'Edit <%object_name> (%class_name)'|i18n( 'design/ezwebin/content/edit', , hash( '%object_name', $object.name, '%class_name', first_set( $class.nameList[$content_language], $class.name ) ) )|wash}</h1>
     </div>
 
-    <div class="attribute-language">
+    <div class="context-information">
+
+    {if $object.content_class.description}
+    <p class="left class-description">
+        {first_set( $class.descriptionList[$content_language], $class.description )|wash}
+    </p>
+    {/if}
+
+    <p class="right translation">
     {def $language_index = 0
          $from_language_index = 0
          $translation_list = $content_version.translation_list}
@@ -36,11 +47,22 @@
         {'Content in %language'|i18n( 'design/ezwebin/content/edit',, hash( '%language', $translation_list[$language_index].locale.intl_language_name ))}&nbsp;<img src="{$translation_list[$language_index].language_code|flag_icon}" style="vertical-align: middle;" alt="{$translation_list[$language_index].language_code}" />
 
     {/if}
+    </p>
     </div>
 
     {include uri='design:content/edit_validation.tpl'}
 
-    {include uri='design:content/edit_attribute.tpl'}
+    {if $is_translating_content}
+    <div class="content-translation">
+    {/if}
+
+    <div class="context-attributes">
+    {include uri='design:content/edit_attribute.tpl' view_parameters=$view_parameters}
+    </div>
+
+    {if $is_translating_content}
+    </div>
+    {/if}
 
     <div class="buttonblock">
     <input class="defaultbutton" type="submit" name="PublishButton" value="{'Send for publishing'|i18n( 'design/ezwebin/content/edit' )}" />