display user avatars in generated templates where appropriate

Guite · Jul 10, 2014 · 228565b · 228565b
1 parent 4efe5be
commit 228565b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/...rg/zikula/modulestudio/generator/cartridges/zclassic/view/extensions/StandardFields.xtend b/...rg/zikula/modulestudio/generator/cartridges/zclassic/view/extensions/StandardFields.xtend
@@ -80,6 +80,7 @@ class StandardFields {
                 {* else just show the user name *}
                 {assign var='profileLink' value=$cr_uname}
             {/if}
+            <dd class="avatar">{useravatar uid=$obj.createdUserId rating='g'}</dd>
             <dd>{gt text='Created by %1$s on %2$s' tag1=$profileLink tag2=$obj.createdDate|dateformat html=true}</dd>
         {/if}
         {if isset($obj.updatedUserId) && $obj.updatedUserId}
@@ -94,6 +95,7 @@ class StandardFields {
                 {* else just show the user name *}
                 {assign var='profileLink' value=$lu_uname}
             {/if}
+            <dd class="avatar">{useravatar uid=$obj.updatedUserId rating='g'}</dd>
             <dd>{gt text='Updated by %1$s on %2$s' tag1=$profileLink tag2=$obj.updatedDate|dateformat html=true}</dd>
         {/if}
         </dl>

diff --git a/.../zikula/modulestudio/generator/cartridges/zclassic/view/formcomponents/SimpleFields.xtend b/.../zikula/modulestudio/generator/cartridges/zclassic/view/formcomponents/SimpleFields.xtend
@@ -261,6 +261,9 @@ class SimpleFields {
     def private dispatch formField(UserField it, String groupSuffix, String idSuffix) '''
         {«entity.container.application.appName.formatForDB»UserInput «groupAndId(groupSuffix, idSuffix)» mandatory=«mandatory.displayBool» readOnly=«readonly.displayBool» __title='Enter a part of the user name to search' cssClass='«IF mandatory»required«ENDIF»«IF !isLegacyApp»«IF mandatory» «ENDIF»form-control«ENDIF»'}
         {if $mode ne 'create' && $«entity.name.formatForDB».«name.formatForDB» && !$inlineUsage}
+            <span class="«IF isLegacyApp»z-formnote«ELSE»help-block«ENDIF» avatar">
+                {useravatar uid=$«entity.name.formatForDB».«name.formatForDB» rating='g'}
+            </span>
             {checkpermissionblock component='Users::' instance='::' level='ACCESS_ADMIN'}
             <span class="«IF isLegacyApp»z-formnote«ELSE»help-block«ENDIF»"><a href="{modurl modname='«IF isLegacyApp»Users«ELSE»ZikulaUsersModule«ENDIF»' type='admin' func='modify' userid=$«entity.name.formatForDB».«name.formatForDB»}" title="{gt text='Switch to users administration'}">{gt text='Manage user'}</a></span>
             {/checkpermissionblock}

diff --git a/.../zikula/modulestudio/generator/cartridges/zclassic/view/pagecomponents/SimpleFields.xtend b/.../zikula/modulestudio/generator/cartridges/zclassic/view/pagecomponents/SimpleFields.xtend
@@ -72,6 +72,7 @@ class SimpleFields {
                   {if !isset($smarty.get.theme) || $smarty.get.theme ne 'Printer'}
             «ENDIF»
                 {$«realName»|profilelinkbyuid}
+                    <span class="avatar">{useravatar uid=$«realName» rating='g'}</span>
             «IF page == 'display'»
                   {else}
                     {usergetvar name='uname' uid=$«realName»}