+
{capture assign='__sidebar'} {if $sidebar|isset} {if $sidebarOrientation|isset && $sidebarOrientation == 'right'} @@ -84,10 +39,7 @@ {@$__sidebar} {/if} -
+
{if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if} {event name='contents'} - - {if $skipBreadcrumbs|empty}{include file='breadcrumbs'}{/if} - diff --git a/com.woltlab.wcf/templates/mainMenu.tpl b/com.woltlab.wcf/templates/mainMenu.tpl index 9b709fb79d..15b97c03c9 100644 --- a/com.woltlab.wcf/templates/mainMenu.tpl +++ b/com.woltlab.wcf/templates/mainMenu.tpl @@ -2,14 +2,11 @@
{hascontent}
diff --git a/com.woltlab.wcf/templates/quoteBBCodeTag.tpl b/com.woltlab.wcf/templates/quoteBBCodeTag.tpl index acefb454e4..0924375572 100644 --- a/com.woltlab.wcf/templates/quoteBBCodeTag.tpl +++ b/com.woltlab.wcf/templates/quoteBBCodeTag.tpl @@ -1,24 +1,26 @@ -{if $quoteAuthorObject} -
- -{/if} -
- {if $quoteAuthor} -
-

- {if $quoteLink} - {lang}wcf.bbcode.quote.title{/lang} - {else} - {lang}wcf.bbcode.quote.title{/lang} - {/if} -

-
- {/if} - -
- {@$content} -
-
-{if $quoteAuthorObject} -
-{/if} +
+
+ + {if $quoteAuthorObject} + {@$quoteAuthorObject->getAvatar()->getImageTag(32)} + {else} + + {/if} + + + {if $quoteAuthor} + {if $quoteLink} + {lang}wcf.bbcode.quote.title{/lang} + {else} + {lang}wcf.bbcode.quote.title{/lang} + {/if} + {else} + {lang}wcf.bbcode.quote{/lang} + {/if} + +
+ +
+ {@$content} +
+
diff --git a/com.woltlab.wcf/templates/searchArea.tpl b/com.woltlab.wcf/templates/searchArea.tpl index bc32f94da2..eea92a1fe9 100644 --- a/com.woltlab.wcf/templates/searchArea.tpl +++ b/com.woltlab.wcf/templates/searchArea.tpl @@ -5,7 +5,7 @@ {event name='settings'} - +
{if !OFFLINE || $__wcf->session->getPermission('admin.general.canViewPageDuringOfflineMode')} {foreach from=$__wcf->getUserMenu()->getMenuItems('') item=menuCategory} -
- {lang}{$menuCategory->menuItem}{/lang} +
+

{lang}{$menuCategory->menuItem}{/lang}

-
+