Template overhaul
authorMarcel Werk <burntime@woltlab.com>
Fri, 22 Apr 2016 14:56:42 +0000 (16:56 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 22 Apr 2016 14:57:14 +0000 (16:57 +0200)
* Moved documentHeader, head, body, contentHeader, userNotice into
header.tpl
* Moved closing head / body tags into footer.tpl
* Moved position of 'contentTop' boxes
* Unified template code

49 files changed:
com.woltlab.wcf/templates/accountManagement.tpl
com.woltlab.wcf/templates/avatarEdit.tpl
com.woltlab.wcf/templates/cms.tpl
com.woltlab.wcf/templates/deletedContentList.tpl
com.woltlab.wcf/templates/disclaimer.tpl
com.woltlab.wcf/templates/editHistory.tpl
com.woltlab.wcf/templates/emailActivation.tpl
com.woltlab.wcf/templates/emailNewActivationCode.tpl
com.woltlab.wcf/templates/following.tpl
com.woltlab.wcf/templates/footer.tpl
com.woltlab.wcf/templates/header.tpl
com.woltlab.wcf/templates/ignoredUsers.tpl
com.woltlab.wcf/templates/login.tpl
com.woltlab.wcf/templates/lostPassword.tpl
com.woltlab.wcf/templates/mail.tpl
com.woltlab.wcf/templates/membersList.tpl
com.woltlab.wcf/templates/moderationActivation.tpl
com.woltlab.wcf/templates/moderationList.tpl
com.woltlab.wcf/templates/moderationReport.tpl
com.woltlab.wcf/templates/newPassword.tpl
com.woltlab.wcf/templates/notificationList.tpl
com.woltlab.wcf/templates/notificationSettings.tpl
com.woltlab.wcf/templates/offline.tpl
com.woltlab.wcf/templates/paidSubscriptionList.tpl
com.woltlab.wcf/templates/permissionDenied.tpl
com.woltlab.wcf/templates/recentActivityList.tpl
com.woltlab.wcf/templates/redirect.tpl
com.woltlab.wcf/templates/register.tpl
com.woltlab.wcf/templates/registerActivation.tpl
com.woltlab.wcf/templates/registerNewActivationCode.tpl
com.woltlab.wcf/templates/search.tpl
com.woltlab.wcf/templates/searchResult.tpl
com.woltlab.wcf/templates/settings.tpl
com.woltlab.wcf/templates/signatureEdit.tpl
com.woltlab.wcf/templates/tagged.tpl
com.woltlab.wcf/templates/team.tpl
com.woltlab.wcf/templates/user.tpl
com.woltlab.wcf/templates/userException.tpl
com.woltlab.wcf/templates/userSearch.tpl
com.woltlab.wcf/templates/usersOnlineList.tpl
wcfsetup/install/files/acp/templates/attachmentList.tpl
wcfsetup/install/files/acp/templates/boxList.tpl
wcfsetup/install/files/acp/templates/languageItemList.tpl
wcfsetup/install/files/acp/templates/mediaList.tpl
wcfsetup/install/files/acp/templates/pageList.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl
wcfsetup/install/files/acp/templates/templateList.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index fe438e86cc21094a065675866728d8576c52b573..71d1ace6b16937e548be9538cb597faba5053f62 100644 (file)
@@ -1,33 +1,11 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.accountManagement{/lang} - {lang}wcf.user.usercp{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.accountManagement{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.accountManagement{/lang}{/capture}
 
 {include file='userMenuSidebar'}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.accountManagement{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {include file='formError'}
 
 <p class="warning">{lang}wcf.user.accountManagement.warning{/lang}</p>
 </form>
 
 {include file='footer'}
-
-</body>
-</html>
index 62c21721b6f0bff0bb6d83aedf85a86f5e02f4c7..ac66906b2c40c06dd30e4bd3d368dfd759070173 100644 (file)
@@ -1,33 +1,11 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.avatar.edit{/lang} - {lang}wcf.user.usercp{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.avatar.edit{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.avatar.edit{/lang}{/capture}
 
 {include file='userMenuSidebar'}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.avatar.edit{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {if $__wcf->user->disableAvatar}
        <p class="error">{lang}wcf.user.avatar.error.disabled{/lang}</p>
 {/if}
        {/if}
 </form>
 
-{include file='footer'}
-
 {if $__wcf->getSession()->getPermission('user.profile.avatar.canUploadAvatar')}
        <script data-relocate="true">
                //<![CDATA[
                        });
                        
                        {if !$__wcf->user->disableAvatar}
-                               {if $__wcf->getUserProfileHandler()->getAvatar()->canCrop()}
-                                       new WCF.User.Avatar.Upload(0, new WCF.User.Avatar.Crop({@$__wcf->getUserProfileHandler()->getAvatar()->avatarID}));
-                               {else}
-                                       new WCF.User.Avatar.Upload();
-                               {/if}
+                       {if $__wcf->getUserProfileHandler()->getAvatar()->canCrop()}
+                       new WCF.User.Avatar.Upload(0, new WCF.User.Avatar.Crop({@$__wcf->getUserProfileHandler()->getAvatar()->avatarID}));
+                       {else}
+                       new WCF.User.Avatar.Upload();
+                       {/if}
                        {/if}
                });
                //]]>
        </script>
 {/if}
 
-</body>
-</html>
+{include file='footer'}
index bac53b2029784cd3878b6203d1367ffc4bf97a51..134012f5b8cc9f2d11fc4eb06e2145540698338f 100644 (file)
@@ -1,50 +1,46 @@
-{include file='documentHeader'}
+{if !$__wcf->isLandingPage()}
+       {capture assign='pageTitle'}{$content[title]}{/capture}
+{/if}
 
-<head>
-       <title>{if !$__wcf->isLandingPage()}{$content[title]} - {/if}{PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
+{capture assign='headContent'}
        <link rel="canonical" href="{$canonicalURL}">
-</head>
+{/capture}
 
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentHeader'}
+       {if $__wcf->isLandingPage()}
+               <header class="contentHeader">
+                       <div class="contentHeaderTitle">
+                               <h1 class="contentTitle">{PAGE_TITLE|language}</h1>
+                               {hascontent}<p>{content}{PAGE_DESCRIPTION|language}{/content}</p>{/hascontent}
+                       </div>
+                       
+                       {hascontent}
+                               <nav class="contentHeaderNavigation">
+                                       <ul>
+                                               {content}{event name='contentHeaderNavigation'}{/content}
+                                       </ul>
+                               </nav>
+                       {/hascontent}
+               </header>
+       {elseif $content[title]}
+               <header class="contentHeader">
+                       <div class="contentHeaderTitle">
+                               <h1 class="contentTitle">{$content[title]}</h1>
+                       </div>
+                       
+                       {hascontent}
+                               <nav class="contentHeaderNavigation">
+                                       <ul>
+                                               {content}{event name='contentHeaderNavigation'}{/content}
+                                       </ul>
+                               </nav>
+                       {/hascontent}
+               </header>
+       {/if}
+{/capture}
 
 {include file='header'}
 
-{if $__wcf->isLandingPage()}
-       <header class="contentHeader">
-               <div class="contentHeaderTitle">
-                       <h1 class="contentTitle">{PAGE_TITLE|language}</h1>
-                       {hascontent}<p>{content}{PAGE_DESCRIPTION|language}{/content}</p>{/hascontent}
-               </div>
-               
-               {hascontent}
-                       <nav class="contentHeaderNavigation">
-                               <ul>
-                                       {content}{event name='contentHeaderNavigation'}{/content}
-                               </ul>
-                       </nav>
-               {/hascontent}
-       </header>
-{elseif $content[title]}
-       <header class="contentHeader">
-               <div class="contentHeaderTitle">
-                       <h1 class="contentTitle">{$content[title]}</h1>
-               </div>
-               
-               {hascontent}
-                       <nav class="contentHeaderNavigation">
-                               <ul>
-                                       {content}{event name='contentHeaderNavigation'}{/content}
-                               </ul>
-                       </nav>
-               {/hascontent}
-       </header>
-{/if}
-
-{include file='userNotice'}
-
 {if $content[content]}
        {if $page->pageType == 'text'}
                <section class="section cmsContent htmlContent">
@@ -68,6 +64,3 @@
 </footer>
 
 {include file='footer'}
-
-</body>
-</html>
index 8b1734f1e682e074b722f2ba5d69af912483a8de..a5eabd842a6cc918f80b2c89320c78d2818e6575 100644 (file)
@@ -1,12 +1,4 @@
-{include file='documentHeader'}
-
-<head>
-       <title>{lang}wcf.moderation.deletedContent.objectType.{@$objectType}{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='pageTitle'}{lang}wcf.moderation.deletedContent.objectType.{@$objectType}{/lang}{/capture}
 
 {capture assign='sidebarLeft'}
        <section class="box">
        </section>
 {/capture}
 
-{include file='header'}
-
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.moderation.deletedContent.{@$objectType}{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
+{capture assign='contentHeader'}
+       <header class="contentHeader">
+               <div class="contentHeaderTitle">
+                       <h1 class="contentTitle">{lang}wcf.moderation.deletedContent.{@$objectType}{/lang}</h1>
+               </div>
+               
+               {hascontent}
+                       <nav class="contentHeaderNavigation">
+                               <ul>
+                                       {content}{event name='contentHeaderNavigation'}{/content}
+                               </ul>
+                       </nav>
+               {/hascontent}
+       </header>
+{/capture}
 
-{include file='userNotice'}
+{include file='header'}
 
 {hascontent}
        <div class="paginationTop">
@@ -71,6 +63,3 @@
 </footer>
 
 {include file='footer'}
-
-</body>
-</html>
\ No newline at end of file
index d3be1292d9bd82de6808bc429d4622b91980bdcf..79b011bf4aa2e86d04a13c684a5b5eb0efbeac31 100644 (file)
@@ -1,31 +1,9 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.register.disclaimer{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.register.disclaimer{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.register.disclaimer{/lang}{/capture}
 
 {include file='header' __disableAds=true}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.register.disclaimer{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {include file='formError'}
 
 <form method="post" action="{link controller='Disclaimer'}{/link}">
@@ -45,6 +23,3 @@
 </form>
 
 {include file='footer'}
-
-</body>
-</html>
index 65ff3ab79dfe437186e0e9e988f449f07f333e74..c6dd004669785e74cfe90fef6b86dc9be21d9a2b 100644 (file)
@@ -1,21 +1,9 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{$object->getTitle()} - {lang}wcf.edit.versions{/lang}{/capture}
 
-<head>
-       <title>{$object->getTitle()} - {lang}wcf.edit.versions{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-</head>
-
-<body id="tpl_{$templateNameApplication}_{$templateName}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.edit.versions{/lang}: {$object->getTitle()}{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.edit.versions{/lang}: {$object->getTitle()}</h1>
-</header>
-
-{include file='userNotice'}
-
 {if $diff}
 <div class="section editHistoryDiff">
        <div class="sideBySide">
 </form>
 
 {include file='footer'}
-
-</body>
-</html>
index e100ad43fdd19d8570b06f3edcd80e6700b20533..37e68909674c49825616a13ef80a237004650ca5 100644 (file)
@@ -1,31 +1,9 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.emailActivation{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.emailActivation{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.emailActivation{/lang}{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.emailActivation{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {include file='formError'}
 
 <form method="post" action="{link controller='EmailActivation'}{/link}">
@@ -67,6 +45,3 @@
 </form>
 
 {include file='footer'}
-
-</body>
-</html>
index d89a784732f45254a645109f93179305829fe5b6..0758a09827cab4a98a37f5a42e77ee12987dd99e 100644 (file)
@@ -1,30 +1,9 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.newActivationCode{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.newActivationCode{/lang} - {PAGE_TITLE|language}</title>
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.newActivationCode{/lang}{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.newActivationCode{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {include file='formError'}
 
 <form method="post" action="{link controller='EmailNewActivationCode'}{/link}">
@@ -75,6 +54,3 @@
 </form>
 
 {include file='footer'}
-
-</body>
-</html>
index 07f01f0aaf99bb7bc2816b8bea09e12ebe35368d..81860292dadbae189f7d89b4ee05ee974931bd09 100644 (file)
@@ -1,40 +1,11 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.following{/lang} - {lang}wcf.user.usercp{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.following{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language}</title>
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.Action.Delete('wcf\\data\\user\\follow\\UserFollowAction', '.jsFollowing');
-               });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.following{/lang} <span class="badge">{#$items}</span>{/capture}
 
 {include file='userMenuSidebar'}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.following{/lang} <span class="badge">{#$items}</span></h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {hascontent}
        <div class="paginationTop">
                {content}{pages print=true assign=pagesLinks controller='Following' link="pageNo=%d"}{/content}
        <p class="info">{lang}wcf.user.following.noUsers{/lang}</p>
 {/if}
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.Action.Delete('wcf\\data\\user\\follow\\UserFollowAction', '.jsFollowing');
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index e850feb94153f5224fec4bd622590d7b5e3ec044..dbbdd4a33d82acaf0042e223b228f437360e6133 100644 (file)
@@ -90,3 +90,6 @@
 {@FOOTER_CODE}
 
 <a id="bottom"></a>
+                               
+</body>
+</html>
index 3864e7791369676f87d9c6dfefe1718d316fcd4d..04c2bbf71db1bb18b2ee88048bbf968cf2737d7a 100644 (file)
@@ -1,3 +1,17 @@
+{include file='documentHeader'}
+
+<head>
+       <title>{if $pageTitle|isset}{@$pageTitle} - {/if}{PAGE_TITLE|language}</title>
+       
+       {include file='headInclude'}
+       
+       {if !$headContent|empty}
+               {@$headContent}
+       {/if}
+</head>
+
+<body id="tpl_{$templateNameApplication}_{$templateName}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+
 <a id="top"></a>
 
 <div id="pageContainer" class="pageContainer">
                        <div id="content" class="content">
                                {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.header.content')}{/if}
                                
+                               {if !$contentHeader|empty}
+                                       {@$contentHeader}
+                               {elseif !$contentTitle|empty}
+                                       <header class="contentHeader">
+                                               <div class="contentHeaderTitle">
+                                                       <h1 class="contentTitle">{@$contentTitle}</h1>
+                                                       {if !$contentDescription|empty}<p class="contentHeaderDescription">{@$contentDescription}</p>{/if}
+                                               </div>
+                                               
+                                               {hascontent}
+                                                       <nav class="contentHeaderNavigation">
+                                                               <ul>
+                                                                       {content}{event name='contentHeaderNavigation'}{/content}
+                                                               </ul>
+                                                       </nav>
+                                               {/hascontent}
+                                       </header>
+                               {/if}
+                               
+                               {include file='userNotice'}
+                               
                                {hascontent}
                                        <div class="boxesContentTop">
                                                <div class="boxContainer">
index bd9225ef25dfe527fff3a4bde56024337d002eb3..cf43c03b5562e523b0305a9304494d854bce1340 100644 (file)
@@ -1,40 +1,11 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.ignoredUsers{/lang} - {lang}wcf.user.usercp{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.ignoredUsers{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language}</title>
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.Action.Delete('wcf\\data\\user\\ignore\\UserIgnoreAction', '.jsIgnoredUser');
-               });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.ignoredUsers{/lang} <span class="badge">{#$items}</span>{/capture}
 
 {include file='userMenuSidebar'}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.ignoredUsers{/lang} <span class="badge">{#$items}</span></h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {hascontent}
        <div class="paginationTop">
                {content}{pages print=true assign=pagesLinks controller='IgnoredUsers' link="pageNo=%d"}{/content}
        <p class="info">{lang}wcf.user.ignoredUsers.noUsers{/lang}</p>
 {/if}
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.Action.Delete('wcf\\data\\user\\ignore\\UserIgnoreAction', '.jsIgnoredUser');
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index 0dcf4ea2d59c414db5f666ed4da73cfcae694b95..d063a44db55e111183afd0d1d038dac6569ce95d 100644 (file)
@@ -1,36 +1,9 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.login{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.login{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.User.Login(false);
-               })
-               //]]>
-       </script>
-</head>
+{capture assign='contentTitle'}{lang}wcf.user.login{/lang}{/capture}
 
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 {include file='header' __disableLoginLink=true __disableAds=true}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle"><h1 class="contentTitle">{lang}wcf.user.login{/lang}</h1></div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {if !$errorField|empty && $errorField == 'cookie'}
        <p class="error">{lang}wcf.user.login.error.cookieRequired{/lang}</p>
 {else}
        </form>
 </div>
 
-{include file='footer' __disableAds=true}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.User.Login(false);
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer' __disableAds=true}
index ac7bbf4bbea5b1870d5c338341e38357c1ebcdb9..4069e6480ca86b37939427922f290473f9052333 100644 (file)
@@ -1,38 +1,9 @@
-{include file="documentHeader"}
+{capture assign='pageTitle'}{lang}wcf.user.lostPassword{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.lostPassword{/lang} - {PAGE_TITLE|language}</title>
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.User.Registration.LostPassword();
-               });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.lostPassword{/lang}{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.lostPassword{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 <p class="info">{lang}wcf.user.lostPassword.description{/lang}</p>
 
 {include file='formError'}
        </div>
 </form>
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.User.Registration.LostPassword();
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index 5dd62060b07e8d78039a54c8eec47c13b40ed88a..64a11a3d1ed656d9245b939d4ae8702a436666b6 100644 (file)
@@ -1,30 +1,9 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.mail.title{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.mail.title{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-</head>
+{capture assign='contentTitle'}{lang}wcf.user.mail.title{/lang}{/capture}
 
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.mail.title{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {include file='formError'}
 
 <form method="post" action="{link controller='Mail' object=$user}{/link}">
 </form>
 
 {include file='footer'}
-
-</body>
-</html>
index 59c10992b45720ede4a11d4e8ac8f2dc921713af..9627ffdb31e3afd3c9d5e919adec1ea6d04ae9a7 100644 (file)
@@ -1,11 +1,10 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if}{if $pageNo > 1} - {lang}wcf.page.pageNo{/lang}{/if}{/capture}
 
-<head>
-       <title>{if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if} {if $pageNo > 1}- {lang}wcf.page.pageNo{/lang} {/if}- {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
-       {capture assign='canonicalURLParameters'}sortField={@$sortField}&sortOrder={@$sortOrder}{if $letter}&letter={@$letter|rawurlencode}{/if}{/capture}
+{capture assign='contentTitle'}{if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if} <span class="badge">{#$items}</span>{/capture}
+
+{capture assign='canonicalURLParameters'}sortField={@$sortField}&sortOrder={@$sortOrder}{if $letter}&letter={@$letter|rawurlencode}{/if}{/capture}
+
+{capture assign='headContent'}
        {if $pageNo < $pages}
                <link rel="next" href="{link controller='MembersList'}pageNo={@$pageNo+1}&{@$canonicalURLParameters}{/link}" />
        {/if}
                <link rel="prev" href="{link controller='MembersList'}{if $pageNo > 2}pageNo={@$pageNo-1}&{/if}{@$canonicalURLParameters}{/link}" />
        {/if}
        <link rel="canonical" href="{link controller='MembersList'}{if $pageNo > 1}pageNo={@$pageNo}&{/if}{@$canonicalURLParameters}{/link}" />
-       
-       <script data-relocate="true">
-               //<![CDATA[
-                       $(function() {
-                               WCF.Language.addObject({
-                                       'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-                                       'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-                                       'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-                                       'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
-                               });
-                               
-                               new WCF.User.Action.Follow($('.userList > li'));
-                               new WCF.User.Action.Ignore($('.userList > li'));
-                               
-                               new WCF.Search.User('#searchUsername', function(data) {
-                                       var $link = '{link controller='User' id=2147483646 title='wcfTitlePlaceholder' encode=false}{/link}';
-                                       window.location = $link.replace('2147483646', data.objectID).replace('wcfTitlePlaceholder', data.label);
-                               }, false, [ ], false);
-                       });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{/capture}     
 
 {capture assign='sidebarRight'}
        {assign var=encodedLetter value=$letter|rawurlencode}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if} <span class="badge">{#$items}</span></h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {hascontent}
        <div class="paginationTop">
                {content}
        {/hascontent}
 </footer>
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               WCF.Language.addObject({
+                       'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
+                       'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
+                       'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
+                       'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
+               });
+               
+               new WCF.User.Action.Follow($('.userList > li'));
+               new WCF.User.Action.Ignore($('.userList > li'));
+               
+               new WCF.Search.User('#searchUsername', function(data) {
+                       var $link = '{link controller='User' id=2147483646 title='wcfTitlePlaceholder' encode=false}{/link}';
+                       window.location = $link.replace('2147483646', data.objectID).replace('wcfTitlePlaceholder', data.label);
+               }, false, [ ], false);
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index 96d0d00f647c23dab79b864a1e8201e41a1d89ff..050b7a658e03f43b98e554a61eaa79b5d0aaaa0e 100644 (file)
@@ -1,82 +1,55 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.moderation.activation{/lang}: {$queue->getTitle()}{/capture}
 
-<head>
-       <title>{lang}wcf.moderation.activation{/lang}: {$queue->getTitle()} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       WCF.Language.addObject({
-                               'wcf.moderation.activation.enableContent.confirmMessage': '{lang}wcf.moderation.activation.enableContent.confirmMessage{/lang}',
-                               'wcf.moderation.activation.removeContent.confirmMessage': '{lang}wcf.moderation.activation.removeContent.confirmMessage{/lang}',
-                               'wcf.moderation.assignedUser': '{lang}wcf.moderation.assignedUser{/lang}',
-                               'wcf.moderation.assignedUser.change': '{lang}wcf.moderation.assignedUser.change{/lang}',
-                               'wcf.moderation.assignedUser.error.notAffected': '{lang}wcf.moderation.assignedUser.error.notAffected{/lang}',
-                               'wcf.moderation.status.outstanding': '{lang}wcf.moderation.status.outstanding{/lang}',
-                               'wcf.moderation.status.processing': '{lang}wcf.moderation.status.processing{/lang}',
-                               'wcf.user.username.error.notFound': '{lang __literal=true}wcf.user.username.error.notFound{/lang}'
-                       });
+{capture assign='contentHeader'}
+       <header class="contentHeader">
+               <div class="contentHeaderTitle">
+                       <h1 class="contentTitle">{lang}wcf.moderation.activation{/lang}</h1>
                        
-                       new WCF.Moderation.Activation.Management({@$queue->queueID}, '{link controller='ModerationList' encode=false}{/link}');
-               });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
-
-{include file='header'}
-
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.moderation.activation{/lang}</h1>
-               
-               {if $queue->lastChangeTime}
-                       <dl class="plain inlineDataList">
-                               <dt>{lang}wcf.moderation.lastChangeTime{/lang}</dt>
-                               <dd>{@$queue->lastChangeTime|time}</dd>
+                       {if $queue->lastChangeTime}
+                               <dl class="plain inlineDataList">
+                                       <dt>{lang}wcf.moderation.lastChangeTime{/lang}</dt>
+                                       <dd>{@$queue->lastChangeTime|time}</dd>
+                               </dl>
+                       {/if}
+                       
+                       <dl class="plain inlineDataList" id="moderationAssignedUserContainer">
+                               <dt>{lang}wcf.moderation.assignedUser{/lang}</dt>
+                               <dd>
+                                       <span>
+                                               {if $queue->assignedUserID}
+                                                       <a href="{link controller='User' id=$assignedUserID}{/link}" class="userLink" data-user-id="{@$assignedUserID}">{$queue->assignedUsername}</a>
+                                               {else}
+                                                       {lang}wcf.moderation.assignedUser.nobody{/lang}
+                                               {/if}
+                                       </span>
+                               </dd>
                        </dl>
-               {/if}
-               
-               <dl class="plain inlineDataList" id="moderationAssignedUserContainer">
-                       <dt>{lang}wcf.moderation.assignedUser{/lang}</dt>
-                       <dd>
-                               <span>
-                                       {if $queue->assignedUserID}
-                                               <a href="{link controller='User' id=$assignedUserID}{/link}" class="userLink" data-user-id="{@$assignedUserID}">{$queue->assignedUsername}</a>
-                                       {else}
-                                               {lang}wcf.moderation.assignedUser.nobody{/lang}
-                                       {/if}
-                               </span>
-                       </dd>
-               </dl>
+                       
+                       <dl class="plain inlineDataList" id="moderationStatusContainer">
+                               <dt>{lang}wcf.moderation.status{/lang}</dt>
+                               <dd>{$queue->getStatus()}</dd>
+                       </dl>
+               </div>
                
-               <dl class="plain inlineDataList" id="moderationStatusContainer">
-                       <dt>{lang}wcf.moderation.status{/lang}</dt>
-                       <dd>{$queue->getStatus()}</dd>
-               </dl>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}
-                                       {if !$queue->isDone()}
-                                               {if $queueManager->canRemoveContent($queue->getDecoratedObject())}<li class="jsOnly"><a id="enableContent" class="button"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.moderation.activation.enableContent{/lang}</span></a></li>{/if}
-                                               <li class="jsOnly"><a id="removeContent" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a></li>
-                                       {/if}
-                                       {if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button"><span class="icon icon16 fa-arrow-right"></span> <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
-                                       
-                                       {event name='contentHeaderNavigation'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
+               {hascontent}
+                       <nav class="contentHeaderNavigation">
+                               <ul>
+                                       {content}
+                                               {if !$queue->isDone()}
+                                                       {if $queueManager->canRemoveContent($queue->getDecoratedObject())}<li class="jsOnly"><a id="enableContent" class="button"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.moderation.activation.enableContent{/lang}</span></a></li>{/if}
+                                                       <li class="jsOnly"><a id="removeContent" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a></li>
+                                               {/if}
+                                               {if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button"><span class="icon icon16 fa-arrow-right"></span> <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
+                                               
+                                               {event name='contentHeaderNavigation'}
+                                       {/content}
+                               </ul>
+                       </nav>
+               {/hascontent}
+       </header>
+{/capture}
 
-{include file='userNotice'}
+{include file='header'}
 
 {include file='formError'}
 
        </ul>
 </section>
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               WCF.Language.addObject({
+                       'wcf.moderation.activation.enableContent.confirmMessage': '{lang}wcf.moderation.activation.enableContent.confirmMessage{/lang}',
+                       'wcf.moderation.activation.removeContent.confirmMessage': '{lang}wcf.moderation.activation.removeContent.confirmMessage{/lang}',
+                       'wcf.moderation.assignedUser': '{lang}wcf.moderation.assignedUser{/lang}',
+                       'wcf.moderation.assignedUser.change': '{lang}wcf.moderation.assignedUser.change{/lang}',
+                       'wcf.moderation.assignedUser.error.notAffected': '{lang}wcf.moderation.assignedUser.error.notAffected{/lang}',
+                       'wcf.moderation.status.outstanding': '{lang}wcf.moderation.status.outstanding{/lang}',
+                       'wcf.moderation.status.processing': '{lang}wcf.moderation.status.processing{/lang}',
+                       'wcf.user.username.error.notFound': '{lang __literal=true}wcf.user.username.error.notFound{/lang}'
+               });
+               
+               new WCF.Moderation.Activation.Management({@$queue->queueID}, '{link controller='ModerationList' encode=false}{/link}');
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index 9c782c795dd310a1a9f2a2bf7f2824e15123d7d4..83aa2708f926b971a9f2fcd9540136dd642f970d 100644 (file)
@@ -1,21 +1,6 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.moderation.moderation{/lang}{if $pageNo > 1} - {lang}wcf.page.pageNo{/lang}{/if}{/capture}
 
-<head>
-       <title>{lang}wcf.moderation.moderation{/lang} {if $pageNo > 1}- {lang}wcf.page.pageNo{/lang} {/if}- {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.Moderation.Queue.MarkAsRead();
-                       new WCF.Moderation.Queue.MarkAllAsRead();
-               });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if} <span class="badge">{#$items}</span>{/capture}
 
 {capture assign='sidebarLeft'}
        <section class="box">
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if} <span class="badge">{#$items}</span></h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {hascontent}
        <div class="paginationTop">
                {content}{pages print=true assign=pagesLinks controller='ModerationList' link="definitionID=$definitionID&assignedUserID=$assignedUserID&status=$status&pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}{/content}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.Moderation.Queue.MarkAsRead();
+               new WCF.Moderation.Queue.MarkAllAsRead();
+       });
+       //]]>
+</script>
 
-</body>
-</html>
\ No newline at end of file
+{include file='footer'}
index 2579e280b17b210088eac07c14148300d507efce..2fe86cd73eb219e71cb078f1a493abfcd3857dfd 100644 (file)
@@ -1,82 +1,54 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.moderation.report{/lang}: {$queue->getTitle()}{/capture}
 
-<head>
-       <title>{lang}wcf.moderation.report{/lang}: {$queue->getTitle()} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       WCF.Language.addObject({
-                               'wcf.moderation.assignedUser': '{lang}wcf.moderation.assignedUser{/lang}',
-                               'wcf.moderation.assignedUser.change': '{lang}wcf.moderation.assignedUser.change{/lang}',
-                               'wcf.moderation.assignedUser.error.notAffected': '{lang}wcf.moderation.assignedUser.error.notAffected{/lang}',
-                               'wcf.moderation.report.removeContent.confirmMessage': '{lang}wcf.moderation.report.removeContent.confirmMessage{/lang}',
-                               'wcf.moderation.report.removeContent.reason': '{lang}wcf.moderation.report.removeContent.reason{/lang}',
-                               'wcf.moderation.report.removeReport.confirmMessage': '{lang}wcf.moderation.report.removeReport.confirmMessage{/lang}',
-                               'wcf.moderation.status.outstanding': '{lang}wcf.moderation.status.outstanding{/lang}',
-                               'wcf.moderation.status.processing': '{lang}wcf.moderation.status.processing{/lang}',
-                               'wcf.user.username.error.notFound': '{lang __literal=true}wcf.user.username.error.notFound{/lang}'
-                       });
+{capture assign='contentHeader'}
+       <header class="contentHeader">
+               <div class="contentHeaderTitle">
+                       <h1 class="contentTitle">{lang}wcf.moderation.report{/lang}</h1>
                        
-                       new WCF.Moderation.Report.Management({@$queue->queueID}, '{link controller='ModerationList' encode=false}{/link}');
-               });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
-
-{include file='header'}
-
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.moderation.report{/lang}</h1>
-               
-               {if $queue->lastChangeTime}
-                       <dl class="plain inlineDataList">
-                               <dt>{lang}wcf.moderation.lastChangeTime{/lang}</dt>
-                               <dd>{@$queue->lastChangeTime|time}</dd>
+                       {if $queue->lastChangeTime}
+                               <dl class="plain inlineDataList">
+                                       <dt>{lang}wcf.moderation.lastChangeTime{/lang}</dt>
+                                       <dd>{@$queue->lastChangeTime|time}</dd>
+                               </dl>
+                       {/if}
+                       
+                       <dl class="plain inlineDataList" id="moderationAssignedUserContainer">
+                               <dt>{lang}wcf.moderation.assignedUser{/lang}</dt>
+                               <dd>
+                                       <span>
+                                               {if $queue->assignedUserID}
+                                                       <a href="{link controller='User' id=$assignedUserID}{/link}" class="userLink" data-user-id="{@$assignedUserID}">{$queue->assignedUsername}</a>
+                                               {else}
+                                                       {lang}wcf.moderation.assignedUser.nobody{/lang}
+                                               {/if}
+                                       </span>
+                               </dd>
                        </dl>
-               {/if}
-               
-               <dl class="plain inlineDataList" id="moderationAssignedUserContainer">
-                       <dt>{lang}wcf.moderation.assignedUser{/lang}</dt>
-                       <dd>
-                               <span>
-                                       {if $queue->assignedUserID}
-                                               <a href="{link controller='User' id=$assignedUserID}{/link}" class="userLink" data-user-id="{@$assignedUserID}">{$queue->assignedUsername}</a>
-                                       {else}
-                                               {lang}wcf.moderation.assignedUser.nobody{/lang}
-                                       {/if}
-                               </span>
-                       </dd>
-               </dl>
+                       
+                       <dl class="plain inlineDataList" id="moderationStatusContainer">
+                               <dt>{lang}wcf.moderation.status{/lang}</dt>
+                               <dd>{$queue->getStatus()}</dd>
+                       </dl>
+               </div>
                
-               <dl class="plain inlineDataList" id="moderationStatusContainer">
-                       <dt>{lang}wcf.moderation.status{/lang}</dt>
-                       <dd>{$queue->getStatus()}</dd>
-               </dl>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}
+               {hascontent}
+                       <nav class="contentHeaderNavigation">
+                               <ul>
+                                       {content}
                                        {if !$queue->isDone()}
                                                {if $queueManager->canRemoveContent($queue->getDecoratedObject())}<li class="jsOnly"><a id="removeContent" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.moderation.report.removeContent{/lang}</span></a></li>{/if}
                                                <li class="jsOnly"><a id="removeReport" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.moderation.report.removeReport{/lang}</span></a></li>
                                        {/if}
                                        {if $queue->getAffectedObject()}<li><a href="{$queue->getAffectedObject()->getLink()}" class="button"><span class="icon icon16 fa-arrow-right"></span> <span>{lang}wcf.moderation.jumpToContent{/lang}</span></a></li>{/if}
                                        {event name='contentHeaderNavigation'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
+                                       {/content}
+                               </ul>
+                       </nav>
+               {/hascontent}
+       </header>
+{/capture}
 
-{include file='userNotice'}
+{include file='header'}
 
 {include file='formError'}
 
        </ul>
 </section>
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               WCF.Language.addObject({
+                       'wcf.moderation.assignedUser': '{lang}wcf.moderation.assignedUser{/lang}',
+                       'wcf.moderation.assignedUser.change': '{lang}wcf.moderation.assignedUser.change{/lang}',
+                       'wcf.moderation.assignedUser.error.notAffected': '{lang}wcf.moderation.assignedUser.error.notAffected{/lang}',
+                       'wcf.moderation.report.removeContent.confirmMessage': '{lang}wcf.moderation.report.removeContent.confirmMessage{/lang}',
+                       'wcf.moderation.report.removeContent.reason': '{lang}wcf.moderation.report.removeContent.reason{/lang}',
+                       'wcf.moderation.report.removeReport.confirmMessage': '{lang}wcf.moderation.report.removeReport.confirmMessage{/lang}',
+                       'wcf.moderation.status.outstanding': '{lang}wcf.moderation.status.outstanding{/lang}',
+                       'wcf.moderation.status.processing': '{lang}wcf.moderation.status.processing{/lang}',
+                       'wcf.user.username.error.notFound': '{lang __literal=true}wcf.user.username.error.notFound{/lang}'
+               });
+               
+               new WCF.Moderation.Report.Management({@$queue->queueID}, '{link controller='ModerationList' encode=false}{/link}');
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index fbad48f3391d668b890c5cbd6e8ee8da4d3306fb..4995bc57273f21c52250a6edfff590a1f9ad8099 100644 (file)
@@ -1,30 +1,9 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.newPassword{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.newPassword{/lang} - {PAGE_TITLE|language}</title>
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.newPassword{/lang}{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.newPassword{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {include file='formError'}
 
 <form method="post" action="{link controller='NewPassword'}{/link}">
@@ -73,6 +52,3 @@
 </form>
 
 {include file='footer'}
-
-</body>
-</html>
index 4526e0bf533cae0cc5974f07a0fbe5349fb27865..d342195906563da4054b94fa747e505d61b2d8f1 100644 (file)
@@ -1,48 +1,28 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.notification.notifications{/lang} - {lang}wcf.user.usercp{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.notification.notifications{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language}</title>
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       WCF.Language.addObject({
-                               'wcf.user.notification.markAsConfirmed': '{lang}wcf.user.notification.markAsConfirmed{/lang}',
-                               'wcf.user.notification.markAllAsConfirmed.confirmMessage': '{lang}wcf.user.notification.markAllAsConfirmed.confirmMessage{/lang}'
-                       });
-                       
-                       new WCF.Notification.List();
-               });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentHeader'}
+       <header class="contentHeader">
+               <div class="contentHeaderTitle">
+                       <h1 class="contentTitle">{lang}wcf.user.notification.notifications{/lang} <span class="badge jsNotificationsBadge">{#$__wcf->getUserNotificationHandler()->countAllNotifications()}</span></h1>
+               </div>
+               
+               {hascontent}
+                       <nav class="contentHeaderNavigation">
+                               <ul>
+                                       {content}
+                                               {if $__wcf->getUserNotificationHandler()->getNotificationCount()}<li class="jsOnly"><a class="button jsMarkAllAsConfirmed"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.user.notification.markAllAsConfirmed{/lang}</span></a></li>{/if}
+                                               {event name='contentHeaderNavigation'}
+                                       {/content}
+                               </ul>
+                       </nav>
+               {/hascontent}
+       </header>
+{/capture}
 
 {include file='userMenuSidebar'}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.notification.notifications{/lang} <span class="badge jsNotificationsBadge">{#$__wcf->getUserNotificationHandler()->countAllNotifications()}</span></h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}
-                                       {if $__wcf->getUserNotificationHandler()->getNotificationCount()}<li class="jsOnly"><a class="button jsMarkAllAsConfirmed"><span class="icon icon16 fa-check"></span> <span>{lang}wcf.user.notification.markAllAsConfirmed{/lang}</span></a></li>{/if}
-                                       {event name='contentHeaderNavigation'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {hascontent}
        <div class="paginationTop">
                {content}{pages print=true assign=pagesLinks controller='NotificationList' link="pageNo=%d"}{/content}
        <p class="info">{lang}wcf.user.notification.noNotifications{/lang}</p>
 {/if}
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               WCF.Language.addObject({
+                       'wcf.user.notification.markAsConfirmed': '{lang}wcf.user.notification.markAsConfirmed{/lang}',
+                       'wcf.user.notification.markAllAsConfirmed.confirmMessage': '{lang}wcf.user.notification.markAllAsConfirmed.confirmMessage{/lang}'
+               });
+               
+               new WCF.Notification.List();
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index 818b33dd48cfcaf19ecf5d48902d306d030ade97..566d6a8b812c6e86af5a7c573fb963a97dfd349d 100644 (file)
@@ -1,46 +1,13 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.notification.notifications{/lang} - {lang}wcf.user.menu.settings{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.notification.notifications{/lang} - {lang}wcf.user.menu.settings{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               require(['Language', 'WoltLab/WCF/Controller/User/Notification/Settings'], function(Language, ControllerUserNotificationSettings) {
-                       Language.addObject({
-                               'wcf.user.notification.mailNotificationType.daily': '{lang}wcf.user.notification.mailNotificationType.daily{/lang}',
-                               'wcf.user.notification.mailNotificationType.instant': '{lang}wcf.user.notification.mailNotificationType.instant{/lang}',
-                               'wcf.user.notification.mailNotificationType.none': '{lang}wcf.user.notification.mailNotificationType.none{/lang}'
-                       });
-                       
-                       ControllerUserNotificationSettings.setup();
-               });
-       </script>
-</head>
+{capture assign='contentTitle'}{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.notification.notifications{/lang}{/capture}
 
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentDescription'}{lang}wcf.user.notification.notifications.description{/lang}{/capture}
 
 {include file='userMenuSidebar'}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.notification.notifications{/lang}</h1>
-               <p class="contentHeaderDescription">{lang}wcf.user.notification.notifications.description{/lang}</p>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {include file='formError'}
 
 {if $success|isset}
        </div>
 </form>
 
-{include file='footer'}
+<script data-relocate="true">
+       require(['Language', 'WoltLab/WCF/Controller/User/Notification/Settings'], function(Language, ControllerUserNotificationSettings) {
+               Language.addObject({
+                       'wcf.user.notification.mailNotificationType.daily': '{lang}wcf.user.notification.mailNotificationType.daily{/lang}',
+                       'wcf.user.notification.mailNotificationType.instant': '{lang}wcf.user.notification.mailNotificationType.instant{/lang}',
+                       'wcf.user.notification.mailNotificationType.none': '{lang}wcf.user.notification.mailNotificationType.none{/lang}'
+               });
+               
+               ControllerUserNotificationSettings.setup();
+       });
+</script>
 
-</body>
-</html>
+{include file='footer'}
index c5a5e02729b60ba69fd7d4fa53f4f0ded6f057a8..bd4a046d97d1a06c842e174c8e8ab4f61800c329 100644 (file)
@@ -1,13 +1,3 @@
-{include file='documentHeader'}
-
-<head>
-       <title>{PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
-
 {include file='header' skipBreadcrumbs=true}
 
 <div class="warning">
@@ -16,6 +6,3 @@
 </div>
 
 {include file='footer'}
-
-</body>
-</html>
\ No newline at end of file
index ea282297b7019f059de2e6f9a47ddb1c27e39deb..b26a8a017f7398adcaa0309448833819ee6845cc 100644 (file)
@@ -1,10 +1,8 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.menu.settings.paidSubscription{/lang} - {lang}wcf.user.menu.settings{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.menu.settings.paidSubscription{/lang} - {lang}wcf.user.menu.settings{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
+{capture assign='contentTitle'}{lang}wcf.user.menu.settings.paidSubscription{/lang}{/capture}
+
+{capture assign='headContent'}
        {if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
                <script data-relocate="true">
                        $(function() {
                        </style>
                </noscript>
        {/if}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{/capture}
 
 {include file='userMenuSidebar'}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.menu.settings.paidSubscription{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {if $subscriptions|count}
        <section class="section sectionContainerList paidSubscriptionList">
                <header class="sectionHeader">
 </footer>
 
 {include file='footer'}
-
-</body>
-</html>
index b2559484e4157394a66cf0aeb844f11606417cb1..764c704a8ac1a9cd54ed99b95a4bc0cfdbdb8479 100644 (file)
@@ -1,12 +1,4 @@
-{include file="documentHeader"}
-
-<head>
-       <title>{lang}wcf.global.error.permissionDenied.title{/lang} - {lang}{PAGE_TITLE}{/lang}</title>
-       
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='pageTitle'}{lang}wcf.global.error.permissionDenied.title{/lang}{/capture}
 
 {include file='header' __disableAds=true}
 
@@ -23,6 +15,3 @@
 {/if}
 
 {include file='footer'}
-
-</body>
-</html>
\ No newline at end of file
index 4ea90571c421cb72404a0e23c95e4e4da509c5f1..76930d77d70c9170fd690059591525c745cef072 100644 (file)
@@ -1,46 +1,13 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.recentActivity{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.recentActivity{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
-       <link rel="canonical" href="{link controller='RecentActivityList'}{/link}" />
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       WCF.Language.addObject({
-                               'wcf.user.recentActivity.more': '{lang}wcf.user.recentActivity.more{/lang}',
-                               'wcf.user.recentActivity.noMoreEntries': '{lang}wcf.user.recentActivity.noMoreEntries{/lang}'
-                       });
-                       
-                       new WCF.User.RecentActivityLoader(null);
-               });
-               //]]>
-       </script>
-</head>
+{capture assign='contentTitle'}{lang}wcf.user.recentActivity{/lang}{/capture}
 
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='headContent'}
+       <link rel="canonical" href="{link controller='RecentActivityList'}{/link}" />
+{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.recentActivity{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {if $eventList|count}
        <div class="section sectionContainerList">
                <ul id="recentActivities" class="containerList recentActivityList" data-last-event-time="{@$lastEventTime}">
        <p class="info">{lang}wcf.user.recentActivity.noEntries{/lang}</p>
 {/if}
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               WCF.Language.addObject({
+                       'wcf.user.recentActivity.more': '{lang}wcf.user.recentActivity.more{/lang}',
+                       'wcf.user.recentActivity.noMoreEntries': '{lang}wcf.user.recentActivity.noMoreEntries{/lang}'
+               });
+               
+               new WCF.User.RecentActivityLoader(null);
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index 7d3c62e98b5c17e8f232647a444c28c8595f78ae..6c1de338fb0a485f526c01b8b10325f10543d8ba 100644 (file)
@@ -1,14 +1,8 @@
-{include file="documentHeader"}
+{capture assign='pageTitle'}{lang}wcf.global.redirect.title{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.global.redirect.title{/lang} - {lang}{PAGE_TITLE}{/lang}</title>
-       
-       {include file='headInclude'}
-       
+{capture assign='headContent'}
        <meta http-equiv="refresh" content="{if $wait|isset}{@$wait}{else}10{/if};URL={$url}" />
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{/capture}
 
 {include file='header' __disableAds=true}
 
@@ -18,6 +12,3 @@
 </div>
 
 {include file='footer' __disableAds=true}
-
-</body>
-</html>
index e16a101c754afbc8b2748add9720074904e38528..a8ca146daca6652a03e5273a23d42bf5b44d05b8 100644 (file)
@@ -1,59 +1,17 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.register{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.register{/lang} - {PAGE_TITLE|language}</title>
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       WCF.Language.addObject({
-                               'wcf.global.form.error.empty': '{lang}wcf.global.form.error.empty{/lang}',
-                               'wcf.user.username.error.notValid': '{lang}wcf.user.username.error.notValid{/lang}',
-                               'wcf.user.username.error.notUnique': '{lang}wcf.user.username.error.notUnique{/lang}',
-                               'wcf.user.email.error.notValid' : '{lang}wcf.user.email.error.notValid{/lang}',
-                               'wcf.user.email.error.notUnique' : '{lang}wcf.user.email.error.notUnique{/lang}',
-                               'wcf.user.confirmEmail.error.notEqual' : '{lang}wcf.user.confirmEmail.error.notEqual{/lang}',
-                               'wcf.user.password.error.notSecure' : '{lang}wcf.user.password.error.notSecure{/lang}',
-                               'wcf.user.confirmPassword.error.notEqual' : '{lang}wcf.user.confirmPassword.error.notEqual{/lang}'
-                       });
-                       
-                       new WCF.User.Registration.Validation.EmailAddress($('#{@$randomFieldNames[email]}'), $('#{@$randomFieldNames[confirmEmail]}'), null);
-                       new WCF.User.Registration.Validation.Password($('#{@$randomFieldNames[password]}'), $('#{@$randomFieldNames[confirmPassword]}'), null);
-                       new WCF.User.Registration.Validation.Username($('#{@$randomFieldNames[username]}', null, {
-                               minlength: {@REGISTER_USERNAME_MIN_LENGTH},
-                               maxlength: {@REGISTER_USERNAME_MAX_LENGTH}
-                       }));
-               });
-               //]]>
-       </script>
-       
+{capture assign='contentTitle'}{lang}wcf.user.register{/lang}{/capture}
+
+{capture assign='headContent'}
        <style type="text/css"> 
                #fieldset1 {
                        display: none;
                }
        </style>
-</head>
+{/capture}
 
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 {include file='header' __disableLoginLink=true __disableAds=true}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.register{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {if $isExternalAuthentication}
        <p class="info">{lang}wcf.user.3rdparty.{$__wcf->session->getVar('__3rdPartyProvider')}.register{/lang}</p>
 {/if}
        </div>
 </form>
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               WCF.Language.addObject({
+                       'wcf.global.form.error.empty': '{lang}wcf.global.form.error.empty{/lang}',
+                       'wcf.user.username.error.notValid': '{lang}wcf.user.username.error.notValid{/lang}',
+                       'wcf.user.username.error.notUnique': '{lang}wcf.user.username.error.notUnique{/lang}',
+                       'wcf.user.email.error.notValid' : '{lang}wcf.user.email.error.notValid{/lang}',
+                       'wcf.user.email.error.notUnique' : '{lang}wcf.user.email.error.notUnique{/lang}',
+                       'wcf.user.confirmEmail.error.notEqual' : '{lang}wcf.user.confirmEmail.error.notEqual{/lang}',
+                       'wcf.user.password.error.notSecure' : '{lang}wcf.user.password.error.notSecure{/lang}',
+                       'wcf.user.confirmPassword.error.notEqual' : '{lang}wcf.user.confirmPassword.error.notEqual{/lang}'
+               });
+               
+               new WCF.User.Registration.Validation.EmailAddress($('#{@$randomFieldNames[email]}'), $('#{@$randomFieldNames[confirmEmail]}'), null);
+               new WCF.User.Registration.Validation.Password($('#{@$randomFieldNames[password]}'), $('#{@$randomFieldNames[confirmPassword]}'), null);
+               new WCF.User.Registration.Validation.Username($('#{@$randomFieldNames[username]}', null, {
+                       minlength: {@REGISTER_USERNAME_MIN_LENGTH},
+                       maxlength: {@REGISTER_USERNAME_MAX_LENGTH}
+               }));
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index 7c33ae05f5b07236f626acd3637f6b827b88bd0a..d491ff20ada082fee847f962589416bf14f5f842 100644 (file)
@@ -1,30 +1,9 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.registerActivation{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.registerActivation{/lang} - {PAGE_TITLE|language}</title>
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.registerActivation{/lang}{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.registerActivation{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {if $__wcf->user->userID && $__wcf->user->activationCode}<p class="info">{lang}wcf.user.registerActivation.info{/lang}</p>{/if}
 
 {include file='formError'}
@@ -68,5 +47,3 @@
 </form>
 
 {include file='footer'}
-</body>
-</html>
index 38a307bf9aa6c3947fafd7e3815ff20129bda8f6..496dd4b1327d9218363897e3723b60b2a01dd66d 100644 (file)
@@ -1,30 +1,9 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.newActivationCode{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.newActivationCode{/lang} - {PAGE_TITLE|language}</title>
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.newActivationCode{/lang}{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.newActivationCode{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {include file='formError'}
 
 <form method="post" action="{link controller='RegisterNewActivationCode'}{/link}">
@@ -88,6 +67,3 @@
 </form>
 
 {include file='footer'}
-
-</body>
-</html>
index 9191e57009a9766876f0adf99bb8c7eafe336334..9388be48d2c5ea1a40a9dc97bfbe7fbbcb32f503 100644 (file)
@@ -1,21 +1,9 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.search.title{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.search.title{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.search.title{/lang}{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <h1 class="contentTitle">{lang}wcf.search.title{/lang}</h1>
-</header>
-
-{include file='userNotice'}
-
 {include file='formError'}
 
 {if $errorMessage|isset}
        </div>
 </form>
 
-{include file='footer'}
-
 <script data-relocate="true">
        //<![CDATA[
        $(function() {
        //]]>
 </script>
 
-</body>
-</html>
+{include file='footer'}
index f603ee48db6f7689924f42e05fb4a7395dcca7fe..d77769d110dab73eff152c2948cc80c7a9864d25 100644 (file)
@@ -1,37 +1,29 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.search.results{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.search.results{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentHeader'}
+       <header class="contentHeader">
+               <div class="contentHeaderTitle">
+                       <h1 class="contentTitle">{if $query}<a href="{link controller='Search'}q={$query|urlencode}{/link}">{lang}wcf.search.results{/lang}</a>{else}{lang}wcf.search.results{/lang}{/if}</h1>
+                       <p class="contentHeaderDescription">{lang}wcf.search.results.description{/lang}</p>
+               </div>
+               
+               {hascontent}
+                       <nav class="contentHeaderNavigation">
+                               <ul>
+                                       {content}
+                                               {if $alterable}
+                                                       <li><a href="{link controller='Search'}modify={@$searchID}{/link}" class="button"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.search.results.change{/lang}</span></a></li>
+                                               {/if}
+                                               {event name='contentHeaderNavigation'}
+                                       {/content}
+                               </ul>
+                       </nav>
+               {/hascontent}
+       </header>
+{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{if $query}<a href="{link controller='Search'}q={$query|urlencode}{/link}">{lang}wcf.search.results{/lang}</a>{else}{lang}wcf.search.results{/lang}{/if}</h1>
-               <p class="contentHeaderDescription">{lang}wcf.search.results.description{/lang}</p>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}
-                                       {if $alterable}
-                                               <li><a href="{link controller='Search'}modify={@$searchID}{/link}" class="button"><span class="icon icon16 fa-search"></span> <span>{lang}wcf.search.results.change{/lang}</span></a></li>
-                                       {/if}
-                                       {event name='contentHeaderNavigation'}
-                               {/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {hascontent}
        <div class="paginationTop">
                {content}
@@ -65,6 +57,3 @@
 </footer>
 
 {include file='footer'}
-
-</body>
-</html>
\ No newline at end of file
index f10c3760d4f7f787e81c737835ad2ea746582dcf..220f59fc90bd6a4a4e3dc517c2b181986d0b26fe 100644 (file)
@@ -1,40 +1,11 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.option.category.settings.{$category}{/lang} - {lang}wcf.user.menu.settings{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.option.category.settings.{$category}{/lang} - {lang}wcf.user.menu.settings{/lang} - {PAGE_TITLE|language}</title>
-       {include file='headInclude'}
-
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.Option.Handler();
-               });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.option.category.settings.{$category}{/lang}{/capture}
 
 {include file='userMenuSidebar'}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.option.category.settings.{$category}{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {include file='formError'}
 
 {if $success|isset}
        </div>
 </form>
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.Option.Handler();
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index 8b8d4877f9d29d32e986bd66b705f1c563f90405..bc79d052bde4dd484ce698fe51b5685faa543b97 100644 (file)
@@ -1,45 +1,11 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.signature.edit{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.signature.edit{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       WCF.Language.addObject({
-                               'wcf.global.preview': '{lang}wcf.global.preview{/lang}'
-                       });
-                       
-                       new WCF.User.SignaturePreview('wcf\\data\\user\\UserProfileAction', 'text', 'previewButton');
-               });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.signature.edit{/lang}{/capture}
 
 {include file='userMenuSidebar'}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.signature.edit{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {include file='formError'}
 
 {if $success|isset}
        {/if}
 </form>
 
-{include file='footer'}
-{include file='wysiwyg'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               WCF.Language.addObject({
+                       'wcf.global.preview': '{lang}wcf.global.preview{/lang}'
+               });
+               
+               new WCF.User.SignaturePreview('wcf\\data\\user\\UserProfileAction', 'text', 'previewButton');
+       });
+       //]]>
+</script>
 
-</body>
-</html>
\ No newline at end of file
+{include file='wysiwyg'}
+{include file='footer'}
index 657fdad9f39262a625041b4a3192fdd752ca2433..2460e6282237a123ef56b8edb59b6a9c53886fb9 100644 (file)
@@ -1,10 +1,8 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.tagging.taggedObjects.{@$objectType}{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.tagging.taggedObjects.{@$objectType}{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
+{capture assign='contentTitle'}{lang}wcf.tagging.taggedObjects.{@$objectType}{/lang}{/capture}
+
+{capture assign='headContent'}
        {if $pageNo < $pages}
                <link rel="next" href="{link controller='Tagged' object=$tag}objectType={@$objectType}&pageNo={@$pageNo+1}{/link}" />
        {/if}
@@ -12,9 +10,7 @@
                <link rel="prev" href="{link controller='Tagged' object=$tag}objectType={@$objectType}{if $pageNo > 2}&pageNo={@$pageNo-1}{/if}{/link}" />
        {/if}
        <link rel="canonical" href="{link controller='Tagged' object=$tag}objectType={@$objectType}{if $pageNo > 1}&pageNo={@$pageNo}{/if}{/link}" />
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{/capture}
 
 {capture assign='sidebarLeft'}
        <section class="box">
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.tagging.taggedObjects.{@$objectType}{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {hascontent}
        <div class="paginationTop">
                {content}{pages print=true assign=pagesLinks controller='Tagged' object=$tag link="objectType=$objectType&pageNo=%d"}{/content}
@@ -85,6 +65,3 @@
 </footer>
 
 {include file='footer'}
-
-</body>
-</html>
\ No newline at end of file
index 8ef578f87bf0b72fc5ed8cf1cd85dc3da0c854cb..a12a02fa83b119715ba98a9b5092f9a553fc0058 100644 (file)
@@ -1,49 +1,13 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.team{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.team{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
-       <link rel="canonical" href="{link controller='Team'}{/link}" />
-       
-       <script data-relocate="true">
-               //<![CDATA[
-                       $(function() {
-                               WCF.Language.addObject({
-                                       'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-                                       'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-                                       'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-                                       'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
-                               });
-                               
-                               new WCF.User.Action.Follow($('.userList > li'));
-                               new WCF.User.Action.Ignore($('.userList > li'));
-                       });
-               //]]>
-       </script>
-</head>
+{capture assign='contentTitle'}{lang}wcf.user.team{/lang}{/capture}
 
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='headContent'}
+       <link rel="canonical" href="{link controller='Team'}{/link}" />
+{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.team{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {foreach from=$objects->getTeams() item=team}
        <section class="section sectionContainerList">
                <header class="sectionHeader">
        {/hascontent}
 </footer>
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               WCF.Language.addObject({
+                       'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
+                       'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
+                       'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
+                       'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
+               });
+               
+               new WCF.User.Action.Follow($('.userList > li'));
+               new WCF.User.Action.Ignore($('.userList > li'));
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index 96f7fc297c1fb883798ec5f8f0c3c47e22b71c5e..66811a5a04fab6f43e7058f6970a689595eea32a 100644 (file)
@@ -1,10 +1,6 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{$user->username} - {lang}wcf.user.members{/lang}{/capture}
 
-<head>
-       <title>{$user->username} - {lang}wcf.user.members{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
+{capture assign='headContent'}
        <link rel="canonical" href="{link controller='User' object=$user}{/link}" />
        
        {event name='javascriptInclude'}
@@ -38,7 +34,7 @@
                        
                        {if $user->canEdit() || ($__wcf->getUser()->userID == $user->userID && $user->canEditOwnProfile())}
                                WCF.Language.addObject({
-                                       'wcf.user.editProfile': '{lang}wcf.user.editProfile{/lang}',
+                                       'wcf.user.editProfile': '{lang}wcf.user.editProfile{/lang}'
                                });
                                
                                new WCF.User.Profile.Editor({@$user->userID}, {if $editOnInit}true{else}false{/if});
                        }
                </style>
        </noscript>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}" class="userProfile">
+{/capture}
 
 {include file='userHeader' assign='boxesTop'}
 
 
 {include file='header'}
 
-{include file='userNotice'}
-
 {if !$user->isProtected()}
        <div id="profileContent" class="section tabMenuContainer userProfileContent" data-active="{$__wcf->getUserProfileMenu()->getActiveMenuItem()->getIdentifier()}">
                <nav class="tabMenu">
 {/if}
 
 {include file='footer'}
-
-</body>
-</html>
index b04be1a47a90f1c1d4357628f0b6ec8c7775e554..2f437fb389e4fe8ee88d0c81ae2fa8d6fb5dbfb1 100644 (file)
@@ -1,11 +1,4 @@
-{include file="documentHeader"}
-<head>
-       <title>{lang}wcf.global.error.title{/lang} - {lang}{PAGE_TITLE}{/lang}</title>
-       
-       {include file='headInclude'}
-</head>
-
-<body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>
+{capture assign='pageTitle'}{lang}wcf.global.error.title{/lang}{/capture}
 
 {include file='header' __disableAds=true}
        
@@ -29,6 +22,3 @@
 {/if}
 
 {include file='footer' __disableAds=true}
-
-</body>
-</html>
index 092eb30aa7827905d103775853f331d2eb8fdde4..24d6a83b4200f72454bcfd9e808cc587943e7074 100644 (file)
@@ -1,39 +1,9 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.search{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.search{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.Search.User('#searchUsername', null, false, [ ], false);
-               });
-               //]]>
-       </script>
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{capture assign='contentTitle'}{lang}wcf.user.search{/lang}{/capture}
 
 {include file='header'}
 
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.search{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
-{include file='userNotice'}
-
 {if $errorField == 'search'}
        <p class="error">{lang}wcf.user.search.error.noMatches{/lang}</p>
 {else}
        </div>
 </form>
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.Search.User('#searchUsername', null, false, [ ], false);
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index 9380ef411c99b8386232636c2dff6268e47f9701..3e43af0b2678a9d6fb82776114d84df595a03083 100644 (file)
@@ -1,34 +1,14 @@
-{include file='documentHeader'}
+{capture assign='pageTitle'}{lang}wcf.user.usersOnline{/lang}{/capture}
 
-<head>
-       <title>{lang}wcf.user.usersOnline{/lang} - {PAGE_TITLE|language}</title>
-       
-       {include file='headInclude'}
-       
+{capture assign='contentTitle'}{lang}wcf.user.usersOnline{/lang}{/capture}
+
+{capture assign='contentHeader'}
        <link rel="canonical" href="{link controller='UsersOnlineList'}{/link}" />
-       
-       <script data-relocate="true">
-               //<![CDATA[
-                       $(function() {
-                               WCF.Language.addObject({
-                                       'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-                                       'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-                                       'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-                                       'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
-                               });
-                               
-                               new WCF.User.Action.Follow($('.userList > li'));
-                               new WCF.User.Action.Ignore($('.userList > li'));
-                       });
-               //]]>
-       </script>
-       
+               
        {if USERS_ONLINE_PAGE_REFRESH > 0}
                <meta http-equiv="refresh" content="{@USERS_ONLINE_PAGE_REFRESH}; url={link controller='UsersOnlineList'}sortField={@$sortField}&sortOrder={@$sortOrder}{/link}" />
        {/if}
-</head>
-
-<body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
+{/capture}
 
 {capture assign='sidebarRight'}
        <section class="box">
 
 {include file='header'}
 
-{include file='userNotice'}
-
-<header class="contentHeader">
-       <div class="contentHeaderTitle">
-               <h1 class="contentTitle">{lang}wcf.user.usersOnline{/lang}</h1>
-       </div>
-       
-       {hascontent}
-               <nav class="contentHeaderNavigation">
-                       <ul>
-                               {content}{event name='contentHeaderNavigation'}{/content}
-                       </ul>
-               </nav>
-       {/hascontent}
-</header>
-
 {assign var=usersOnlineList value=''}
 {assign var=usersOnline value=0}
 {assign var=robotsOnlineList value=''}
        {/hascontent}
 </footer>
 
-{include file='footer'}
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               WCF.Language.addObject({
+                       'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
+                       'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
+                       'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
+                       'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
+               });
+               
+               new WCF.User.Action.Follow($('.userList > li'));
+               new WCF.User.Action.Ignore($('.userList > li'));
+       });
+       //]]>
+</script>
 
-</body>
-</html>
+{include file='footer'}
index 576c952126b5f1893a721f3d8f7f4ea9f77d8127..0e03c09125120be91ac2331a4f1dd50dde4ea208 100644 (file)
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.global.filter{/lang}</h2>
                
-               <div class="row rowColGap">
+               <div class="row rowColGap formGrid">
                        <dl class="col-xs-12 col-md-4">
-                               <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
-                                       <input type="text" id="username" name="username" value="{$username}" class="long" />
+                                       <input type="text" id="username" name="username" value="{$username}" placeholder="{lang}wcf.user.username{/lang}" class="long" />
                                </dd>
                        </dl>
                        
                        <dl class="col-xs-12 col-md-4">
-                               <dt><label for="filename">{lang}wcf.attachment.filename{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
-                                       <input type="text" id="filename" name="filename" value="{$filename}" class="long" />
+                                       <input type="text" id="filename" name="filename" value="{$filename}" placeholder="{lang}wcf.attachment.filename{/lang}" class="long" />
                                </dd>
                        </dl>
                        
-                       <dl class="col-xs-12 col-md-4">
-                               <dt><label for="fileType">{lang}wcf.attachment.fileType{/lang}</label></dt>
-                               <dd>
-                                       <select name="fileType" id="fileType">
-                                               <option value="">{lang}wcf.global.noSelection{/lang}</option>
-                                               {htmlOptions options=$availableFileTypes selected=$fileType}
-                                       </select>
-                               </dd>
-                       </dl>
+                       {if $availableFileTypes|count > 1}
+                               <dl class="col-xs-12 col-md-4">
+                                       <dt></dt>
+                                       <dd>
+                                               <select name="fileType" id="fileType">
+                                                       <option value="">{lang}wcf.attachment.fileType{/lang}</option>
+                                                       {htmlOptions options=$availableFileTypes selected=$fileType}
+                                               </select>
+                                       </dd>
+                               </dl>
+                       {/if}
                        
                        {event name='filterFields'}
-               </div>  
+               </div>
+               
+               <div class="formSubmit">
+                       <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                       {@SECURITY_TOKEN_INPUT_TAG}
+               </div>
        </section>
-       
-       <div class="formSubmit">
-               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {@SECURITY_TOKEN_INPUT_TAG}
-       </div>
 </form>
 
 {hascontent}
index 11c2ac2ee273680ffb7c2ba69fcc79120be836ae..51edbbe122264242fee21eb8cd2d0c0eace527df 100644 (file)
        </nav>
 </header>
 
-{hascontent}
-       <div class="paginationTop">
-               {content}
-                       {assign var='linkParameters' value=''}
-                       {if $name}{capture append=linkParameters}&name={@$name|rawurlencode}{/capture}{/if}
-                       {if $title}{capture append=linkParameters}&title={@$title|rawurlencode}{/capture}{/if}
-                       {if $content}{capture append=linkParameters}&content={@$content|rawurlencode}{/capture}{/if}
-                       {if $position}{capture append=linkParameters}&position={@$position}{/capture}{/if}
-                       {if $boxType}{capture append=linkParameters}&boxType={@$boxType|rawurlencode}{/capture}{/if}
-               
-                       {pages print=true assign=pagesLinks controller="BoxList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
-               {/content}
-       </div>
-{/hascontent}
-
 <form method="post" action="{link controller='BoxList'}{/link}">
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.global.filter{/lang}</h2>
        </section>
 </form>
 
+{hascontent}
+       <div class="paginationTop">
+               {content}
+               {assign var='linkParameters' value=''}
+               {if $name}{capture append=linkParameters}&name={@$name|rawurlencode}{/capture}{/if}
+               {if $title}{capture append=linkParameters}&title={@$title|rawurlencode}{/capture}{/if}
+               {if $content}{capture append=linkParameters}&content={@$content|rawurlencode}{/capture}{/if}
+               {if $position}{capture append=linkParameters}&position={@$position}{/capture}{/if}
+               {if $boxType}{capture append=linkParameters}&boxType={@$boxType|rawurlencode}{/capture}{/if}
+               
+               {pages print=true assign=pagesLinks controller="BoxList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
+               {/content}
+       </div>
+{/hascontent}
+
 {if $objects|count}
        <div class="section tabularBox">
                <table class="table">
index 7fbe0a952d4934739e5d200bbc10c36fa0fb348b..e1c816925573c21c88cbf2e02d6e4b7a8259fb8a 100644 (file)
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.global.filter{/lang}</h2>
                
-               <div class="row rowColGap">
+               <div class="row rowColGap formGrid">
                        <dl class="col-xs-12 col-md-4">
-                               <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
                                        <select name="id" id="languageID">
+                                               <option value="0">{lang}wcf.user.language{/lang}</option>
                                                {foreach from=$availableLanguages item=availableLanguage}
                                                        <option value="{@$availableLanguage->languageID}"{if $availableLanguage->languageID == $languageID} selected="selected"{/if}>{$availableLanguage->languageName} ({$availableLanguage->languageCode})</option>
                                                {/foreach}
                        </dl>
                        
                        <dl class="col-xs-12 col-md-4">
-                               <dt><label for="languageCategoryID">{lang}wcf.acp.language.category{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
                                        <select name="languageCategoryID" id="languageCategoryID">
-                                               <option value="0">{lang}wcf.global.noSelection{/lang}</option>
+                                               <option value="0">{lang}wcf.acp.language.category{/lang}</option>
                                                {foreach from=$availableLanguageCategories item=availableLanguageCategory}
                                                        <option value="{@$availableLanguageCategory->languageCategoryID}"{if $availableLanguageCategory->languageCategoryID == $languageCategoryID} selected="selected"{/if}>{$availableLanguageCategory->languageCategory}</option>
                                                {/foreach}
                        </dl>
                        
                        <dl class="col-xs-12 col-md-4">
-                               <dt><label for="languageItem">{lang}wcf.global.name{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
-                                       <input type="text" id="languageItem" name="languageItem" value="{$languageItem}" class="long" />
+                                       <input type="text" id="languageItem" name="languageItem" value="{$languageItem}" placeholder="{lang}wcf.global.name{/lang}" class="long" />
                                </dd>
                        </dl>
                        
                        <dl class="col-xs-12 col-md-4">
-                               <dt><label for="languageItemValue">{lang}wcf.acp.language.item.value{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
-                                       <input type="text" id="languageItemValue" name="languageItemValue" value="{$languageItemValue}" class="long" />
+                                       <input type="text" id="languageItemValue" name="languageItemValue" value="{$languageItemValue}" placeholder="{lang}wcf.acp.language.item.value{/lang}" class="long" />
                                        <label><input type="checkbox" name="hasCustomValue" value="1" {if $hasCustomValue == 1}checked="checked" {/if}/> {lang}wcf.acp.language.item.customValues{/lang}</label>
                                </dd>
                        </dl>
                        
                        {event name='filterFields'}
                </div>
+               
+               <div class="formSubmit">
+                       <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                       {@SECURITY_TOKEN_INPUT_TAG}
+               </div>
        </section>
-       
-       <div class="formSubmit">
-               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {@SECURITY_TOKEN_INPUT_TAG}
-       </div>
 </form>
 
 {if $objects|count}
index f988b46454207221eb6e26fba4265b6bff9ffa55..8f0b5dad98c4f2bc97bd8ecb6e550cb252ee76f6 100644 (file)
@@ -64,9 +64,9 @@
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.global.filter{/lang}</h2>
                
-               <div class="row rowColGap">
+               <div class="row rowColGap formGrid">
                        <dl class="col-xs-12 col-md-4">
-                               <dt><label for="filename">{lang}wcf.media.filename{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
                                        <div class="inputAddon dropdown" id="mediaSearch">
                                                <span class="button dropdownToggle inputPrefix">
                                                        <li class="dropdownDivider"></li>
                                                        <li data-file-type="all"><span>{lang}wcf.media.search.filetype.all{/lang}</span></li>
                                                </ul>
-                                               <input type="text" id="filename" name="filename" value="{$filename}" class="long" />
+                                               <input type="text" id="filename" name="filename" value="{$filename}" placeholder="{lang}wcf.media.filename{/lang}" class="long" />
                                        </div>
                                </dd>
                        </dl>
                        
                        <dl class="col-xs-12 col-md-4">
-                               <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
-                                       <input type="text" id="username" name="username" value="{$username}" class="long" />
+                                       <input type="text" id="username" name="username" value="{$username}" placeholder="{lang}wcf.user.username{/lang}" class="long" />
                                </dd>
                        </dl>
                
                        {event name='filterFields'}
-               </div>  
+               </div>
+               
+               <div class="formSubmit">
+                       <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                       {@SECURITY_TOKEN_INPUT_TAG}
+               </div>
        </section>
-       
-       {event name='sections'}
-       
-       <div class="formSubmit">
-               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {@SECURITY_TOKEN_INPUT_TAG}
-       </div>
 </form>
 
 {hascontent}
index 3b6c80afe4c6da01121c6570e26884f89113827e..796423c320f31b589e85c2b00a37e152a8b40802 100644 (file)
        </nav>
 </header>
 
-{hascontent}
-       <div class="paginationTop">
-               {content}
-                       {assign var='linkParameters' value=''}
-                       {if $name}{capture append=linkParameters}&name={@$name|rawurlencode}{/capture}{/if}
-                       {if $title}{capture append=linkParameters}&title={@$title|rawurlencode}{/capture}{/if}
-                       {if $content}{capture append=linkParameters}&content={@$content|rawurlencode}{/capture}{/if}
-                       {if $applicationPackageID}{capture append=linkParameters}&applicationPackageID={@$applicationPackageID}{/capture}{/if}
-                       {if $pageType}{capture append=linkParameters}&pageType={@$pageType|rawurlencode}{/capture}{/if}
-                       
-                       {pages print=true assign=pagesLinks controller="PageList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
-               {/content}
-       </div>
-{/hascontent}
-
 <form method="post" action="{link controller='PageList'}{/link}">
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.global.filter{/lang}</h2>
        </section>
 </form>
 
+{hascontent}
+       <div class="paginationTop">
+               {content}
+               {assign var='linkParameters' value=''}
+               {if $name}{capture append=linkParameters}&name={@$name|rawurlencode}{/capture}{/if}
+               {if $title}{capture append=linkParameters}&title={@$title|rawurlencode}{/capture}{/if}
+               {if $content}{capture append=linkParameters}&content={@$content|rawurlencode}{/capture}{/if}
+               {if $applicationPackageID}{capture append=linkParameters}&applicationPackageID={@$applicationPackageID}{/capture}{/if}
+               {if $pageType}{capture append=linkParameters}&pageType={@$pageType|rawurlencode}{/capture}{/if}
+               
+               {pages print=true assign=pagesLinks controller="PageList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"}
+               {/content}
+       </div>
+{/hascontent}
+
 {if $objects|count}
        <div class="section tabularBox">
                <table class="table">
index e2f50e98fa37a7423262c2eb0e771943aa933cf4..7cd99769f77ae06b0c4ab8f64f74c408ecdd1793 100644 (file)
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.global.filter{/lang}</h2>
                
-               <div class="row rowColGap">
+               <div class="row rowColGap formGrid">
                        <dl class="col-xs-12 col-md-4">
-                               <dt><label for="transactionID">{lang}wcf.acp.paidSubscription.transactionLog.transactionID{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
-                                       <input type="text" id="transactionID" name="transactionID" value="{$transactionID}" class="long" />
+                                       <input type="text" id="transactionID" name="transactionID" value="{$transactionID}" placeholder="{lang}wcf.acp.paidSubscription.transactionLog.transactionID{/lang}" class="long" />
                                </dd>
                        </dl>
                        
                        <dl class="col-xs-12 col-md-4">
-                               <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
-                                       <input type="text" id="username" name="username" value="{$username}" class="long" />
+                                       <input type="text" id="username" name="username" value="{$username}" placeholder="{lang}wcf.user.username{/lang}" class="long" />
                                </dd>
                        </dl>
                        
-                       {if $availableSubscriptions|count}
+                       {if $availableSubscriptions|count > 1}
                                <dl class="col-xs-12 col-md-4">
-                                       <dt><label for="subscriptionID">{lang}wcf.acp.paidSubscription.subscription{/lang}</label></dt>
+                                       <dt></dt>
                                        <dd>
                                                <select name="subscriptionID" id="subscriptionID">
-                                                       <option value="0">{lang}wcf.global.noSelection{/lang}</option>
+                                                       <option value="0">{lang}wcf.acp.paidSubscription.subscription{/lang}</option>
                                                        {foreach from=$availableSubscriptions item=availableSubscription}
                                                                <option value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID == $subscriptionID} selected="selected"{/if}>{$availableSubscription->title|language}</option>
                                                        {/foreach}
                        
                        {event name='filterFields'}
                </div>
+               
+               <div class="formSubmit">
+                       <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                       {@SECURITY_TOKEN_INPUT_TAG}
+               </div>
        </section>
-       
-       <div class="formSubmit">
-               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {@SECURITY_TOKEN_INPUT_TAG}
-       </div>
 </form>
 
 {hascontent}
index 50e68636ffb4fa103264eb9404296da5a76fdae7..a1b97b18d5e9d53a95b3486931621ad9df346727 100644 (file)
        <section class="section">
                <h2 class="sectionTitle">{lang}wcf.global.filter{/lang}</h2>
                
-               <div class="row rowColGap">
-                       <dl class="col-xs-12 col-md-4">
-                               <dt><label for="templateGroupID">{lang}wcf.acp.template.group{/lang}</label></dt>
-                               <dd>
-                                       <select name="templateGroupID" id="templateGroupID">
-                                               <option value="0">{lang}wcf.acp.template.group.default{/lang}</option>
-                                               {htmlOptions options=$availableTemplateGroups selected=$templateGroupID disableEncoding=true}
-                                       </select>
-                               </dd>
-                       </dl>
+               <div class="row rowColGap formGrid">
+                       {if $availableTemplateGroups|count}
+                               <dl class="col-xs-12 col-md-4">
+                                       <dt></dt>
+                                       <dd>
+                                               <select name="templateGroupID" id="templateGroupID">
+                                                       <option value="0">{lang}wcf.acp.template.group.default{/lang}</option>
+                                                       {htmlOptions options=$availableTemplateGroups selected=$templateGroupID disableEncoding=true}
+                                               </select>
+                                       </dd>
+                               </dl>
+                       {/if}
                        
-                       <dl class="col-xs-12 col-md-4">
-                               <dt><label for="application">{lang}wcf.acp.template.application{/lang}</label></dt>
-                               <dd>
-                                       <select name="application" id="application">
-                                               <option value="">{lang}wcf.acp.template.application.all{/lang}</option>
-                                               {foreach from=$availableApplications key=abbreviation item=availableApplication}
-                                                       <option value="{$abbreviation}"{if $abbreviation == $application} selected="selected"{/if}>{$availableApplication}</option>
-                                               {/foreach}
-                                       </select>
-                               </dd>
-                       </dl>
+                       {if $availableApplications|count > 1}
+                               <dl class="col-xs-12 col-md-4">
+                                       <dt></dt>
+                                       <dd>
+                                               <select name="application" id="application">
+                                                       <option value="">{lang}wcf.acp.template.application{/lang}</option>
+                                                       {foreach from=$availableApplications key=abbreviation item=availableApplication}
+                                                               <option value="{$abbreviation}"{if $abbreviation == $application} selected="selected"{/if}>{$availableApplication}</option>
+                                                       {/foreach}
+                                               </select>
+                                       </dd>
+                               </dl>
+                       {/if}
                        
                        <dl class="col-xs-12 col-md-4">
-                               <dt><label for="searchTemplateName">{lang}wcf.global.name{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
-                                       <input type="text" id="searchTemplateName" name="searchTemplateName" value="{$searchTemplateName}" class="long" />
+                                       <input type="text" id="searchTemplateName" name="searchTemplateName" value="{$searchTemplateName}" placeholder="{lang}wcf.global.name{/lang}" class="long" />
                                </dd>
                        </dl>
                        
                        {event name='filterFields'}
                </div>
+               
+               <div class="formSubmit">
+                       <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                       {@SECURITY_TOKEN_INPUT_TAG}
+               </div>
        </section>
-       
-       <div class="formSubmit">
-               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-               {@SECURITY_TOKEN_INPUT_TAG}
-       </div>
 </form>
 
 {hascontent}
index 4797657fc353c6d1e9d2e0cc1aac342db2936b22..842b975d99ff7e6dfcb669e7ad12fdd10b151e9b 100644 (file)
@@ -1512,7 +1512,6 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.template.group"><![CDATA[Templategruppe]]></item>
                <item name="wcf.acp.template.group.default"><![CDATA[Standardtemplates]]></item>
                <item name="wcf.acp.template.application"><![CDATA[Anwendung]]></item>
-               <item name="wcf.acp.template.application.all"><![CDATA[Keine Filterung]]></item>
                <item name="wcf.acp.template.add"><![CDATA[Template hinzufügen]]></item>
                <item name="wcf.acp.template.edit"><![CDATA[Template bearbeiten]]></item>
                <item name="wcf.acp.template.copy"><![CDATA[Template kopieren]]></item>
index 96e6b176b6478e1e23a6986ec6ae8adcbaa357f8..190d55d411fcc4460c575c5029854161e4b682b0 100644 (file)
@@ -1517,7 +1517,6 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.template.group"><![CDATA[Template Group]]></item>
                <item name="wcf.acp.template.group.default"><![CDATA[Default Templates]]></item>
                <item name="wcf.acp.template.application"><![CDATA[Application]]></item>
-               <item name="wcf.acp.template.application.all"><![CDATA[No Filter]]></item>
                <item name="wcf.acp.template.add"><![CDATA[Add Template]]></item>
                <item name="wcf.acp.template.edit"><![CDATA[Edit Template]]></item>
                <item name="wcf.acp.template.copy"><![CDATA[Copy Template]]></item>