From 41ec911ac8889c7d2cb4d13fde00920aae5a5fd9 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Tue, 9 Feb 2016 20:08:58 +0100 Subject: [PATCH] User profile header overhaul --- com.woltlab.wcf/templates/footer.tpl | 18 +-- com.woltlab.wcf/templates/header.tpl | 20 +-- com.woltlab.wcf/templates/user.tpl | 4 +- com.woltlab.wcf/templates/userHeader.tpl | 120 +++++++++++++++++ com.woltlab.wcf/templates/userSidebar.tpl | 109 --------------- wcfsetup/install/files/style/layout/box.scss | 11 +- .../install/files/style/layout/global.scss | 6 +- .../install/files/style/ui/userProfile.scss | 124 +++++++++--------- 8 files changed, 214 insertions(+), 198 deletions(-) create mode 100644 com.woltlab.wcf/templates/userHeader.tpl diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl index a86014672d..785fbc7d32 100644 --- a/com.woltlab.wcf/templates/footer.tpl +++ b/com.woltlab.wcf/templates/footer.tpl @@ -48,14 +48,16 @@ {hascontent}
-
-
- {content} - {foreach from=$__wcf->getBoxHandler()->getBoxes('bottom') item=box} - {@$box->render()} - {/foreach} - {/content} -
+
+ {content} + {if !$boxesBottom|empty} + {@$boxesBottom} + {/if} + + {foreach from=$__wcf->getBoxHandler()->getBoxes('bottom') item=box} + {@$box->render()} + {/foreach} + {/content}
{/hascontent} diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl index c6e8bd4429..3864e77913 100644 --- a/com.woltlab.wcf/templates/header.tpl +++ b/com.woltlab.wcf/templates/header.tpl @@ -25,15 +25,17 @@ {hascontent}
-
-
- {content} - {foreach from=$__wcf->getBoxHandler()->getBoxes('top') item=box} - {@$box->render()} - {/foreach} - {/content} -
-
+
+ {content} + {if !$boxesTop|empty} + {@$boxesTop} + {/if} + + {foreach from=$__wcf->getBoxHandler()->getBoxes('top') item=box} + {@$box->render()} + {/foreach} + {/content} +
{/hascontent} diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl index 97aeb12313..c176a3a40d 100644 --- a/com.woltlab.wcf/templates/user.tpl +++ b/com.woltlab.wcf/templates/user.tpl @@ -134,6 +134,8 @@ +{include file='userHeader' assign='boxesTop'} + {include file='userSidebar' assign='sidebarRight'} {include file='header'} @@ -153,7 +155,7 @@ {/hascontent}
-
+