Style/Template overhaul
authorMarcel Werk <burntime@woltlab.com>
Sat, 27 Feb 2016 16:22:08 +0000 (17:22 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 27 Feb 2016 16:22:25 +0000 (17:22 +0100)
* Fixed margins/paddings
* Removed/replaced deprecated elements (.container, .boxHeadline,
fieldset, .marginTop)
* Fixed deprecated icon names (.icon-* -> .fa-*)
* Fixed sidebars
* Some minor tweaks

245 files changed:
com.woltlab.wcf/templates/accountManagement.tpl
com.woltlab.wcf/templates/attachments.tpl
com.woltlab.wcf/templates/authorSidebarBox.tpl
com.woltlab.wcf/templates/avatarEdit.tpl
com.woltlab.wcf/templates/benchmark.tpl
com.woltlab.wcf/templates/captchaQuestion.tpl
com.woltlab.wcf/templates/commentAddGuestDialog.tpl
com.woltlab.wcf/templates/dashboard.tpl
com.woltlab.wcf/templates/dashboardBoxFollowingsOnlineSidebar.tpl
com.woltlab.wcf/templates/dashboardBoxMostActiveMembers.tpl
com.woltlab.wcf/templates/dashboardBoxMostLikedMembers.tpl
com.woltlab.wcf/templates/dashboardBoxNewestMembers.tpl
com.woltlab.wcf/templates/dashboardBoxPaidSubscriptions.tpl
com.woltlab.wcf/templates/dashboardBoxPaidSubscriptionsSidebar.tpl
com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl
com.woltlab.wcf/templates/dashboardBoxRecentActivitySidebar.tpl
com.woltlab.wcf/templates/dashboardBoxRegisterButton.tpl
com.woltlab.wcf/templates/dashboardBoxSignedInAs.tpl
com.woltlab.wcf/templates/dashboardBoxStaffOnlineSidebar.tpl
com.woltlab.wcf/templates/dashboardBoxTodaysBirthdays.tpl
com.woltlab.wcf/templates/dashboardBoxTodaysFollowingBirthdays.tpl
com.woltlab.wcf/templates/dashboardBoxUsersOnlineSidebar.tpl
com.woltlab.wcf/templates/deletedContentList.tpl
com.woltlab.wcf/templates/detailedActivityPointList.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/groupedUserList.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/manageSubscription.tpl
com.woltlab.wcf/templates/mediaEditor.tpl
com.woltlab.wcf/templates/mediaManager.tpl
com.woltlab.wcf/templates/membersList.tpl
com.woltlab.wcf/templates/messageQuoteList.tpl
com.woltlab.wcf/templates/messageSidebar.tpl
com.woltlab.wcf/templates/moderationActivation.tpl
com.woltlab.wcf/templates/moderationComment.tpl
com.woltlab.wcf/templates/moderationList.tpl
com.woltlab.wcf/templates/moderationQueueAssignUser.tpl
com.woltlab.wcf/templates/moderationQueueList.tpl
com.woltlab.wcf/templates/moderationReport.tpl
com.woltlab.wcf/templates/moderationReportDialog.tpl
com.woltlab.wcf/templates/moderationUser.tpl
com.woltlab.wcf/templates/newPassword.tpl
com.woltlab.wcf/templates/notificationList.tpl
com.woltlab.wcf/templates/notificationSettings.tpl
com.woltlab.wcf/templates/pageFooterCopyright.tpl
com.woltlab.wcf/templates/pageHeaderUser.tpl
com.woltlab.wcf/templates/paidSubscriptionList.tpl
com.woltlab.wcf/templates/poll.tpl
com.woltlab.wcf/templates/quoteBBCodeTag.tpl
com.woltlab.wcf/templates/quoteMetaCode.tpl
com.woltlab.wcf/templates/recaptcha.tpl
com.woltlab.wcf/templates/recentActivities.tpl
com.woltlab.wcf/templates/recentActivityList.tpl
com.woltlab.wcf/templates/recentActivityListItem.tpl
com.woltlab.wcf/templates/register.tpl
com.woltlab.wcf/templates/registerActivation.tpl
com.woltlab.wcf/templates/registerNewActivationCode.tpl
com.woltlab.wcf/templates/searchResult.tpl
com.woltlab.wcf/templates/searchResultList.tpl
com.woltlab.wcf/templates/settings.tpl
com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl
com.woltlab.wcf/templates/signatureEdit.tpl
com.woltlab.wcf/templates/sitemap.tpl
com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
com.woltlab.wcf/templates/styleChooser.tpl
com.woltlab.wcf/templates/tagged.tpl
com.woltlab.wcf/templates/team.tpl
com.woltlab.wcf/templates/user.tpl
com.woltlab.wcf/templates/userBirthdayList.tpl
com.woltlab.wcf/templates/userHeader.tpl
com.woltlab.wcf/templates/userListItem.tpl
com.woltlab.wcf/templates/userMenuSidebar.tpl
com.woltlab.wcf/templates/userProfileAboutEditable.tpl
com.woltlab.wcf/templates/userProfileCommentList.tpl
com.woltlab.wcf/templates/userProfileLikeItem.tpl
com.woltlab.wcf/templates/userSearch.tpl
com.woltlab.wcf/templates/userSidebar.tpl
com.woltlab.wcf/templates/usersOnlineInfoBox.tpl
com.woltlab.wcf/templates/usersOnlineList.tpl
com.woltlab.wcf/templates/worker.tpl
wcfsetup/install/files/acp/js/WCF.ACP.js
wcfsetup/install/files/acp/templates/acpSessionLog.tpl
wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
wcfsetup/install/files/acp/templates/adAdd.tpl
wcfsetup/install/files/acp/templates/adList.tpl
wcfsetup/install/files/acp/templates/applicationEdit.tpl
wcfsetup/install/files/acp/templates/applicationManagement.tpl
wcfsetup/install/files/acp/templates/attachmentList.tpl
wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
wcfsetup/install/files/acp/templates/bbcodeList.tpl
wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl
wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
wcfsetup/install/files/acp/templates/benchmark.tpl
wcfsetup/install/files/acp/templates/boxAdd.tpl
wcfsetup/install/files/acp/templates/boxList.tpl
wcfsetup/install/files/acp/templates/bulkProcessing.tpl
wcfsetup/install/files/acp/templates/cacheList.tpl
wcfsetup/install/files/acp/templates/captchaQuestion.tpl
wcfsetup/install/files/acp/templates/captchaQuestionAdd.tpl
wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
wcfsetup/install/files/acp/templates/categoryAdd.tpl
wcfsetup/install/files/acp/templates/categoryList.tpl
wcfsetup/install/files/acp/templates/cronjobAdd.tpl
wcfsetup/install/files/acp/templates/cronjobList.tpl
wcfsetup/install/files/acp/templates/cronjobLogList.tpl
wcfsetup/install/files/acp/templates/dashboardList.tpl
wcfsetup/install/files/acp/templates/dashboardOption.tpl
wcfsetup/install/files/acp/templates/dataImport.tpl
wcfsetup/install/files/acp/templates/exceptionLogView.tpl
wcfsetup/install/files/acp/templates/index.tpl
wcfsetup/install/files/acp/templates/labelAdd.tpl
wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
wcfsetup/install/files/acp/templates/labelGroupList.tpl
wcfsetup/install/files/acp/templates/labelList.tpl
wcfsetup/install/files/acp/templates/languageAdd.tpl
wcfsetup/install/files/acp/templates/languageExport.tpl
wcfsetup/install/files/acp/templates/languageImport.tpl
wcfsetup/install/files/acp/templates/languageItemEditDialog.tpl
wcfsetup/install/files/acp/templates/languageItemList.tpl
wcfsetup/install/files/acp/templates/languageList.tpl
wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
wcfsetup/install/files/acp/templates/languageServerAdd.tpl
wcfsetup/install/files/acp/templates/languageServerList.tpl
wcfsetup/install/files/acp/templates/masterPassword.tpl
wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
wcfsetup/install/files/acp/templates/mediaAdd.tpl
wcfsetup/install/files/acp/templates/mediaEditor.tpl
wcfsetup/install/files/acp/templates/mediaList.tpl
wcfsetup/install/files/acp/templates/mediaManager.tpl
wcfsetup/install/files/acp/templates/menuAdd.tpl
wcfsetup/install/files/acp/templates/menuItemAdd.tpl
wcfsetup/install/files/acp/templates/menuItemList.tpl
wcfsetup/install/files/acp/templates/menuList.tpl
wcfsetup/install/files/acp/templates/noticeAdd.tpl
wcfsetup/install/files/acp/templates/noticeList.tpl
wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
wcfsetup/install/files/acp/templates/option.tpl
wcfsetup/install/files/acp/templates/package.tpl
wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl
wcfsetup/install/files/acp/templates/packageList.tpl
wcfsetup/install/files/acp/templates/packageSearchResultList.tpl
wcfsetup/install/files/acp/templates/packageStartInstall.tpl
wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl
wcfsetup/install/files/acp/templates/packageUpdate.tpl
wcfsetup/install/files/acp/templates/packageUpdateExcludedPackages.tpl
wcfsetup/install/files/acp/templates/packageUpdateServerAdd.tpl
wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
wcfsetup/install/files/acp/templates/packageUpdateUnauthorized.tpl
wcfsetup/install/files/acp/templates/pageAdd.tpl
wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
wcfsetup/install/files/acp/templates/pageLanding.tpl
wcfsetup/install/files/acp/templates/pageList.tpl
wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionList.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLog.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionTransactionLogList.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionUserAdd.tpl
wcfsetup/install/files/acp/templates/paidSubscriptionUserList.tpl
wcfsetup/install/files/acp/templates/phpInfo.tpl
wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl
wcfsetup/install/files/acp/templates/pluginStorePurchasedItems.tpl
wcfsetup/install/files/acp/templates/rebuildData.tpl
wcfsetup/install/files/acp/templates/recaptcha.tpl
wcfsetup/install/files/acp/templates/rescueMode.tpl
wcfsetup/install/files/acp/templates/smileyAdd.tpl
wcfsetup/install/files/acp/templates/smileyList.tpl
wcfsetup/install/files/acp/templates/stat.tpl
wcfsetup/install/files/acp/templates/styleAdd.tpl
wcfsetup/install/files/acp/templates/styleExport.tpl
wcfsetup/install/files/acp/templates/styleImport.tpl
wcfsetup/install/files/acp/templates/styleList.tpl
wcfsetup/install/files/acp/templates/tagAdd.tpl
wcfsetup/install/files/acp/templates/tagList.tpl
wcfsetup/install/files/acp/templates/tagSetAsSynonyms.tpl
wcfsetup/install/files/acp/templates/templateAdd.tpl
wcfsetup/install/files/acp/templates/templateDiff.tpl
wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
wcfsetup/install/files/acp/templates/templateGroupList.tpl
wcfsetup/install/files/acp/templates/templateList.tpl
wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
wcfsetup/install/files/acp/templates/userAdd.tpl
wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
wcfsetup/install/files/acp/templates/userAuthenticationFailureList.tpl
wcfsetup/install/files/acp/templates/userConditions.tpl
wcfsetup/install/files/acp/templates/userContentRevertChanges.tpl
wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
wcfsetup/install/files/acp/templates/userGroupAdd.tpl
wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
wcfsetup/install/files/acp/templates/userGroupAssignmentList.tpl
wcfsetup/install/files/acp/templates/userGroupList.tpl
wcfsetup/install/files/acp/templates/userGroupOption.tpl
wcfsetup/install/files/acp/templates/userList.tpl
wcfsetup/install/files/acp/templates/userMail.tpl
wcfsetup/install/files/acp/templates/userMerge.tpl
wcfsetup/install/files/acp/templates/userOptionAdd.tpl
wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
wcfsetup/install/files/acp/templates/userOptionList.tpl
wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
wcfsetup/install/files/acp/templates/userOptionsCondition.tpl
wcfsetup/install/files/acp/templates/userRankAdd.tpl
wcfsetup/install/files/acp/templates/userRankList.tpl
wcfsetup/install/files/acp/templates/userSearch.tpl
wcfsetup/install/files/acp/templates/worker.tpl
wcfsetup/install/files/js/WCF.ImageViewer.js
wcfsetup/install/files/js/WCF.Location.js
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WCF.Moderation.js
wcfsetup/install/files/js/WCF.User.js
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/js/WoltLab/WCF/Language/Chooser.js
wcfsetup/install/files/js/WoltLab/WCF/Media/Editor.js
wcfsetup/install/files/js/WoltLab/WCF/Media/Manager/Base.js
wcfsetup/install/files/js/WoltLab/WCF/Ui/Redactor/Mention.js
wcfsetup/install/files/lib/acp/page/PHPInfoPage.class.php
wcfsetup/install/files/lib/system/form/container/GroupFormElementContainer.class.php
wcfsetup/install/files/lib/system/form/container/MultipleSelectionFormElementContainer.class.php
wcfsetup/install/files/lib/system/form/container/SingleSelectionFormElementContainer.class.php
wcfsetup/install/files/style/element/dl.scss
wcfsetup/install/files/style/element/label.scss
wcfsetup/install/files/style/layout/box.scss
wcfsetup/install/files/style/layout/containerList.scss
wcfsetup/install/files/style/layout/content.scss
wcfsetup/install/files/style/layout/global.scss
wcfsetup/install/files/style/layout/layout.scss
wcfsetup/install/files/style/layout/pageFooter.scss
wcfsetup/install/files/style/layout/sidebar.scss
wcfsetup/install/files/style/ui/alert.scss
wcfsetup/install/files/style/ui/dialog.scss
wcfsetup/install/files/style/ui/dropdown.scss
wcfsetup/install/files/style/ui/message.scss
wcfsetup/install/files/style/ui/tabMenu.scss
wcfsetup/install/files/style/ui/tabularBox.scss
wcfsetup/install/files/style/ui/userProfile.scss

index bcd19e2a433380bc60d575861ba9014573541e0b..aa32c75768d4fda8753ed8369bc1f969fcdde79c 100644 (file)
 
 {include file='userMenuSidebar'}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.accountManagement{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.accountManagement{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='AccountManagement'}{/link}">
-       <div class="container containerPadding marginTop">
-               {if !$__authProvider}
-                       <fieldset>
-                               <legend><label for="password">{lang}wcf.user.password{/lang}</label></legend>
-                               
-                               <dl{if $errorField == 'password'} class="formError"{/if}>
-                                       <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
-                                       <dd>
-                                               <input type="password" id="password" name="password" value="" required="required" class="medium" />
-                                               {if $errorField == 'password'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                               {if $errorType == 'false'}{lang}wcf.user.password.error.false{/lang}{/if}
-                                                       </small>
-                                               {/if}
-                                               <small>{lang}wcf.user.accountManagement.password.description{/lang}</small>
-                                       </dd>
-                               </dl>
+       {if !$__authProvider}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.user.password{/lang}</h2>
+                       
+                       <dl{if $errorField == 'password'} class="formError"{/if}>
+                               <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
+                               <dd>
+                                       <input type="password" id="password" name="password" value="" required="required" class="medium" />
+                                       {if $errorField == 'password'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                                       {if $errorType == 'false'}{lang}wcf.user.password.error.false{/lang}{/if}
+                                               </small>
+                                       {/if}
+                                       <small>{lang}wcf.user.accountManagement.password.description{/lang}</small>
+                               </dd>
+                       </dl>
+                       
+                       <dl>
+                               <dt></dt>
+                               <dd>
+                                       <ul class="buttonList smallButtons">
+                                               <li><a class="button small" href="{link controller='LostPassword'}{/link}"><span>{lang}wcf.user.lostPassword{/lang}</span></a></li>
+                                       </ul>
+                               </dd>
+                       </dl>
+                       
+                       {event name='passwordFields'}
+               </section>
+       {/if}
+       
+       {if $__wcf->getSession()->getPermission('user.profile.canRename')}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.user.changeUsername{/lang}</h2>
                                
+                       <dl{if $errorField == 'username'} class="formError"{/if}>
+                               <dt><label for="username">{lang}wcf.user.newUsername{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="username" name="username" value="{$username}" required="required" pattern="^[^,]{ldelim}{REGISTER_USERNAME_MIN_LENGTH},{REGISTER_USERNAME_MAX_LENGTH}}$" class="medium" />
+                                               
+                                       {if $errorField == 'username'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                                       {if $errorType == 'notValid'}{lang}wcf.user.username.error.notValid{/lang}{/if}
+                                                       {if $errorType == 'notUnique'}{lang}wcf.user.username.error.notUnique{/lang}{/if}
+                                                       {if $errorType == 'alreadyRenamed'}{lang}wcf.user.username.error.alreadyRenamed{/lang}{/if}
+                                               </small>
+                                       {/if}
+                                       {if $renamePeriod > 0}
+                                               <small>{lang}wcf.user.changeUsername.description{/lang}</small>
+                                       {/if}
+                               </dd>
+                       </dl>
+                       
+                       {event name='changeUsernameFields'}
+               </section>
+       {/if}
+       
+       {if !$__authProvider}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.user.changePassword{/lang}</h2>
+                       
+                       <dl{if $errorField == 'newPassword'} class="formError"{/if}>
+                               <dt><label for="newPassword">{lang}wcf.user.newPassword{/lang}</label></dt>
+                               <dd>
+                                       <input type="password" id="newPassword" name="newPassword" value="{$newPassword}" class="medium" />
+                                               
+                                       {if $errorField == 'newPassword'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                                       {if $errorType == 'notSecure'}{lang}wcf.user.password.error.notSecure{/lang}{/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+                       
+                       <dl{if $errorField == 'confirmNewPassword'} class="formError"{/if}>
+                               <dt><label for="confirmNewPassword">{lang}wcf.user.confirmPassword{/lang}</label></dt>
+                               <dd>
+                                       <input type="password" id="confirmNewPassword" name="confirmNewPassword" value="{$confirmNewPassword}" class="medium" />
+                                               
+                                       {if $errorField == 'confirmNewPassword'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                                       {if $errorType == 'notEqual'}{lang}wcf.user.confirmPassword.error.notEqual{/lang}{/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+                       
+                       {event name='changePasswordFields'}
+               </section>
+       {/if}
+       
+       {if $__wcf->getSession()->getPermission('user.profile.canChangeEmail')}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.user.changeEmail{/lang}</h2>
+                       
+                       <dl{if $errorField == 'email'} class="formError"{/if}>
+                               <dt><label for="email">{lang}wcf.user.newEmail{/lang}</label></dt>
+                               <dd>
+                                       <input type="email" id="email" name="email" value="{$email}" class="medium" />
+                                               
+                                       {if $errorField == 'email'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                                       {if $errorType == 'notValid'}{lang}wcf.user.email.error.notValid{/lang}{/if}
+                                                       {if $errorType == 'notUnique'}{lang}wcf.user.email.error.notUnique{/lang}{/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+                       
+                       <dl{if $errorField == 'confirmEmail'} class="formError"{/if}>
+                               <dt><label for="confirmEmail">{lang}wcf.user.confirmEmail{/lang}</label></dt>
+                               <dd>
+                                       <input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" class="medium" />
+                                               
+                                       {if $errorField == 'confirmEmail'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'notEqual'}{lang}wcf.user.confirmEmail.error.notEqual{/lang}{/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+                       
+                       {event name='changeEmailFields'}
+                       
+                       {if REGISTER_ACTIVATION_METHOD == 1 && $__wcf->getUser()->reactivationCode != 0}
                                <dl>
                                        <dt></dt>
                                        <dd>
                                                <ul class="buttonList smallButtons">
-                                                       <li><a class="button small" href="{link controller='LostPassword'}{/link}"><span>{lang}wcf.user.lostPassword{/lang}</span></a></li>
+                                                       <li><a class="button small" href="{link controller='EmailActivation'}{/link}"><span>{lang}wcf.user.emailActivation{/lang}</span></a></li>
                                                </ul>
+                                               <small>{lang newEmail=$__wcf->user->email}wcf.user.changeEmail.needReactivation{/lang}</small>
                                        </dd>
                                </dl>
-                               
-                               {event name='passwordFields'}
-                       </fieldset>
-               {/if}
-               
-               {if $__wcf->getSession()->getPermission('user.profile.canRename')}
-                       <fieldset>
-                               <legend><label for="username">{lang}wcf.user.changeUsername{/lang}</label></legend>
-                                       
-                               <dl{if $errorField == 'username'} class="formError"{/if}>
-                                       <dt><label for="username">{lang}wcf.user.newUsername{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="username" name="username" value="{$username}" required="required" pattern="^[^,]{ldelim}{REGISTER_USERNAME_MIN_LENGTH},{REGISTER_USERNAME_MAX_LENGTH}}$" class="medium" />
-                                                       
-                                               {if $errorField == 'username'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                               {if $errorType == 'notValid'}{lang}wcf.user.username.error.notValid{/lang}{/if}
-                                                               {if $errorType == 'notUnique'}{lang}wcf.user.username.error.notUnique{/lang}{/if}
-                                                               {if $errorType == 'alreadyRenamed'}{lang}wcf.user.username.error.alreadyRenamed{/lang}{/if}
-                                                       </small>
-                                               {/if}
-                                               {if $renamePeriod > 0}
-                                                       <small>{lang}wcf.user.changeUsername.description{/lang}</small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               
-                               {event name='changeUsernameFields'}
-                       </fieldset>
-               {/if}
-               
-               {if !$__authProvider}
-                       <fieldset>
-                               <legend><label for="newPassword">{lang}wcf.user.changePassword{/lang}</label></legend>
-                               
-                               <dl{if $errorField == 'newPassword'} class="formError"{/if}>
-                                       <dt><label for="newPassword">{lang}wcf.user.newPassword{/lang}</label></dt>
-                                       <dd>
-                                               <input type="password" id="newPassword" name="newPassword" value="{$newPassword}" class="medium" />
-                                                       
-                                               {if $errorField == 'newPassword'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                               {if $errorType == 'notSecure'}{lang}wcf.user.password.error.notSecure{/lang}{/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               
-                               <dl{if $errorField == 'confirmNewPassword'} class="formError"{/if}>
-                                       <dt><label for="confirmNewPassword">{lang}wcf.user.confirmPassword{/lang}</label></dt>
-                                       <dd>
-                                               <input type="password" id="confirmNewPassword" name="confirmNewPassword" value="{$confirmNewPassword}" class="medium" />
-                                                       
-                                               {if $errorField == 'confirmNewPassword'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                               {if $errorType == 'notEqual'}{lang}wcf.user.confirmPassword.error.notEqual{/lang}{/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               
-                               {event name='changePasswordFields'}
-                       </fieldset>
-               {/if}
-               
-               {if $__wcf->getSession()->getPermission('user.profile.canChangeEmail')}
-                       <fieldset>
-                               <legend><label for="email">{lang}wcf.user.changeEmail{/lang}</label></legend>
-                               
-                               <dl{if $errorField == 'email'} class="formError"{/if}>
-                                       <dt><label for="email">{lang}wcf.user.newEmail{/lang}</label></dt>
+                       {/if}
+               </section>
+       {/if}
+       
+       {if $__wcf->getSession()->getPermission('user.profile.canQuit')}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.user.quit{/lang}</h2>
+                       
+                       {if $quitStarted}
+                               <dl>
+                                       <dt></dt>
                                        <dd>
-                                               <input type="email" id="email" name="email" value="{$email}" class="medium" />
-                                                       
-                                               {if $errorField == 'email'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                               {if $errorType == 'notValid'}{lang}wcf.user.email.error.notValid{/lang}{/if}
-                                                               {if $errorType == 'notUnique'}{lang}wcf.user.email.error.notUnique{/lang}{/if}
-                                                       </small>
-                                               {/if}
+                                               <label><input type="checkbox" name="cancelQuit" value="1" {if $cancelQuit == 1}checked="checked" {/if}/> {lang}wcf.user.quit.cancel{/lang}</label>
                                        </dd>
                                </dl>
-                               
-                               <dl{if $errorField == 'confirmEmail'} class="formError"{/if}>
-                                       <dt><label for="confirmEmail">{lang}wcf.user.confirmEmail{/lang}</label></dt>
+                       {else}
+                               <dl>
+                                       <dt></dt>
                                        <dd>
-                                               <input type="email" id="confirmEmail" name="confirmEmail" value="{$confirmEmail}" class="medium" />
-                                                       
-                                               {if $errorField == 'confirmEmail'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'notEqual'}{lang}wcf.user.confirmEmail.error.notEqual{/lang}{/if}
-                                                       </small>
-                                               {/if}
+                                               <label><input type="checkbox" name="quit" value="1" {if $quit == 1}checked="checked" {/if}/> {lang}wcf.user.quit.sure{/lang}</label>
+                                               <small>{lang}wcf.user.quit.description{/lang}</small>
                                        </dd>
                                </dl>
-                               
-                               {event name='changeEmailFields'}
-                               
-                               {if REGISTER_ACTIVATION_METHOD == 1 && $__wcf->getUser()->reactivationCode != 0}
-                                       <dl>
-                                               <dt></dt>
-                                               <dd>
-                                                       <ul class="buttonList smallButtons">
-                                                               <li><a class="button small" href="{link controller='EmailActivation'}{/link}"><span>{lang}wcf.user.emailActivation{/lang}</span></a></li>
-                                                       </ul>
-                                                       <small>{lang newEmail=$__wcf->user->email}wcf.user.changeEmail.needReactivation{/lang}</small>
-                                               </dd>
-                                       </dl>
-                               {/if}
-                       </fieldset>
-               {/if}
-               
-               {if $__wcf->getSession()->getPermission('user.profile.canQuit')}
-                       <fieldset>
-                               <legend>{lang}wcf.user.quit{/lang}</legend>
-                               
-                               {if $quitStarted}
-                                       <dl>
-                                               <dt></dt>
-                                               <dd>
-                                                       <label><input type="checkbox" name="cancelQuit" value="1" {if $cancelQuit == 1}checked="checked" {/if}/> {lang}wcf.user.quit.cancel{/lang}</label>
-                                               </dd>
-                                       </dl>
-                               {else}
+                       {/if}
+                       
+                       {event name='quitFields'}
+               </section>
+       {/if}
+       
+       {hascontent}
+               <section class="section" id="3rdParty">
+                       <h2 class="sectionTitle">{lang}wcf.user.3rdparty{/lang}</h2>
+                       
+                       {content}
+                               {if $__authProvider}
                                        <dl>
-                                               <dt></dt>
+                                               <dt>{lang}wcf.user.3rdparty.{@$__authProvider}{/lang}</dt>
                                                <dd>
-                                                       <label><input type="checkbox" name="quit" value="1" {if $quit == 1}checked="checked" {/if}/> {lang}wcf.user.quit.sure{/lang}</label>
-                                                       <small>{lang}wcf.user.quit.description{/lang}</small>
+                                                       <label><input type="checkbox" name="{@$__authProvider}Disconnect" value="1" /> {lang}wcf.user.3rdparty.{@$__authProvider}.disconnect{/lang}</label>
                                                </dd>
                                        </dl>
-                               {/if}
-                               
-                               {event name='quitFields'}
-                       </fieldset>
-               {/if}
-               
-               {hascontent}
-                       <fieldset id="3rdParty">
-                               <legend>{lang}wcf.user.3rdparty{/lang}</legend>
-                               
-                               {content}
-                                       {if $__authProvider}
+                               {elseif !$__wcf->getUser()->hasAdministrativeAccess()}
+                                       {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
                                                <dl>
-                                                       <dt>{lang}wcf.user.3rdparty.{@$__authProvider}{/lang}</dt>
+                                                       <dt>{lang}wcf.user.3rdparty.github{/lang}</dt>
                                                        <dd>
-                                                               <label><input type="checkbox" name="{@$__authProvider}Disconnect" value="1" /> {lang}wcf.user.3rdparty.{@$__authProvider}.disconnect{/lang}</label>
+                                                               {if $__wcf->getSession()->getVar('__githubToken')}
+                                                                       <label><input type="checkbox" name="githubConnect" value="1"{if $githubConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.github.connect{/lang}</label>
+                                                               {else}
+                                                                       <a href="{link controller='GithubAuth'}{/link}" class="thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.connect{/lang}</span></a>
+                                                               {/if}
                                                        </dd>
                                                </dl>
-                                       {elseif !$__wcf->getUser()->hasAdministrativeAccess()}
-                                               {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
-                                                       <dl>
-                                                               <dt>{lang}wcf.user.3rdparty.github{/lang}</dt>
-                                                               <dd>
-                                                                       {if $__wcf->getSession()->getVar('__githubToken')}
-                                                                               <label><input type="checkbox" name="githubConnect" value="1"{if $githubConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.github.connect{/lang}</label>
-                                                                       {else}
-                                                                               <a href="{link controller='GithubAuth'}{/link}" class="thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.connect{/lang}</span></a>
-                                                                       {/if}
-                                                               </dd>
-                                                       </dl>
-                                               {/if}
-                                               
-                                               {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
-                                                       <dl>
-                                                               <dt>{lang}wcf.user.3rdparty.twitter{/lang}</dt>
-                                                               <dd>
-                                                                       {if $__wcf->getSession()->getVar('__twitterData')}
-                                                                               <label><input type="checkbox" name="twitterConnect" value="1"{if $twitterConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.twitter.connect{/lang}</label>
-                                                                       {else}
-                                                                               <a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.connect{/lang}</span></a>
-                                                                       {/if}
-                                                               </dd>
-                                                       </dl>
-                                               {/if}
-                                               
-                                               {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
-                                                       <dl>
-                                                               <dt>{lang}wcf.user.3rdparty.facebook{/lang}</dt>
-                                                               <dd>
-                                                                       {if $__wcf->getSession()->getVar('__facebookData')}
-                                                                               <label><input type="checkbox" name="facebookConnect" value="1"{if $facebookConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.facebook.connect{/lang}</label>
-                                                                       {else}
-                                                                               <a href="{link controller='FacebookAuth'}{/link}" class="thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.connect{/lang}</span></a>
-                                                                       {/if}
-                                                               </dd>
-                                                       </dl>
-                                               {/if}
-                                               
-                                               {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''}
-                                                       <dl>
-                                                               <dt>{lang}wcf.user.3rdparty.google{/lang}</dt>
-                                                               <dd>
-                                                                       {if $__wcf->getSession()->getVar('__googleData')}
-                                                                               <label><input type="checkbox" name="googleConnect" value="1"{if $googleConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.google.connect{/lang}</label>
-                                                                       {else}
-                                                                               <a href="{link controller='GoogleAuth'}{/link}" class="thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google-plus"></span> <span>{lang}wcf.user.3rdparty.google.connect{/lang}</span></a>
-                                                                       {/if}
-                                                               </dd>
-                                                       </dl>
-                                               {/if}
-                                               
-                                               {event name='3rdpartyFields'}
                                        {/if}
-                               {/content}
-                       </fieldset>
-               {/hascontent}
-               
-               {event name='fieldsets'}
-       </div>
+                                       
+                                       {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
+                                               <dl>
+                                                       <dt>{lang}wcf.user.3rdparty.twitter{/lang}</dt>
+                                                       <dd>
+                                                               {if $__wcf->getSession()->getVar('__twitterData')}
+                                                                       <label><input type="checkbox" name="twitterConnect" value="1"{if $twitterConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.twitter.connect{/lang}</label>
+                                                               {else}
+                                                                       <a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.connect{/lang}</span></a>
+                                                               {/if}
+                                                       </dd>
+                                               </dl>
+                                       {/if}
+                                       
+                                       {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
+                                               <dl>
+                                                       <dt>{lang}wcf.user.3rdparty.facebook{/lang}</dt>
+                                                       <dd>
+                                                               {if $__wcf->getSession()->getVar('__facebookData')}
+                                                                       <label><input type="checkbox" name="facebookConnect" value="1"{if $facebookConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.facebook.connect{/lang}</label>
+                                                               {else}
+                                                                       <a href="{link controller='FacebookAuth'}{/link}" class="thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.connect{/lang}</span></a>
+                                                               {/if}
+                                                       </dd>
+                                               </dl>
+                                       {/if}
+                                       
+                                       {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''}
+                                               <dl>
+                                                       <dt>{lang}wcf.user.3rdparty.google{/lang}</dt>
+                                                       <dd>
+                                                               {if $__wcf->getSession()->getVar('__googleData')}
+                                                                       <label><input type="checkbox" name="googleConnect" value="1"{if $googleConnect} checked="checked"{/if} /> {lang}wcf.user.3rdparty.google.connect{/lang}</label>
+                                                               {else}
+                                                                       <a href="{link controller='GoogleAuth'}{/link}" class="thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google-plus"></span> <span>{lang}wcf.user.3rdparty.google.connect{/lang}</span></a>
+                                                               {/if}
+                                                       </dd>
+                                               </dl>
+                                       {/if}
+                                       
+                                       {event name='3rdpartyFields'}
+                               {/if}
+                       {/content}
+               </section>
+       {/hascontent}
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index ca6a12f2cef39e0600bfa50eef922347e2b3acdb..0f68496554a88ce7b4c8e4939a187c6458a84b71 100644 (file)
@@ -1,55 +1,51 @@
 {if $attachmentList && $attachmentList->getGroupedObjects($objectID)|count}
        {hascontent}
-               <div class="attachmentThumbnailList">
-                       <fieldset>
-                               <legend>{lang}wcf.attachment.images{/lang}</legend>
-                               
-                               <ul>
-                                       {content}
-                                               {foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment}
-                                                       {if $attachment->showAsImage() && !$attachment->isEmbedded()}
-                                                               <li class="attachmentThumbnail" data-attachment-id="{@$attachment->attachmentID}">
-                                                                       {if $attachment->hasThumbnail()}
-                                                                               <a href="{link controller='Attachment' object=$attachment}{/link}"{if $attachment->canDownload()} class="jsImageViewer" title="{$attachment->filename}"{/if}><img src="{link controller='Attachment' object=$attachment}thumbnail=1{/link}" alt="" style="{if $attachment->thumbnailHeight < ATTACHMENT_THUMBNAIL_HEIGHT}margin-top: {@ATTACHMENT_THUMBNAIL_HEIGHT/2-$attachment->thumbnailHeight/2}px; {/if}{if $attachment->thumbnailWidth < ATTACHMENT_THUMBNAIL_WIDTH}margin-left: {@ATTACHMENT_THUMBNAIL_WIDTH/2-$attachment->thumbnailWidth/2}px{/if}" /></a>
-                                                                       {else}
-                                                                               <img src="{link controller='Attachment' object=$attachment}{/link}" alt="" style="margin-top: {@ATTACHMENT_THUMBNAIL_HEIGHT/2-$attachment->height/2}px; margin-left: {@ATTACHMENT_THUMBNAIL_WIDTH/2-$attachment->width/2}px" />
-                                                                       {/if}
-                                                                       
-                                                                       <div title="{lang}wcf.attachment.image.info{/lang}">
-                                                                               <p>{$attachment->filename}</p>
-                                                                               <small>{lang}wcf.attachment.image.info{/lang}</small>
-                                                                       </div>
-                                                               </li>
-                                                       {/if}
-                                               {/foreach}
-                                       {/content}
-                               </ul>
-                       </fieldset>
-               </div>
+               <section class="section attachmentThumbnailList">
+                       <h2 class="sectionTitle">{lang}wcf.attachment.images{/lang}</h2>
+                       
+                       <ul>
+                               {content}
+                                       {foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment}
+                                               {if $attachment->showAsImage() && !$attachment->isEmbedded()}
+                                                       <li class="attachmentThumbnail" data-attachment-id="{@$attachment->attachmentID}">
+                                                               {if $attachment->hasThumbnail()}
+                                                                       <a href="{link controller='Attachment' object=$attachment}{/link}"{if $attachment->canDownload()} class="jsImageViewer" title="{$attachment->filename}"{/if}><img src="{link controller='Attachment' object=$attachment}thumbnail=1{/link}" alt="" style="{if $attachment->thumbnailHeight < ATTACHMENT_THUMBNAIL_HEIGHT}margin-top: {@ATTACHMENT_THUMBNAIL_HEIGHT/2-$attachment->thumbnailHeight/2}px; {/if}{if $attachment->thumbnailWidth < ATTACHMENT_THUMBNAIL_WIDTH}margin-left: {@ATTACHMENT_THUMBNAIL_WIDTH/2-$attachment->thumbnailWidth/2}px{/if}" /></a>
+                                                               {else}
+                                                                       <img src="{link controller='Attachment' object=$attachment}{/link}" alt="" style="margin-top: {@ATTACHMENT_THUMBNAIL_HEIGHT/2-$attachment->height/2}px; margin-left: {@ATTACHMENT_THUMBNAIL_WIDTH/2-$attachment->width/2}px" />
+                                                               {/if}
+                                                               
+                                                               <div title="{lang}wcf.attachment.image.info{/lang}">
+                                                                       <p>{$attachment->filename}</p>
+                                                                       <small>{lang}wcf.attachment.image.info{/lang}</small>
+                                                               </div>
+                                                       </li>
+                                               {/if}
+                                       {/foreach}
+                               {/content}
+                       </ul>
+               </section>
        {/hascontent}
        
        {hascontent}
-               <div class="attachmentFileList">
-                       <fieldset>
-                               <legend>{lang}wcf.attachment.files{/lang}</legend>
+               <section class="section attachmentFileList">
+                       <h2 class="sectionTitle">{lang}wcf.attachment.files{/lang}</h2>
                                
-                               <ul>
-                                       {content}
-                                               {foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment}
-                                                       {if $attachment->showAsFile() && !$attachment->isEmbedded()}
-                                                               <li class="box32" data-attachment-id="{@$attachment->attachmentID}">
-                                                                       <a href="{link controller='Attachment' object=$attachment}{/link}"><span class="icon icon32 fa-paperclip"></span></a>
-                                                                       
-                                                                       <div>
-                                                                               <p><a href="{link controller='Attachment' object=$attachment}{/link}">{$attachment->filename}</a></p>
-                                                                               <small>{lang}wcf.attachment.file.info{/lang}</small>
-                                                                       </div>
-                                                               </li>
-                                                       {/if}
-                                               {/foreach}
-                                       {/content}
-                               </ul>
-                       </fieldset>
-               </div>
+                       <ul>
+                               {content}
+                                       {foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment}
+                                               {if $attachment->showAsFile() && !$attachment->isEmbedded()}
+                                                       <li class="box32" data-attachment-id="{@$attachment->attachmentID}">
+                                                               <a href="{link controller='Attachment' object=$attachment}{/link}"><span class="icon icon32 fa-paperclip"></span></a>
+                                                               
+                                                               <div>
+                                                                       <p><a href="{link controller='Attachment' object=$attachment}{/link}">{$attachment->filename}</a></p>
+                                                                       <small>{lang}wcf.attachment.file.info{/lang}</small>
+                                                               </div>
+                                                       </li>
+                                               {/if}
+                                       {/foreach}
+                               {/content}
+                       </ul>
+               </section>
        {/hascontent}
 {/if}
index 03f648b4649318794d6df9c44dc6144a3e75faf4..c40925d5ddec4db0580e3407cf89ece2f41405df 100644 (file)
@@ -1,7 +1,5 @@
-<fieldset>
-       <legend class="invisible">{lang}wcf.user.author{/lang}</legend>
-       
-       <div class="box96 framed">
+<div class="box">
+       <div class="boxContent box96">
                {@$userProfile->getAvatar()->getImageTag(96)}
                
                <div>
@@ -24,4 +22,4 @@
                        {/if}
                </div>
        </div>
-</fieldset>
\ No newline at end of file
+</div>
\ No newline at end of file
index bb593609062038b26275dcbcb24c35bc6c1c07a6..a2cd0c127b06f111bfc4bbec3f39cd8fdc0727c6 100644 (file)
 
 {include file='userMenuSidebar'}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.avatar.edit{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.avatar.edit{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='AvatarEdit'}{/link}" id="avatarForm">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.user.avatar{/lang}</legend>
-                               
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="radio" name="avatarType" value="none" {if $avatarType == 'none'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.none{/lang}</label>
-                                       <small>{lang}wcf.user.avatar.type.none.description{/lang}</small>
-                               </dd>
-                       </dl>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.user.avatar{/lang}</h2>
                        
-                       {if $__wcf->getSession()->getPermission('user.profile.avatar.canUploadAvatar')}
-                               <dl class="jsOnly{if $errorField == 'custom'} formError{/if}" id="avatarUpload">
-                                       <dt class="framed">
-                                               {if $avatarType == 'custom'}
-                                                       {if $__wcf->getUserProfileHandler()->getAvatar()->canCrop()}
-                                                               {@$__wcf->getUserProfileHandler()->getAvatar()->getCropImageTag(96)}
-                                                       {else}
-                                                               {@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(96)}
-                                                       {/if}
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="radio" name="avatarType" value="none" {if $avatarType == 'none'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.none{/lang}</label>
+                               <small>{lang}wcf.user.avatar.type.none.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {if $__wcf->getSession()->getPermission('user.profile.avatar.canUploadAvatar')}
+                       <dl class="jsOnly{if $errorField == 'custom'} formError{/if}" id="avatarUpload">
+                               <dt>
+                                       {if $avatarType == 'custom'}
+                                               {if $__wcf->getUserProfileHandler()->getAvatar()->canCrop()}
+                                                       {@$__wcf->getUserProfileHandler()->getAvatar()->getCropImageTag(96)}
                                                {else}
-                                                       <img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="icon96" />
-                                               {/if}
-                                       </dt>
-                                       <dd>
-                                               <label><input type="radio" name="avatarType" value="custom" {if $avatarType == 'custom'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.custom{/lang}</label>
-                                               <small>{lang}wcf.user.avatar.type.custom.description{/lang}</small>
-                                               
-                                               {* placeholder for upload button: *}
-                                               <div></div>
-                                               
-                                               {if $errorField == 'custom'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                       </small>
+                                                       {@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(96)}
                                                {/if}
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       {if MODULE_GRAVATAR}
-                               <dl{if $errorField == 'gravatar'} class="formError"{/if}>
-                                       <dt class="framed"><img src="https://secure.gravatar.com/avatar/{@$__wcf->user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="icon96" /></dt>
-                                       <dd>
-                                               <label><input type="radio" name="avatarType" value="gravatar" {if $avatarType == 'gravatar'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
-                                               {if $errorField == 'gravatar'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'notFound'}{lang}wcf.user.avatar.type.gravatar.error.notFound{/lang}{/if}
-                                                       </small>
-                                               {/if}
-                                               <small>{lang}wcf.user.avatar.type.gravatar.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       {event name='avatarFields'}
-               </fieldset>
+                                       {else}
+                                               <img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage icon96" />
+                                       {/if}
+                               </dt>
+                               <dd>
+                                       <label><input type="radio" name="avatarType" value="custom" {if $avatarType == 'custom'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.custom{/lang}</label>
+                                       <small>{lang}wcf.user.avatar.type.custom.description{/lang}</small>
+                                       
+                                       {* placeholder for upload button: *}
+                                       <div></div>
+                                       
+                                       {if $errorField == 'custom'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+               {/if}
+               
+               {if MODULE_GRAVATAR}
+                       <dl{if $errorField == 'gravatar'} class="formError"{/if}>
+                               <dt><img src="https://secure.gravatar.com/avatar/{@$__wcf->user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="userAvatarImage icon96" /></dt>
+                               <dd>
+                                       <label><input type="radio" name="avatarType" value="gravatar" {if $avatarType == 'gravatar'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
+                                       {if $errorField == 'gravatar'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'notFound'}{lang}wcf.user.avatar.type.gravatar.error.notFound{/lang}{/if}
+                                               </small>
+                                       {/if}
+                                       <small>{lang}wcf.user.avatar.type.gravatar.description{/lang}</small>
+                               </dd>
+                       </dl>
+               {/if}
+               
+               {event name='avatarFields'}
+       </section>
                
-               {event name='fieldsets'}
-       </div>
+       {event name='sections'}
        
        {if !$__wcf->user->disableAvatar}
                <div class="formSubmit">
index d289c89fd58ac64d3fccdaeca3d96aeaf34a18b6..1d7be2e7ea491b56403c36e86f1132d09f69c230 100644 (file)
@@ -1,6 +1,7 @@
-<p class="marginTop" id="benchmark"><small>Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</small></p>
+<div class="benchmark">
+       {if ENABLE_DEBUG_MODE}<a id="benchmark">{/if}Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}{if ENABLE_DEBUG_MODE}</a>{/if}
 
-{if ENABLE_DEBUG_MODE} 
+{if ENABLE_DEBUG_MODE}
        <script data-relocate="true">
                //<![CDATA[
                $(function() {
@@ -34,4 +35,5 @@
                });
                //]]>
        </script>
-{/if}
\ No newline at end of file
+{/if}
+</div>
\ No newline at end of file
index 827525057e641be7553ac3abddab31efdc7af0a8..9bd84ac69adc44dcebbbf4ce6c2acab23ecffac9 100644 (file)
@@ -1,9 +1,11 @@
 <input type="hidden" name="captchaQuestion" value="{$captchaQuestion}" />
 
 {if !$captchaQuestionAnswered}
-       <fieldset>
-               <legend>{lang}wcf.captcha.question.captcha{/lang}</legend>
-               <small>{lang}wcf.captcha.question.captcha.description{/lang}</small>
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.captcha.question.captcha{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.captcha.question.captcha.description{/lang}</small>
+               </header>
                
                <dl class="condensed{if (($errorType|isset && $errorType|is_array && $errorType[captchaAnswer]|isset) || ($errorField|isset && $errorField == 'captchaAnswer'))} formError{/if}">
                        <dt><label for="captchaAnswer">{lang}{$captchaQuestionObject->question}{/lang}</label></dt>
@@ -24,7 +26,7 @@
                                {/if}
                        </dd>
                </dl>
-       </fieldset>
+       </section>
        
        {if !$ajaxCaptcha|empty}
                <script data-relocate="true">
index 8fe7e4d71ad9b72652fe54ab94a5f8807d93f770..0631d1174d81bd3b7bcb63e3d2837e160d79bb57 100644 (file)
@@ -1,5 +1,5 @@
 <div>
-       <fieldset>
+       <div class="section">
                <dl{if $errorType[username]|isset} class="formError"{/if}>
                        <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
                        <dd>
@@ -15,7 +15,7 @@
                                {/if}
                        </dd>
                </dl>
-       </fieldset>
+       </div>
        
        {include file='captcha'}
 </div>
index a3b3daf148c7cee0c49027869a4c0404528b4825..fbcd452f5f0dde80f318cf21903b63740a4b6acb 100644 (file)
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
 {if $__boxSidebar|isset && $__boxSidebar}
-       {capture assign='sidebar'}
+       {capture assign='sidebarRight'}
                {@$__boxSidebar}
        {/capture}
 {/if}
 
-{include file='header' sidebarOrientation='right'}
+{include file='header'}
 
 {if $__wcf->getPageMenu()->getLandingPage()->menuItem == 'wcf.user.dashboard'}
-       <header class="boxHeadline">
-               <h1>{PAGE_TITLE|language}</h1>
-               {hascontent}<p>{content}{PAGE_DESCRIPTION|language}{/content}</p>{/hascontent}
+       <header class="contentHeader">
+               <h1 class="contentTitle">{PAGE_TITLE|language}</h1>
+               {hascontent}<p class="contentHeaderDescription">{content}{PAGE_DESCRIPTION|language}{/content}</p>{/hascontent}
        </header>
 {else}
-       <header class="boxHeadline">
-               <h1>{lang}wcf.user.dashboard{/lang}</h1>
+       <header class="contentHeader">
+               <h1 class="contentTitle">{lang}wcf.user.dashboard{/lang}</h1>
        </header>
 {/if}
 
index 72224deb883a0816027041ff6f268f4ac5b2f5c1..7f4e68f858b00cb4369360d5bf4fefb972e1614a 100644 (file)
@@ -1,7 +1,7 @@
 <ul class="sidebarBoxList">
        {foreach from=$usersOnlineList item=userOnline}
                <li class="box32">
-                       <a href="{link controller='User' object=$userOnline}{/link}" class="framed">{@$userOnline->getAvatar()->getImageTag(32)}</a>
+                       <a href="{link controller='User' object=$userOnline}{/link}">{@$userOnline->getAvatar()->getImageTag(32)}</a>
                        
                        <div class="sidebarBoxHeadline">
                                <h3><a href="{link controller='User' object=$userOnline}{/link}" class="userLink" data-user-id="{@$userOnline->userID}">{$userOnline->username}</a></h3>
index d0d5c45446da276fb1ca4edf4e6299f87640986a..7f9fcb3561eede72d9db3395589071ef8f914df5 100644 (file)
@@ -1,7 +1,7 @@
 <ul class="sidebarBoxList">
        {foreach from=$mostActiveMembers item=activeMember}
                <li class="box24">
-                       <a href="{link controller='User' object=$activeMember}{/link}" class="framed">{@$activeMember->getAvatar()->getImageTag(24)}</a>
+                       <a href="{link controller='User' object=$activeMember}{/link}">{@$activeMember->getAvatar()->getImageTag(24)}</a>
                        
                        <div class="sidebarBoxHeadline">
                                <h3><a href="{link controller='User' object=$activeMember}{/link}" class="userLink" data-user-id="{@$activeMember->userID}">{$activeMember->username}</a></h3>
index 20b55ba98a4f67fe59fcad8da6f1594c12fcdaad..0c7a5c589d2bc3899a18c10a24ceb04cfa59e41a 100644 (file)
@@ -1,7 +1,7 @@
 <ul class="sidebarBoxList">
        {foreach from=$mostLikedMembers item=likedMember}
                <li class="box24">
-                       <a href="{link controller='User' object=$likedMember}{/link}" class="framed">{@$likedMember->getAvatar()->getImageTag(24)}</a>
+                       <a href="{link controller='User' object=$likedMember}{/link}">{@$likedMember->getAvatar()->getImageTag(24)}</a>
                        
                        <div class="sidebarBoxHeadline">
                                <h3><a href="{link controller='User' object=$likedMember}{/link}" class="userLink" data-user-id="{@$likedMember->userID}">{$likedMember->username}</a></h3>
index b9f6cea4e6bf8b504219347633f81e95be80a8e1..15fdbd4a99badcdf9a3e06c6064a28dea8e3bad6 100644 (file)
@@ -1,7 +1,7 @@
 <ul class="sidebarBoxList">
        {foreach from=$newestMembers item=newMember}
                <li class="box24">
-                       <a href="{link controller='User' object=$newMember}{/link}" class="framed">{@$newMember->getAvatar()->getImageTag(24)}</a>
+                       <a href="{link controller='User' object=$newMember}{/link}">{@$newMember->getAvatar()->getImageTag(24)}</a>
                        
                        <div class="sidebarBoxHeadline">
                                <h3><a href="{link controller='User' object=$newMember}{/link}" class="userLink" data-user-id="{@$newMember->userID}">{$newMember->username}</a></h3>
index 182528089bd810e3c3d6b8e14721287642e01425..e637f734ca80b377a47c473fe4f28e654a541bfd 100644 (file)
@@ -1,8 +1,6 @@
-<header class="boxHeadline boxSubHeadline">
-       <h2>{lang}wcf.dashboard.box.com.woltlab.wcf.paidSubscriptions{/lang}</h2>
-</header>
-
-<div class="container marginTop containerPadding">
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.dashboard.box.com.woltlab.wcf.paidSubscriptions{/lang}</h2>
+       
        <ul class="containerBoxList tripleColumned">
                {foreach from=$subscriptions item=subscription}
                        <li>
                                </div>
                                
                                {if !PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
-                                       <ul class="buttonList marginTopTiny">
-                                               {foreach from=$subscription->getPurchaseButtons() item=button}
-                                                       <li>{@$button}</li>
-                                               {/foreach}
-                                       </ul>
+                                       <div class="containerContent">
+                                               <ul class="buttonList">
+                                                       {foreach from=$subscription->getPurchaseButtons() item=button}
+                                                               <li>{@$button}</li>
+                                                       {/foreach}
+                                               </ul>
+                                       </div>
                                {/if}
                        </li>
                {/foreach}
@@ -27,4 +27,4 @@
                        <li><a class="button small" href="{link controller='PaidSubscriptionList'}{/link}">{lang}wcf.paidSubscription.button.moreInformation{/lang}</a></li>
                </ul>
        {/if}
-</div>
+</section>
index b338552ab0861e4c5f7b16dcbfb5257d70fcab61..4941e3c869e484b2295350948948b3edcb4efd60 100644 (file)
@@ -7,7 +7,7 @@
                        </div>
                        
                        {if !PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
-                               <ul class="buttonList marginTopTiny">
+                               <ul class="buttonList">
                                        {foreach from=$subscription->getPurchaseButtons() item=button}
                                                <li>{@$button}</li>
                                        {/foreach}
index 041cc2effcb7f90f2b36fb3b6942fb1c318a82e5..800835226e8a8f40e57f168601ed1a6018be75aa 100644 (file)
@@ -1,23 +1,23 @@
-<header class="boxHeadline boxSubHeadline dashboardBoxRecentActivityHeadline" id="dashboardBoxRecentActivity">
-       <h1>{lang}wcf.user.recentActivity{/lang}</h1>
+<section class="section sectionContainerList dashboardBoxRecentActivity" id="dashboardBoxRecentActivity">
+       <header class="sectionHeader">
+               <h2 class="sectionTitle">{lang}wcf.user.recentActivity{/lang}</h2>
+               
+               {if $canFilterByFollowedUsers}{*todo*}
+                       <nav class="jsMobileNavigation buttonGroupNavigation jsOnly jsRecentActivitySwitchContext">
+                               <ul class="buttonGroup">
+                                       <li><a href="#" class="button small{if !$filteredByFollowedUsers} active{/if}">{lang}wcf.user.recentActivity.scope.all{/lang}</a></li>
+                                       <li><a href="#" class="button small{if $filteredByFollowedUsers} active{/if}">{lang}wcf.user.recentActivity.scope.followedUsers{/lang}</a></li>
+                               </ul>
+                       </nav>
+               {/if}
+       </header>
        
-       {if $canFilterByFollowedUsers}
-               <nav class="marginTop jsMobileNavigation buttonGroupNavigation jsOnly jsRecentActivitySwitchContext">
-                       <ul class="buttonGroup">
-                               <li><a href="#" class="button small{if !$filteredByFollowedUsers} active{/if}">{lang}wcf.user.recentActivity.scope.all{/lang}</a></li>
-                               <li><a href="#" class="button small{if $filteredByFollowedUsers} active{/if}">{lang}wcf.user.recentActivity.scope.followedUsers{/lang}</a></li>                         
-                       </ul>
-               </nav>
-       {/if}
-</header>
-
-<div class="container marginTop">
        {assign var='__events' value=$eventList->getObjects()}
        {assign var='__lastEvent' value=$__events|end}
        <ul id="recentActivities" class="containerList recentActivityList" data-last-event-time="{@$lastEventTime}" data-last-event-id="{if $__lastEvent}{@$__lastEvent->eventID}{else}0{/if}">
                {include file='recentActivityListItem'}
        </ul>
-</div>
+</section>
 
 <script data-relocate="true">
        //<![CDATA[
index 85bec82e6143f3aa176655b3d09fb0ad2e56596b..542949ffbd5654fda2f6f4bc8db4e7b9cdfcde49 100644 (file)
@@ -1,7 +1,7 @@
 <ul class="sidebarBoxList">
        {foreach from=$eventList item=event}
                <li class="box24">
-                       <a href="{link controller='User' object=$event->getUserProfile()}{/link}" title="{$event->getUserProfile()->username}" class="framed">{@$event->getUserProfile()->getAvatar()->getImageTag(24)}</a>
+                       <a href="{link controller='User' object=$event->getUserProfile()}{/link}" title="{$event->getUserProfile()->username}">{@$event->getUserProfile()->getAvatar()->getImageTag(24)}</a>
                        
                        <div class="sidebarBoxHeadline">
                                <h3><a href="{link controller='User' object=$event->getUserProfile()}{/link}" class="userLink" data-user-id="{@$event->getUserProfile()->userID}">{$event->getUserProfile()->username}</a><small> - {@$event->time|time}</small></h3> 
index 3a4310f0ba4d3a8f68bd54780fbe677bbb6a73a1..177e993e6c6da7563bfc12f1ed0a6d6942a24b76 100644 (file)
@@ -1,5 +1,5 @@
-<fieldset class="dashboardBox dashboardBoxSidebarButton">
-       <div>
+<div class="box dashboardBoxSidebarButton">
+       <div class="boxContent">
                <a href="{link controller='Register'}{/link}" class="button">{lang}wcf.user.button.registerNow{/lang}</a>
        </div>
-</fieldset>
+</div>
index bb32c06a99e3c937d7f1c1084628af3a37ce8038..ec54617d2d13dfec702afb1bea9c39045f567220 100644 (file)
@@ -1,7 +1,7 @@
 <section class="dashboardBox dashboardBoxSignedInAs">
        <h1 class="invisible">{lang}wcf.dashboard.box.{$box->boxName}{/lang}</h1>
        
-       <div class="box96 framed">
+       <div class="box96">
                {@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(96)}
                
                <div>
index 86a76d1d45b1b69106121bc6f23f1dd55844d5bd..060b74bc3ac145b8481d8e81d46bef2bb4bfa6a4 100644 (file)
@@ -1,7 +1,7 @@
 <ul class="sidebarBoxList">
        {foreach from=$usersOnlineList item=userOnline}
                <li class="box32">
-                       <a href="{link controller='User' object=$userOnline}{/link}" class="framed">{@$userOnline->getAvatar()->getImageTag(32)}</a>
+                       <a href="{link controller='User' object=$userOnline}{/link}">{@$userOnline->getAvatar()->getImageTag(32)}</a>
                        
                        <div class="sidebarBoxHeadline">
                                <h3><a href="{link controller='User' object=$userOnline}{/link}" class="userLink" data-user-id="{@$userOnline->userID}">{$userOnline->username}</a></h3>
index e756e22fae1dabf9c2dfb04bc3a731d47c4dbcf9..32d524416389515592a2de4d28173b4b35a9fad5 100644 (file)
@@ -1,7 +1,7 @@
 <ul class="sidebarBoxList">
        {foreach from=$birthdayUserProfiles item=birthdayUserProfile}
                <li class="box32">
-                       <a href="{link controller='User' object=$birthdayUserProfile}{/link}" class="framed">{@$birthdayUserProfile->getAvatar()->getImageTag(32)}</a>
+                       <a href="{link controller='User' object=$birthdayUserProfile}{/link}">{@$birthdayUserProfile->getAvatar()->getImageTag(32)}</a>
                        
                        <div class="sidebarBoxHeadline">
                                <h3><a href="{link controller='User' object=$birthdayUserProfile}{/link}" class="userLink" data-user-id="{@$birthdayUserProfile->userID}">{$birthdayUserProfile->username}</a></h3>
index 61cedf5f60f7934ff8c2a66dc8326120bd436338..894338b5082f3b217125c25f5251c39c8d42a6e2 100644 (file)
@@ -1,7 +1,7 @@
 <ul class="sidebarBoxList">
        {foreach from=$birthdayUserProfiles item=birthdayUserProfile}
                <li class="box32">
-                       <a href="{link controller='User' object=$birthdayUserProfile}{/link}" class="framed">{@$birthdayUserProfile->getAvatar()->getImageTag(32)}</a>
+                       <a href="{link controller='User' object=$birthdayUserProfile}{/link}">{@$birthdayUserProfile->getAvatar()->getImageTag(32)}</a>
                        
                        <div class="sidebarBoxHeadline">
                                <h3><a href="{link controller='User' object=$birthdayUserProfile}{/link}" class="userLink" data-user-id="{@$birthdayUserProfile->userID}">{$birthdayUserProfile->username}</a></h3>
index de03bcc23a70a4c345f0f917f8e612aef53e8818..b45c040d598c7172d6e86a823ef72e260f54c2fe 100644 (file)
@@ -4,4 +4,4 @@
        {/foreach}
 </ul>
 
-<p class="marginTopTiny"><small>{lang}wcf.user.usersOnline.detail{/lang}{if USERS_ONLINE_RECORD} - {lang}wcf.user.usersOnline.record{/lang}{/if}</small></p>
\ No newline at end of file
+<p><small>{lang}wcf.user.usersOnline.detail{/lang}{if USERS_ONLINE_RECORD} - {lang}wcf.user.usersOnline.record{/lang}{/if}</small></p>
\ No newline at end of file
index 23ea687f88436eb64eed48d5fe3e221f5b9fe760..7fb978837cc1fa4400b94415a81f3ce4f19006cc 100644 (file)
@@ -8,24 +8,26 @@
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{capture assign='sidebar'}
-       <fieldset>
-               <legend>{lang}wcf.moderation.deletedContent.objectTypes{/lang}</legend>
+{capture assign='sidebarLeft'}
+       <section class="box">
+               <h2 class="boxTitle">{lang}wcf.moderation.deletedContent.objectTypes{/lang}</h2>
                
-               <nav>
-                       <ul>
-                               {foreach from=$availableObjectTypes item=availableObjectType}
-                                       <li{if $objectType == $availableObjectType->objectType} class="active"{/if}><a href="{link controller='DeletedContentList'}objectType={@$availableObjectType->objectType}{/link}">{lang}wcf.moderation.deletedContent.objectType.{@$availableObjectType->objectType}{/lang}</a></li>
-                               {/foreach}
-                       </ul>
-               </nav>
-       </fieldset>
+               <div class="boxContent">
+                       <nav>
+                               <ul>
+                                       {foreach from=$availableObjectTypes item=availableObjectType}
+                                               <li{if $objectType == $availableObjectType->objectType} class="active"{/if}><a href="{link controller='DeletedContentList'}objectType={@$availableObjectType->objectType}{/link}">{lang}wcf.moderation.deletedContent.objectType.{@$availableObjectType->objectType}{/lang}</a></li>
+                                       {/foreach}
+                               </ul>
+                       </nav>
+               </div>
+       </section>
 {/capture}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.moderation.deletedContent.{@$objectType}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.moderation.deletedContent.{@$objectType}{/lang}</h1>
 </header>
 
 {include file='userNotice'}
index 7ac15a9f2050ef56764d39164ba087639f1e1cee..cd8301ebbaead15d8f12fa8dd8e12d2a6d6aadf5 100644 (file)
@@ -1,4 +1,4 @@
-<div id="userActivityPointListContainer" class="tabularBox marginTop">
+<div id="userActivityPointListContainer" class="section tabularBox">
        <table class="table">
                <thead>
                        <tr>
index 4ff61870d5d22783270598e435fda46b917b3e67..f511a1a6da4b1371c6392afca80d409c169c074e 100644 (file)
@@ -10,8 +10,8 @@
 
 {include file='header' __disableAds=true}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.register.disclaimer{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.register.disclaimer{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='Disclaimer'}{/link}">
-       <div class="container containerPadding marginTop htmlContent">
+       <div class="section htmlContent">
                {lang}wcf.user.register.disclaimer.text{/lang}
                
-               {event name='fieldsets'}
+               {event name='sections'}
        </div>
        
        {if !$__wcf->user->userID}
-       <div class="formSubmit">
-               <input type="submit" name="accept" value="{lang}wcf.user.register.disclaimer.accept{/lang}" accesskey="s" />
-               <a class="button" href="{link}{/link}">{lang}wcf.user.register.disclaimer.decline{/lang}</a>
-               {@SECURITY_TOKEN_INPUT_TAG}
-       </div>
+               <div class="formSubmit">
+                       <input type="submit" name="accept" value="{lang}wcf.user.register.disclaimer.accept{/lang}" accesskey="s" />
+                       <a class="button" href="{link}{/link}">{lang}wcf.user.register.disclaimer.decline{/lang}</a>
+                       {@SECURITY_TOKEN_INPUT_TAG}
+               </div>
        {/if}
 </form>
 
index 64aa6d0bc29c6b5cea6098444343f028ed5b66cb..814da194ccf5773d19808c6f8de1b698322fb94a 100644 (file)
 
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.edit.versions{/lang}: {$object->getTitle()}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.edit.versions{/lang}: {$object->getTitle()}</h1>
 </header>
 
 {include file='userNotice'}
 
 {if $diff}
-<div class="container containerPadding marginTop editHistoryDiff">
+<div class="section editHistoryDiff">
        <div class="sideBySide">
                <div class="containerHeadline">
                        <h3>{lang}wcf.edit.headline.old{/lang}</h3>
 {/if}
 
 <form action="{link controller='EditHistory'}{/link}" method="post">
-       <div class="tabularBox tabularBoxTitle marginTop editHistoryVersionList">
-               <header>
-                       {assign var='versionCount' value=$objects|count}
-                       <h2>{lang}wcf.edit.versions{/lang} <span class="badge badgeInverse">{#$versionCount+1}</span></h2>
-               </header>
+       <section class="section tabularBox editHistoryVersionList">
+               {assign var='versionCount' value=$objects|count}
+               <h2 class="sectionTitle">
+                       {lang}wcf.edit.versions{/lang} <span class="badge badgeInverse">{#$versionCount+1}</span>
+               </h2>
                
                <table class="table">
                        <thead>
                                //]]>
                        </script>
                </table>
-       </div>
+       </section>
        
        <div class="formSubmit">
                {@SID_INPUT_TAG}
index e989e57b743a198b8b623e4ac27f94779b3363e8..5e58bad51c7bfd9ae80b966a8d232a422b45e523 100644 (file)
@@ -10,8 +10,8 @@
 
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.emailActivation{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.emailActivation{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='EmailActivation'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend><label for="userID">{lang}wcf.user.emailActivation{/lang}</label></legend>
-                       
-                       <dl{if $errorField == 'u'} class="formError"{/if}>
-                               <dt><label for="userID">{lang}wcf.user.userID{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="userID" name="u" value="{@$u}" required="required" class="medium" />
-                                       {if $errorField == 'u'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'notValid'}{lang}wcf.user.userID.error.invalid{/lang}{/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'a'} class="formError"{/if}>
-                               <dt><label for="activationCode">{lang}wcf.user.activationCode{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="activationCode" maxlength="9" name="a" value="{@$a}" required="required" class="medium" />
-                                       {if $errorField == 'a'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if}
-                                               </small>
-                                       {/if}
-                                       <small><a href="{link controller='EmailNewActivationCode'}{/link}">{lang}wcf.user.newActivationCode{/lang}</a></small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='fields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'u'} class="formError"{/if}>
+                       <dt><label for="userID">{lang}wcf.user.userID{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="userID" name="u" value="{@$u}" required="required" class="medium" />
+                               {if $errorField == 'u'}
+                                       <small class="innerError">
+                                               {if $errorType == 'notValid'}{lang}wcf.user.userID.error.invalid{/lang}{/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl{if $errorField == 'a'} class="formError"{/if}>
+                       <dt><label for="activationCode">{lang}wcf.user.activationCode{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="activationCode" maxlength="9" name="a" value="{@$a}" required="required" class="medium" />
+                               {if $errorField == 'a'}
+                                       <small class="innerError">
+                                               {if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if}
+                                       </small>
+                               {/if}
+                               <small><a href="{link controller='EmailNewActivationCode'}{/link}">{lang}wcf.user.newActivationCode{/lang}</a></small>
+                       </dd>
+               </dl>
+               
+               {event name='fields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index 2e3c4a8ed7c4e6433b615e0b4e0d5a19e758a98b..71d1905508492da3e1db986e4b255baf1250920e 100644 (file)
@@ -9,8 +9,8 @@
 
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.newActivationCode{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.newActivationCode{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='EmailNewActivationCode'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.user.newActivationCode{/lang}</legend>
-                       
-                       <dl{if $errorField == 'username'} class="formError"{/if}>
-                               <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
-                                       {if $errorField == 'username'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {elseif $errorType == 'alreadyEnabled'}
-                                                               {lang}wcf.user.registerActivation.error.userAlreadyEnabled{/lang}
-                                                       {else}
-                                                               {lang}wcf.user.username.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'password'} class="formError"{/if}>
-                               <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
-                               <dd>
-                                       <input type="password" id="password" name="password" value="{$password}" required="required" class="medium" />
-                                       {if $errorField == 'password'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.user.password.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                               
-                       {event name='fields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'username'} class="formError"{/if}>
+                       <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
+                               {if $errorField == 'username'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {elseif $errorType == 'alreadyEnabled'}
+                                                       {lang}wcf.user.registerActivation.error.userAlreadyEnabled{/lang}
+                                               {else}
+                                                       {lang}wcf.user.username.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl{if $errorField == 'password'} class="formError"{/if}>
+                       <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
+                       <dd>
+                               <input type="password" id="password" name="password" value="{$password}" required="required" class="medium" />
+                               {if $errorField == 'password'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.user.password.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+                       
+               {event name='fields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index d3ba17f421220ba1515750c84e325f33fdffebbe..ca88fed791aa62a3974d3fd094a3e210d0ba06fa 100644 (file)
 
 {include file='userMenuSidebar'}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline"> 
-       <h1>{lang}wcf.user.following{/lang} <span class="badge">{#$items}</span></h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.following{/lang} <span class="badge">{#$items}</span></h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 {if $objects|count}
-       <div class="container marginTop">
+       <div class="section sectionContainerList">
                <ol class="containerList userList">
                        {foreach from=$objects item=user}
                                <li class="jsFollowing">
                                        <div class="box48">
-                                               <a href="{link controller='User' object=$user}{/link}" title="{$user->username}" class="framed">{@$user->getAvatar()->getImageTag(48)}</a>
+                                               <a href="{link controller='User' object=$user}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag(48)}</a>
                                                        
                                                <div class="details userInformation">
                                                        {include file='userInformationHeadline'}
index d2c55729046fa9a096a0fb065635b674dce244be..583228960395ba0814a2b03fac94d3cda9b061e6 100644 (file)
@@ -1,20 +1,21 @@
 {foreach from=$groupedUsers item=group}
        {if $group}
-               <header class="boxHeadline">
-                       <h1>{$group}</h1>
-               </header>
+               <section class="section sectionContainerList">
+                       <h2 class="sectionTitle">{$group}</h2>
        {/if}
        
        {if $group|count}
-               <div class="container marginTop">
-                       <ol class="containerList jsGroupedUserList">
-                               {foreach from=$group item=user}
-                                       {include file='userListItem'}
-                               {/foreach}
-                       </ol>
-               </div>
+               <ol class="containerList jsGroupedUserList">
+                       {foreach from=$group item=user}
+                               {include file='userListItem'}
+                       {/foreach}
+               </ol>
        {else}
-               <p class="marginTop">{$group->getNoUsersMessage()}</p>
+               <p>{$group->getNoUsersMessage()}</p>
+       {/if}
+       
+       {if $group}
+               </section>
        {/if}
 {/foreach}
 
index 82d9d3eee4536b56975d87d71fbc8ebf4a42c8cb..272e914ee63ec796d2b14ee806c4601531285cc2 100644 (file)
 
 {include file='userMenuSidebar'}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.ignoredUsers{/lang} <span class="badge">{#$items}</span></h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.ignoredUsers{/lang} <span class="badge">{#$items}</span></h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 {if $objects|count}
-       <div class="container marginTop">
+       <div class="section sectionContainerList">
                <ol class="containerList userList">
                        {foreach from=$objects item=user}
                                <li class="jsIgnoredUser">
                                        <div class="box48">
-                                               <a href="{link controller='User' object=$user}{/link}" title="{$user->username}" class="framed">{@$user->getAvatar()->getImageTag(48)}</a>
+                                               <a href="{link controller='User' object=$user}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag(48)}</a>
                                                        
                                                <div class="details userInformation">
                                                        {include file='userInformationHeadline'}
index 605daea848fc9577a79387af80fded8b54cba5a3..1be04f5c7f704bd30d9dbae76c0f56a308fad79b 100644 (file)
@@ -17,8 +17,8 @@
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 {include file='header' __disableLoginLink=true __disableAds=true}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.login{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.login{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{@$loginController}" id="loginForm">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.user.login.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'username'} class="formError"{/if}>
-                               <dt><label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label></dt>
+       <div class="section">
+               <dl{if $errorField == 'username'} class="formError"{/if}>
+                       <dt><label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
+                               {if $errorField == 'username'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.user.username.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {if !REGISTER_DISABLED}
+                       <dl>
+                               <dt>{lang}wcf.user.login.action{/lang}</dt>
                                <dd>
-                                       <input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
-                                       {if $errorField == 'username'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.user.username.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
+                                       <label><input type="radio" name="action" value="register" /> {lang}wcf.user.login.action.register{/lang}</label>
+                                       <label><input type="radio" name="action" value="login" checked="checked" /> {lang}wcf.user.login.action.login{/lang}</label>
                                </dd>
                        </dl>
-                       
-                       {if !REGISTER_DISABLED}
-                               <dl>
-                                       <dt>{lang}wcf.user.login.action{/lang}</dt>
-                                       <dd>
-                                               <label><input type="radio" name="action" value="register" /> {lang}wcf.user.login.action.register{/lang}</label>
-                                               <label><input type="radio" name="action" value="login" checked="checked" /> {lang}wcf.user.login.action.login{/lang}</label>
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       <dl{if $errorField == 'password'} class="formError"{/if}>
-                               <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
+               {/if}
+               
+               <dl{if $errorField == 'password'} class="formError"{/if}>
+                       <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
+                       <dd>
+                               <input type="password" id="password" name="password" value="{$password}" class="medium" />
+                               {if $errorField == 'password'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.user.password.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small><a href="{link controller='LostPassword'}{/link}">{lang}wcf.user.lostPassword{/lang}</a></small>
+                       </dd>
+               </dl>
+               
+               {if $supportsPersistentLogins}
+                       <dl>
+                               <dt></dt>
                                <dd>
-                                       <input type="password" id="password" name="password" value="{$password}" class="medium" />
-                                       {if $errorField == 'password'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.user.password.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
+                                       <label for="useCookies"><input type="checkbox" id="useCookies" name="useCookies" value="1" {if $useCookies}checked="checked" {/if}/> {lang}wcf.user.useCookies{/lang}</label>
                                </dd>
                        </dl>
-                       
-                       {if $supportsPersistentLogins}
-                               <dl>
-                                       <dt></dt>
-                                       <dd>
-                                               <label for="useCookies"><input type="checkbox" id="useCookies" name="useCookies" value="1" {if $useCookies}checked="checked" {/if}/> {lang}wcf.user.useCookies{/lang}</label>
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       {event name='fields'}
+               {/if}
+               
+               {event name='fields'}
+       </div>
+       
+       {hascontent}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.user.login.3rdParty{/lang}</h2>
                        
                        <dl>
                                <dt></dt>
                                <dd>
                                        <ul class="buttonList smallButtons">
-                                               <li><a class="button small" href="{link controller='LostPassword'}{/link}"><span>{lang}wcf.user.lostPassword{/lang}</span></a></li>
-                                               {if !REGISTER_DISABLED && REGISTER_ACTIVATION_METHOD == 1}<li><a class="button small" href="{link controller='RegisterActivation'}{/link}"><span>{lang}wcf.user.registerActivation{/lang}</span></a></li>{/if}
-                                               {event name='buttons'}
+                                               {content}
+                                                       {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
+                                                               <li id="githubAuth" class="3rdPartyAuth">
+                                                                       <a href="{link controller='GithubAuth'}{/link}" class="thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
+                                                               </li>
+                                                       {/if}
+                                                       
+                                                       {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
+                                                               <li id="twitterAuth" class="3rdPartyAuth">
+                                                                       <a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
+                                                               </li>
+                                                       {/if}
+                                                       
+                                                       {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
+                                                               <li id="facebookAuth" class="3rdPartyAuth">
+                                                                       <a href="{link controller='FacebookAuth'}{/link}" class="thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
+                                                               </li>
+                                                       {/if}
+                                                       
+                                                       {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''}
+                                                               <li id="googleAuth" class="3rdPartyAuth">
+                                                                       <a href="{link controller='GoogleAuth'}{/link}" class="thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google-plus"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
+                                                               </li>
+                                                       {/if}
+                                                       
+                                                       {event name='3rdpartyButtons'}
+                                               {/content}
                                        </ul>
                                </dd>
                        </dl>
-               </fieldset>
-               
-               {hascontent}
-                       <fieldset>
-                               <legend>{lang}wcf.user.login.3rdParty{/lang}</legend>
-                               
-                               <dl>
-                                       <dt></dt>
-                                       <dd>
-                                               <ul class="buttonList smallButtons">
-                                                       {content}
-                                                               {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
-                                                                       <li id="githubAuth" class="3rdPartyAuth">
-                                                                               <a href="{link controller='GithubAuth'}{/link}" class="thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
-                                                                       </li>
-                                                               {/if}
-                                                               
-                                                               {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
-                                                                       <li id="twitterAuth" class="3rdPartyAuth">
-                                                                               <a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
-                                                                       </li>
-                                                               {/if}
-                                                               
-                                                               {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
-                                                                       <li id="facebookAuth" class="3rdPartyAuth">
-                                                                               <a href="{link controller='FacebookAuth'}{/link}" class="thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
-                                                                       </li>
-                                                               {/if}
-                                                               
-                                                               {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''}
-                                                                       <li id="googleAuth" class="3rdPartyAuth">
-                                                                               <a href="{link controller='GoogleAuth'}{/link}" class="thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google-plus"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
-                                                                       </li>
-                                                               {/if}
-                                                               
-                                                               {event name='3rdpartyButtons'}
-                                                       {/content}
-                                               </ul>
-                                       </dd>
-                               </dl>
-                       </fieldset>
-               {/hascontent}
-               
-               {event name='fieldsets'}
-               
-               {include file='captcha'}
-       </div>
+               </section>
+       {/hascontent}
+       
+       {event name='sections'}
+       
+       {include file='captcha'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 66f87a290894769271735262972b2858ae89c055..401549d0f3047b544f2c8668ab34220ea9febcc6 100644 (file)
@@ -17,8 +17,8 @@
 
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.lostPassword{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.lostPassword{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='LostPassword'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.user.lostPassword{/lang}</legend>
-                       
-                       <dl id="usernameDiv"{if $errorField == 'username'} class="formError"{/if}>
-                               <dt>
-                                       <label for="usernameInput">{lang}wcf.user.username{/lang}</label>
-                               </dt>
-                               <dd>
-                                       <input type="text" id="usernameInput" name="username" value="{$username}" class="medium" />
-                                       {if $errorField == 'username'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                       {if $errorType == 'notFound'}{lang}wcf.user.username.error.notFound{/lang}{/if}
-                                                       {if $errorType == '3rdParty'}{lang}wcf.user.username.error.3rdParty{/lang}{/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl id="emailDiv"{if $errorField == 'email'} class="formError"{/if}>
-                               <dt>
-                                       <label for="emailInput">{lang}wcf.user.email{/lang}</label>
-                               </dt>
-                               <dd>
-                                       <input type="email" id="emailInput" name="email" value="{$email}" class="medium" />
-                                       {if $errorField == 'email'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                       {if $errorType == 'notFound'}{lang}wcf.user.lostPassword.email.error.notFound{/lang}{/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       {event name='fields'}
-               </fieldset>
+       <div class="section">
+               <dl id="usernameDiv"{if $errorField == 'username'} class="formError"{/if}>
+                       <dt>
+                               <label for="usernameInput">{lang}wcf.user.username{/lang}</label>
+                       </dt>
+                       <dd>
+                               <input type="text" id="usernameInput" name="username" value="{$username}" class="medium" />
+                               {if $errorField == 'username'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                               {if $errorType == 'notFound'}{lang}wcf.user.username.error.notFound{/lang}{/if}
+                                               {if $errorType == '3rdParty'}{lang}wcf.user.username.error.3rdParty{/lang}{/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl id="emailDiv"{if $errorField == 'email'} class="formError"{/if}>
+                       <dt>
+                               <label for="emailInput">{lang}wcf.user.email{/lang}</label>
+                       </dt>
+                       <dd>
+                               <input type="email" id="emailInput" name="email" value="{$email}" class="medium" />
+                               {if $errorField == 'email'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                               {if $errorType == 'notFound'}{lang}wcf.user.lostPassword.email.error.notFound{/lang}{/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {include file='captcha'}
+               {event name='fields'}
        </div>
        
+       {event name='sections'}
+       
+       {include file='captcha'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index 15400225351ca62e6e47b50bc0fb8e856ec85d95..9806ced7929fa0876408fdd3a178da1eafbc5f5e 100644 (file)
@@ -9,8 +9,8 @@
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.mail.title{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.mail.title{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='Mail' object=$user}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.user.mail.information{/lang}</legend>
-                       
-                       <dl{if $errorField == 'subject'} class="formError"{/if}>
-                               <dt><label for="subject">{lang}wcf.user.mail.subject{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="subject" name="subject" value="{$subject}" required="required" class="long" />
-                                       {if $errorField == 'subject'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.user.mail.subject.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       {if $__wcf->user->userID}
-                               <dl>
-                                       <dt></dt>
-                                       <dd><label><input type="checkbox" name="showAddress" value="1" {if $showAddress == 1} checked="checked"{/if}/> {lang}wcf.user.mail.showAddress{/lang}</label></dd>
-                               </dl>
-                       {else}
-                               <dl{if $errorField == 'email'} class="formError"{/if}>
-                                       <dt><label for="email">{lang}wcf.user.mail.senderEmail{/lang}</label></dt>
-                                       <dd>
-                                               <input type="email" id="email" name="email" value="{$email}" required="required" class="medium" />
-                                               {if $errorField == 'email'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {elseif $errorType == 'notValid'}
-                                                                       {lang}wcf.user.email.error.notValid{/lang}
-                                                               {else}
-                                                                       {lang}wcf.user.mail.senderEmail.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.user.mail.information{/lang}</h2>
+               
+               <dl{if $errorField == 'subject'} class="formError"{/if}>
+                       <dt><label for="subject">{lang}wcf.user.mail.subject{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="subject" name="subject" value="{$subject}" required="required" class="long" />
+                               {if $errorField == 'subject'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.user.mail.subject.error.{@$errorType}{/lang}
                                                {/if}
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       {event name='informationFields'}
-               </fieldset>
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               <fieldset>
-                       <legend><label for="message">{lang}wcf.user.mail.message{/lang}</label></legend>
-                       
-                       <dl class="wide{if $errorField == 'message'} formError{/if}">
+               {if $__wcf->user->userID}
+                       <dl>
+                               <dt></dt>
+                               <dd><label><input type="checkbox" name="showAddress" value="1" {if $showAddress == 1} checked="checked"{/if}/> {lang}wcf.user.mail.showAddress{/lang}</label></dd>
+                       </dl>
+               {else}
+                       <dl{if $errorField == 'email'} class="formError"{/if}>
+                               <dt><label for="email">{lang}wcf.user.mail.senderEmail{/lang}</label></dt>
                                <dd>
-                                       <textarea rows="15" cols="40" name="message" id="message" required="required">{$message}</textarea>
-                                       {if $errorField == 'message'}
+                                       <input type="email" id="email" name="email" value="{$email}" required="required" class="medium" />
+                                       {if $errorField == 'email'}
                                                <small class="innerError">
                                                        {if $errorType == 'empty'}
                                                                {lang}wcf.global.form.error.empty{/lang}
+                                                       {elseif $errorType == 'notValid'}
+                                                               {lang}wcf.user.email.error.notValid{/lang}
                                                        {else}
-                                                               {lang}wcf.user.mail.message.error.{@$errorType}{/lang}
+                                                               {lang}wcf.user.mail.senderEmail.error.{@$errorType}{/lang}
                                                        {/if}
                                                </small>
                                        {/if}
                                </dd>
                        </dl>
-                       
-                       {event name='messageFields'}
-               </fieldset>
+               {/if}
                
-               {event name='fieldsets'}
+               {event name='informationFields'}
+       </section>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.user.mail.message{/lang}</h2>
                
-               {include file='captcha'}
-       </div>
+               <dl class="wide{if $errorField == 'message'} formError{/if}">
+                       <dd>
+                               <textarea rows="15" cols="40" name="message" id="message" required="required">{$message}</textarea>
+                               {if $errorField == 'message'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.user.mail.message.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {event name='messageFields'}
+       </section>
+       
+       {event name='sections'}
+       
+       {include file='captcha'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index a6523d9824d14a920ec679546a889022850d4f4d..34aae66d528a654d6541e6093ad54c18b0c05d69 100644 (file)
@@ -1,4 +1,4 @@
-<fieldset>
+<div class="section">
        <dl class="wide">
                <dd>
                        <label><input type="radio" name="subscribe" value="1"{if $userObjectWatch} checked="checked"{/if} /> {lang}wcf.user.objectWatch.subscribe.{@$objectType->objectType}{/lang}</label>
@@ -13,7 +13,7 @@
        </dl>
        
        {event name='fields'}
-</fieldset>
+</div>
 
 <div class="formSubmit">
        <button class="jsButtonSave buttonPrimary">{lang}wcf.global.button.save{/lang}</button>
index 65172e57e88e47a7835e54d575dcfa460969cbe6..76adbad8600eee418d056da1449cfc10db683d35 100644 (file)
@@ -1,4 +1,4 @@
-<div id="mediaThumbnail" class="framed"></div>
+<div id="mediaThumbnail"></div>
 
 <div class="box48">
        <span id="mediaFileIcon" class="icon icon48 fa-file-o"></span>
@@ -18,8 +18,8 @@
        </dl>
 </div>
 
-<fieldset class="marginTop">
-       <legend>{lang}wcf.global.form.data{/lang}</legend>
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.global.form.data{/lang}</h2>
        
        <dl>
                <dt></dt>
@@ -34,7 +34,7 @@
        {include file='languageChooser' label='wcf.media.languageID'}
        
        <dl>
-               <dt>{lang}wcf.global.title{/lang}</dt>
+               <dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
                <dd>
                        <input type="text" id="title" name="title" class="long" />
                </dd>
@@ -42,7 +42,7 @@
        {include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=true}
        
        <dl>
-               <dt>{lang}wcf.media.caption{/lang}</dt>
+               <dt><label for="caption">{lang}wcf.media.caption{/lang}</label></dt>
                <dd>
                        <textarea id="caption" name="caption" cols="40" rows="3"></textarea>
                </dd>
@@ -50,7 +50,7 @@
        {include file='multipleLanguageInputJavascript' elementIdentifier='caption' forceSelection=true}
        
        <dl>
-               <dt>{lang}wcf.media.altText{/lang}</dt>
+               <dt><label for="altText">{lang}wcf.media.altText{/lang}</label></dt>
                <dd>
                        <input type="text" id="altText" name="altText" class="long" />
                </dd>
@@ -58,7 +58,7 @@
        {include file='multipleLanguageInputJavascript' elementIdentifier='altText' forceSelection=true}
        
        {event name='dataFields'}
-</fieldset>
+</section>
 
 <div class="formSubmit">
        <button data-type="submit" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
index 2c33b79d9d11fe58efa858684cf1b9ab0026c57b..381a49f65e20fc7d8c9b62e15c44154bfd0557cc 100644 (file)
 </div>
 
 {if $__wcf->session->getPermission('admin.content.cms.canManageMedia')}
-       <div id="mediaManagerMediaUploadButton" class="marginTop"></div>
+       <div id="mediaManagerMediaUploadButton"></div>
 {/if}
 
-<div class="jsClipboardContainer marginTop" data-type="com.woltlab.wcf.media">
+<div class="jsClipboardContainer" data-type="com.woltlab.wcf.media">
        <input type="checkbox" class="jsClipboardMarkAll" style="display: none;" />
        <ul id="mediaManagerMediaList">
                {include file='mediaListItems'}
index 15f6ace8b56e4ed5c53d8c44afe1bf28f126cc4c..235026bd09879b06f71cb06a9554d0ec5834c8c9 100644 (file)
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{capture assign='sidebar'}
+{capture assign='sidebarRight'}
        {assign var=encodedLetter value=$letter|rawurlencode}
-       <div class="jsOnly">
+       <section class="jsOnly box">
                <form method="post" action="{link controller='UserSearch'}{/link}">
-                       <fieldset>
-                               <legend><label for="searchUsername">{lang}wcf.user.search{/lang}</label></legend>
-                               
+                       <h2 class="boxTitle">{lang}wcf.user.search{/lang}</h2>
+                       
+                       <div class="boxContent">
                                <dl>
                                        <dt></dt>
                                        <dd>
                                                {@SECURITY_TOKEN_INPUT_TAG}
                                        </dd>
                                </dl>
-                       </fieldset>
+                       </div>
                </form>
-       </div>
+       </section>
        
-       <fieldset>
-               <legend>{lang}wcf.user.members.sort.letters{/lang}</legend>
-                               
-               <ul class="buttonList smallButtons letters">
-                       {foreach from=$letters item=__letter}
-                               <li><a href="{if $searchID}{link controller='MembersList' id=$searchID}sortField={$sortField}&sortOrder={$sortOrder}&letter={$__letter|rawurlencode}{/link}{else}{link controller='MembersList'}sortField={$sortField}&sortOrder={$sortOrder}&letter={$__letter|rawurlencode}{/link}{/if}" class="button small{if $letter == $__letter} active{/if}">{$__letter}</a></li>
-                       {/foreach}
-                       {if !$letter|empty}<li><a href="{if $searchID}{link controller='MembersList' id=$searchID}sortField={$sortField}&sortOrder={$sortOrder}{/link}{else}{link controller='MembersList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}{/if}" class="button small">{lang}wcf.user.members.sort.letters.all{/lang}</a></li>{/if}
-               </ul>
-       </fieldset>
+       <section class="box">
+               <h2 class="boxTitle">{lang}wcf.user.members.sort.letters{/lang}</h2>
                
-       <div>
+               <div class="boxContent">
+                       <ul class="buttonList smallButtons letters">
+                               {foreach from=$letters item=__letter}
+                                       <li><a href="{if $searchID}{link controller='MembersList' id=$searchID}sortField={$sortField}&sortOrder={$sortOrder}&letter={$__letter|rawurlencode}{/link}{else}{link controller='MembersList'}sortField={$sortField}&sortOrder={$sortOrder}&letter={$__letter|rawurlencode}{/link}{/if}" class="button small{if $letter == $__letter} active{/if}">{$__letter}</a></li>
+                               {/foreach}
+                               {if !$letter|empty}<li><a href="{if $searchID}{link controller='MembersList' id=$searchID}sortField={$sortField}&sortOrder={$sortOrder}{/link}{else}{link controller='MembersList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}{/if}" class="button small">{lang}wcf.user.members.sort.letters.all{/lang}</a></li>{/if}
+                       </ul>
+               </div>  
+       </section>
+
+       <section class="box">
                <form method="post" action="{if $searchID}{link controller='MembersList' id=$searchID}{/link}{else}{link controller='MembersList'}{/link}{/if}">
-                       <fieldset>
-                               <legend><label for="sortField">{lang}wcf.user.members.sort{/lang}</label></legend>
-                               
+                       <h2 class="boxTitle">{lang}wcf.user.members.sort{/lang}</h2>
+                       
+                       <div class="boxContent">
                                <dl>
                                        <dt></dt>
                                        <dd>
                                                </select>
                                        </dd>
                                </dl>
-                       </fieldset>
-                       
-                       <div class="formSubmit">
-                               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-                               <input type="hidden" name="letter" value="{$letter}" />
-                               {@SID_INPUT_TAG}
+                               
+                               <div class="formSubmit">
+                                       <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                                       <input type="hidden" name="letter" value="{$letter}" />
+                                       {@SID_INPUT_TAG}
+                               </div>
                        </div>
                </form>
-       </div>
+       </section>
        
        {@$__boxSidebar}
 {/capture}
 
-{include file='header' sidebarOrientation='right'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if} <span class="badge">{#$items}</span></h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if} <span class="badge">{#$items}</span></h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 {if $items}
-       <div class="section">
+       <div class="section sectionContainerList">
                <ol class="containerList userList">
                        {foreach from=$objects item=user}
                                {include file='userListItem'}
index 3711291c6ab81b256a69a5035f7f284582ba34db..c1be9f9b0168fcad27515f628204e549945ed669 100644 (file)
@@ -1,13 +1,13 @@
 {if !$supportPaste|isset}{assign var=supportPaste value=false}{/if}
 {foreach from=$messages item=message}
-       <article class="message messageReduced marginTop jsInvalidQuoteTarget" data-link="{@$message->getLink()}" data-username="{$message->getUsername()}">
+       <article class="message messageReduced jsInvalidQuoteTarget" data-link="{@$message->getLink()}" data-username="{$message->getUsername()}">
                <div>
                        <section class="messageContent">
                                <div>
                                        <header class="messageHeader">
                                                <div class="box32">
                                                        {if $userProfiles[$message->getUserID()]|isset}
-                                                               <a href="{link controller='User' object=$userProfiles[$message->getUserID()]}{/link}" class="framed">{@$userProfiles[$message->getUserID()]->getAvatar()->getImageTag(32)}</a>
+                                                               <a href="{link controller='User' object=$userProfiles[$message->getUserID()]}{/link}">{@$userProfiles[$message->getUserID()]->getAvatar()->getImageTag(32)}</a>
                                                        {/if}
                                                        
                                                        <div class="messageHeadline">
index dabd84ca40d341ae0a750f52836c0041fc9f9477..82bfe271a32061ae261c03baccbafef7428faa94 100644 (file)
@@ -11,7 +11,7 @@
                                {if $userProfile->getAvatar()}
                                        <div class="userAvatar">
                                                {capture assign='__userAvatar'}{@$userProfile->getAvatar()->getImageTag(128)}{/capture}
-                                               <a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}" class="framed">{@'<img'|str_replace:'<img itemprop="photo"':$__userAvatar}</a>
+                                               <a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}">{@'<img'|str_replace:'<img itemprop="photo"':$__userAvatar}</a>
                                                
                                                {if MESSAGE_SIDEBAR_ENABLE_ONLINE_STATUS && $userProfile->isOnline()}<span class="badge green badgeOnline" title="{lang}wcf.user.online.title{/lang}">{lang}wcf.user.online{/lang}</span>{/if}
                                        </div>
index 15067b2e5669e0a98c476f0b91cfa490dc9e0b3d..73014b29f1e5e04c153e83b45d67aa8a468a1223 100644 (file)
@@ -29,8 +29,8 @@
 
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.moderation.activation{/lang}: {$queue->getTitle()}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.moderation.activation{/lang}: {$queue->getTitle()}</h1>
        
        {if $queue->lastChangeTime}
                <dl class="plain inlineDataList">
 
 {include file='formError'}
 
-<header class="boxHeadline boxSubHeadline">
-       <h2>{lang}wcf.moderation.activation.content{/lang}</h2>
-       <p>{lang}wcf.moderation.type.{@$queue->getObjectTypeName()}{/lang}</p>
-</header>
+<section class="section sectionContainerList">
+       <header class="sectionHeader">
+               <h2 class="sectionTitle">{lang}wcf.moderation.activation.content{/lang}</h2>
+               <small class="sectionDescription">{lang}wcf.moderation.type.{@$queue->getObjectTypeName()}{/lang}</small>
+       </header>
 
-<div class="marginTop">
        {@$disabledContent}
-</div>
-
+</section>
+       
 <div class="contentNavigation">
        <nav>
                <ul>
        </nav>
 </div>
 
-<header id="comments" class="boxHeadline boxSubHeadline">
-       <h2>{lang}wcf.moderation.comments{/lang} <span class="badge">{#$queue->comments}</span></h2>
-       <p>{lang}wcf.moderation.comments.description{/lang}</p>
-</header>
-
 {include file='__commentJavaScript' commentContainerID='moderationQueueCommentList'}
 
-<div class="container marginTop moderationComments">
+<section id="comments" class="section sectionContainerList moderationComments">
+       <header class="sectionHeader">
+               <h2 class="sectionTitle">{lang}wcf.moderation.comments{/lang} <span class="badge">{#$queue->comments}</span></h2>
+               <small class="sectionDescription">{lang}wcf.moderation.comments.description{/lang}</small>
+       </header>
+       
        <ul id="moderationQueueCommentList" class="commentList containerList" data-can-add="true" data-object-id="{@$queueID}" data-object-type-id="{@$commentObjectTypeID}" data-comments="{@$commentList->countObjects()}" data-last-comment-time="{@$lastCommentTime}">
                {include file='commentList'}
        </ul>
-</div>
+</section>
 
 {include file='footer'}
 
index becf299de2a796e792a67a9ff5a65bdd606a0597..bfe0f6de67a38b45ba0b6ef1329629e921f5fcc0 100644 (file)
@@ -4,7 +4,7 @@
                        <div>
                                <header class="messageHeader">
                                        <div class="box32">
-                                               <a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}" class="framed">{@$message->getUserProfile()->getAvatar()->getImageTag(32)}</a>
+                                               <a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}">{@$message->getUserProfile()->getAvatar()->getImageTag(32)}</a>
                                                
                                                <div class="messageHeadline">
                                                        <h1><a href="{@$message->getLink()}">{$message->getTitle()}</a></h1>
index 1251d88cc74904ae0c28b9ec0beccd58ee6c8fc1..55346a7c183d805a45fb1a668a553384fb9cd861 100644 (file)
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{capture assign='sidebar'}
+{capture assign='sidebarLeft'}
        {* moderation type *}
-       <fieldset>
-               <legend>{lang}wcf.moderation.filterByType{/lang}</legend>
+       <section class="box">
+               <h2 class="boxTitle">{lang}wcf.moderation.filterByType{/lang}</h2>
                
-               <nav>
+               <nav class="boxContent">
                        <ul>
                                <li{if $definitionID == 0} class="active"{/if}><a href="{link controller='ModerationList'}definitionID=0&assignedUserID={@$assignedUserID}&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.type.all{/lang}</a></li>
                                {foreach from=$availableDefinitions key=__definitionID item=definitionName}
                                {event name='sidebarModerationType'}
                        </ul>
                </nav>
-       </fieldset>
+       </section>
        
        {* assigned user *}
-       <fieldset>
-               <legend>{lang}wcf.moderation.filterByUser{/lang}</legend>
+       <section class="box">
+               <h2 class="boxTitle">{lang}wcf.moderation.filterByUser{/lang}</h2>
                
-               <nav>
+               <nav class="boxContent">
                        <ul>
                                <li{if $assignedUserID == -1} class="active"{/if}><a href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID=-1&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.filterByUser.allEntries{/lang}</a></li>
                                <li{if $assignedUserID == 0} class="active"{/if}><a href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID=0&status={@$status}&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.filterByUser.nobody{/lang}</a></li>
                                {event name='sidebarAssignedUser'}
                        </ul>
                </nav>
-       </fieldset>
+       </section>
        
        {* status *}
-       <fieldset>
-               <legend>{lang}wcf.moderation.status{/lang}</legend>
+       <section class="box">
+               <h2 class="boxTitle">{lang}wcf.moderation.status{/lang}</h2>
                
-               <nav>
+               <nav class="boxContent">
                        <ul>
                                <li{if $status == -1} class="active"{/if}><a href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID={@$assignedUserID}&status=-1&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.status.outstanding{/lang}</a></li>
                                <li{if $status == 2} class="active"{/if}><a href="{link controller='ModerationList'}definitionID={@$definitionID}&assignedUserID={@$assignedUserID}&status=2&pageNo={@$pageNo}&sortField={@$sortField}&sortOrder={@$sortOrder}{/link}">{lang}wcf.moderation.status.done{/lang}</a></li>
@@ -61,7 +61,7 @@
                                {event name='sidebarStatus'}
                        </ul>
                </nav>
-       </fieldset>
+       </section>
        
        {event name='sidebarBoxes'}
 {/capture}
        <li class="jsOnly"><a href="#" title="{lang}wcf.moderation.markAllAsRead{/lang}" class="markAllAsReadButton jsTooltip"><span class="icon icon16 fa-check"></span> <span class="invisible">{lang}wcf.moderation.markAllAsRead{/lang}</span></a></li>
 {/capture}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.moderation.moderation{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if} <span class="badge badgeInverse">{#$items}</span></h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 {if $objects|count}
-       <div class="marginTop tabularBox tabularBoxTitle messageGroupList moderationList">
-               <header>
-                       <h2>{if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox messageGroupList moderationList">
                <table class="table">
                        <thead>
                                <tr>
                                        <tr class="moderationQueueEntry{if $entry->isNew()} new{/if}" data-queue-id="{@$entry->queueID}">
                                                <td class="columnIcon columnAvatar">
                                                        <div>
-                                                               <p class="framed"{if $entry->isNew()} title="{lang}wcf.moderation.markAsRead.doubleClick{/lang}"{/if}>{@$entry->getUserProfile()->getAvatar()->getImageTag(32)}</p>
+                                                               <p{if $entry->isNew()} title="{lang}wcf.moderation.markAsRead.doubleClick{/lang}"{/if}>{@$entry->getUserProfile()->getAvatar()->getImageTag(32)}</p>
                                                        </div>
                                                </td>
                                                <td class="columnText columnSubject">
index a362ec36c0fd73e856ee15fc2f82c8e6d01f6988..73625a800277cdffee452c29dd7596a6e9c80fb4 100644 (file)
@@ -1,4 +1,4 @@
-<fieldset>
+<div class="section">
        <dl>
                <dt>{lang}wcf.moderation.assignedUser{/lang}</dt>
                <dd>
@@ -30,7 +30,7 @@
        <div class="formSubmit">
                <button data-type="submit">{lang}wcf.global.button.submit{/lang}</button>
        </div>
-</fieldset>
+</div>
 <script>
        $(function() {
                new WCF.Search.User('#assignedUsername');
index 4169c18b9270166d1ce1b70bec03b3c2f33b4bee..509cef6e774bed42583bf9d51587239cae011f80 100644 (file)
@@ -1,7 +1,7 @@
 {foreach from=$queues item=queue}
        <li class="moderationQueueEntry{if $queue->isNew()} interactiveDropdownItemOutstanding{/if}" data-link="{$queue->getLink()}" data-object-id="{@$queue->queueID}" data-is-read="{if $queue->isNew()}false{else}true{/if}">
                <div class="box32">
-                       <div class="framed">
+                       <div>
                                {@$queue->getUserProfile()->getAvatar()->getImageTag(32)}
                        </div>
                        <div>
index 1d1d3cfd4fdc89b2bddb5768d7d13662fd4421e6..75e6958759a139347b6916f717f200093aada98e 100644 (file)
@@ -30,8 +30,8 @@
 
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.moderation.report{/lang}: {$queue->getTitle()}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.moderation.report{/lang}: {$queue->getTitle()}</h1>
        
        {if $queue->lastChangeTime}
                <dl class="plain inlineDataList">
 
 {include file='formError'}
 
-<header class="boxHeadline boxSubHeadline">
-       <h2>{lang}wcf.moderation.report.reportedContent{/lang}</h2>
-       <p>{lang}wcf.moderation.type.{@$queue->getObjectTypeName()}{/lang}</p>
-</header>
-
-<div class="marginTop">
+<section class="section">
+       <header class="sectionHeader">
+               <h2 class="sectionTitle">{lang}wcf.moderation.report.reportedContent{/lang}</h2>
+               <p class="sectionDescription">{lang}wcf.moderation.type.{@$queue->getObjectTypeName()}{/lang}</p>
+       </header>
+       
        {@$reportedContent}
-</div>
+</section>
 
 <div class="contentNavigation">
        <nav>
        </nav>
 </div>
 
-<header class="boxHeadline boxSubHeadline">
-       <h2>{lang}wcf.moderation.report.reportedBy{/lang}</h2>
-</header>
-
-<div class="container containerPadding marginTop">
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.moderation.report.reportedBy{/lang}</h2>
+       
        <div class="box32">
                {if $reportUser->userID}
-                       <a href="{link controller='User' object=$reportUser}{/link}" title="{$reportUser->username}" class="framed">
+                       <a href="{link controller='User' object=$reportUser}{/link}" title="{$reportUser->username}">
                                {@$reportUser->getAvatar()->getImageTag(32)}
                        </a>
                {else}
-                       <span class="framed">{@$reportUser->getAvatar()->getImageTag(32)}</span>
+                       <span>{@$reportUser->getAvatar()->getImageTag(32)}</span>
                {/if}
                
                <div>
                                </h3>
                        </div>
                        
-                       <div>{@$queue->getFormattedMessage()}</div>
+                       <div class="containerContent">{@$queue->getFormattedMessage()}</div>
                </div>
        </div>
-</div>
-
-<header id="comments" class="boxHeadline boxSubHeadline">
-       <h2>{lang}wcf.moderation.comments{/lang} <span class="badge">{#$queue->comments}</span></h2>
-       <p>{lang}wcf.moderation.comments.description{/lang}</p>
-</header>
+</section>
 
 {include file='__commentJavaScript' commentContainerID='moderationQueueCommentList'}
 
-<div class="container marginTop moderationComments">
+<section id="comments" class="section sectionContainerList moderationComments">
+       <header class="sectionHeader">
+               <h2>{lang}wcf.moderation.comments{/lang} <span class="badge">{#$queue->comments}</span></h2>
+               <p>{lang}wcf.moderation.comments.description{/lang}</p>
+       </header>
+       
        <ul id="moderationQueueCommentList" class="commentList containerList" data-can-add="true" data-object-id="{@$queueID}" data-object-type-id="{@$commentObjectTypeID}" data-comments="{if $queue->comments}{@$commentList->countObjects()}{else}0{/if}" data-last-comment-time="{@$lastCommentTime}">
                {include file='commentList'}
        </ul>
-</div>
+</section>
 
 {include file='footer'}
 
index afcbcfaf2cc5fc9f059d586531424b0e6db3ea8d..54c99c0174d53e95738b6ffacb99c97afba89b89 100644 (file)
@@ -1,8 +1,8 @@
 {if $alreadyReported}
        <p class="info">{lang}wcf.moderation.report.alreadyReported{/lang}</p>
 {else}
-       <fieldset>
-               <legend><label for="reason">{lang}wcf.moderation.report.reason{/lang}</label></legend>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.moderation.report.reason{/lang}</h2>
                
                <dl class="wide">
                        <dd>
@@ -12,9 +12,9 @@
                </dl>
                
                {event name='reasonFields'}
-       </fieldset>
+       </section>
        
-       {event name='fieldsets'}
+       {event name='sections'}
        
        <div class="formSubmit">
                <button class="jsSubmitReport buttonPrimary" accesskey="s">{lang}wcf.global.button.submit{/lang}</button>
index 1695d1cc78aa379b296cfeff1fe0c64196d31f6c..6882e7b8638f12e233c53aff6cea1b300d59e9d1 100644 (file)
@@ -1,4 +1,4 @@
-<div class="container marginTop">
+<div class="section sectionContainerList">
        <ol class="containerList userList">
                {include file='userListItem'}
        </ol>
index 851513f7ba6a1ea496ff24025aca049c207e3b00..a3211785a4e880158e5090cbfcf1e98417ad553d 100644 (file)
@@ -9,8 +9,8 @@
 
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.newPassword{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.newPassword{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='NewPassword'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.user.newPassword{/lang}</legend>
-                       
-                       <dl{if $errorField == 'userID'} class="formError"{/if}>
-                               <dt>
-                                       <label for="userID">{lang}wcf.user.userID{/lang}</label>
-                               </dt>
-                               <dd>
-                                       <input type="text" id="userID" name="u" value="{@$userID}" required="required" class="medium" />
-                                       {if $errorField == 'userID'}
-                                               <small class="innerError">
-                                                       {lang}wcf.user.userID.error.{$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'lostPasswordKey'} class="formError"{/if}>
-                               <dt>
-                                       <label for="lostPasswordKey">{lang}wcf.user.lostPasswordKey{/lang}</label>
-                               </dt>
-                               <dd>
-                                       <input type="text" id="lostPasswordKey" name="k" value="{$lostPasswordKey}" required="required" class="medium" />
-                                       {if $errorField == 'lostPasswordKey'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.user.lostPasswordKey.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       {event name='fields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'userID'} class="formError"{/if}>
+                       <dt>
+                               <label for="userID">{lang}wcf.user.userID{/lang}</label>
+                       </dt>
+                       <dd>
+                               <input type="text" id="userID" name="u" value="{@$userID}" required="required" class="medium" />
+                               {if $errorField == 'userID'}
+                                       <small class="innerError">
+                                               {lang}wcf.user.userID.error.{$errorType}{/lang}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl{if $errorField == 'lostPasswordKey'} class="formError"{/if}>
+                       <dt>
+                               <label for="lostPasswordKey">{lang}wcf.user.lostPasswordKey{/lang}</label>
+                       </dt>
+                       <dd>
+                               <input type="text" id="lostPasswordKey" name="k" value="{$lostPasswordKey}" required="required" class="medium" />
+                               {if $errorField == 'lostPasswordKey'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.user.lostPasswordKey.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {event name='fields'}
        </div>
+       
+       {event name='sections'}
                
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index a4372cd07327a516e1bea84cff392f9a322a77de..fa819515d62ba809d4ffbe8e11fa3d7119b8f93a 100644 (file)
 
 {include file='userMenuSidebar'}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.notification.notifications{/lang} <span class="badge jsNotificationsBadge">{#$__wcf->getUserNotificationHandler()->countAllNotifications()}</span></h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.notification.notifications{/lang} <span class="badge jsNotificationsBadge">{#$__wcf->getUserNotificationHandler()->countAllNotifications()}</span></h1>
 </header>
 
 {include file='userNotice'}
                {if $notification[event]->getPeriod() != $lastPeriod}
                        {if $lastPeriod}
                                        </ul>
-                               </div>
+                               </section>
                        {/if}
                        {assign var=lastPeriod value=$notification[event]->getPeriod()}
                        
-                       <header class="boxHeadline boxSubHeadline">
-                               <h2>{$lastPeriod}</h2>
-                       </header>
+                       <section class="section sectionContainerList">
+                               <h2 class="sectionTitle">{$lastPeriod}</h2>
                        
-                       <div class="container marginTop">
                                <ul class="containerList userNotificationItemList">
                {/if}
                                <li class="jsNotificationItem notificationItem{if $notification[authors] > 1} groupedNotificationItem{/if}{if !$notification[event]->isConfirmed()} notificationUnconfirmed{/if}" data-link="{if $notification[event]->isConfirmed()}{$notification[event]->getLink()}{else}{link controller='NotificationConfirm' id=$notification[notificationID]}{/link}{/if}" data-link-replace-all="{if $notification[event]->isConfirmed()}false{else}true{/if}" data-object-id="{@$notification[notificationID]}" data-is-read="{if $notification[event]->isConfirmed()}true{else}false{/if}" data-is-grouped="{if $notification[authors] > 1}true{else}false{/if}">
                                        <div class="box32">
                                                {if $notification[authors] < 2}
-                                                       <div class="framed jsTooltip" title="{$notification[event]->getAuthor()->username}">
+                                                       <div class="jsTooltip" title="{$notification[event]->getAuthor()->username}">
                                                                {@$notification[event]->getAuthor()->getAvatar()->getImageTag(32)}
                                                        </div>
                                                        
@@ -79,7 +77,7 @@
                                                                <p><small>{@$notification[time]|time}</small></p>
                                                        </div>
                                                {else}
-                                                       <div class="framed">
+                                                       <div>
                                                                <span class="icon icon32 fa-users"></span>
                                                        </div>
                                                        
                                                                </p>
                                                                <p><small>{@$notification[time]|time}</small></p>
                                                                
-                                                               <ul class="marginTopTiny">
+                                                               <ul>
                                                                        {foreach from=$notification[event]->getAuthors() item=author}
                                                                                {if $author->userID}
-                                                                                       <li style="display: inline-block" class="jsTooltip" title="{$author->username}"><a href="{link controller='User' object=$author}{/link}" class="framed">{@$author->getAvatar()->getImageTag(24)}</a></li>
+                                                                                       <li style="display: inline-block" class="jsTooltip" title="{$author->username}"><a href="{link controller='User' object=$author}{/link}">{@$author->getAvatar()->getImageTag(24)}</a></li>
                                                                                {/if}
                                                                        {/foreach}
                                                                </ul>
                                </li>
        {/foreach}
                </ul>
-       </div>
+       </section>
        
        <div class="contentNavigation">
                {@$pagesLinks}
index 1da6aeca6314de89b08132488d449fa5bcf6c9d2..93957db4d005d2999c5da462205da06089f71e48 100644 (file)
 
 {include file='userMenuSidebar'}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.notification.notifications{/lang}</h1>
-       <p>{lang}wcf.user.notification.notifications.description{/lang}
+<header class="contentHeader">
+       <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>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='NotificationSettings'}{/link}">
-       <div class="container containerPadding marginTop" id="notificationSettings">
+       <div id="notificationSettings">
                {foreach from=$events key='eventCategory' item='eventList'}
-                       <fieldset>
-                               <legend>{lang}wcf.user.notification.{$eventCategory}{/lang}</legend>
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.user.notification.{$eventCategory}{/lang}</h2>
                                
                                <dl>
                                        {foreach from=$eventList item=event}
                                                </dd>
                                        {/foreach}
                                </dl>
-                       </fieldset>
+                       </section>
                {/foreach}
                
-               {event name='fieldsets'}
+               {event name='sections'}
        </div>
        
        <div class="formSubmit">
index 2ab68fa1dbfff31bc2a7826173cd65280203428b..3a3b99f8ed89d2943e4904f837614e4033eee390 100644 (file)
@@ -1,3 +1,3 @@
 {event name='copyright'}
 
-{if $__wcf->isActiveApplication()}<address class="copyright">{lang}wcf.index.copyright{/lang}</address>{/if}
+{if $__wcf->isActiveApplication()}<div class="copyright">{lang}wcf.index.copyright{/lang}</div>{/if}
index b5d678b561459b5b0bd2c0c3a0ae9a2439efdaa0..e32bd7d24289d6160781b0c08025f76736dbe321 100644 (file)
@@ -20,7 +20,7 @@
                                                <ul class="interactiveDropdownItems interactiveDropdownItemsUserMenu">
                                                        <li>
                                                                <div class="box48">
-                                                                       <a href="{link controller='User' object=$__wcf->user}{/link}" class="framed">{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(48)}</a>
+                                                                       <a href="{link controller='User' object=$__wcf->user}{/link}">{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(48)}</a>
                                                                        
                                                                        <div class="containerHeadline">
                                                                                <h3>
                                                {/capture}
                                                
                                                <form method="post" action="{link controller='Login'}{/link}">
-                                                       <fieldset>
-                                                               {if $__3rdPartyButtons|trim}<legend>{lang}wcf.user.login{/lang}</legend>{/if}
+                                                       <section class="section">
+                                                               {if $__3rdPartyButtons|trim}<h2 class="sectionTitle">{lang}wcf.user.login{/lang}</h2>{/if}
                                                                
                                                                <dl>
                                                                        <dt><label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label></dt>
                                                                        <input type="hidden" name="url" value="{$__wcf->session->requestURI}" />
                                                                        {@SECURITY_TOKEN_INPUT_TAG}
                                                                </div>
-                                                       </fieldset>
+                                                       </section>
                                                        
                                                        {if $__3rdPartyButtons|trim}
-                                                               <fieldset>
-                                                                       <legend>{lang}wcf.user.login.3rdParty{/lang}</legend>
+                                                               <section class="section">
+                                                                       <h2 class="sectionTitle">{lang}wcf.user.login.3rdParty{/lang}</h2>
                                                                        <ul class="buttonList smallButtons thirdPartyLogin">
                                                                                {@$__3rdPartyButtons}   
                                                                        </ul>
-                                                               </fieldset>
+                                                               </section>
                                                        {/if}
                                                </form>
                                        </div>
index 49d61961f51ada3e9ffd41705611d09969b9beae..9d56304f6e64a8389274ffc9ef879edd8e836ce0 100644 (file)
 
 {include file='userMenuSidebar'}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.menu.settings.paidSubscription{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.menu.settings.paidSubscription{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 {if $subscriptions|count}
-       <header class="boxHeadline boxSubHeadline">
-               <h2>{lang}wcf.paidSubscription.availableSubscriptions{/lang}</h2>
-       </header>
+       <section class="section sectionContainerList paidSubscriptionList">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.paidSubscription.availableSubscriptions{/lang}</h2>
+                       {if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
+                               <div class="sectionDescription"><label><input type="checkbox" id="tosConfirmed" name="tosConfirmed" value="1" /> {lang}wcf.paidSubscription.confirmTOS{/lang}</label></div>
+                       {/if}
+               </header>
        
-       {if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
-               <div class="container containerPadding marginTop">
-                       <label><input type="checkbox" id="tosConfirmed" name="tosConfirmed" value="1" /> {lang}wcf.paidSubscription.confirmTOS{/lang}</label>
-               </div>
-       {/if}
-       
-       <div class="container marginTop paidSubscriptionList">
                <ul class="containerList">
                        {foreach from=$subscriptions item=subscription}
                                <li>
                                        <div class="containerHeadline">
-                                               <h3>{$subscription->title|language}</h3>
+                                               <h3>{$subscription->title|language} <span class="badge label">{lang}wcf.paidSubscription.formattedCost{/lang}</span></h3>
                                                <p>{@$subscription->description|language|newlineToBreak}</p>
-                                               
-                                               <p class="marginTopTiny">{lang}wcf.paidSubscription.formattedCost{/lang}</p>
-                                               
-                                               <ul class="buttonList marginTopTiny">
+                                       </div>
+                                       
+                                       <div class="containerContent">
+                                               <ul class="buttonList">
                                                        {foreach from=$subscription->getPurchaseButtons() item=button}
                                                                <li>{@$button}</li>
                                                        {/foreach}
                                </li>
                        {/foreach}
                </ul>
-       </div>
+       </section>
 {/if}
        
 {if $userSubscriptions|count}
-       <header class="boxHeadline boxSubHeadline">
-               <h2>{lang}wcf.paidSubscription.purchasedSubscriptions{/lang}</h2>
-       </header>
+       <section class="section sectionContainerList">
+               <h2 class="sectionTitle">{lang}wcf.paidSubscription.purchasedSubscriptions{/lang}</h2>
        
-       <div class="container marginTop">
                <ul class="containerList">
                        {foreach from=$userSubscriptions item=userSubscription}
                                <li>
                                        <div class="containerHeadline">
                                                <h3>{$userSubscription->getSubscription()->title|language}</h3>
                                                <p>{@$userSubscription->getSubscription()->description|language|newlineToBreak}</p>
-                                               
-                                               {if $userSubscription->endDate}
-                                                       <p>{lang}wcf.paidSubscription.expires{/lang}: {@$userSubscription->endDate|time}</p>
-                                               {/if}
                                        </div>
+                                       
+                                       {if $userSubscription->endDate}
+                                               <div class="containerContent">
+                                                       <dl class="plain inlineDataList">
+                                                               <dt>{lang}wcf.paidSubscription.expires{/lang}</dt>
+                                                               <dd>{@$userSubscription->endDate|time}</dd>
+                                                       </dl>
+                                               </div>
+                                       {/if}
                                </li>
                        {/foreach}
                </ul>
-       </div>
+       </section>
 {/if}
 
 {if !$subscriptions|count && !$userSubscriptions|count}
index db6f20b88da4122a57981b22554b54b95e07daa3..aaf78794eca39ee4bfed7cb7f7d12f313258daf3 100644 (file)
@@ -9,7 +9,7 @@
        </script>
 {/if}
 
-<div class="container containerPadding pollContainer" data-poll-id="{@$poll->pollID}" data-can-vote="{if $poll->canVote()}1{else}0{/if}" data-can-view-result="{if $poll->canSeeResult()}1{else}0{/if}" data-can-view-participants="{if $poll->canViewParticipants()}true{else}false{/if}" data-in-vote="{if $poll->canVote() && !$poll->isParticipant()}1{else}0{/if}" data-question="{$poll->question}" data-max-votes="{@$poll->maxVotes}">
+<div class="pollContainer" data-poll-id="{@$poll->pollID}" data-can-vote="{if $poll->canVote()}1{else}0{/if}" data-can-view-result="{if $poll->canSeeResult()}1{else}0{/if}" data-can-view-participants="{if $poll->canViewParticipants()}true{else}false{/if}" data-in-vote="{if $poll->canVote() && !$poll->isParticipant()}1{else}0{/if}" data-question="{$poll->question}" data-max-votes="{@$poll->maxVotes}">
        <section>
                <h1>{$poll->question} <span class="badge jsTooltip" title="{lang}wcf.poll.totalVotes{/lang}">{#$poll->votes}</span></h1>
                
index 0924375572ea3c4d8ecba5adc7893c1c75632a13..faf1774149999b8e11b8d2d6ef452c80417df9ae 100644 (file)
@@ -1,8 +1,8 @@
-<blockquote class="quoteBox container containerPadding{if !$quoteAuthorObject} quoteBoxSimple{/if}"{if $quoteLink} cite="{$quoteLink}"{/if}>
+<blockquote class="quoteBox{if !$quoteAuthorObject} quoteBoxSimple{/if}"{if $quoteLink} cite="{$quoteLink}"{/if}>
        <header class="quoteBoxHeader">
                <span class="quoteBoxIcon">
                        {if $quoteAuthorObject}
-                               <a href="{link controller='User' object=$quoteAuthorObject}{/link}" class="userLink framed" data-user-id="{@$quoteAuthorObject->userID}">{@$quoteAuthorObject->getAvatar()->getImageTag(32)}</a>
+                               <a href="{link controller='User' object=$quoteAuthorObject}{/link}" class="userLink" data-user-id="{@$quoteAuthorObject->userID}">{@$quoteAuthorObject->getAvatar()->getImageTag(32)}</a>
                        {else}
                                <span class="icon icon24 fa-quote-left"></span>
                        {/if}
index e934b11ad91b892550d374e018a63799f356e934..19195cbc5998af2575971a4007b7aa2815309b2a 100644 (file)
@@ -1,8 +1,8 @@
-<blockquote class="quoteBox container containerPadding{if !$quoteAuthorObject} quoteBoxSimple{/if}"{if $quoteLink} cite="{$quoteLink}"{/if}>
+<blockquote class="quoteBox{if !$quoteAuthorObject} quoteBoxSimple{/if}"{if $quoteLink} cite="{$quoteLink}"{/if}>
        <header class="quoteBoxHeader">
                <span class="quoteBoxIcon">
                        {if $quoteAuthorObject}
-                               <a href="{link controller='User' object=$quoteAuthorObject}{/link}" class="userLink framed" data-user-id="{@$quoteAuthorObject->userID}">{@$quoteAuthorObject->getAvatar()->getImageTag(32)}</a>
+                               <a href="{link controller='User' object=$quoteAuthorObject}{/link}" class="userLink" data-user-id="{@$quoteAuthorObject->userID}">{@$quoteAuthorObject->getAvatar()->getImageTag(32)}</a>
                        {else}
                                <span class="icon icon24 fa-quote-left"></span>
                        {/if}
index c9e3c2a1b530aadc10a9b343305dd92ec347a893..b7593271368c204ccf210c195da495489ca096ee 100644 (file)
@@ -3,8 +3,8 @@
 {else}
        {* No explicit keys were set, use legacy V1 API and WoltLab's OEM keys *}
        {if RECAPTCHA_PUBLICKEY === '' || RECAPTCHA_PRIVATEKEY === ''}
-       <fieldset>
-               <legend><label for="recaptcha_response_field">{lang}wcf.recaptcha.title{/lang}</label></legend>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.recaptcha.title{/lang}</h2>
                <small>{lang}wcf.recaptcha.description{/lang}</small>
                
                <dl class="wide reCaptcha{if $errorField|isset && $errorField == 'recaptchaString'} formError{/if}">
@@ -22,8 +22,8 @@
                                <label for="recaptcha_response_field">reCAPTCHA</label>
                        </dt>
                        <dd class="jsOnly">
-                               <div id="recaptcha_image" class="framed"></div>
-                               <input type="text" id="recaptcha_response_field" name="recaptcha_response_field" class="medium marginTop" />
+                               <div id="recaptcha_image"></div>
+                               <input type="text" id="recaptcha_response_field" name="recaptcha_response_field" class="medium" />
                                {if (($errorType|isset && $errorType|is_array && $errorType[recaptchaString]|isset) || ($errorField|isset && $errorField == 'recaptchaString'))}
                                        {if $errorType|is_array && $errorType[recaptchaString]|isset}
                                                {assign var='__errorType' value=$errorType[recaptchaString]}
                                </script>
                        {/if}
                </dl>
-       </fieldset>
+       </section>
        {else}
-       <fieldset>
-               <legend>{lang}wcf.recaptcha.title{/lang}</legend>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.recaptcha.title{/lang}</h2>
                {assign var="recaptchaBucketID" value=true|microtime|sha1}
                <dl class="{if $errorField|isset && $errorField == 'recaptchaString'}formError{/if}">
                        <dt></dt>
                if (!window.grecaptcha) $.getScript('https://www.google.com/recaptcha/api.js?render=explicit&onload=recaptchaCallback');
                //]]>
                </script>
-       </fieldset>
+       </section>
        {/if}
 {/if}
index 9f54fea14f8c3bc2424ca183b7ea430e694823f9..6dd2554b5277a0dce49bfd806e0fe00a2899cb97 100644 (file)
@@ -18,7 +18,7 @@
                {/content}
        </ul>
 {hascontentelse}
-       <div class="containerPadding">
+       <div class="section">
                {if $placeholder|isset}{$placeholder}{/if}
        </div>
 {/hascontent}
index 4397e8bfc762ca423cbbd857583c8977d48b297e..799ccd2a2d7127cb136a0321a1161c906280a1e7 100644 (file)
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{capture assign='sidebar'}
+{capture assign='sidebarRight'}
        {@$__boxSidebar}
 {/capture}
 
-{include file='header' sidebarOrientation='right'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.recentActivity{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.recentActivity{/lang}</h1>
 </header>
 
 {include file='userNotice'}
@@ -48,7 +48,7 @@
 </div>
 
 {if $eventList|count}
-       <div class="container marginTop">
+       <div class="section sectionContainerList">
                <ul id="recentActivities" class="containerList recentActivityList" data-last-event-time="{@$lastEventTime}">
                        {include file='recentActivityListItem'}
                </ul>
index a6be32e527fc8b08af6460f4ddd4dff6a033839b..0e81b44c2166dc9c7edfe69f00c7cbc5b910f73d 100644 (file)
@@ -1,7 +1,7 @@
 {foreach from=$eventList item=event}
        <li>
                <div class="box48">
-                       <a href="{link controller='User' object=$event->getUserProfile()}{/link}" title="{$event->getUserProfile()->username}" class="framed">{@$event->getUserProfile()->getAvatar()->getImageTag(48)}</a>
+                       <a href="{link controller='User' object=$event->getUserProfile()}{/link}" title="{$event->getUserProfile()->username}">{@$event->getUserProfile()->getAvatar()->getImageTag(48)}</a>
                        
                        <div>
                                <div class="containerHeadline">
index 6223020d11050a56e4ec32da226cc8924115363d..99fc246fffffc28fdf0709201f0805f3c222f48a 100644 (file)
@@ -38,8 +38,8 @@
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 {include file='header' __disableLoginLink=true __disableAds=true}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.register{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.register{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='Register'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.user.username{/lang}</legend>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.user.username{/lang}</h2>
+               
+               <dl{if $errorType.username|isset} class="formError"{/if}>
+                       <dt>
+                               <label for="{@$randomFieldNames[username]}">{lang}wcf.user.username{/lang}</label>
+                       </dt>
+                       <dd>
+                               <input type="text" id="{@$randomFieldNames[username]}" name="{@$randomFieldNames[username]}" value="{$username}" required="required" class="medium" />
+                               {if $errorType.username|isset}
+                                       <small class="innerError">
+                                               {if $errorType.username == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                               {if $errorType.username == 'notValid'}{lang}wcf.user.username.error.notValid{/lang}{/if}
+                                               {if $errorType.username == 'notUnique'}{lang}wcf.user.username.error.notUnique{/lang}{/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.user.username.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {event name='usernameFields'}
+       </section>
+       
+       <section class="section" id="fieldset1">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.user.register.honeyPot{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.user.register.honeyPot.description{/lang}</small>
+               </header>
+               
+               <dl>
+                       <dt>
+                               <label for="username">{lang}wcf.user.username{/lang}</label>
+                       </dt>
+                       <dd>
+                               <input type="text" id="username" name="username" value="" autocomplete="off" class="medium" tabindex="998" />
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt>
+                               <label for="email">{lang}wcf.user.email{/lang}</label>
+                       </dt>
+                       <dd>
+                               <input type="email" id="email" name="email" value="" autocomplete="off" class="medium" tabindex="999" />
+                       </dd>
+               </dl>
+               
+               {event name='honeyPotFields'}
+       </section>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.user.email{/lang}</h2>
+               
+               <dl{if $errorType.email|isset} class="formError"{/if}>
+                       <dt>
+                               <label for="{@$randomFieldNames[email]}">{lang}wcf.user.email{/lang}</label>
+                       </dt>
+                       <dd>
+                               <input type="email" id="{@$randomFieldNames[email]}" name="{@$randomFieldNames[email]}" value="{$email}" required="required" class="medium" />
+                               {if $errorType.email|isset}
+                                       <small class="innerError">
+                                               {if $errorType.email == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                               {if $errorType.email == 'notValid'}{lang}wcf.user.email.error.notValid{/lang}{/if}
+                                               {if $errorType.email == 'notUnique'}{lang}wcf.user.email.error.notUnique{/lang}{/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorType.confirmEmail|isset} class="formError"{/if}>
+                       <dt>
+                               <label for="{@$randomFieldNames[confirmEmail]}">{lang}wcf.user.confirmEmail{/lang}</label>
+                       </dt>
+                       <dd>
+                               <input type="email" id="{@$randomFieldNames[confirmEmail]}" name="{@$randomFieldNames[confirmEmail]}" value="{$confirmEmail}" required="required" class="medium" />
+                               {if $errorType.confirmEmail|isset}
+                                       <small class="innerError">
+                                               {if $errorType.confirmEmail == 'notEqual'}{lang}wcf.user.confirmEmail.error.notEqual{/lang}{/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {event name='emailFields'}
+       </section>
+       
+       {if !$isExternalAuthentication}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.user.password{/lang}</h2>
                        
-                       <dl{if $errorType.username|isset} class="formError"{/if}>
+                       <dl{if $errorType.password|isset} class="formError"{/if}>
                                <dt>
-                                       <label for="{@$randomFieldNames[username]}">{lang}wcf.user.username{/lang}</label>
+                                       <label for="{@$randomFieldNames[password]}">{lang}wcf.user.password{/lang}</label>
                                </dt>
                                <dd>
-                                       <input type="text" id="{@$randomFieldNames[username]}" name="{@$randomFieldNames[username]}" value="{$username}" required="required" class="medium" />
-                                       {if $errorType.username|isset}
+                                       <input type="password" id="{@$randomFieldNames[password]}" name="{@$randomFieldNames[password]}" value="{$password}" required="required" class="medium" />
+                                       {if $errorType.password|isset}
                                                <small class="innerError">
-                                                       {if $errorType.username == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                       {if $errorType.username == 'notValid'}{lang}wcf.user.username.error.notValid{/lang}{/if}
-                                                       {if $errorType.username == 'notUnique'}{lang}wcf.user.username.error.notUnique{/lang}{/if}
+                                                       {if $errorType.password == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                                       {if $errorType.password == 'notSecure'}{lang}wcf.user.password.error.notSecure{/lang}{/if}
                                                </small>
                                        {/if}
-                                       <small>{lang}wcf.user.username.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='usernameFields'}
-               </fieldset>
-               
-               <fieldset id="fieldset1">
-                       <legend>{lang}wcf.user.register.honeyPot{/lang}</legend>
-                       
-                       <small>{lang}wcf.user.register.honeyPot.description{/lang}</small>
-                       
-                       <dl>
-                               <dt>
-                                       <label for="username">{lang}wcf.user.username{/lang}</label>
-                               </dt>
-                               <dd>
-                                       <input type="text" id="username" name="username" value="" autocomplete="off" class="medium" tabindex="998" />
+                                       <small>{lang}wcf.user.password.description{/lang}</small>
                                </dd>
                        </dl>
                        
-                       <dl>
+                       <dl{if $errorType.confirmPassword|isset} class="formError"{/if}>
                                <dt>
-                                       <label for="email">{lang}wcf.user.email{/lang}</label>
+                                       <label for="{@$randomFieldNames[confirmPassword]}">{lang}wcf.user.confirmPassword{/lang}</label>
                                </dt>
                                <dd>
-                                       <input type="email" id="email" name="email" value="" autocomplete="off" class="medium" tabindex="999" />
-                               </dd>
-                       </dl>
-                       
-                       {event name='honeyPotFields'}
-               </fieldset>
-               
-               <fieldset>
-                       <legend>{lang}wcf.user.email{/lang}</legend>
-                       
-                       <dl{if $errorType.email|isset} class="formError"{/if}>
-                               <dt>
-                                       <label for="{@$randomFieldNames[email]}">{lang}wcf.user.email{/lang}</label>
-                               </dt>
-                               <dd>
-                                       <input type="email" id="{@$randomFieldNames[email]}" name="{@$randomFieldNames[email]}" value="{$email}" required="required" class="medium" />
-                                       {if $errorType.email|isset}
+                                       <input type="password" id="{@$randomFieldNames[confirmPassword]}" name="{@$randomFieldNames[confirmPassword]}" value="{$confirmPassword}" required="required" class="medium" />
+                                       {if $errorType.confirmPassword|isset}
                                                <small class="innerError">
-                                                       {if $errorType.email == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                       {if $errorType.email == 'notValid'}{lang}wcf.user.email.error.notValid{/lang}{/if}
-                                                       {if $errorType.email == 'notUnique'}{lang}wcf.user.email.error.notUnique{/lang}{/if}
+                                                       {if $errorType.confirmPassword == 'notEqual'}{lang}wcf.user.confirmPassword.error.notEqual{/lang}{/if}
                                                </small>
                                        {/if}
                                </dd>
                        </dl>
                        
-                       <dl{if $errorType.confirmEmail|isset} class="formError"{/if}>
-                               <dt>
-                                       <label for="{@$randomFieldNames[confirmEmail]}">{lang}wcf.user.confirmEmail{/lang}</label>
-                               </dt>
+                       {event name='passwordFields'}
+               </section>
+       {/if}
+       
+       {if $availableLanguages|count > 1}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.user.language{/lang}</h2>
+                       
+                       <dl>
+                               <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
                                <dd>
-                                       <input type="email" id="{@$randomFieldNames[confirmEmail]}" name="{@$randomFieldNames[confirmEmail]}" value="{$confirmEmail}" required="required" class="medium" />
-                                       {if $errorType.confirmEmail|isset}
-                                               <small class="innerError">
-                                                       {if $errorType.confirmEmail == 'notEqual'}{lang}wcf.user.confirmEmail.error.notEqual{/lang}{/if}
-                                               </small>
-                                       {/if}
+                                       <select id="languageID" name="languageID">
+                                               {foreach from=$availableLanguages item=language}
+                                                       <option value="{@$language->languageID}"{if $language->languageID == $languageID} selected="selected"{/if}>{$language}</option>
+                                               {/foreach}
+                                       </select>
+                                       <small>{lang}wcf.user.language.description{/lang}</small>
                                </dd>
                        </dl>
                        
-                       {event name='emailFields'}
-               </fieldset>
-               
-               {if !$isExternalAuthentication}
-                       <fieldset>
-                               <legend>{lang}wcf.user.password{/lang}</legend>
-                               
-                               <dl{if $errorType.password|isset} class="formError"{/if}>
-                                       <dt>
-                                               <label for="{@$randomFieldNames[password]}">{lang}wcf.user.password{/lang}</label>
-                                       </dt>
-                                       <dd>
-                                               <input type="password" id="{@$randomFieldNames[password]}" name="{@$randomFieldNames[password]}" value="{$password}" required="required" class="medium" />
-                                               {if $errorType.password|isset}
-                                                       <small class="innerError">
-                                                               {if $errorType.password == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                               {if $errorType.password == 'notSecure'}{lang}wcf.user.password.error.notSecure{/lang}{/if}
-                                                       </small>
-                                               {/if}
-                                               <small>{lang}wcf.user.password.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                               
-                               <dl{if $errorType.confirmPassword|isset} class="formError"{/if}>
-                                       <dt>
-                                               <label for="{@$randomFieldNames[confirmPassword]}">{lang}wcf.user.confirmPassword{/lang}</label>
-                                       </dt>
-                                       <dd>
-                                               <input type="password" id="{@$randomFieldNames[confirmPassword]}" name="{@$randomFieldNames[confirmPassword]}" value="{$confirmPassword}" required="required" class="medium" />
-                                               {if $errorType.confirmPassword|isset}
-                                                       <small class="innerError">
-                                                               {if $errorType.confirmPassword == 'notEqual'}{lang}wcf.user.confirmPassword.error.notEqual{/lang}{/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               
-                               {event name='passwordFields'}
-                       </fieldset>
-               {/if}
-               
-               {if $availableLanguages|count > 1}
-                       <fieldset>
-                               <legend>{lang}wcf.user.language{/lang}</legend>
-                               
+                       {hascontent}
                                <dl>
-                                       <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
-                                       <dd>
-                                               <select id="languageID" name="languageID">
-                                                       {foreach from=$availableLanguages item=language}
-                                                               <option value="{@$language->languageID}"{if $language->languageID == $languageID} selected="selected"{/if}>{$language}</option>
-                                                       {/foreach}
-                                               </select>
-                                               <small>{lang}wcf.user.language.description{/lang}</small>
-                                       </dd>
+                                       <dt><label>{lang}wcf.user.visibleLanguages{/lang}</label></dt>
+                                       <dd class="floated">
+                                       {content}
+                                               {foreach from=$availableContentLanguages item=language}
+                                                       <label><input name="visibleLanguages[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$visibleLanguages} checked="checked"{/if} /> {$language}</label>
+                                               {/foreach}
+                                       {/content}
+                                       <small>{lang}wcf.user.visibleLanguages.description{/lang}</small></dd>
                                </dl>
-                               
-                               {hascontent}
-                                       <dl>
-                                               <dt><label>{lang}wcf.user.visibleLanguages{/lang}</label></dt>
-                                               <dd class="floated">
-                                               {content}
-                                                       {foreach from=$availableContentLanguages item=language}
-                                                               <label><input name="visibleLanguages[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$visibleLanguages} checked="checked"{/if} /> {$language}</label>
-                                                       {/foreach}
-                                               {/content}
-                                               <small>{lang}wcf.user.visibleLanguages.description{/lang}</small></dd>
-                                       </dl>
-                               {/hascontent}
-                               
-                               {event name='languageFields'}
-                       </fieldset>
-               {/if}
-               
-               {foreach from=$optionTree item=category}
-                       <fieldset>
-                               <legend>{lang}wcf.user.option.category.{@$category[object]->categoryName}{/lang}</legend>
-                               
-                               {include file='userOptionFieldList' options=$category[options] langPrefix='wcf.user.option.'}
-                       </fieldset>
-               {/foreach}
-               
-               {event name='fieldsets'}
-               
-               {include file='captcha'}
-       </div>
+                       {/hascontent}
+                       
+                       {event name='languageFields'}
+               </section>
+       {/if}
+       
+       {foreach from=$optionTree item=category}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.user.option.category.{@$category[object]->categoryName}{/lang}</h2>
+                       
+                       {include file='userOptionFieldList' options=$category[options] langPrefix='wcf.user.option.'}
+               </section>
+       {/foreach}
+       
+       {event name='sections'}
+       
+       {include file='captcha'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 11650bc4fee1cfe1e5688095cfe79c9dfa066bfc..4ab00ecb498073f5a507088da025574df7b59f34 100644 (file)
@@ -9,8 +9,8 @@
 
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.registerActivation{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.registerActivation{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='RegisterActivation'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend><label for="userID">{lang}wcf.user.registerActivation{/lang}</label></legend>
-                       
-                       <dl{if $errorField == 'username'} class="formError"{/if}>
-                               <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
-                                       {if $errorField == 'username'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'notFound'}{lang}wcf.user.username.error.notFound{/lang}{/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'activationCode'} class="formError"{/if}>
-                               <dt><label for="activationCode">{lang}wcf.user.activationCode{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="activationCode" maxlength="9" name="activationCode" value="{@$activationCode}" required="required" class="medium" />
-                                       {if $errorField == 'activationCode'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if}
-                                               </small>
-                                       {/if}
-                                       <small><a href="{link controller='RegisterNewActivationCode'}{/link}">{lang}wcf.user.newActivationCode{/lang}</a></small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='fields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'username'} class="formError"{/if}>
+                       <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
+                               {if $errorField == 'username'}
+                                       <small class="innerError">
+                                               {if $errorType == 'notFound'}{lang}wcf.user.username.error.notFound{/lang}{/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl{if $errorField == 'activationCode'} class="formError"{/if}>
+                       <dt><label for="activationCode">{lang}wcf.user.activationCode{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="activationCode" maxlength="9" name="activationCode" value="{@$activationCode}" required="required" class="medium" />
+                               {if $errorField == 'activationCode'}
+                                       <small class="innerError">
+                                               {if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if}
+                                       </small>
+                               {/if}
+                               <small><a href="{link controller='RegisterNewActivationCode'}{/link}">{lang}wcf.user.newActivationCode{/lang}</a></small>
+                       </dd>
+               </dl>
+               
+               {event name='fields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index 4b71f4ff8d025c696c39fbb170e63c59d6580b5e..ecac56103ec8a429eb6659a5804b4bfb6d8aba81 100644 (file)
@@ -9,8 +9,8 @@
 
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.newActivationCode{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.newActivationCode{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
        
 <form method="post" action="{link controller='RegisterNewActivationCode'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.user.newActivationCode{/lang}</legend>
-                       
-                       <dl{if $errorField == 'username'} class="formError"{/if}>
-                               <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
-                                       {if $errorField == 'username'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {elseif $errorType == 'alreadyEnabled'}
-                                                               {lang}wcf.user.registerActivation.error.userAlreadyEnabled{/lang}
-                                                       {else}
-                                                               {lang}wcf.user.username.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'password'} class="formError"{/if}>
-                               <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
-                               <dd>
-                                       <input type="password" id="password" name="password" value="{$password}" required="required" class="medium" />
-                                       {if $errorField == 'password'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.user.password.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'email'} class="formError"{/if}>
-                               <dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
-                               <dd>
-                                       <input type="email" id="email" name="email" value="{$email}" class="medium" />
-                                       {if $errorField == 'email'}
-                                               <small class="innerError">
-                                                       {lang}wcf.user.email.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.user.registerNewActivationCode.email.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='fields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'username'} class="formError"{/if}>
+                       <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="username" name="username" value="{$username}" required="required" class="medium" />
+                               {if $errorField == 'username'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {elseif $errorType == 'alreadyEnabled'}
+                                                       {lang}wcf.user.registerActivation.error.userAlreadyEnabled{/lang}
+                                               {else}
+                                                       {lang}wcf.user.username.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl{if $errorField == 'password'} class="formError"{/if}>
+                       <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
+                       <dd>
+                               <input type="password" id="password" name="password" value="{$password}" required="required" class="medium" />
+                               {if $errorField == 'password'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.user.password.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'email'} class="formError"{/if}>
+                       <dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
+                       <dd>
+                               <input type="email" id="email" name="email" value="{$email}" class="medium" />
+                               {if $errorField == 'email'}
+                                       <small class="innerError">
+                                               {lang}wcf.user.email.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.user.registerNewActivationCode.email.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {event name='fields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index 5ef37ab1a61448b0745218026781a23111590a27..e749092b8899e41dfc7fc93be110318bf217da69 100644 (file)
@@ -10,9 +10,9 @@
 
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{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>{lang}wcf.search.results.description{/lang}</p>
+<header class="contentHeader">
+       <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>
 </header>
 
 {include file='userNotice'}
index 7129b03edad8cfd96506931a4bd170ec0d8c4bd5..361db5e9467ea56568de98d76f80420651b481ed 100644 (file)
@@ -1,16 +1,16 @@
-<div class="container marginTop">
+<div class="section sectionContainerList">
        <ul class="containerList messageSearchResultList">
                {foreach from=$objects item=message}
                        <li>
                                <div class="box48">
                                        {if $message->getUserProfile()}
                                                {if $message->getUserProfile()->userID}
-                                                       <a href="{link controller='User' object=$message->getUserProfile()}{/link}" title="{$message->getUserProfile()->username}" class="framed">{@$message->getUserProfile()->getAvatar()->getImageTag(48)}</a>
+                                                       <a href="{link controller='User' object=$message->getUserProfile()}{/link}" title="{$message->getUserProfile()->username}">{@$message->getUserProfile()->getAvatar()->getImageTag(48)}</a>
                                                {else}
-                                                       <p class="framed">{@$message->getUserProfile()->getAvatar()->getImageTag(48)}</p>
+                                                       <p>{@$message->getUserProfile()->getAvatar()->getImageTag(48)}</p>
                                                {/if}
                                        {else}
-                                               <p class="framed"><span class="icon icon48 fa-file-o"></span></p>
+                                               <p><span class="icon icon48 fa-file-o"></span></p>
                                        {/if}
                                        
                                        <div>
@@ -39,7 +39,7 @@
                                                        <small class="containerContentType">{lang}wcf.search.object.{@$message->getObjectTypeName()}{/lang}</small>
                                                </div>
                                                
-                                               <p>{@$message->getFormattedMessage()}</p>
+                                               <div class="containerContent">{@$message->getFormattedMessage()}</div>
                                        </div>
                                </div>
                        </li>
index 1db4810084b83b4ff7bdd6594fca3e82c067d6b8..2dd56dac3d504890bf5911b19a4cb2d1a2524bbe 100644 (file)
 
 {include file='userMenuSidebar'}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.option.category.settings.{$category}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.option.category.settings.{$category}{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='Settings'}{/link}">
-       <div class="container containerPadding marginTop">
-               {if $category == 'general'}
-                       {if $availableLanguages|count > 1}
-                               <fieldset>
-                                       <legend>{lang}wcf.user.language{/lang}</legend>
-                                       
-                                       <dl>
-                                               <dt><label>{lang}wcf.user.language{/lang}</label></dt>
-                                               <dd id="languageIDContainer">
-                                                       <script data-relocate="true">
-                                                               //<![CDATA[
-                                                               $(function() {
-                                                                       var $languages = {
-                                                                               {implode from=$availableLanguages item=language}
-                                                                                       '{@$language->languageID}': {
-                                                                                               iconPath: '{@$language->getIconPath()}',
-                                                                                               languageName: '{$language}'
-                                                                                       }
-                                                                               {/implode}
-                                                                       };
-                                                                       
-                                                                       new WCF.Language.Chooser('languageIDContainer', 'languageID', {@$languageID}, $languages);
-                                                               });
-                                                               //]]>
-                                                       </script>
-                                                       <noscript>
-                                                               <select name="languageID" id="languageID">
-                                                                       {foreach from=$availableLanguages item=language}
-                                                                               <option value="{@$language->languageID}"{if $language->languageID == $languageID} selected="selected"{/if}>{$language}</option>
-                                                                       {/foreach}
-                                                               </select>
-                                                       </noscript>
-                                               </dd>
-                                       </dl>
-                                       
-                                       {hascontent}
-                                               <dl>
-                                                       <dt><label>{lang}wcf.user.visibleLanguages{/lang}</label></dt>
-                                                       <dd class="floated">
-                                                       {content}
-                                                               {foreach from=$availableContentLanguages item=language}
-                                                                       <label><input name="contentLanguageIDs[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$contentLanguageIDs} checked="checked"{/if} /> {$language}</label>
-                                                               {/foreach}
-                                                       {/content}
-                                                       <small>{lang}wcf.user.visibleLanguages.description{/lang}</small></dd>
-                                               </dl>
-                                       {/hascontent}
-                                       
-                                       {event name='languageFields'}
-                               </fieldset>
-                       {/if}
-                       
-                       {if $availableStyles|count > 1}
-                               <fieldset>
-                                       <legend>{lang}wcf.user.style{/lang}</legend>
-                                       
-                                       <dl>
-                                               <dt><label for="styleID">{lang}wcf.user.style{/lang}</label></dt>
-                                               <dd>
-                                                       <select id="styleID" name="styleID">
-                                                               <option value="0">{lang}wcf.global.defaultValue{/lang}</option>
-                                                               {foreach from=$availableStyles item=style}
-                                                                       <option value="{@$style->styleID}"{if $style->styleID == $styleID} selected="selected"{/if}>{$style->styleName}</option>
+       {if $category == 'general'}
+               {if $availableLanguages|count > 1}
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.user.language{/lang}</h2>
+                               
+                               <dl>
+                                       <dt><label>{lang}wcf.user.language{/lang}</label></dt>
+                                       <dd id="languageIDContainer">
+                                               <script data-relocate="true">
+                                                       //<![CDATA[
+                                                       $(function() {
+                                                               var $languages = {
+                                                                       {implode from=$availableLanguages item=language}
+                                                                               '{@$language->languageID}': {
+                                                                                       iconPath: '{@$language->getIconPath()}',
+                                                                                       languageName: '{$language}'
+                                                                               }
+                                                                       {/implode}
+                                                               };
+                                                               
+                                                               new WCF.Language.Chooser('languageIDContainer', 'languageID', {@$languageID}, $languages);
+                                                       });
+                                                       //]]>
+                                               </script>
+                                               <noscript>
+                                                       <select name="languageID" id="languageID">
+                                                               {foreach from=$availableLanguages item=language}
+                                                                       <option value="{@$language->languageID}"{if $language->languageID == $languageID} selected="selected"{/if}>{$language}</option>
                                                                {/foreach}
                                                        </select>
-                                                       <small>{lang}wcf.user.style.description{/lang}</small>
-                                               </dd>
+                                               </noscript>
+                                       </dd>
+                               </dl>
+                               
+                               {hascontent}
+                                       <dl>
+                                               <dt><label>{lang}wcf.user.visibleLanguages{/lang}</label></dt>
+                                               <dd class="floated">
+                                               {content}
+                                                       {foreach from=$availableContentLanguages item=language}
+                                                               <label><input name="contentLanguageIDs[]" type="checkbox" value="{@$language->languageID}"{if $language->languageID|in_array:$contentLanguageIDs} checked="checked"{/if} /> {$language}</label>
+                                                       {/foreach}
+                                               {/content}
+                                               <small>{lang}wcf.user.visibleLanguages.description{/lang}</small></dd>
                                        </dl>
-                                       
-                                       {event name='styleFields'}
-                               </fieldset>
-                       {/if}
+                               {/hascontent}
+                               
+                               {event name='languageFields'}
+                       </section>
                {/if}
                
-               {if !$optionTree|empty}
-                       {foreach from=$optionTree[0][categories][0][categories] item=optionCategory}
-                               <fieldset>
-                                       <legend>{lang}wcf.user.option.category.{@$optionCategory[object]->categoryName}{/lang}</legend>
-                                       
-                                       {include file='userProfileOptionFieldList' options=$optionCategory[options] langPrefix='wcf.user.option.'}
-                               </fieldset>
-                       {/foreach}
+               {if $availableStyles|count > 1}
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.user.style{/lang}</h2>
+                               
+                               <dl>
+                                       <dt><label for="styleID">{lang}wcf.user.style{/lang}</label></dt>
+                                       <dd>
+                                               <select id="styleID" name="styleID">
+                                                       <option value="0">{lang}wcf.global.defaultValue{/lang}</option>
+                                                       {foreach from=$availableStyles item=style}
+                                                               <option value="{@$style->styleID}"{if $style->styleID == $styleID} selected="selected"{/if}>{$style->styleName}</option>
+                                                       {/foreach}
+                                               </select>
+                                               <small>{lang}wcf.user.style.description{/lang}</small>
+                                       </dd>
+                               </dl>
+                               
+                               {event name='styleFields'}
+                       </section>
                {/if}
-               
-               {event name='fieldsets'}
-       </div>
+       {/if}
+       
+       {if !$optionTree|empty}
+               {foreach from=$optionTree[0][categories][0][categories] item=optionCategory}
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.user.option.category.{@$optionCategory[object]->categoryName}{/lang}</h2>
+                               
+                               {include file='userProfileOptionFieldList' options=$optionCategory[options] langPrefix='wcf.user.option.'}
+                       </section>
+               {/foreach}
+       {/if}
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index ae0a0f430f6b79a93d3d09ca18271e5c5d8972ac..e1d7d0a824e407289aa23416f453032e2987fbaa 100644 (file)
@@ -1,6 +1,6 @@
 <small style="display: inline-block; max-width: 500px;">{lang}wcf.message.share.privacy.description{/lang}</small>
 
-<ul class="marginTop">
+<ul>
        <li><label><input type="checkbox" name="facebook" value="1"{if $settings[facebook]} checked="checked"{/if} /> {lang}wcf.message.share.facebook{/lang}</label></li>
        <li><label><input type="checkbox" name="twitter" value="1"{if $settings[twitter]} checked="checked"{/if} /> {lang}wcf.message.share.twitter{/lang}</label></li>
        <li><label><input type="checkbox" name="google" value="1"{if $settings[google]} checked="checked"{/if} /> {lang}wcf.message.share.google{/lang}</label></li>
index 0d61687c6704c810cba99ac835c036937b167ba2..36099cca3a8a0522628d1d0721e65bc369672a6d 100644 (file)
 
 {include file='userMenuSidebar'}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.signature.edit{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.signature.edit{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='SignatureEdit'}{/link}">
-       <div class="container containerPadding marginTop">
-               {if $signatureCache}
-                       <fieldset>
-                               <legend>{lang}wcf.user.signature.current{/lang}</legend>
-                               
-                               {@$signatureCache}
-                       </fieldset>
-               {/if}
-               
-               {if !$__wcf->user->disableSignature}
-                       <fieldset id="signatureContainer">
-                               <legend>{lang}wcf.user.signature{/lang}</legend>
-                                       
-                               <dl class="wide{if $errorField == 'text'} formError{/if}">
-                                       <dt><label for="text">{lang}wcf.user.signature{/lang}</label></dt>
-                                       <dd>
-                                               <textarea id="text" name="text" rows="20" cols="40">{$text}</textarea>
-                                               {if $errorField == 'text'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {elseif $errorType == 'tooLong'}
-                                                                       {lang}wcf.message.error.tooLong{/lang}
-                                                               {elseif $errorType == 'censoredWordsFound'}
-                                                                       {lang}wcf.message.error.censoredWordsFound{/lang}
-                                                               {elseif $errorType == 'disallowedBBCodes'}
-                                                                       {lang}wcf.message.error.disallowedBBCodes{/lang}
-                                                               {else}
-                                                                       {lang}wcf.user.signature.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               
-                               {event name='fields'}
-                       </fieldset>
+       {if $signatureCache}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.user.signature.current{/lang}</h2>
                        
-                       {event name='fieldsets'}
+                       {@$signatureCache}
+               </section>
+       {/if}
+       
+       {if !$__wcf->user->disableSignature}
+               <section class="section" id="signatureContainer">
+                       <h2 class="sectionTitle">{lang}wcf.user.signature{/lang}</h2>
+                               
+                       <dl class="wide{if $errorField == 'text'} formError{/if}">
+                               <dt><label for="text">{lang}wcf.user.signature{/lang}</label></dt>
+                               <dd>
+                                       <textarea id="text" name="text" rows="20" cols="40">{$text}</textarea>
+                                       {if $errorField == 'text'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {elseif $errorType == 'tooLong'}
+                                                               {lang}wcf.message.error.tooLong{/lang}
+                                                       {elseif $errorType == 'censoredWordsFound'}
+                                                               {lang}wcf.message.error.censoredWordsFound{/lang}
+                                                       {elseif $errorType == 'disallowedBBCodes'}
+                                                               {lang}wcf.message.error.disallowedBBCodes{/lang}
+                                                       {else}
+                                                               {lang}wcf.user.signature.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
                        
-                       {include file='messageFormTabs'}
-               {/if}
-       </div>
+                       {event name='fields'}
+               </section>
+               
+               {event name='sections'}
+               
+               {include file='messageFormTabs'}
+       {/if}
        
        {if !$__wcf->user->disableSignature}
                <div class="formSubmit">
index cffdc031220ab4cebfd16686e5a01c6bd58f8c92..d233f38a000574ae9cc250b0d0b48ec2492a3eb2 100644 (file)
@@ -1,6 +1,6 @@
 <div class="sitemap">
        {hascontent}
-               <div class="tabMenuContainer" data-active="sitemap_{@$defaultSitemapName}">
+               <div class="section tabMenuContainer" data-active="sitemap_{@$defaultSitemapName}">
                        <nav class="tabMenu">
                                <ul>
                                        {content}
@@ -12,7 +12,7 @@
                        </nav>
                        
                        {foreach from=$tree item=sitemapName}
-                               <div id="sitemap_{$sitemapName}" class="container containerPadding tabMenuContent hidden">
+                               <div id="sitemap_{$sitemapName}" class="tabMenuContent hidden">
                                        {if $sitemapName == $defaultSitemapName}{@$sitemap}{/if}
                                </div>
                        {/foreach}
index 8b29a6134a68c0ea8f36bc0eaf9be718acc5ac3d..7785dc3b2c5997ee220ff4bd6580dffae02fc665 100644 (file)
@@ -1,5 +1,5 @@
 <!-- begin:parser_nonessential -->
-<div class="container containerPadding spoilerBox jsSpoilerBox">
+<div class="spoilerBox jsSpoilerBox">
        <header class="jsOnly">
                <a class="button jsSpoilerToggle"{if $buttonTitle} data-has-custom-label="true"{/if}>{if $buttonTitle}{@$buttonTitle}{else}{lang}wcf.bbcode.spoiler.show{/lang}{/if}</a>
        </header>
index 34a163d5ca7ce0eb079fd7771dce2fcdaeff9af6..f5876d973985deb9acb075bcf2f3b11736fdb4a6 100644 (file)
@@ -2,7 +2,7 @@
        {foreach from=$styleList item=style}
                <li data-style-id="{@$style->styleID}">
                        <div class="box64">
-                               <span class="framed">
+                               <span>
                                        <img src="{@$style->getPreviewImage()}" alt="" />
                                </span>
                                <div class="details">
index 82c279061baca0a2dba4e0802b48acd36cb99703..f49443372d6bfb6b4c7201b904aaa12b01905c02 100644 (file)
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{capture assign='sidebar'}
-       <fieldset>
-               <legend>{lang}wcf.tagging.objectTypes{/lang}</legend>
+{capture assign='sidebarLeft'}
+       <section class="box">
+               <h2 class="boxTitle">{lang}wcf.tagging.objectTypes{/lang}</h2>
                
-               <nav>
+               <nav class="boxContent">
                        <ul>
                                {foreach from=$availableObjectTypes item=availableObjectType}
                                        <li{if $objectType == $availableObjectType->objectType} class="active"{/if}><a href="{link controller='Tagged' object=$tag}objectType={@$availableObjectType->objectType}{/link}">{lang}wcf.tagging.objectType.{@$availableObjectType->objectType}{/lang}</a></li>
                                {/foreach}
                        </ul>
                </nav>
-       </fieldset>
+       </section>
        
-       <fieldset>
-               <legend>{lang}wcf.tagging.tags{/lang}</legend>
+       <section class="box">
+               <h2 class="boxTitle">{lang}wcf.tagging.tags{/lang}</h2>
                
-               {include file='tagCloudBox' taggableObjectType=$objectType}
-       </fieldset>
+               <div class="boxContent">
+                       {include file='tagCloudBox' taggableObjectType=$objectType}
+               </div>
+       </section>
 {/capture}
 
-{include file='header' sidebarOrientation='left'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.tagging.taggedObjects.{@$objectType}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.tagging.taggedObjects.{@$objectType}{/lang}</h1>
 </header>
 
 {include file='userNotice'}
index 76874d044d328b9c8216cdbfd5c2eee0e03a00bc..b523aa45cc9021501a58f4add1eb367073370a5e 100644 (file)
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{capture assign='sidebar'}
+{capture assign='sidebarRight'}
        {@$__boxSidebar}
 {/capture}
 
-{include file='header' sidebarOrientation='right'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.team{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.team{/lang}</h1>
 </header>
 
 {include file='userNotice'}
index c176a3a40d1257f0f5c2e444096158e03047db5c..3b491a32722632ad679cee2ccf77918d659ba539 100644 (file)
 {include file='userNotice'}
 
 {if !$user->isProtected()}
-       <div class="contentNavigation">
-               {hascontent}
-                       <nav>
-                               <ul>
-                                       {content}
-                                               {event name='contentNavigationButtons'}
-                                       {/content}
-                               </ul>
-                       </nav>
-               {/hascontent}
-       </div>
-       
-       <section id="profileContent" class="tabMenuContainer" data-active="{$__wcf->getUserProfileMenu()->getActiveMenuItem()->getIdentifier()}">
+       <div id="profileContent" class="section tabMenuContainer userProfile" data-active="{$__wcf->getUserProfileMenu()->getActiveMenuItem()->getIdentifier()}">
                <nav class="tabMenu">
                        <ul>
                                {foreach from=$__wcf->getUserProfileMenu()->getMenuItems() item=menuItem}
                
                {foreach from=$__wcf->getUserProfileMenu()->getMenuItems() item=menuItem}
                        {if $menuItem->getContentManager()->isVisible($userID)}
-                               <div id="{$menuItem->getIdentifier()}" class="container tabMenuContent" data-menu-item="{$menuItem->menuItem}">
+                               <div id="{$menuItem->getIdentifier()}" class="tabMenuContent" data-menu-item="{$menuItem->menuItem}">
                                        {if $menuItem === $__wcf->getUserProfileMenu()->getActiveMenuItem()}
                                                {@$profileContent}
                                        {/if}
                                </div>
                        {/if}
                {/foreach}
-       </section>
+       </div>
 {else}
        <p class="info">{lang}wcf.user.profile.protected{/lang}</p>
 {/if}
index cc83d402782007dc7ebed2aca0963bcbfeb35e98..132bf2012bbefa02b9e60b20c5837eb37fe6eeb9 100644 (file)
@@ -1,10 +1,10 @@
 {if $users|count}
-       <div class="container marginTop">
+       <div class="section sectionContainerList">
                <ol class="containerList jsGroupedUserList">
                        {foreach from=$users item=user}
                                <li data-object-id="{@$user->userID}">
                                        <div class="box48">
-                                               <a href="{link controller='User' object=$user}{/link}" title="{$user->username}" class="framed">{@$user->getAvatar()->getImageTag(48)}</a>
+                                               <a href="{link controller='User' object=$user}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag(48)}</a>
                                                
                                                <div class="details userInformation">
                                                        <div class="containerHeadline">
@@ -33,5 +33,5 @@
                </ol>
        </div>
 {else}
-       <p class="marginTop">{lang}wcf.global.noItems{/lang}</p>
+       <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
\ No newline at end of file
index 2cd9a5ef23dde2c7829352225cef4c1e414b314d..3ebb3696eda7d6be973751b58e986c268d7ceb8c 100644 (file)
@@ -5,9 +5,9 @@
                        <div class="box128">
                                <div class="userAvatar">
                                        {if $user->userID == $__wcf->user->userID}
-                                               <a href="{link controller='AvatarEdit'}{/link}" class="framed jsTooltip" title="{lang}wcf.user.avatar.edit{/lang}">{@$user->getAvatar()->getImageTag(128)}</a>
+                                               <a href="{link controller='AvatarEdit'}{/link}" class="jsTooltip" title="{lang}wcf.user.avatar.edit{/lang}">{@$user->getAvatar()->getImageTag(128)}</a>
                                        {else}
-                                               <span class="framed">{@$user->getAvatar()->getImageTag(128)}</span>
+                                               <span>{@$user->getAvatar()->getImageTag(128)}</span>
                                        {/if}
                                </div>
                        
index 751884b67666eb6ed9dc9fc086728ad9ed99045a..15abe6e63240ab99ceedbfde37322438a2f79004 100644 (file)
@@ -1,6 +1,6 @@
 <li data-object-id="{@$user->userID}">
        <div class="box48">
-               <a href="{link controller='User' object=$user}{/link}" title="{$user->username}" class="framed">{@$user->getAvatar()->getImageTag(48)}</a>
+               <a href="{link controller='User' object=$user}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag(48)}</a>
                
                <div class="details userInformation">
                        {include file='userInformation'}
index f944a6688ace6c483b61b2be66ba284419b543f5..b32eb23b2e87324905ba93b3ea6da3bf7278b2bd 100644 (file)
@@ -1,4 +1,4 @@
-{capture assign='sidebar'}
+{capture assign='sidebarLeft'}
        {assign var=__userMenuActiveItems value=$__wcf->getUserMenu()->getActiveMenuItems()}
        
        <script data-relocate="true">
index 0c301086b15cb5f5297a030d4150d3c4d82620b2..261f57b95217f2b3f2a34473142439c8fda605e3 100644 (file)
@@ -1,34 +1,33 @@
-<div class="containerPadding">
-       {foreach from=$optionTree item=categoryLevel1}
-               {foreach from=$categoryLevel1[categories] item=categoryLevel2}
-                       <fieldset>
-                               <legend>{lang}wcf.user.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>
-                               
-                               {if $categoryLevel2[object]->categoryName == 'profile.personal' && MODULE_USER_RANK && $__wcf->session->getPermission('user.profile.canEditUserTitle')}
-                                       <dl>
-                                               <dt><label for="__userTitle">{lang}wcf.user.userTitle{/lang}</label></dt>
-                                               <dd>
-                                                       <input type="text" id="__userTitle" name="values[__userTitle]" value="{$__userTitle}" class="long" maxlength="{@USER_TITLE_MAX_LENGTH}" />
-                                                       {if $errorType[__userTitle]|isset}
-                                                               <small class="innerError">
-                                                                       {lang}wcf.user.userTitle.error.{@$errorType[__userTitle]}{/lang}
-                                                               </small>
-                                                       {/if}
-                                                       <small>{lang}wcf.user.userTitle.description{/lang}</small>
-                                               </dd>
-                                       </dl>
-                               {/if}
-                               
-                               {include file='userProfileOptionFieldList' options=$categoryLevel2[options] langPrefix='wcf.user.option.'}
-                       </fieldset>
-               {/foreach}
+{foreach from=$optionTree item=categoryLevel1}
+       {foreach from=$categoryLevel1[categories] item=categoryLevel2}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.user.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</h2>
+                       
+                       {if $categoryLevel2[object]->categoryName == 'profile.personal' && MODULE_USER_RANK && $__wcf->session->getPermission('user.profile.canEditUserTitle')}
+                               <dl>
+                                       <dt><label for="__userTitle">{lang}wcf.user.userTitle{/lang}</label></dt>
+                                       <dd>
+                                               <input type="text" id="__userTitle" name="values[__userTitle]" value="{$__userTitle}" class="long" maxlength="{@USER_TITLE_MAX_LENGTH}" />
+                                               {if $errorType[__userTitle]|isset}
+                                                       <small class="innerError">
+                                                               {lang}wcf.user.userTitle.error.{@$errorType[__userTitle]}{/lang}
+                                                       </small>
+                                               {/if}
+                                               <small>{lang}wcf.user.userTitle.description{/lang}</small>
+                                       </dd>
+                               </dl>
+                       {/if}
+                       
+                       {include file='userProfileOptionFieldList' options=$categoryLevel2[options] langPrefix='wcf.user.option.'}
+               </section>
        {/foreach}
-       
-       <div class="formSubmit">
-               <button class="buttonPrimary" accesskey="s" data-type="save">{lang}wcf.global.button.save{/lang}</button>
-               <button data-type="restore">{lang}wcf.global.button.cancel{/lang}</button>
-       </div>
+{/foreach}
+
+<div class="formSubmit">
+       <button class="buttonPrimary" accesskey="s" data-type="save">{lang}wcf.global.button.save{/lang}</button>
+       <button data-type="restore">{lang}wcf.global.button.cancel{/lang}</button>
 </div>
+
 <script data-relocate="true">
        $(function() {
                new WCF.Option.Handler();
index ba0d970d70e1739470a9c5c7026496c30e688963..7e3c3c574c75cdf3f9e5b84b349dd8d1702e0eef 100644 (file)
@@ -12,7 +12,7 @@
                        {/content}
                </ul>
        {hascontentelse}
-               <div class="containerPadding">
+               <div class="section">
                        {lang}wcf.user.profile.content.wall.noEntries{/lang}
                </div>
        {/hascontent}
index 791320e9a33bb684d5a161d52fc2bb8cb578a963..10f83dd4ef93f0fcc00669a1837a93fed5dfd86d 100644 (file)
@@ -1,7 +1,7 @@
 {foreach from=$likeList item=like}
        <li>
                <div class="box48">
-                       <a href="{link controller='User' object=$like->getUserProfile()}{/link}" title="{$like->getUserProfile()->username}" class="framed">{@$like->getUserProfile()->getAvatar()->getImageTag(48)}</a>
+                       <a href="{link controller='User' object=$like->getUserProfile()}{/link}" title="{$like->getUserProfile()->username}">{@$like->getUserProfile()->getAvatar()->getImageTag(48)}</a>
                        
                        <div>
                                <div class="containerHeadline">
index b6e88dc11babe8958b612523da39dba8ead4d7e2..a47d8aed6f7b2b2197ad14915a5dff8f717d0d4f 100644 (file)
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{capture assign='sidebar'}
+{capture assign='sidebarRight'}
        {@$__boxSidebar}
 {/capture}
 
-{include file='header' sidebarOrientation='right'}
+{include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.user.search{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.search{/lang}</h1>
 </header>
 
 {include file='userNotice'}
 </div>
 
 <form method="post" action="{link controller='UserSearch'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.search.conditions.general{/lang}</legend>
-                       
-                       <dl>
-                               <dt><label for="searchUsername">{lang}wcf.user.username{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="searchUsername" name="username" value="{$username}" class="medium" />
-                               </dd>
-                       </dl>
-                       
-                       {event name='generalFields'}
-               </fieldset>
+       <div class="section">
+               <dl>
+                       <dt><label for="searchUsername">{lang}wcf.user.username{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="searchUsername" name="username" value="{$username}" class="medium" />
+                       </dd>
+               </dl>
                
-               {if !$optionTree|empty}
-                       {foreach from=$optionTree[0][categories] item=category}
-                               <fieldset>
-                                       <legend>{lang}wcf.user.option.category.{@$category[object]->categoryName}{/lang}</legend>
-                                       {hascontent}<p>{content}{lang __optional=true}wcf.user.option.category.{@$category[object]->categoryName}.description{/lang}{/content}</p>{/hascontent}
-                                       
-                                       {include file='userOptionFieldList' options=$category[options] langPrefix='wcf.user.option.' isSearchMode=true}
-                               </fieldset>
-                       {/foreach}
-               {/if}
+               {event name='generalFields'}
        </div>
        
-       {event name='fieldsets'}
+       {if !$optionTree|empty}
+               {foreach from=$optionTree[0][categories] item=category}
+                       <section class="section">
+                               <header class="sectionHeader">
+                                       <h2 class="sectionTitle">{lang}wcf.user.option.category.{@$category[object]->categoryName}{/lang}</h2>
+                                       {hascontent}<p class="sectionDescription">{content}{lang __optional=true}wcf.user.option.category.{@$category[object]->categoryName}.description{/lang}{/content}</p>{/hascontent}
+                               </header>
+                               {include file='userOptionFieldList' options=$category[options] langPrefix='wcf.user.option.' isSearchMode=true}
+                       </section>
+               {/foreach}
+       {/if}
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 09020679671548c00a2c5a124e1489faaace2f0a..e14508eaab6ba1bb12622567e6e5e80a9280f831 100644 (file)
@@ -6,7 +6,7 @@
                        <div class="boxContent">
                                <ul class="userAvatarList">
                                        {foreach from=$following item=followingUser}
-                                               <li><a href="{link controller='User' object=$followingUser}{/link}" title="{$followingUser->username}" class="framed jsTooltip">{@$followingUser->getAvatar()->getImageTag(48)}</a></li>
+                                               <li><a href="{link controller='User' object=$followingUser}{/link}" title="{$followingUser->username}" class="jsTooltip">{@$followingUser->getAvatar()->getImageTag(48)}</a></li>
                                        {/foreach}
                                </ul>
                                
@@ -24,7 +24,7 @@
                        <div class="boxContent">
                                <ul class="userAvatarList">
                                        {foreach from=$followers item=follower}
-                                               <li><a href="{link controller='User' object=$follower}{/link}" title="{$follower->username}" class="framed jsTooltip">{@$follower->getAvatar()->getImageTag(48)}</a></li>
+                                               <li><a href="{link controller='User' object=$follower}{/link}" title="{$follower->username}" class="jsTooltip">{@$follower->getAvatar()->getImageTag(48)}</a></li>
                                        {/foreach}
                                </ul>
                                        
@@ -42,7 +42,7 @@
                        <div class="boxContent">
                                <ul class="userAvatarList">
                                        {foreach from=$visitors item=visitor}
-                                               <li><a href="{link controller='User' object=$visitor}{/link}" title="{$visitor->username} ({@$visitor->time|plainTime})" class="framed jsTooltip">{@$visitor->getAvatar()->getImageTag(48)}</a></li>
+                                               <li><a href="{link controller='User' object=$visitor}{/link}" title="{$visitor->username} ({@$visitor->time|plainTime})" class="jsTooltip">{@$visitor->getAvatar()->getImageTag(48)}</a></li>
                                        {/foreach}
                                </ul>
                                        
index 5e9992978c60e38dd2e9cb7ab4797f51562d979e..331e7338e4d17af64160aa3e580537050c5784dd 100644 (file)
@@ -4,25 +4,33 @@
                <h2 class="boxTitle"><a href="{link controller='UsersOnlineList'}{/link}">{lang}wcf.user.usersOnline{/lang}</a> <span class="badge">{#$usersOnlineList->stats[total]}</span></h2>
                
                <div class="boxContent">
-                       <p>{lang}wcf.user.usersOnline.detail{/lang}{if $usersOnlineShowRecord && USERS_ONLINE_RECORD} - {lang}wcf.user.usersOnline.record{/lang}{/if}</p>
+                       <ul class="inlineList dotSeparated">
+                               <li>{lang}wcf.user.usersOnline.detail{/lang}</li>
+                               {if $usersOnlineShowRecord && USERS_ONLINE_RECORD}<li>{lang}wcf.user.usersOnline.record{/lang}</li>{/if}
+                       </ul>   
                        
                        {if $usersOnlineList|count}
-                               <ul class="dataList">
+                               <ul class="inlineList commaSeparated">
                                        {foreach from=$usersOnlineList->getObjects() item=userOnline}
                                                <li><a href="{link controller='User' object=$userOnline->getDecoratedObject()}{/link}" class="userLink" data-user-id="{@$userOnline->userID}">{@$userOnline->getFormattedUsername()}</a></li>
                                        {/foreach}
                                </ul>
                        {/if}
-                       
+               </div>
+               
+               <div class="boxContent">
                        {if USERS_ONLINE_ENABLE_LEGEND && $usersOnlineList->getUsersOnlineMarkings()|count}
-                               <div class="usersOnlineLegend">
-                                       <p>{lang}wcf.user.usersOnline.marking.legend{/lang}:</p>
-                                       <ul class="dataList">
-                                               {foreach from=$usersOnlineList->getUsersOnlineMarkings() item=usersOnlineMarking}
-                                                       <li>{@$usersOnlineMarking}</li>
-                                               {/foreach}
-                                       </ul>
-                               </div>
+                               <dl class="plain inlineDataList usersOnlineLegend">
+                                       <dt>{lang}wcf.user.usersOnline.marking.legend{/lang}</dt>
+                                       <dd>
+                                               <ul class="inlineList commaSeparated">
+                                                       {foreach from=$usersOnlineList->getUsersOnlineMarkings() item=usersOnlineMarking}
+                                                               <li>{@$usersOnlineMarking}</li>
+                                                       {/foreach}
+                                               </ul>
+                                       </dd>
+                               
+                               </dl>
                        {/if}
                </div>
        </section>
index d9410e17f9da09638f03455d15c0fd14abe5ed90..c1c30aca6533afefb4c6a00df2352c9500b7b354 100644 (file)
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
 
-{capture assign='sidebar'}
-       <div>
+{capture assign='sidebarRight'}
+       <section class="box">
                <form method="post" action="{link controller='UsersOnlineList'}{/link}">
-                       <fieldset>
-                               <legend><label for="sortField">{lang}wcf.user.members.sort{/lang}</label></legend>
+                       <h2 class="boxTitle">{lang}wcf.user.members.sort{/lang}</h2>
                                
+                       <div class="boxContent">
                                <dl>
                                        <dt></dt>
                                        <dd>
                                                </select>
                                        </dd>
                                </dl>
-                       </fieldset>
                        
-                       <div class="formSubmit">
-                               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-                               {@SID_INPUT_TAG}
+                               <div class="formSubmit">
+                                       <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+                                       {@SID_INPUT_TAG}
+                               </div>
                        </div>
                </form>
-       </div>
+       </section>
        
-       <fieldset>
-               <legend>{lang}wcf.user.usersOnline{/lang}</legend>
+       <section class="box">
+               <h2 class="boxTitle">{lang}wcf.user.usersOnline{/lang}</h2>
                
-               <p><small>{lang usersOnlineList=$objects}wcf.user.usersOnline.detail{/lang}</small></p>
-               {if USERS_ONLINE_RECORD}<p><small>{lang}wcf.user.usersOnline.record{/lang}</small></p>{/if}
+               <div class="boxContent">
+                       <p>{lang usersOnlineList=$objects}wcf.user.usersOnline.detail{/lang}</p>
+                       {if USERS_ONLINE_RECORD}<p>{lang}wcf.user.usersOnline.record{/lang}</p>{/if}
+               </div>
                
                {if USERS_ONLINE_ENABLE_LEGEND && $objects->getUsersOnlineMarkings()|count}
-                       <div class="marginTopSmall">
-                               <p><small>{lang}wcf.user.usersOnline.marking.legend{/lang}:</small></p>
-                               <ul class="dataList">
-                                       {foreach from=$objects->getUsersOnlineMarkings() item=usersOnlineMarking}
-                                               <li><small>{@$usersOnlineMarking}</small></li>
-                                       {/foreach}
-                               </ul>
+                       <div class="boxContent">
+                               <dl class="plain inlineDataList usersOnlineLegend">
+                                       <dt>{lang}wcf.user.usersOnline.marking.legend{/lang}</dt>
+                                       <dd>
+                                               <ul class="inlineList commaSeparated">
+                                                       {foreach from=$objects->getUsersOnlineMarkings() item=usersOnlineMarking}
+                                                               <li>{@$usersOnlineMarking}</li>
+                                                       {/foreach}
+                                               </ul>
+                                       </dd>
+                               
+                               </dl>
                        </div>
                {/if}
-       </fieldset>
+       </section>
        
        {@$__boxSidebar}
 {/capture}
 
-{include file='header' sidebarOrientation='right'}
+{include file='header'}
 
 {include file='userNotice'}
 
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.user.usersOnline{/lang}</h1>
+</header>
+
 {assign var=usersOnlineList value=''}
 {assign var=usersOnline value=0}
 {assign var=robotsOnlineList value=''}
                {capture append=usersOnlineList}
                        <li>
                                <div class="box48">
-                                       <a href="{link controller='User' object=$user}{/link}" title="{$user->username}" class="framed">{@$user->getAvatar()->getImageTag(48)}</a>
+                                       <a href="{link controller='User' object=$user}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag(48)}</a>
                                        
                                        <div class="details userInformation">
                                                <div class="containerHeadline">
                {capture append=robotsOnlineList}
                        <li>
                                <div class="box48">
-                                       <div class="framed"><img src="{$__wcf->getPath()}images/avatars/avatar-spider-default.svg" alt="" class="icon48" /></div>
+                                       <div><img src="{$__wcf->getPath()}images/avatars/avatar-spider-default.svg" alt="" class="userAvatarImage icon48" /></div>
                                        
                                        <div class="details userInformation">
                                                <div class="containerHeadline">
                {capture append=guestsOnlineList}
                        <li>
                                <div class="box48">
-                                       <div class="framed"><img src="{$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="icon48" /></div>
+                                       <div><img src="{$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage icon48" /></div>
                                        
                                        <div class="details userInformation">
                                                <div class="containerHeadline">
 </div>
 
 {if $usersOnline}
-       <header class="boxHeadline">
-               <h1>{lang}wcf.user.usersOnline{/lang} <span class="badge">{#$usersOnline}</span></h1>
-       </header>
-       
-       <div class="container marginTop">
+       <section class="section sectionContainerList">
+               <h2 class="sectionTitle">{lang}wcf.user.usersOnline.users{/lang} <span class="badge">{#$usersOnline}</span></h2>
+               
                <ol class="containerList userList">
                        {@$usersOnlineList}
                </ol>
-       </div>
+       </section>
 {/if}
 
 {if $guestsOnline && USERS_ONLINE_SHOW_GUESTS}
-       <header class="boxHeadline">
-               <h1>{lang}wcf.user.usersOnline.guests{/lang} <span class="badge">{#$guestsOnline}</span></h1>
-       </header>
-       
-       <div class="container marginTop">
+       <section class="section sectionContainerList">
+               <h2 class="sectionTitle">{lang}wcf.user.usersOnline.guests{/lang} <span class="badge">{#$guestsOnline}</span></h2>
+               
                <ol class="containerList">
                        {@$guestsOnlineList}
                </ol>
-       </div>
+       </section>
 {/if}
 
 {if $robotsOnline && USERS_ONLINE_SHOW_ROBOTS}
-       <header class="boxHeadline">
-               <h1>{lang}wcf.user.usersOnline.robots{/lang} <span class="badge">{#$robotsOnline}</span></h1>
-       </header>
-       
-       <div class="container marginTop">
+       <section class="section sectionContainerList">
+               <h2 class="sectionTitle">{lang}wcf.user.usersOnline.robots{/lang} <span class="badge">{#$robotsOnline}</span></h2>
+               
                <ol class="containerList">
                        {@$robotsOnlineList}
                </ol>
-       </div>
+       </section>
 {/if}
 
 <div class="contentNavigation">
index 08e0ca1a31ff2d6d16062fd83b3780eb45fffce2..27e816a5340b37ccd20135c15f19d79cc4f9bc65 100644 (file)
@@ -1,9 +1,9 @@
 <div id="workerContainer">
-       <header class="box48 boxHeadline">
+       <header class="box48 contentHeader">
                <span class="icon icon48 fa-spinner"></span>
                
                <div>
-                       <h1>{lang}wcf.global.worker.executing{/lang}</h1>
+                       <h1 class="contentTitle">{lang}wcf.global.worker.executing{/lang}</h1>
                        <small><progress value="0" max="100">0%</progress> <span>0%</span></small>
                </div>
        </header>
index a24429ec0b75762b816ada9718b5cfea964a8875..5b74819e9533c87f005b2b76eb463bb18213c269 100644 (file)
@@ -2032,7 +2032,7 @@ WCF.ACP.User.BanHandler = {
                if (this._dialog === null) {
                        // create dialog
                        this._dialog = $('<div />').hide().appendTo(document.body);
-                       this._dialog.append($('<fieldset><dl><dt><label for="userBanReason">' + WCF.Language.get('wcf.acp.user.banReason') + '</label></dt><dd><textarea id="userBanReason" cols="40" rows="3" /><small>' + WCF.Language.get('wcf.acp.user.banReason.description') + '</small></dd></dl><dl><dt></dt><dd><label for="userBanNeverExpires"><input type="checkbox" name="userBanNeverExpires" id="userBanNeverExpires" checked="checked" /> ' + WCF.Language.get('wcf.acp.user.ban.neverExpires') + '</label></dd></dl><dl id="userBanExpiresSettings" style="display: none;"><dt><label for="userBanExpires">' + WCF.Language.get('wcf.acp.user.ban.expires') + '</label></dt><dd><input type="date" name="userBanExpires" id="userBanExpires" class="medium" min="' + new Date(TIME_NOW * 1000).toISOString() + '" data-ignore-timezone="true" /><small>' + WCF.Language.get('wcf.acp.user.ban.expires.description') + '</small></dd></dl></fieldset>'));
+                       this._dialog.append($('<div class="section"><dl><dt><label for="userBanReason">' + WCF.Language.get('wcf.acp.user.banReason') + '</label></dt><dd><textarea id="userBanReason" cols="40" rows="3" /><small>' + WCF.Language.get('wcf.acp.user.banReason.description') + '</small></dd></dl><dl><dt></dt><dd><label for="userBanNeverExpires"><input type="checkbox" name="userBanNeverExpires" id="userBanNeverExpires" checked="checked" /> ' + WCF.Language.get('wcf.acp.user.ban.neverExpires') + '</label></dd></dl><dl id="userBanExpiresSettings" style="display: none;"><dt><label for="userBanExpires">' + WCF.Language.get('wcf.acp.user.ban.expires') + '</label></dt><dd><input type="date" name="userBanExpires" id="userBanExpires" class="medium" min="' + new Date(TIME_NOW * 1000).toISOString() + '" data-ignore-timezone="true" /><small>' + WCF.Language.get('wcf.acp.user.ban.expires.description') + '</small></dd></dl></div>'));
                        this._dialog.append($('<div class="formSubmit"><button class="buttonPrimary" accesskey="s">' + WCF.Language.get('wcf.global.button.submit') + '</button></div>'));
                        
                        this._dialog.find('#userBanNeverExpires').change(function() {
@@ -2144,9 +2144,9 @@ WCF.ACP.User.Group.Copy = Class.extend({
         */
        _click: function() {
                var $template = $('<div />');
-               $template.append($('<dl class="wide marginTop"><dt /><dd><label><input type="checkbox" id="copyMembers" value="1" /> ' + WCF.Language.get('wcf.acp.group.copy.copyMembers') + '</label><small>' + WCF.Language.get('wcf.acp.group.copy.copyMembers.description') + '</small></dd></dl>'));
-               $template.append($('<dl class="wide marginTopSmall"><dt /><dd><label><input type="checkbox" id="copyUserGroupOptions" value="1" /> ' + WCF.Language.get('wcf.acp.group.copy.copyUserGroupOptions') + '</label><small>' + WCF.Language.get('wcf.acp.group.copy.copyUserGroupOptions.description') + '</small></dd></dl>'));
-               $template.append($('<dl class="wide marginTopSmall"><dt /><dd><label><input type="checkbox" id="copyACLOptions" value="1" /> ' + WCF.Language.get('wcf.acp.group.copy.copyACLOptions') + '</label><small>' + WCF.Language.get('wcf.acp.group.copy.copyACLOptions.description') + '</small></dd></dl>'));
+               $template.append($('<dl class="wide"><dt /><dd><label><input type="checkbox" id="copyMembers" value="1" /> ' + WCF.Language.get('wcf.acp.group.copy.copyMembers') + '</label><small>' + WCF.Language.get('wcf.acp.group.copy.copyMembers.description') + '</small></dd></dl>'));
+               $template.append($('<dl class="wide"><dt /><dd><label><input type="checkbox" id="copyUserGroupOptions" value="1" /> ' + WCF.Language.get('wcf.acp.group.copy.copyUserGroupOptions') + '</label><small>' + WCF.Language.get('wcf.acp.group.copy.copyUserGroupOptions.description') + '</small></dd></dl>'));
+               $template.append($('<dl class="wide"><dt /><dd><label><input type="checkbox" id="copyACLOptions" value="1" /> ' + WCF.Language.get('wcf.acp.group.copy.copyACLOptions') + '</label><small>' + WCF.Language.get('wcf.acp.group.copy.copyACLOptions.description') + '</small></dd></dl>'));
                
                WCF.System.Confirmation.show(WCF.Language.get('wcf.acp.group.copy.confirmMessage'), $.proxy(function(action) {
                        if (action === 'confirm') {
index 15cd209dcc1ab741ccd0be1efe3050be24092c31..035957290176595ccc37efe0902f392cc8edceb7 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.sessionLog.access.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.sessionLog.access.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.sessionLog.access.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {hascontent}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.sessionLog.access.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 1cfd3176b4c0c49f51183be8893e8cdfc7d5dde8..949c7147037ae80cf2bf808b067f3b5ec21ccd5c 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.sessionLog.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.sessionLog.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.sessionLog.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.sessionLog.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index d5253ff874885ab5268d07466c2116cef4a0b341..4db797474b67170f898a41821ea64b3de0fcd97e 100644 (file)
@@ -10,8 +10,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.ad.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.ad.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form id="adForm" method="post" action="{if $action == 'add'}{link controller='AdAdd'}{/link}{else}{link controller='AdEdit' object=$adObject}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'adName'} class="formError"{/if}>
-                               <dt><label for="adName">{lang}wcf.global.name{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="adName" name="adName" value="{$adName}" required="required" autofocus="autofocus" class="long" />
-                                       {if $errorField == 'adName'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.ad.adName.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'ad'} class="formError"{/if}>
-                               <dt><label for="ad">{lang}wcf.acp.ad.ad{/lang}</label></dt>
-                               <dd>
-                                       <textarea id="ad" name="ad" cols="40" rows="10">{$ad}</textarea>
-                                       <small>{lang}wcf.acp.ad.ad.description{/lang}</small>
-                                       {if $errorField == 'ad'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.ad.ad.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.ad.isDisabled{/lang}</label>
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="objectTypeID">{lang}wcf.acp.ad.location{/lang}</label></dt>
-                               <dd>
-                                       <select name="objectTypeID" id="objectTypeID">
-                                               <option value="0"{if !$objectTypeID} checked="checked"{/if}>{lang}wcf.global.noSelection{/lang}</option>
-                                               {foreach from=$locations key='locationGroupLabel' item='locationGroup'}
-                                                       <optgroup label="{$locationGroupLabel}">
-                                                               {foreach from=$locationGroup key='locationID' item='location'}
-                                                                       <option value="{@$locationID}"{if $locationObjectTypes[$locationID]->page} data-page="{$locationObjectTypes[$locationID]->page}"{/if}{if $objectTypeID == $locationID} selected="selected"{/if}>{$location}</option>
-                                                               {/foreach}
-                                                       </optgroup>
-                                               {/foreach}
-                                       </select>
-                                       {if $errorField == 'objectTypeID'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {elseif $errorType == 'noValidSelection'}
-                                                               {lang}wcf.global.form.error.noValidSelection{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.ad.location.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="showOrder">{lang}wcf.acp.ad.showOrder{/lang}</label></dt>
-                               <dd>
-                                       <input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0" />
-                                       <small>{lang}wcf.acp.ad.showOrder.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'adName'} class="formError"{/if}>
+                       <dt><label for="adName">{lang}wcf.global.name{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="adName" name="adName" value="{$adName}" required="required" autofocus="autofocus" class="long" />
+                               {if $errorField == 'adName'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.ad.adName.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'ad'} class="formError"{/if}>
+                       <dt><label for="ad">{lang}wcf.acp.ad.ad{/lang}</label></dt>
+                       <dd>
+                               <textarea id="ad" name="ad" cols="40" rows="10">{$ad}</textarea>
+                               <small>{lang}wcf.acp.ad.ad.description{/lang}</small>
+                               {if $errorField == 'ad'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.ad.ad.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.ad.isDisabled{/lang}</label>
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt><label for="objectTypeID">{lang}wcf.acp.ad.location{/lang}</label></dt>
+                       <dd>
+                               <select name="objectTypeID" id="objectTypeID">
+                                       <option value="0"{if !$objectTypeID} checked="checked"{/if}>{lang}wcf.global.noSelection{/lang}</option>
+                                       {foreach from=$locations key='locationGroupLabel' item='locationGroup'}
+                                               <optgroup label="{$locationGroupLabel}">
+                                                       {foreach from=$locationGroup key='locationID' item='location'}
+                                                               <option value="{@$locationID}"{if $locationObjectTypes[$locationID]->page} data-page="{$locationObjectTypes[$locationID]->page}"{/if}{if $objectTypeID == $locationID} selected="selected"{/if}>{$location}</option>
+                                                       {/foreach}
+                                               </optgroup>
+                                       {/foreach}
+                               </select>
+                               {if $errorField == 'objectTypeID'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {elseif $errorType == 'noValidSelection'}
+                                                       {lang}wcf.global.form.error.noValidSelection{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.ad.location.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt><label for="showOrder">{lang}wcf.acp.ad.showOrder{/lang}</label></dt>
+                       <dd>
+                               <input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0" />
+                               <small>{lang}wcf.acp.ad.showOrder.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
        </div>
        
-       <header class="boxHeadline boxSubHeadline">
-               <h2>{lang}wcf.acp.ad.conditions{/lang}</h2>
-               <small>{lang}wcf.acp.ad.conditions.description{/lang}</small>
-       </header>
+       {event name='sections'}
        
-       <div class="container containerPadding marginTop">
-               <fieldset id="pageConditions">
-                       <legend>{lang}wcf.acp.ad.conditions.page{/lang}</legend>
-                       <small>{lang}wcf.acp.ad.conditions.page.description{/lang}</small>
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.acp.ad.conditions{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.acp.ad.conditions.description{/lang}</small>
+               </header>
+               
+               <section class="section" id="pageConditions">
+                       <header class="sectionHeader">
+                               <h2 class="sectionTitle">{lang}wcf.acp.ad.conditions.page{/lang}</h2>
+                               <small class="sectionDescription">{lang}wcf.acp.ad.conditions.page.description{/lang}</small>
+                       </header>
                        
                        {foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.page'] item='pageConditionObjectType'}
                                {@$pageConditionObjectType->getProcessor()->getHtml()}
                        {/foreach}
-               </fieldset>
+               </section>
                
-               <fieldset id="pointInTimeConditions">
-                       <legend>{lang}wcf.acp.ad.conditions.pointInTime{/lang}</legend>
-                       <small>{lang}wcf.acp.ad.conditions.pointInTime.description{/lang}</small>
-                       
+               <section class="section" id="pointInTimeConditions">
+                       <header class="sectionHeader">
+                               <h2 class="sectionTitle">{lang}wcf.acp.ad.conditions.pointInTime{/lang}</h2>
+                               <small class="sectionDescription">{lang}wcf.acp.ad.conditions.pointInTime.description{/lang}</small>
+                       </header>
+                               
                        {foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.pointInTime'] item='pointInTimeConditionObjectType'}
                                {@$pointInTimeConditionObjectType->getProcessor()->getHtml()}
                        {/foreach}
-               </fieldset>
+               </section>
                
                {event name='conditionTypeFieldsets'}
-       </div>
+       </section>
        
-       <header class="boxHeadline boxSubHeadline">
-               <h2>{lang}wcf.acp.ad.conditions.user{/lang}</h2>
-               <small>{lang}wcf.acp.ad.conditions.user.description{/lang}</small>
-       </header>
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.acp.ad.conditions.user{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.acp.ad.conditions.user.description{/lang}</small>
+               </header>
        
-       {include file='userConditions' groupedObjectTypes=$groupedConditionObjectTypes['com.woltlab.wcf.user']}
+               {include file='userConditions' groupedObjectTypes=$groupedConditionObjectTypes['com.woltlab.wcf.user']}
+       </section>
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 07b2e7b8c625cca95539f5ac2c1d54e7d037f5c5..a7d576889cb940d64aff211a3717c703b5e33fa9 100644 (file)
@@ -10,8 +10,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.ad.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.ad.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -27,7 +27,7 @@
 </div>
 
 {if $objects|count}
-       <div class="container containerPadding sortableListContainer marginTop" id="adList">
+       <div class="section sortableListContainer" id="adList">
                <ol class="sortableList" data-object-id="0" start="{@($pageNo - 1) * $itemsPerPage + 1}">
                        {foreach from=$objects item='ad'}
                                <li class="sortableNode sortableNoNesting jsAd" data-object-id="{@$ad->adID}">
index bceaf485bf6ca4b0c29dff4a236afc21da2a9f22..8825dec07354aea5b8f1de3619c158ca1d7b8d76 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.application.edit'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.application.edit.title{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.application.edit.title{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{link controller='ApplicationEdit' id=$application->packageID}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.application.domain{/lang}</legend>
-                       
-                       <dl{if $errorField == 'domainName'} class="formError"{/if}>
-                               <dt><label for="domainName">{lang}wcf.acp.application.domainName{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" name="domainName" id="domainName" value="{$domainName}" class="long" />
-                                       {if $errorField == 'domainName'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.application.domainName.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.application.domainName.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'domainPath'} class="formError"{/if}>
-                               <dt><label for="domainPath">{lang}wcf.acp.application.domainPath{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" name="domainPath" id="domainPath" value="{$domainPath}" class="long" />
-                                       <small>{lang}wcf.acp.application.domainPath.description{/lang}</small>
-                                       {if $errorField == 'domainPath'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.application.domainPath.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       {event name='domainFields'}
-               </fieldset>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.application.domain{/lang}</h2>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.application.cookie{/lang}</legend>
-                       
-                       <small>{lang}wcf.acp.application.cookie.warning{/lang}</small>
-                       
-                       <dl class="marginTop {if $errorField == 'cookieDomain'} formError{/if}">
-                               <dt><label for="cookieDomain">{lang}wcf.acp.application.cookieDomain{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" name="cookieDomain" id="cookieDomain" value="{$cookieDomain}" class="long" />
-                                       {if $errorField == 'cookieDomain'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.application.cookieDomain.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       {event name='cookieFields'}
-               </fieldset>
+               <dl{if $errorField == 'domainName'} class="formError"{/if}>
+                       <dt><label for="domainName">{lang}wcf.acp.application.domainName{/lang}</label></dt>
+                       <dd>
+                               <input type="text" name="domainName" id="domainName" value="{$domainName}" class="long" />
+                               {if $errorField == 'domainName'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.application.domainName.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.application.domainName.description{/lang}</small>
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
-       </div>
+               <dl{if $errorField == 'domainPath'} class="formError"{/if}>
+                       <dt><label for="domainPath">{lang}wcf.acp.application.domainPath{/lang}</label></dt>
+                       <dd>
+                               <input type="text" name="domainPath" id="domainPath" value="{$domainPath}" class="long" />
+                               <small>{lang}wcf.acp.application.domainPath.description{/lang}</small>
+                               {if $errorField == 'domainPath'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.application.domainPath.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {event name='domainFields'}
+       </section>
+       
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.acp.application.cookie{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.acp.application.cookie.warning{/lang}</small>
+               </header>
+               
+               <dl{if $errorField == 'cookieDomain'} class="formError{/if}">
+                       <dt><label for="cookieDomain">{lang}wcf.acp.application.cookieDomain{/lang}</label></dt>
+                       <dd>
+                               <input type="text" name="cookieDomain" id="cookieDomain" value="{$cookieDomain}" class="long" />
+                               {if $errorField == 'cookieDomain'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.application.cookieDomain.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {event name='cookieFields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 2f56fc76cf2321da1a458ef0284fa15b4983e5b4..922341b925224a78f4f1015cf695f65d6045d7ae 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.application.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.application.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.application.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
        {/hascontent}
 </div>
 
-<div class="tabularBox tabularBoxTitle marginTop">
-       <header>
-               <h2>{lang}wcf.acp.application.list{/lang} <span class="badge badgeInverse">{#$applicationList|count}</span></h2>
-       </header>
-       
+<div class="section tabularBox">
        <table class="table">
                <thead>
                        <tr>
index d6c868d255b804a026d8fa6484dda1d622f80799..35e74d87a996d2ab42affa83a1756970079da611 100644 (file)
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.attachment.list{/lang}</h1>
-       <p>{lang}wcf.acp.attachment.stats{/lang}</p>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.attachment.list{/lang}</h1>
+       <p class="contentHeaderDescription">{lang}wcf.acp.attachment.stats{/lang}</p>
 </header>
 
 {include file='formError'}
 
 <form method="post" action="{link controller='AttachmentList'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.filter{/lang}</legend>
-                       
-                       <dl>
-                               <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="username" name="username" value="{$username}" class="long" />
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="filename">{lang}wcf.attachment.filename{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="filename" name="filename" value="{$filename}" class="long" />
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <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>
-               </fieldset>
-       </div>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.global.filter{/lang}</h2>
+               
+               <dl>
+                       <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="username" name="username" value="{$username}" class="long" />
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt><label for="filename">{lang}wcf.attachment.filename{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="filename" name="filename" value="{$filename}" class="long" />
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <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>
+       </section>
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.attachment.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 60f21faf2560005466d29aaf90e15bdad496c0d5..7ffbe33e70285b3024cc9f460d9446665248d8ce 100644 (file)
@@ -1,8 +1,9 @@
 {include file='header' pageTitle='wcf.acp.bbcode.'|concat:$action}
 
 {capture assign='attributeTemplate'}
-       <fieldset>
-               <legend><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang}wcf.acp.bbcode.attribute{/lang} {ldelim}#$attributeNo}</span></legend>
+       <section class="section">
+               <h2 class="sectionTitle"><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang}wcf.acp.bbcode.attribute{/lang} {ldelim}#$attributeNo}</span></h2>
+               
                <dl>
                        <dt><label for="attributes[{ldelim}@$attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
                        <dd>
@@ -33,7 +34,7 @@
                </dl>
                
                {event name='attributeFields'}
-       </fieldset>
+       </section>
 {/capture}
 
 <script data-relocate="true">
@@ -71,8 +72,8 @@
 //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.bbcode.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.bbcode.{$action}{/lang}</h1>
 </header>
 
 {if $action == 'add'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='BBCodeAdd'}{/link}{else}{link controller='BBCodeEdit' object=$bbcode}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
+       <div class="section">
+               <dl{if $errorField == 'bbcodeTag'} class="formError"{/if}>
+                       <dt><label for="bbcodeTag">{lang}wcf.acp.bbcode.bbcodeTag{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="bbcodeTag" name="bbcodeTag" value="{$bbcodeTag}" required="required" autofocus="autofocus" pattern="^[a-zA-Z0-9]+$" class="medium" />
+                               {if $errorField == 'bbcodeTag'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.bbcode.bbcodeTag.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'htmlOpen'} class="formError"{/if}>
+                       <dt><label for="htmlOpen">{lang}wcf.acp.bbcode.htmlOpen{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="htmlOpen" name="htmlOpen" value="{$htmlOpen}" class="long" />
+                               {if $errorField == 'htmlOpen'}
+                                       <small class="innerError">{lang}wcf.acp.bbcode.htmlOpen.error.{$errorType}{/lang}</small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'htmlClose'} class="formError"{/if}>
+                       <dt><label for="htmlClose">{lang}wcf.acp.bbcode.htmlClose{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="htmlClose" name="htmlClose" value="{$htmlClose}" class="long" />
+                               {if $errorField == 'htmlClose'}
+                                       <small class="innerError">{lang}wcf.acp.bbcode.htmlClose.error.{$errorType}{/lang}</small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'allowedChildren'} class="formError"{/if}>
+                       <dt><label for="allowedChildren">{lang}wcf.acp.bbcode.allowedChildren{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="allowedChildren" name="allowedChildren" value="{$allowedChildren}" class="long" required="required" pattern="^((all|none)\^)?([a-zA-Z0-9]+,)*[a-zA-Z0-9]+$" />
+                               {if $errorField == 'allowedChildren'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.bbcode.allowedChildren.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label for="isSourceCode"><input type="checkbox" id="isSourceCode" name="isSourceCode" value="1"{if $isSourceCode} checked="checked"{/if} /> {lang}wcf.acp.bbcode.isSourceCode{/lang}</label>
+                               <small>{lang}wcf.acp.bbcode.isSourceCode.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'className'} class="formError"{/if}>
+                       <dt><label for="className">{lang}wcf.acp.bbcode.className{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="className" name="className" value="{$className}" class="long" pattern="^\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\\)*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$" />
+                               {if $errorField == 'className'}
+                                       <small class="innerError">{lang}wcf.acp.bbcode.className.error.{$errorType}{/lang}</small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {if $nativeBBCode|empty}
+                       <dl>
+                               <dt></dt>
+                               <dd>
+                                       <label><input type="checkbox" id="showButton" name="showButton" value="1"{if $showButton} checked="checked"{/if} /> {lang}wcf.acp.bbcode.showButton{/lang}</label>
+                               </dd>
+                       </dl>
                        
-                       <dl{if $errorField == 'bbcodeTag'} class="formError"{/if}>
-                               <dt><label for="bbcodeTag">{lang}wcf.acp.bbcode.bbcodeTag{/lang}</label></dt>
+                       <dl class="jsButtonSetting{if $errorField == 'buttonLabel'} formError{/if}">
+                               <dt><label for="buttonLabel">{lang}wcf.acp.bbcode.buttonLabel{/lang}</label></dt>
                                <dd>
-                                       <input type="text" id="bbcodeTag" name="bbcodeTag" value="{$bbcodeTag}" required="required" autofocus="autofocus" pattern="^[a-zA-Z0-9]+$" class="medium" />
-                                       {if $errorField == 'bbcodeTag'}
+                                       <input type="text" id="buttonLabel" name="buttonLabel" value="{$i18nPlainValues['buttonLabel']}" class="long" />
+                                       {if $errorField == 'buttonLabel'}
                                                <small class="innerError">
                                                        {if $errorType == 'empty'}
                                                                {lang}wcf.global.form.error.empty{/lang}
+                                                       {elseif $errorType == 'multilingual'}
+                                                               {lang}wcf.global.form.error.multilingual{/lang}
                                                        {else}
-                                                               {lang}wcf.acp.bbcode.bbcodeTag.error.{$errorType}{/lang}
+                                                               {lang}wcf.acp.bbcode.buttonLabel.error.{@$errorType}{/lang}
                                                        {/if}
                                                </small>
                                        {/if}
+                                       
+                                       {include file='multipleLanguageInputJavascript' elementIdentifier='buttonLabel' forceSelection=false}
                                </dd>
                        </dl>
                        
-                       <dl{if $errorField == 'htmlOpen'} class="formError"{/if}>
-                               <dt><label for="htmlOpen">{lang}wcf.acp.bbcode.htmlOpen{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="htmlOpen" name="htmlOpen" value="{$htmlOpen}" class="long" />
-                                       {if $errorField == 'htmlOpen'}
-                                               <small class="innerError">{lang}wcf.acp.bbcode.htmlOpen.error.{$errorType}{/lang}</small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'htmlClose'} class="formError"{/if}>
-                               <dt><label for="htmlClose">{lang}wcf.acp.bbcode.htmlClose{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="htmlClose" name="htmlClose" value="{$htmlClose}" class="long" />
-                                       {if $errorField == 'htmlClose'}
-                                               <small class="innerError">{lang}wcf.acp.bbcode.htmlClose.error.{$errorType}{/lang}</small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'allowedChildren'} class="formError"{/if}>
-                               <dt><label for="allowedChildren">{lang}wcf.acp.bbcode.allowedChildren{/lang}</label></dt>
+                       <dl class="jsButtonSetting{if $errorField == 'wysiwygIcon'} formError{/if}">
+                               <dt><label for="wysiwygIcon">{lang}wcf.acp.bbcode.wysiwygIcon{/lang}</label></dt>
                                <dd>
-                                       <input type="text" id="allowedChildren" name="allowedChildren" value="{$allowedChildren}" class="long" required="required" pattern="^((all|none)\^)?([a-zA-Z0-9]+,)*[a-zA-Z0-9]+$" />
-                                       {if $errorField == 'allowedChildren'}
+                                       <input type="text" id="wysiwygIcon" name="wysiwygIcon" value="{$wysiwygIcon}" class="long" />
+                                       {if $errorField == 'wysiwygIcon'}
                                                <small class="innerError">
                                                        {if $errorType == 'empty'}
                                                                {lang}wcf.global.form.error.empty{/lang}
                                                        {else}
-                                                               {lang}wcf.acp.bbcode.allowedChildren.error.{$errorType}{/lang}
+                                                               {lang}wcf.acp.bbcode.wysiwygIcon.error.{@$errorType}{/lang}
                                                        {/if}
                                                </small>
                                        {/if}
+                                       <small>{lang}wcf.acp.bbcode.wysiwygIcon.description{/lang}</small>
                                </dd>
                        </dl>
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label for="isSourceCode"><input type="checkbox" id="isSourceCode" name="isSourceCode" value="1"{if $isSourceCode} checked="checked"{/if} /> {lang}wcf.acp.bbcode.isSourceCode{/lang}</label>
-                                       <small>{lang}wcf.acp.bbcode.isSourceCode.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'className'} class="formError"{/if}>
-                               <dt><label for="className">{lang}wcf.acp.bbcode.className{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="className" name="className" value="{$className}" class="long" pattern="^\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\\)*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$" />
-                                       {if $errorField == 'className'}
-                                               <small class="innerError">{lang}wcf.acp.bbcode.className.error.{$errorType}{/lang}</small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       {if $nativeBBCode|empty}
-                               <dl>
-                                       <dt></dt>
+               {/if}
+               
+               {event name='dataFields'}
+       </div>
+               
+       <section class="section" id="attributeFieldset">
+               <h2 class="sectionTitle"><span class="icon icon16 fa-plus pointer jsAddButton jsTooltip" title="{lang}wcf.global.button.add{/lang}"></span> {lang}wcf.acp.bbcode.attributes{/lang}</h2>
+               
+               {foreach from=$attributes item='attribute'}
+                       <section class="section">
+                               <h2 class="sectionTitle"><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang}wcf.acp.bbcode.attribute{/lang} {#$attribute->attributeNo}</span></h2>
+                               
+                               <dl{if $errorField == 'attributeHtml'|concat:$attribute->attributeNo} class="formError"{/if}>
+                                       <dt><label for="attributes[{@$attribute->attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
                                        <dd>
-                                               <label><input type="checkbox" id="showButton" name="showButton" value="1"{if $showButton} checked="checked"{/if} /> {lang}wcf.acp.bbcode.showButton{/lang}</label>
+                                               <input type="text" id="attributes[{@$attribute->attributeNo}][attributeHtml]" name="attributes[{@$attribute->attributeNo}][attributeHtml]" value="{$attribute->attributeHtml}" class="long" />
                                        </dd>
                                </dl>
                                
-                               <dl class="jsButtonSetting{if $errorField == 'buttonLabel'} formError{/if}">
-                                       <dt><label for="buttonLabel">{lang}wcf.acp.bbcode.buttonLabel{/lang}</label></dt>
+                               <dl{if $errorField == 'attributeValidationPattern'|concat:$attribute->attributeNo} class="formError"{/if}>
+                                       <dt><label for="attributes[{@$attribute->attributeNo}][validationPattern]">{lang}wcf.acp.bbcode.attribute.validationPattern{/lang}</label></dt>
                                        <dd>
-                                               <input type="text" id="buttonLabel" name="buttonLabel" value="{$i18nPlainValues['buttonLabel']}" class="long" />
-                                               {if $errorField == 'buttonLabel'}
+                                               <input type="text" id="attributes[{@$attribute->attributeNo}][validationPattern]" name="attributes[{@$attribute->attributeNo}][validationPattern]" value="{$attribute->validationPattern}" class="long" />
+                                               {if $errorField == 'attributeValidationPattern'|concat:$attribute->attributeNo}
                                                        <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {elseif $errorType == 'multilingual'}
-                                                                       {lang}wcf.global.form.error.multilingual{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.bbcode.buttonLabel.error.{@$errorType}{/lang}
+                                                               {if $errorType == 'notValid'}
+                                                                       {lang}wcf.acp.bbcode.attribute.validationPattern.error.notValid{/lang}
                                                                {/if}
                                                        </small>
                                                {/if}
-                                               
-                                               {include file='multipleLanguageInputJavascript' elementIdentifier='buttonLabel' forceSelection=false}
                                        </dd>
                                </dl>
                                
-                               <dl class="jsButtonSetting{if $errorField == 'wysiwygIcon'} formError{/if}">
-                                       <dt><label for="wysiwygIcon">{lang}wcf.acp.bbcode.wysiwygIcon{/lang}</label></dt>
+                               <dl{if $errorField == 'attributeRequired'|concat:$attribute->attributeNo} class="formError"{/if}>
                                        <dd>
-                                               <input type="text" id="wysiwygIcon" name="wysiwygIcon" value="{$wysiwygIcon}" class="long" />
-                                               {if $errorField == 'wysiwygIcon'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.bbcode.wysiwygIcon.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                               <small>{lang}wcf.acp.bbcode.wysiwygIcon.description{/lang}</small>
+                                               <label for="attributes[{@$attribute->attributeNo}][required]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][required]" name="attributes[{@$attribute->attributeNo}][required]" value="1"{if $attribute->required} checked="checked"{/if} /> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
                                        </dd>
                                </dl>
-                       {/if}
-                       
-                       {event name='dataFields'}
-               </fieldset>
-               
-               <fieldset id="attributeFieldset">
-                       <legend><span class="icon icon16 fa-plus pointer jsAddButton jsTooltip" title="{lang}wcf.global.button.add{/lang}"></span> {lang}wcf.acp.bbcode.attributes{/lang}</legend>
-                       
-                       {foreach from=$attributes item='attribute'}
-                               <fieldset>
-                                       <legend><span class="icon icon16 fa-times pointer jsDeleteButton jsTooltip" title="{lang}wcf.global.button.delete{/lang}"></span> <span>{lang}wcf.acp.bbcode.attribute{/lang} {#$attribute->attributeNo}</span></legend>
-                                       
-                                       <dl{if $errorField == 'attributeHtml'|concat:$attribute->attributeNo} class="formError"{/if}>
-                                               <dt><label for="attributes[{@$attribute->attributeNo}][attributeHtml]">{lang}wcf.acp.bbcode.attribute.attributeHtml{/lang}</label></dt>
-                                               <dd>
-                                                       <input type="text" id="attributes[{@$attribute->attributeNo}][attributeHtml]" name="attributes[{@$attribute->attributeNo}][attributeHtml]" value="{$attribute->attributeHtml}" class="long" />
-                                               </dd>
-                                       </dl>
-                                       
-                                       <dl{if $errorField == 'attributeValidationPattern'|concat:$attribute->attributeNo} class="formError"{/if}>
-                                               <dt><label for="attributes[{@$attribute->attributeNo}][validationPattern]">{lang}wcf.acp.bbcode.attribute.validationPattern{/lang}</label></dt>
-                                               <dd>
-                                                       <input type="text" id="attributes[{@$attribute->attributeNo}][validationPattern]" name="attributes[{@$attribute->attributeNo}][validationPattern]" value="{$attribute->validationPattern}" class="long" />
-                                                       {if $errorField == 'attributeValidationPattern'|concat:$attribute->attributeNo}
-                                                               <small class="innerError">
-                                                                       {if $errorType == 'notValid'}
-                                                                               {lang}wcf.acp.bbcode.attribute.validationPattern.error.notValid{/lang}
-                                                                       {/if}
-                                                               </small>
-                                                       {/if}
-                                               </dd>
-                                       </dl>
-                                       
-                                       <dl{if $errorField == 'attributeRequired'|concat:$attribute->attributeNo} class="formError"{/if}>
-                                               <dd>
-                                                       <label for="attributes[{@$attribute->attributeNo}][required]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][required]" name="attributes[{@$attribute->attributeNo}][required]" value="1"{if $attribute->required} checked="checked"{/if} /> {lang}wcf.acp.bbcode.attribute.required{/lang}</label>
-                                               </dd>
-                                       </dl>
-                                       
-                                       <dl{if $errorField == 'attributeUseText'|concat:$attribute->attributeNo} class="formError"{/if}>
-                                               <dd>
-                                                       <label for="attributes[{@$attribute->attributeNo}][useText]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][useText]" name="attributes[{@$attribute->attributeNo}][useText]" value="1"{if $attribute->useText} checked="checked"{/if} /> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
-                                                       <small>{lang}wcf.acp.bbcode.attribute.useText.description{/lang}</small>
-                                               </dd>
-                                       </dl>
-                                       
-                                       {event name='attributeFields'}
-                               </fieldset>
-                       {/foreach}
-               </fieldset>
-               
-               {event name='fieldsets'}
-       </div>
+                               
+                               <dl{if $errorField == 'attributeUseText'|concat:$attribute->attributeNo} class="formError"{/if}>
+                                       <dd>
+                                               <label for="attributes[{@$attribute->attributeNo}][useText]"><input type="checkbox" id="attributes[{@$attribute->attributeNo}][useText]" name="attributes[{@$attribute->attributeNo}][useText]" value="1"{if $attribute->useText} checked="checked"{/if} /> {lang}wcf.acp.bbcode.attribute.useText{/lang}</label>
+                                               <small>{lang}wcf.acp.bbcode.attribute.useText.description{/lang}</small>
+                                       </dd>
+                               </dl>
+                               
+                               {event name='attributeFields'}
+                       </section>
+               {/foreach}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 469fbe7267250b6e3d1d245a01ed9314b6f206d8..3e43e0c775c1dd83373a8aaf234cabd53b80c764 100644 (file)
@@ -1,16 +1,16 @@
 {include file='header' pageTitle='wcf.acp.bbcode.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.bbcode.list{/lang}</h1>
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.Action.Delete('wcf\\data\\bbcode\\BBCodeAction', '.jsBBCodeRow');
-                       new WCF.Action.Toggle('wcf\\data\\bbcode\\BBCodeAction', $('.jsBBCodeRow'));
-               });
-               //]]>
-       </script>
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.Action.Delete('wcf\\data\\bbcode\\BBCodeAction', '.jsBBCodeRow');
+               new WCF.Action.Toggle('wcf\\data\\bbcode\\BBCodeAction', $('.jsBBCodeRow'));
+       });
+       //]]>
+</script>
+
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.bbcode.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.bbcode.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 3836c3e4167b3a6774b39c5b73de19070572cf50..f5837ebf29b056b28b6fc078ee3778ec1fc5fc90 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.bbcode.mediaProvider.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.bbcode.mediaProvider.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.bbcode.mediaProvider.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='BBCodeMediaProviderAdd'}{/link}{else}{link controller='BBCodeMediaProviderEdit' object=$mediaProvider}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'title'} class="formError"{/if}>
-                               <dt><label for="title">{lang}wcf.acp.bbcode.mediaProvider.title{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="title" name="title" value="{$title}" required="required" autofocus="autofocus" class="long" />
-                                       {if $errorField == 'title'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.bbcode.mediaProvider.title.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'regex'} class="formError"{/if}>
-                               <dt><label for="regex">{lang}wcf.acp.bbcode.mediaProvider.regex{/lang}</label></dt>
-                               <dd>
-                                       <textarea id="regex" name="regex" cols="40" rows="10" required="required">{$regex}</textarea>
-                                       {if $errorField == 'regex'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.bbcode.mediaProvider.regex.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.bbcode.mediaProvider.regex.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'html'} class="formError"{/if}>
-                               <dt><label for="html">{lang}wcf.acp.bbcode.mediaProvider.html{/lang}</label></dt>
-                               <dd>
-                                       <textarea id="html" name="html" cols="40" rows="10" required="required">{$html}</textarea>
-                                       {if $errorField == 'html'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.bbcode.mediaProvider.html.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.bbcode.mediaProvider.html.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'title'} class="formError"{/if}>
+                       <dt><label for="title">{lang}wcf.acp.bbcode.mediaProvider.title{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="title" name="title" value="{$title}" required="required" autofocus="autofocus" class="long" />
+                               {if $errorField == 'title'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.bbcode.mediaProvider.title.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl{if $errorField == 'regex'} class="formError"{/if}>
+                       <dt><label for="regex">{lang}wcf.acp.bbcode.mediaProvider.regex{/lang}</label></dt>
+                       <dd>
+                               <textarea id="regex" name="regex" cols="40" rows="10" required="required">{$regex}</textarea>
+                               {if $errorField == 'regex'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.bbcode.mediaProvider.regex.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.bbcode.mediaProvider.regex.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'html'} class="formError"{/if}>
+                       <dt><label for="html">{lang}wcf.acp.bbcode.mediaProvider.html{/lang}</label></dt>
+                       <dd>
+                               <textarea id="html" name="html" cols="40" rows="10" required="required">{$html}</textarea>
+                               {if $errorField == 'html'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.bbcode.mediaProvider.html.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.bbcode.mediaProvider.html.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index ed9ec4d1c4b7d04c6c6cf7cd7497553251106b06..2ce97ce76d92f80471cd00adc17addef0ea7c71f 100644 (file)
@@ -1,15 +1,15 @@
 {include file='header' pageTitle='wcf.acp.bbcode.mediaProvider.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.bbcode.mediaProvider.list{/lang}</h1>
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.Action.Delete('wcf\\data\\bbcode\\media\\provider\\BBCodeMediaProviderAction', '.jsMediaProviderRow');
-               });
-               //]]>
-       </script>
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.Action.Delete('wcf\\data\\bbcode\\media\\provider\\BBCodeMediaProviderAction', '.jsMediaProviderRow');
+       });
+       //]]>
+</script>
+
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.bbcode.mediaProvider.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.bbcode.mediaProvider.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
                </nav>
        </div>
 {else}
-       <div class="container containerPadding">
-               <div>
-                       <p class="info">{lang}wcf.global.noItems{/lang}</p>
-               </div>
-       </div>
+       <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
 
 {include file='footer'}
index d289c89fd58ac64d3fccdaeca3d96aeaf34a18b6..8a37ea8bf79e29d511866a5dd77a0ea8238f54d2 100644 (file)
@@ -1,4 +1,4 @@
-<p class="marginTop" id="benchmark"><small>Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</small></p>
+<p id="benchmark"><small>Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</small></p>
 
 {if ENABLE_DEBUG_MODE} 
        <script data-relocate="true">
index ea649aa33d38a72cf1d83245dc6ad6dc6a14cca2..358b94ffbd6c04e7dfb8dea47b4861aace9eda3b 100644 (file)
                        </dl>
                </section>
        {else}
-               <div class="tabMenuContainer">
+               <div class="section tabMenuContainer">
                        <nav class="tabMenu">
                                <ul>
                                        {foreach from=$availableLanguages item=availableLanguage}
index 19f8134e5fffaab73cae1dbac653e14df364f785..5a073aa9d8b18273d582fac36177bfeb2f7bf97f 100644 (file)
@@ -8,8 +8,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.box.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.box.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.box.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
@@ -70,8 +66,7 @@
        
        <div class="contentNavigation">
                {@$pagesLinks}
-               
-               
+                               
                <nav>
                        <ul>
                                <li><a href="{link controller='BoxAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.box.add{/lang}</span></a></li>
index 57947578df29db8c665de030a4c54e9fcc22194b..7778ee03e58a6dee51a1b2f14e5cec7352f719fa 100644 (file)
@@ -26,8 +26,8 @@
        });
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}{$objectType->getProcessor()->getLanguageItemPrefix()}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}{$objectType->getProcessor()->getLanguageItemPrefix()}{/lang}</h1>
 </header>
 
 {include file='formError'}
 {/if}
 
 <form id="formContainer" method="post" action="{link controller=$controller}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.action{/lang}</legend>
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       {foreach from=$actions item=actionObjectType}
-                                               <label><input type="radio" name="action" value="{@$actionObjectType->action}" {if $actionObjectType->action == $action}checked="checked" {/if}/> {lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{@$actionObjectType->action}{/lang}</label>
-                                       {/foreach}
-                                       
-                                       {if $errorField == 'action'}
-                                               <small class="innerError">
-                                                       {lang}wcf.global.form.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-               </fieldset>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.action{/lang}</h2>
                
-               {foreach from=$actions item=actionObjectType}
-                       {if $actionObjectType->getProcessor()->getHTML()}
-                               <fieldset class="jsBulkProcessingActionSettings" data-action="{@$actionObjectType->action}" {if $actionObjectType->action != $action}style="display: none;"{/if}>
-                                       <legend>{lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{@$actionObjectType->action}{/lang}</legend>
-                                       
-                                       {@$actionObjectType->getProcessor()->getHTML()}
-                               </fieldset>
-                       {/if}
-               {/foreach}
-       </div>
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               {foreach from=$actions item=actionObjectType}
+                                       <label><input type="radio" name="action" value="{@$actionObjectType->action}" {if $actionObjectType->action == $action}checked="checked" {/if}/> {lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{@$actionObjectType->action}{/lang}</label>
+                               {/foreach}
+                               
+                               {if $errorField == 'action'}
+                                       <small class="innerError">
+                                               {lang}wcf.global.form.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+       </section>
        
-       <header class="boxHeadline boxSubHeadline">
-               <h2>{lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.conditions{/lang}</h2>
-               {hascontent}<small>{content}{lang __optional=true}{$objectType->getProcessor()->getLanguageItemPrefix()}.conditions.descriptions{/lang}{/content}</small>{/hascontent}
-       </header>
+       {foreach from=$actions item=actionObjectType}
+               {if $actionObjectType->getProcessor()->getHTML()}
+                       <section class="section jsBulkProcessingActionSettings" data-action="{@$actionObjectType->action}" {if $actionObjectType->action != $action}style="display: none;"{/if}>
+                               <h2 class="sectionTitle">{lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.{@$actionObjectType->action}{/lang}</h2>
+                               
+                               {@$actionObjectType->getProcessor()->getHTML()}
+                       </section>
+               {/if}
+       {/foreach}
        
-       {@$objectType->getProcessor()->getConditionHTML()}
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.conditions{/lang}</h2>
+                       {hascontent}<small class="sectionDescription">{content}{lang __optional=true}{$objectType->getProcessor()->getLanguageItemPrefix()}.conditions.descriptions{/lang}{/content}</small>{/hascontent}
+               </header>
+               
+               {@$objectType->getProcessor()->getConditionHTML()}
+       </section>
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 343d1a0d37aa59c554a8cbf41a6a00475b339b90..ff9f6f44ad79049e80949287de4eed9eaf4e3817 100644 (file)
@@ -8,40 +8,38 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.cache.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.cache.list{/lang}</h1>
 </header>
 
-<div class="container containerPadding marginTop">
-       <fieldset>
-               <legend>{lang}wcf.acp.cache.data{/lang}</legend>
-               
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.acp.cache.data{/lang}</h2>
+       
+       <dl>
+               <dt>{lang}wcf.acp.cache.data.source{/lang}</dt>
+               <dd>
+                       {assign var='__source' value="\\"|explode:$cacheData.source}
+                       {lang}wcf.acp.cache.source.type.{$__source|array_pop}{/lang}
+                       <small>{$cacheData.source}</small>
+               </dd>
+       </dl>
+       {if $cacheData.version}
                <dl>
-                       <dt>{lang}wcf.acp.cache.data.source{/lang}</dt>
-                       <dd>
-                               {assign var='__source' value="\\"|explode:$cacheData.source}
-                               {lang}wcf.acp.cache.source.type.{$__source|array_pop}{/lang}
-                               <small>{$cacheData.source}</small>
-                       </dd>
+                       <dt>{lang}wcf.acp.cache.data.version{/lang}</dt>
+                       <dd>{$cacheData.version}</dd>
                </dl>
-               {if $cacheData.version}
-                       <dl>
-                               <dt>{lang}wcf.acp.cache.data.version{/lang}</dt>
-                               <dd>{$cacheData.version}</dd>
-                       </dl>
-               {/if}
-               {if $cacheData.size}<dl>
-                       <dt>{lang}wcf.acp.cache.data.size{/lang}</dt>
-                       <dd>{@$cacheData.size|filesize}</dd>
-               </dl>{/if}
-               {if $cacheData.files}<dl>
-                       <dt>{lang}wcf.acp.cache.data.files{/lang}</dt>
-                       <dd>{#$cacheData.files}</dd>
-               </dl>{/if}
-               
-               {event name='dataFields'}
-       </fieldset>
-</div>
+       {/if}
+       {if $cacheData.size}<dl>
+               <dt>{lang}wcf.acp.cache.data.size{/lang}</dt>
+               <dd>{@$cacheData.size|filesize}</dd>
+       </dl>{/if}
+       {if $cacheData.files}<dl>
+               <dt>{lang}wcf.acp.cache.data.files{/lang}</dt>
+               <dd>{#$cacheData.files}</dd>
+       </dl>{/if}
+       
+       {event name='dataFields'}
+</section>
 
 <div class="contentNavigation">
        <nav>
                {counter name=cacheIndex assign=cacheIndex print=false start=0}
                
                {if $files|count}
-                       <section class="tabularBox tabularBoxTitle marginTop">
-                               <header class="boxHeadline">
-                                       <h2><a class="jsCollapsible jsTooltip" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip"><span class="icon icon16 fa-chevron-right"></span></a> {lang}wcf.acp.cache.type.{$cacheType}{/lang} <span class="badge badgeInverse">{#$files|count}</span></h2>
+                       <section class="section tabularBox tabularBoxTitle">
+                               <header>
+                                       <h2>
+                                               <a class="jsCollapsible jsTooltip" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip"><span class="icon icon16 fa-chevron-right"></span></a>
+                                               {lang}wcf.acp.cache.type.{$cacheType}{/lang}
+                                               <span class="badge">{#$files|count}</span>
+                                       </h2>
                                        <small>{$cache}</small>
                                </header>
                                
index 06e0a3fdd793340dd8fa8463a03c53fe58a881fa..7754c5d5a84d0975f559efe77ff5535ec65e431c 100644 (file)
@@ -1,9 +1,11 @@
 <input type="hidden" name="captchaQuestion" value="{$captchaQuestion}" />
 
 {if !$captchaQuestionAnswered}
-       <fieldset>
-               <legend>{lang}wcf.captcha.question.captcha{/lang}</legend>
-               <small>{lang}wcf.captcha.question.captcha.description{/lang}</small>
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.captcha.question.captcha{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.captcha.question.captcha.description{/lang}</small>
+               </header>
                
                <dl{if (($errorType|isset && $errorType|is_array && $errorType[captchaAnswer]|isset) || ($errorField|isset && $errorField == 'captchaAnswer'))} class="formError"{/if}>
                        <dt><label for="captchaAnswer">{lang}{$captchaQuestionObject->question}{/lang}</label></dt>
@@ -24,7 +26,7 @@
                                {/if}
                        </dd>
                </dl>
-       </fieldset>
+       </section>
        
        {if !$ajaxCaptcha|empty}
                <script data-relocate="true">
index ced8be9648c5a4cace4651472e58a36c1729a67b..a593c4ac2937cea80ee0e52f7f595f88bae15e62 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.captcha.question.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.captcha.question.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.captcha.question.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form id="adForm" method="post" action="{if $action == 'add'}{link controller='CaptchaQuestionAdd'}{/link}{else}{link controller='CaptchaQuestionEdit' id=$captchaQuestion->questionID}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'question'} class="formError"{/if}>
-                               <dt><label for="question">{lang}wcf.acp.captcha.question.question{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="question" name="question" value="{$i18nPlainValues[question]}" required="required" autofocus="autofocus" class="long" />
-                                       {if $errorField == 'question'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {elseif $errorType == 'multilingual'}
-                                                               {lang}wcf.global.form.error.multilingual{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.captcha.question.question.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       {include file='multipleLanguageInputJavascript' elementIdentifier='question' forceSelection=false}
-                       
-                       <dl{if $errorField == 'answers'} class="formError"{/if}>
-                               <dt><label for="answers">{lang}wcf.acp.captcha.question.answers{/lang}</label></dt>
-                               <dd>
-                                       <textarea id="answers" name="answers" cols="40" rows="10">{$i18nPlainValues[answers]}</textarea>
-                                       <small>{lang}wcf.acp.captcha.question.answers.description{/lang}</small>
-                                       {if $errorField == 'answers'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {elseif $errorType == 'multilingual'}
-                                                               {lang}wcf.global.form.error.multilingual{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.captcha.question.answers.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       {include file='multipleLanguageInputJavascript' elementIdentifier='answers' forceSelection=false}
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.captcha.question.isDisabled{/lang}</label>
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'question'} class="formError"{/if}>
+                       <dt><label for="question">{lang}wcf.acp.captcha.question.question{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="question" name="question" value="{$i18nPlainValues[question]}" required="required" autofocus="autofocus" class="long" />
+                               {if $errorField == 'question'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {elseif $errorType == 'multilingual'}
+                                                       {lang}wcf.global.form.error.multilingual{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.captcha.question.question.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               {include file='multipleLanguageInputJavascript' elementIdentifier='question' forceSelection=false}
                
-               {event name='fieldsets'}
+               <dl{if $errorField == 'answers'} class="formError"{/if}>
+                       <dt><label for="answers">{lang}wcf.acp.captcha.question.answers{/lang}</label></dt>
+                       <dd>
+                               <textarea id="answers" name="answers" cols="40" rows="10">{$i18nPlainValues[answers]}</textarea>
+                               <small>{lang}wcf.acp.captcha.question.answers.description{/lang}</small>
+                               {if $errorField == 'answers'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {elseif $errorType == 'multilingual'}
+                                                       {lang}wcf.global.form.error.multilingual{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.captcha.question.answers.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               {include file='multipleLanguageInputJavascript' elementIdentifier='answers' forceSelection=false}
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.captcha.question.isDisabled{/lang}</label>
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index 3322baa00ce2738ad3a678df5bc986567c63de55..602b47d80bdfe80ad82e9ccc19338119fdf114ab 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.captcha.question.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.captcha.question.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.captcha.question.list{/lang}</h1>
 </header>
 
 <script data-relocate="true">
 </div>
 
 {hascontent}
-       <div id="captchaQuestionTabelContainer" class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.captcha.question.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div id="captchaQuestionTabelContainer" class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index eb628a64cd1bf177317bc1ea53fe0ccb055d8e65..177bc4db712b17c2c285e126c52f7ef800de1035 100644 (file)
@@ -15,8 +15,8 @@
        {include file='multipleLanguageInputJavascript' elementIdentifier='description' forceSelection=false}
 {/if}
 
-<header class="boxHeadline">
-       <h1>{@$objectType->getProcessor()->getLanguageVariable($action)}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{@$objectType->getProcessor()->getLanguageVariable($action)}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller=$addController application=$objectType->getProcessor()->getApplication()}{/link}{else}{link controller=$editController application=$objectType->getProcessor()->getApplication() object=$category}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               {event name='beforeFieldsets'}
+       {event name='beforeSections'}
                
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'title'} class="formError"{/if}>
-                               <dt><label for="title">{@$objectType->getProcessor()->getLanguageVariable('title')}</label></dt>
+       <div class="section">
+               <dl{if $errorField == 'title'} class="formError"{/if}>
+                       <dt><label for="title">{@$objectType->getProcessor()->getLanguageVariable('title')}</label></dt>
+                       <dd>
+                               <input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" class="long" />
+                               {if $errorField == 'title'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty' || $errorType == 'multilingual'}
+                                                       {lang}wcf.global.form.error.{$errorType}{/lang}
+                                               {else}
+                                                       {assign var=__languageVariable value='title.error.'|concat:$errorType}
+                                                       {@$objectType->getProcessor()->getLanguageVariable($__languageVariable)}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               {hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('title.description', true)}{/content}</small>{/hascontent}
+                       </dd>
+               </dl>
+               
+               {if $objectType->getProcessor()->hasDescription()}
+                       <dl{if $errorField == 'description'} class="formError"{/if}>
+                               <dt><label for="description">{@$objectType->getProcessor()->getLanguageVariable('description')}</label></dt>
                                <dd>
-                                       <input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" class="long" />
-                                       {if $errorField == 'title'}
+                                       <textarea cols="40" rows="10" id="description" name="description">{$i18nPlainValues['description']}</textarea>
+                                       {if $errorField == 'description'}
                                                <small class="innerError">
                                                        {if $errorType == 'empty' || $errorType == 'multilingual'}
                                                                {lang}wcf.global.form.error.{$errorType}{/lang}
                                                        {else}
-                                                               {assign var=__languageVariable value='title.error.'|concat:$errorType}
+                                                               {assign var=__languageVariable value='description.error.'|concat:$errorType}
                                                                {@$objectType->getProcessor()->getLanguageVariable($__languageVariable)}
                                                        {/if}
                                                </small>
                                        {/if}
-                                       {hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('title.description', true)}{/content}</small>{/hascontent}
+                                       {hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('description.description', true)}{/content}</small>{/hascontent}
                                </dd>
                        </dl>
-                       
-                       {if $objectType->getProcessor()->hasDescription()}
-                               <dl{if $errorField == 'description'} class="formError"{/if}>
-                                       <dt><label for="description">{@$objectType->getProcessor()->getLanguageVariable('description')}</label></dt>
-                                       <dd>
-                                               <textarea cols="40" rows="10" id="description" name="description">{$i18nPlainValues['description']}</textarea>
-                                               {if $errorField == 'description'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty' || $errorType == 'multilingual'}
-                                                                       {lang}wcf.global.form.error.{$errorType}{/lang}
-                                                               {else}
-                                                                       {assign var=__languageVariable value='description.error.'|concat:$errorType}
-                                                                       {@$objectType->getProcessor()->getLanguageVariable($__languageVariable)}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                               {hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('description.description', true)}{/content}</small>{/hascontent}
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       <dl{if $errorField == 'isDisabled'} class="formError"{/if}>
-                               <dt class="reversed"><label for="isDisabled">{@$objectType->getProcessor()->getLanguageVariable('isDisabled')}</label></dt>
-                               <dd>
-                                       <input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if} />
-                                       {hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('isDisabled.description', true)}{/content}</small>{/hascontent}
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+               {/if}
                
-               <fieldset>
-                       <legend>{@$objectType->getProcessor()->getLanguageVariable('position')}</legend>
-                       
-                       {if $categoryNodeList->hasChildren() && $objectType->getProcessor()->getMaximumNestingLevel()}
-                               <dl{if $errorField == 'parentCategoryID'} class="formError"{/if}>
-                                       <dt><label for="parentCategoryID">{@$objectType->getProcessor()->getLanguageVariable('parentCategoryID')}</label></dt>
-                                       <dd>
-                                               <select id="parentCategoryID" name="parentCategoryID">
-                                                       <option value="0">{lang}wcf.global.noSelection{/lang}</option>
-                                                       {include file='categoryOptionList' categoryID=$parentCategoryID maximumNestingLevel=$objectType->getProcessor()->getMaximumNestingLevel()}
-                                               </select>
-                                               {if $errorField == 'parentCategoryID'}
-                                                       <small class="innerError">
-                                                               {assign var=__languageVariable value='parentCategoryID.error.'|concat:$errorType}
-                                                               {@$objectType->getProcessor()->getLanguageVariable($__languageVariable)}
-                                                       </small>
-                                               {/if}
-                                               {hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('parentCategoryID.description', true)}{/content}</small>{/hascontent}
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       <dl{if $errorField == 'showOrder'} class="formError"{/if}>
-                               <dt><label for="showOrder">{@$objectType->getProcessor()->getLanguageVariable('showOrder')}</label></dt>
+               <dl{if $errorField == 'isDisabled'} class="formError"{/if}>
+                       <dt class="reversed"><label for="isDisabled">{@$objectType->getProcessor()->getLanguageVariable('isDisabled')}</label></dt>
+                       <dd>
+                               <input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if} />
+                               {hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('isDisabled.description', true)}{/content}</small>{/hascontent}
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
+       </div>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{@$objectType->getProcessor()->getLanguageVariable('position')}</h2>
+               
+               {if $categoryNodeList->hasChildren() && $objectType->getProcessor()->getMaximumNestingLevel()}
+                       <dl{if $errorField == 'parentCategoryID'} class="formError"{/if}>
+                               <dt><label for="parentCategoryID">{@$objectType->getProcessor()->getLanguageVariable('parentCategoryID')}</label></dt>
                                <dd>
-                                       <input type="number" id="showOrder" name="showOrder" value="{$showOrder}" min="0" class="short" />
-                                       {if $errorField == 'showOrder'}
+                                       <select id="parentCategoryID" name="parentCategoryID">
+                                               <option value="0">{lang}wcf.global.noSelection{/lang}</option>
+                                               {include file='categoryOptionList' categoryID=$parentCategoryID maximumNestingLevel=$objectType->getProcessor()->getMaximumNestingLevel()}
+                                       </select>
+                                       {if $errorField == 'parentCategoryID'}
                                                <small class="innerError">
-                                                       {assign var=__languageVariable value='showOrder.error.'|concat:$errorType}
+                                                       {assign var=__languageVariable value='parentCategoryID.error.'|concat:$errorType}
                                                        {@$objectType->getProcessor()->getLanguageVariable($__languageVariable)}
                                                </small>
                                        {/if}
-                                       {hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('showOrder.description', true)}{/content}</small>{/hascontent}
+                                       {hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('parentCategoryID.description', true)}{/content}</small>{/hascontent}
                                </dd>
                        </dl>
-                       
-                       {event name='positionFields'}
-               </fieldset>
-               
-               {if $aclObjectTypeID}
-                       <fieldset>
-                               <legend>{lang}wcf.acl.permissions{/lang}</legend>
-                               
-                               <dl id="groupPermissions" class="wide">
-                                       <dt>{lang}wcf.acl.permissions{/lang}</dt>
-                                       <dd></dd>
-                               </dl>
-                               
-                               {event name='permissionFields'}
-                       </fieldset>
                {/if}
                
-               {event name='afterFieldsets'}
-       </div>
+               <dl{if $errorField == 'showOrder'} class="formError"{/if}>
+                       <dt><label for="showOrder">{@$objectType->getProcessor()->getLanguageVariable('showOrder')}</label></dt>
+                       <dd>
+                               <input type="number" id="showOrder" name="showOrder" value="{$showOrder}" min="0" class="short" />
+                               {if $errorField == 'showOrder'}
+                                       <small class="innerError">
+                                               {assign var=__languageVariable value='showOrder.error.'|concat:$errorType}
+                                               {@$objectType->getProcessor()->getLanguageVariable($__languageVariable)}
+                                       </small>
+                               {/if}
+                               {hascontent}<small>{content}{@$objectType->getProcessor()->getLanguageVariable('showOrder.description', true)}{/content}</small>{/hascontent}
+                       </dd>
+               </dl>
+               
+               {event name='positionFields'}
+       </section>
+       
+       {if $aclObjectTypeID}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acl.permissions{/lang}</h2>
+                       
+                       <dl id="groupPermissions" class="wide">
+                               <dt>{lang}wcf.acl.permissions{/lang}</dt>
+                               <dd></dd>
+                       </dl>
+                       
+                       {event name='permissionFields'}
+               </section>
+       {/if}
+       
+       {event name='afterSections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 66f98f8f8c9cdefc53d5ad76de7b7a9317f62891..94f4e9223323cbdd6363e89b8373976642838f1c 100644 (file)
@@ -66,8 +66,8 @@
        </script>
 {/if}
 
-<header class="boxHeadline">
-       <h1>{@$objectType->getProcessor()->getLanguageVariable('list')}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{@$objectType->getProcessor()->getLanguageVariable('list')}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -87,7 +87,7 @@
 </div>
 
 {hascontent}
-       <section id="categoryList" class="container containerPadding marginTop{if $objectType->getProcessor()->canEditCategory()} sortableListContainer{/if}">
+       <div id="categoryList" class="section{if $objectType->getProcessor()->canEditCategory()} sortableListContainer{/if}">
                <ol class="categoryList sortableList" data-object-id="0">
                        {content}
                                {assign var=oldDepth value=0}
                                {section name=i loop=$oldDepth}</ol></li>{/section}
                        {/content}
                </ol>
-       </section>
+       </div>
        
        <div class="formSubmit">
                <button class="button" data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
index bd81e4ca57ef1ec4ad38c9e99813ff3bdedeb0bf..f4e3fa3536b5db988e8c468503b4a2ea3210d129 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.cronjob.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.cronjob.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.cronjob.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='CronjobAdd'}{/link}{else}{link controller='CronjobEdit' id=$cronjobID}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'className'} class="formError"{/if}>
-                               <dt><label for="className">{lang}wcf.acp.cronjob.className{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="className" name="className" value="{$className}" required="required" autofocus="autofocus" pattern="^\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\\)*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$" class="long" />
-                                       {if $errorField == 'className'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.cronjob.className.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'description'} class="formError"{/if}>
-                               <dt><label for="description">{lang}wcf.acp.cronjob.description{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="description" name="description" value="{$i18nPlainValues['description']}" class="long" />
-                                       {if $errorField == 'description'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty' || $errorType == 'multilingual'}
-                                                               {lang}wcf.global.form.error.{@$errorType}{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.cronjob.className.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       {include file='multipleLanguageInputJavascript' elementIdentifier='description' forceSelection=false}
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'className'} class="formError"{/if}>
+                       <dt><label for="className">{lang}wcf.acp.cronjob.className{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="className" name="className" value="{$className}" required="required" autofocus="autofocus" pattern="^\\?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*\\)*[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$" class="long" />
+                               {if $errorField == 'className'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.cronjob.className.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.cronjob.timing{/lang}</legend>
-                       
-                       <dl{if $errorField == 'startMinute'} class="formError"{/if}>
-                               <dt><label for="startMinute">{lang}wcf.acp.cronjob.startMinute{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="startMinute" name="startMinute" value="{$startMinute}" class="short" />
-                                       {if $errorField == 'startMinute'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.cronjob.startMinute.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'startHour'} class="formError"{/if}>
-                               <dt><label for="startHour">{lang}wcf.acp.cronjob.startHour{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="startHour" name="startHour" value="{$startHour}" class="short" />
-                                       {if $errorField == 'startHour'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.cronjob.startHour.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'startDom'} class="formError"{/if}>
-                               <dt><label for="startDom">{lang}wcf.acp.cronjob.startDom{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="startDom" name="startDom" value="{$startDom}" class="short" />
-                                       {if $errorField == 'startDom'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.cronjob.startDom.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'startMonth'} class="formError"{/if}>
-                               <dt><label for="startMonth">{lang}wcf.acp.cronjob.startMonth{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="startMonth" name="startMonth" value="{$startMonth}" class="short" />
-                                       {if $errorField == 'startMonth'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.cronjob.startMonth.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'startDow'} class="formError"{/if}>
-                               <dt><label for="startDow">{lang}wcf.acp.cronjob.startDow{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="startDow" name="startDow" value="{$startDow}" class="short" />
-                                       {if $errorField == 'startDow'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.cronjob.startDow.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='timingFields'}
-               </fieldset>
+               <dl{if $errorField == 'description'} class="formError"{/if}>
+                       <dt><label for="description">{lang}wcf.acp.cronjob.description{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="description" name="description" value="{$i18nPlainValues['description']}" class="long" />
+                               {if $errorField == 'description'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty' || $errorType == 'multilingual'}
+                                                       {lang}wcf.global.form.error.{@$errorType}{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.cronjob.className.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               {include file='multipleLanguageInputJavascript' elementIdentifier='description' forceSelection=false}
                
-               {event name='fieldsets'}
+               {event name='dataFields'}
        </div>
        
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.cronjob.timing{/lang}</h2>
+               
+               <dl{if $errorField == 'startMinute'} class="formError"{/if}>
+                       <dt><label for="startMinute">{lang}wcf.acp.cronjob.startMinute{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="startMinute" name="startMinute" value="{$startMinute}" class="short" />
+                               {if $errorField == 'startMinute'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.cronjob.startMinute.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'startHour'} class="formError"{/if}>
+                       <dt><label for="startHour">{lang}wcf.acp.cronjob.startHour{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="startHour" name="startHour" value="{$startHour}" class="short" />
+                               {if $errorField == 'startHour'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.cronjob.startHour.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'startDom'} class="formError"{/if}>
+                       <dt><label for="startDom">{lang}wcf.acp.cronjob.startDom{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="startDom" name="startDom" value="{$startDom}" class="short" />
+                               {if $errorField == 'startDom'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.cronjob.startDom.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'startMonth'} class="formError"{/if}>
+                       <dt><label for="startMonth">{lang}wcf.acp.cronjob.startMonth{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="startMonth" name="startMonth" value="{$startMonth}" class="short" />
+                               {if $errorField == 'startMonth'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.cronjob.startMonth.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'startDow'} class="formError"{/if}>
+                       <dt><label for="startDow">{lang}wcf.acp.cronjob.startDow{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="startDow" name="startDow" value="{$startDow}" class="short" />
+                               {if $errorField == 'startDow'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.cronjob.timing.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.cronjob.startDow.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {event name='timingFields'}
+       </section>
+       
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index 7455a6a55a9d98dd5f22fe89102297c39fa42c88..3bda083ea7686a597958ca3a00ec925a3c469519 100644 (file)
@@ -1,10 +1,5 @@
 {include file='header' pageTitle='wcf.acp.cronjob.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.cronjob.list{/lang}</h1>
-       <p>{lang}wcf.acp.cronjob.subtitle{/lang}</p>
-</header>
-
 <script data-relocate="true">
        //<![CDATA[
        $(function() {
        //]]>
 </script>
 
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.cronjob.list{/lang}</h1>
+       <p class="contentHeaderDescription">{lang}wcf.acp.cronjob.subtitle{/lang}</p>
+</header>
+
 <div class="contentNavigation">
        {pages print=true assign=pagesLinks controller="CronjobList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
        
 </div>
 
 {hascontent}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.cronjob.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 3e2bc5b5bb195dbce94397f3836cf912c41997fd..e6d6abeea36ecd91c18a0b3725a6306505b4cd8e 100644 (file)
@@ -13,8 +13,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.cronjob.log{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.cronjob.log{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {hascontent}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.cronjob.log{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 8e328ffd2355f759409b4f316c53850fd4c2dfdc..d393156c0b7667339d579bed3e21163c9a6b8099 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.dashboard.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.dashboard.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.dashboard.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
        {/hascontent}
 </div>
 
-<div class="tabularBox tabularBoxTitle marginTop">
-       <header>
-               <h2>{lang}wcf.acp.dashboard.list{/lang} <span class="badge badgeInverse">{#$objectTypes|count}</span></h2>
-       </header>
-       
+<div class="section tabularBox">
        <table class="table">
                <thead>
                        <tr>
index 851775d915167d4414ad897e658425272b1d43fb..699ab7e18c801998aba9bdcac7d30b4a75607da5 100644 (file)
@@ -8,9 +8,9 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.dashboard.option{/lang}</h1>
-       <p>{lang}wcf.dashboard.objectType.{$objectType->objectType}{/lang}</p>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.dashboard.option{/lang}</h1>
+       <p class="contentHeaderDescription">{lang}wcf.dashboard.objectType.{$objectType->objectType}{/lang}</p>
 </header>
 
 <p class="info">{lang}wcf.acp.dashboard.box.sort{/lang}</p>
@@ -25,7 +25,7 @@
        </nav>
 </div>
 
-<div class="tabMenuContainer">
+<div class="section tabMenuContainer">
        <nav class="tabMenu">
                <ul>
                        {if $objectType->allowcontent}
        </nav>
        
        {if $objectType->allowcontent}
-               <div id="dashboard-content" class="container containerPadding tabMenuContent hidden">
-                       <fieldset>
-                               <legend>{lang}wcf.dashboard.box.enabledBoxes{/lang}</legend>
+               <div id="dashboard-content" class="tabMenuContent hidden">
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.dashboard.box.enabledBoxes{/lang}</h2>
                                
-                               <div class="container containerPadding sortableListContainer">
+                               <div class="sortableListContainer">
                                        <ol class="sortableList simpleSortableList" data-object-id="0">
                                                {foreach from=$enabledBoxes item=boxID}
                                                        {if $boxes[$boxID]->boxType == 'content'}
                                                {/foreach}
                                        </ol>
                                </div>
-                       </fieldset>
+                       </section>
                        
-                       <fieldset>
-                               <legend>{lang}wcf.dashboard.box.availableBoxes{/lang}</legend>
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.dashboard.box.availableBoxes{/lang}</h2>
                                
-                               <div class="container containerPadding sortableListContainer">
+                               <div class="sortableListContainer">
                                        <ol class="sortableList simpleSortableList">
                                                {foreach from=$boxes item=box}
                                                        {if $box->boxType == 'content' && !$box->boxID|in_array:$enabledBoxes}
@@ -71,7 +71,7 @@
                                                {/foreach}
                                        </ol>
                                </div>
-                       </fieldset>
+                       </section>
                        
                        <div class="formSubmit">
                                <button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
        {/if}
        
        {if $objectType->allowsidebar}
-               <div id="dashboard-sidebar" class="container containerPadding tabMenuContent hidden">
-                       <fieldset>
-                               <legend>{lang}wcf.dashboard.box.enabledBoxes{/lang}</legend>
+               <div id="dashboard-sidebar" class="tabMenuContent hidden">
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.dashboard.box.enabledBoxes{/lang}</h2>
                                
-                               <div class="container containerPadding sortableListContainer">
+                               <div class="sortableListContainer">
                                        <ol class="sortableList simpleSortableList" data-object-id="0">
                                                {foreach from=$enabledBoxes item=boxID}
                                                        {if $boxes[$boxID]->boxType == 'sidebar'}
                                                {/foreach}
                                        </ol>
                                </div>
-                       </fieldset>
+                       </section>
                        
-                       <fieldset>
-                               <legend>{lang}wcf.dashboard.box.availableBoxes{/lang}</legend>
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.dashboard.box.availableBoxes{/lang}</h2>
                                
-                               <div id="dashboard-sidebar-enabled" class="container containerPadding sortableListContainer">
+                               <div id="dashboard-sidebar-enabled" class="sortableListContainer">
                                        <ol class="sortableList simpleSortableList">
                                                {foreach from=$boxes item=box}
                                                        {if $box->boxType == 'sidebar' && !$box->boxID|in_array:$enabledBoxes}
                                                {/foreach}
                                        </ol>
                                </div>
-                       </fieldset>
+                       </section>
                        
                        <div class="formSubmit">
                                <button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
index e472ce37a5fed3227b93eea0882c18bc72d40898..2abb1f9f030ede7f67236d692fd20f3c09d60c17 100644 (file)
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.dataImport{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.dataImport{/lang}</h1>
        {if $exporterName}
-               <p>{lang}wcf.acp.dataImport.exporter.{@$exporterName}{/lang}</p>
+               <p class="contentHeaderDescription">{lang}wcf.acp.dataImport.exporter.{@$exporterName}{/lang}</p>
        {/if}
 </header>
 
                {/if}
                
                <form method="post" action="{link controller='DataImport'}{/link}">
-                       <div class="container containerPadding marginTop">
-                               <fieldset>
-                                       <legend>{lang}wcf.acp.dataImport.selectExporter{/lang}</legend>
-                                       
-                                       <dl{if $errorField == 'exporterName'} class="formError"{/if}>
-                                               <dt><label for="exporterName">{lang}wcf.acp.dataImport.exporter{/lang}</label></dt>
-                                               <dd>
-                                                       <select name="exporterName" id="exporterName">
-                                                               {foreach from=$availableExporters key=availableExporterName item=availableExporter}
-                                                                       <option value="{@$availableExporterName}">{lang}wcf.acp.dataImport.exporter.{@$availableExporterName}{/lang}</option>
-                                                               {/foreach}
-                                                       </select>
-                                                       {if $errorField == 'exporterName'}
-                                                               <small class="innerError">
-                                                                       {if $errorType == 'empty'}
-                                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                                       {else}
-                                                                               {lang}wcf.acp.dataImport.exporterName.error.{@$errorType}{/lang}
-                                                                       {/if}
-                                                               </small>
-                                                       {/if}
-                                               </dd>
-                                       </dl>
-                                       
-                                       {event name='selectExporterFields'}
-                               </fieldset>
-                       </div>
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.acp.dataImport.selectExporter{/lang}</h2>
+                               
+                               <dl{if $errorField == 'exporterName'} class="formError"{/if}>
+                                       <dt><label for="exporterName">{lang}wcf.acp.dataImport.exporter{/lang}</label></dt>
+                                       <dd>
+                                               <select name="exporterName" id="exporterName">
+                                                       {foreach from=$availableExporters key=availableExporterName item=availableExporter}
+                                                               <option value="{@$availableExporterName}">{lang}wcf.acp.dataImport.exporter.{@$availableExporterName}{/lang}</option>
+                                                       {/foreach}
+                                               </select>
+                                               {if $errorField == 'exporterName'}
+                                                       <small class="innerError">
+                                                               {if $errorType == 'empty'}
+                                                                       {lang}wcf.global.form.error.empty{/lang}
+                                                               {else}
+                                                                       {lang}wcf.acp.dataImport.exporterName.error.{@$errorType}{/lang}
+                                                               {/if}
+                                                       </small>
+                                               {/if}
+                                       </dd>
+                               </dl>
+                               
+                               {event name='selectExporterFields'}
+                       </section>
                        
                        <div class="formSubmit">
                                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
        {/if}
 {else}
        <form method="post" action="{link controller='DataImport'}{/link}">
-               <div class="container containerPadding marginTop">
-                       <fieldset>
-                               <legend>{lang}wcf.acp.dataImport.configure.data{/lang}</legend>
-                               
-                               <small>{lang}wcf.acp.dataImport.configure.data.description{/lang}</small>
-                               
-                               {foreach from=$supportedData key=objectTypeName item=objectTypes}
-                                       <dl class="wide">
-                                               <dd class="jsImportCollection">
-                                                       <label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportSection"{if $objectTypeName|in_array:$selectedData}checked="checked" {/if}/> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
-                                                       <p>
-                                                               {foreach from=$objectTypes item=objectTypeName}
-                                                                       <label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportItem"{if $objectTypeName|in_array:$selectedData}checked="checked" {/if}/> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
-                                                               {/foreach}
-                                                       </p>
-                                               </dd>
-                                       </dl>
-                               {/foreach}
-                               
-                               {event name='dataFields'}
-                       </fieldset>
+               <section class="section">
+                       <header class="sectionHeader">
+                               <h2 class="sectionTitle">{lang}wcf.acp.dataImport.configure.data{/lang}</h2>
+                               <small class="sectionDescription">{lang}wcf.acp.dataImport.configure.data.description{/lang}</small>
+                       </header>
                        
-                       <fieldset>
-                               <legend>{lang}wcf.acp.dataImport.configure.settings{/lang}</legend>
-                               
-                               <dl>
-                                       <dt><label for="userMergeMode">{lang}wcf.acp.dataImport.configure.settings.userMergeMode{/lang}</label></dt>
-                                       <dd>
-                                               <label><input type="radio" id="userMergeMode" name="userMergeMode" value="4" {if $userMergeMode == 4}checked="checked" {/if}/> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.4{/lang}</label>
-                                               <label><input type="radio" name="userMergeMode" value="5" {if $userMergeMode == 5}checked="checked" {/if}/> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.5{/lang}</label>
+                       {foreach from=$supportedData key=objectTypeName item=objectTypes}
+                               <dl class="wide">
+                                       <dt></dt>
+                                       <dd class="jsImportCollection">
+                                               <label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportSection"{if $objectTypeName|in_array:$selectedData}checked="checked" {/if}/> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
+                                               <p>
+                                                       {foreach from=$objectTypes item=objectTypeName}
+                                                               <label><input type="checkbox" name="selectedData[]" value="{@$objectTypeName}" class="jsImportItem"{if $objectTypeName|in_array:$selectedData}checked="checked" {/if}/> {lang}wcf.acp.dataImport.data.{@$objectTypeName}{/lang}</label>
+                                                       {/foreach}
+                                               </p>
                                        </dd>
                                </dl>
-                               
-                               {event name='settingFields'}
-                       </fieldset>
+                       {/foreach}
                        
-                       <fieldset{if $errorField == 'database'} class="formError"{/if}>
-                               <legend>{lang}wcf.acp.dataImport.configure.database{/lang}</legend>
-                               
-                               <dl>
-                                       <dt><label for="dbHost">{lang}wcf.acp.dataImport.configure.database.host{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="dbHost" name="dbHost" value="{$dbHost}" class="long" />
-                                       </dd>
-                               </dl>
-                               
-                               <dl>
-                                       <dt><label for="dbUser">{lang}wcf.acp.dataImport.configure.database.user{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="dbUser" name="dbUser" value="{$dbUser}" class="medium" />
-                                       </dd>
-                               </dl>
-                               
-                               <dl>
-                                       <dt><label for="dbPassword">{lang}wcf.acp.dataImport.configure.database.password{/lang}</label></dt>
-                                       <dd>
-                                               <input type="password" id="dbPassword" name="dbPassword" value="{$dbPassword}" class="medium" autocomplete="off" />
-                                       </dd>
-                               </dl>
-                               
-                               <dl>
-                                       <dt><label for="dbName">{lang}wcf.acp.dataImport.configure.database.name{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="dbName" name="dbName" value="{$dbName}" class="medium" />
-                                       </dd>
-                               </dl>
-                               
-                               <dl>
-                                       <dt><label for="dbPrefix">{lang}wcf.acp.dataImport.configure.database.prefix{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="dbPrefix" name="dbPrefix" value="{$dbPrefix}" class="short" />
-                                               {if $errorField == 'database'}
-                                                       <small class="innerError">{lang}wcf.acp.dataImport.configure.database.error{/lang}</small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               
-                               {event name='databaseFields'}
-                       </fieldset>
+                       {event name='dataFields'}
+               </section>
+               
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.dataImport.configure.settings{/lang}</h2>
                        
-                       <fieldset>
-                               <legend>{lang}wcf.acp.dataImport.configure.fileSystem{/lang}</legend>
-                               
-                               <dl{if $errorField == 'fileSystemPath'} class="formError"{/if}>
-                                       <dt><label for="fileSystemPath">{lang}wcf.acp.dataImport.configure.fileSystem.path{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="fileSystemPath" name="fileSystemPath" value="{$fileSystemPath}" class="long" />
-                                               {if $errorField == 'fileSystemPath'}
-                                                       <small class="innerError">{lang}wcf.acp.dataImport.configure.fileSystem.path.error{/lang}</small>
-                                               {/if}
-                                               <small>{lang}wcf.acp.dataImport.configure.fileSystem.path.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                               
-                               {event name='fileSystemFields'}
-                       </fieldset>
+                       <dl>
+                               <dt><label for="userMergeMode">{lang}wcf.acp.dataImport.configure.settings.userMergeMode{/lang}</label></dt>
+                               <dd>
+                                       <label><input type="radio" id="userMergeMode" name="userMergeMode" value="4" {if $userMergeMode == 4}checked="checked" {/if}/> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.4{/lang}</label>
+                                       <label><input type="radio" name="userMergeMode" value="5" {if $userMergeMode == 5}checked="checked" {/if}/> {lang}wcf.acp.dataImport.configure.settings.userMergeMode.5{/lang}</label>
+                               </dd>
+                       </dl>
                        
-                       {event name='fieldsets'}
-               </div>
+                       {event name='settingFields'}
+               </section>
+               
+               <section class="section{if $errorField == 'database'} formError{/if}">
+                       <h2 class="sectionTitle">{lang}wcf.acp.dataImport.configure.database{/lang}</h2>
+                       
+                       <dl>
+                               <dt><label for="dbHost">{lang}wcf.acp.dataImport.configure.database.host{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="dbHost" name="dbHost" value="{$dbHost}" class="long" />
+                               </dd>
+                       </dl>
+                       
+                       <dl>
+                               <dt><label for="dbUser">{lang}wcf.acp.dataImport.configure.database.user{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="dbUser" name="dbUser" value="{$dbUser}" class="medium" />
+                               </dd>
+                       </dl>
+                       
+                       <dl>
+                               <dt><label for="dbPassword">{lang}wcf.acp.dataImport.configure.database.password{/lang}</label></dt>
+                               <dd>
+                                       <input type="password" id="dbPassword" name="dbPassword" value="{$dbPassword}" class="medium" autocomplete="off" />
+                               </dd>
+                       </dl>
+                       
+                       <dl>
+                               <dt><label for="dbName">{lang}wcf.acp.dataImport.configure.database.name{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="dbName" name="dbName" value="{$dbName}" class="medium" />
+                               </dd>
+                       </dl>
+                       
+                       <dl>
+                               <dt><label for="dbPrefix">{lang}wcf.acp.dataImport.configure.database.prefix{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="dbPrefix" name="dbPrefix" value="{$dbPrefix}" class="short" />
+                                       {if $errorField == 'database'}
+                                               <small class="innerError">{lang}wcf.acp.dataImport.configure.database.error{/lang}</small>
+                                       {/if}
+                               </dd>
+                       </dl>
+                       
+                       {event name='databaseFields'}
+               </section>
+               
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.dataImport.configure.fileSystem{/lang}</h2>
+                       
+                       <dl{if $errorField == 'fileSystemPath'} class="formError"{/if}>
+                               <dt><label for="fileSystemPath">{lang}wcf.acp.dataImport.configure.fileSystem.path{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="fileSystemPath" name="fileSystemPath" value="{$fileSystemPath}" class="long" />
+                                       {if $errorField == 'fileSystemPath'}
+                                               <small class="innerError">{lang}wcf.acp.dataImport.configure.fileSystem.path.error{/lang}</small>
+                                       {/if}
+                                       <small>{lang}wcf.acp.dataImport.configure.fileSystem.path.description{/lang}</small>
+                               </dd>
+                       </dl>
+                       
+                       {event name='fileSystemFields'}
+               </section>
+               
+               {event name='sections'}
                
                <div class="formSubmit">
                        <input type="hidden" name="exporterName" value="{$exporterName}" />
index ae2d43ae80e022e504f68ef6e1df6b9862171aaa..7753dc49877e247004effd8cccd89656e5a3bee6 100644 (file)
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.exceptionLog{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.exceptionLog{/lang}</h1>
 </header>
 
 {include file='formError'}
 
 {if !$logFiles|empty}
        <form method="post" action="{link controller='ExceptionLogView'}{/link}">
-               <div class="container containerPadding marginTop">
-                       <fieldset><legend>{lang}wcf.acp.exceptionLog.search{/lang}</legend>
-                               <dl>
-                                       <dt><label for="exceptionID">{lang}wcf.acp.exceptionLog.search.exceptionID{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="exceptionID" name="exceptionID" value="{$exceptionID}" autofocus="autofocus" class="long" />
-                                       </dd>
-                               </dl>
-                               <dl>
-                                       <dt><label for="logFile">{lang}wcf.acp.exceptionLog.search.logFile{/lang}</label></dt>
-                                       <dd>
-                                               <select id="logFile" name="logFile">
-                                                       {htmlOptions options=$logFiles selected=$logFile}
-                                               </select>
-                                       </dd>
-                               </dl>
-                       </fieldset>
-               </div>
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.exceptionLog.search{/lang}</h2>
+                       
+                       <dl>
+                               <dt><label for="exceptionID">{lang}wcf.acp.exceptionLog.search.exceptionID{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="exceptionID" name="exceptionID" value="{$exceptionID}" autofocus="autofocus" class="long" />
+                               </dd>
+                       </dl>
+                       <dl>
+                               <dt><label for="logFile">{lang}wcf.acp.exceptionLog.search.logFile{/lang}</label></dt>
+                               <dd>
+                                       <select id="logFile" name="logFile">
+                                               {htmlOptions options=$logFiles selected=$logFile}
+                                       </select>
+                               </dd>
+                       </dl>
+               </section>
                
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
 {if !$logFiles|empty}
        {if $logFile}
                {foreach from=$exceptions item='exception' key='exceptionKey'}
-                       <div id="{$exceptionKey}" class="container containerPadding marginTop">
-                               <fieldset>
-                                       <legend>{$exception[message]}</legend>
-                                       
-                                       <dl>
-                                               <dt>{lang}wcf.acp.exceptionLog.exception.date{/lang}</dt>
-                                               <dd>{$exception[date]|strtotime|plainTime}</dd>
-                                       </dl>
-                                       
-                                       <dl>
-                                               <dt>{lang}wcf.acp.exceptionLog.exception.requestURI{/lang}</dt>
-                                               <dd>{$exception[requestURI]}</dd>
-                                       </dl>
-                                       <dl>
-                                               <dt>{lang}wcf.acp.exceptionLog.exception.referrer{/lang}</dt>
-                                               <dd>{$exception[referrer]}</dd>
-                                       </dl>
-                                       <dl>
-                                               <dt>{lang}wcf.acp.exceptionLog.exception.userAgent{/lang}</dt>
-                                               <dd>{$exception[userAgent]}</dd>
-                                       </dl>
-                                       <dl>
-                                               <dt>{lang}wcf.acp.exceptionLog.exception.memory{/lang}</dt>
-                                               <dd>{$exception[peakMemory]|filesizeBinary} / {$exception[maxMemory]|filesizeBinary}</dd>
-                                       </dl>
-                                       {foreach from=$exception[chain] item=chain}
-                                       <dl>
-                                               <dt>{lang}wcf.acp.exceptionLog.exception.message{/lang}</dt>
-                                               <dd>{$chain[message]}</dd>
-                                       </dl>
-                                       <dl>
-                                               <dt>{lang}wcf.acp.exceptionLog.exception.class{/lang}</dt>
-                                               <dd>{$chain[class]}</dd>
-                                       </dl>
-                                       <dl>
-                                               <dt>{lang}wcf.acp.exceptionLog.exception.file{/lang}</dt>
-                                               <dd>{$chain[file]} ({$chain[line]})</dd>
-                                       </dl>
-                                       <dl>
-                                               <dt>{lang}wcf.acp.exceptionLog.exception.stacktrace{/lang}</dt>
-                                               <dd>
-                                                       <ol start="0" class="nativeList">
-                                                               {foreach from=$chain[stack] item=stack}
-                                                               <li>{$stack[file]} ({$stack[line]}): {$stack[class]}{$stack[type]}{$stack[function]}(&hellip;)</li>
-                                                               {/foreach}
-                                                       </ul>
-                                               </dd>
-                                       </dl>
-                                       {/foreach}
-                                       <dl>
-                                               <dt><label for="copyException{$exceptionKey}">{lang}wcf.acp.exceptionLog.exception.copy{/lang}</label></dt>
-                                               <dd><textarea id="copyException{$exceptionKey}" rows="5" cols="40" class="jsCopyException" readonly="readonly">{$exception[0]}</textarea></dd>
-                                       </dl>
-                               </fieldset>
-                       </div>
+                       <section id="{$exceptionKey}" class="section">
+                               <h2 class="sectionTitle">{$exception[message]}</h2>
+                               
+                               <dl>
+                                       <dt>{lang}wcf.acp.exceptionLog.exception.date{/lang}</dt>
+                                       <dd>{$exception[date]|strtotime|plainTime}</dd>
+                               </dl>
+                               
+                               <dl>
+                                       <dt>{lang}wcf.acp.exceptionLog.exception.requestURI{/lang}</dt>
+                                       <dd>{$exception[requestURI]}</dd>
+                               </dl>
+                               <dl>
+                                       <dt>{lang}wcf.acp.exceptionLog.exception.referrer{/lang}</dt>
+                                       <dd>{$exception[referrer]}</dd>
+                               </dl>
+                               <dl>
+                                       <dt>{lang}wcf.acp.exceptionLog.exception.userAgent{/lang}</dt>
+                                       <dd>{$exception[userAgent]}</dd>
+                               </dl>
+                               <dl>
+                                       <dt>{lang}wcf.acp.exceptionLog.exception.memory{/lang}</dt>
+                                       <dd>{$exception[peakMemory]|filesizeBinary} / {$exception[maxMemory]|filesizeBinary}</dd>
+                               </dl>
+                               {foreach from=$exception[chain] item=chain}
+                               <dl>
+                                       <dt>{lang}wcf.acp.exceptionLog.exception.message{/lang}</dt>
+                                       <dd>{$chain[message]}</dd>
+                               </dl>
+                               <dl>
+                                       <dt>{lang}wcf.acp.exceptionLog.exception.class{/lang}</dt>
+                                       <dd>{$chain[class]}</dd>
+                               </dl>
+                               <dl>
+                                       <dt>{lang}wcf.acp.exceptionLog.exception.file{/lang}</dt>
+                                       <dd>{$chain[file]} ({$chain[line]})</dd>
+                               </dl>
+                               <dl>
+                                       <dt>{lang}wcf.acp.exceptionLog.exception.stacktrace{/lang}</dt>
+                                       <dd>
+                                               <ol start="0" class="nativeList">
+                                                       {foreach from=$chain[stack] item=stack}
+                                                       <li>{$stack[file]} ({$stack[line]}): {$stack[class]}{$stack[type]}{$stack[function]}(&hellip;)</li>
+                                                       {/foreach}
+                                               </ul>
+                                       </dd>
+                               </dl>
+                               {/foreach}
+                               <dl>
+                                       <dt><label for="copyException{$exceptionKey}">{lang}wcf.acp.exceptionLog.exception.copy{/lang}</label></dt>
+                                       <dd><textarea id="copyException{$exceptionKey}" rows="5" cols="40" class="jsCopyException" readonly="readonly">{$exception[0]}</textarea></dd>
+                               </dl>
+                       </section>
                {/foreach}
        {elseif $exceptionID}
                <p class="error">{lang}wcf.acp.exceptionLog.exceptionNotFound{/lang}</p>
index c5600bc7d770818af31f08f5634c02f79333cad0..a2b398f67faa4655c318d34558c5f3e800439046 100644 (file)
@@ -27,7 +27,7 @@
        <script data-relocate="true" src="https://assets.woltlab.com/widget/pluginstore/featuredFiles.min.js"></script>
 {/if*}
 
-<div class="tabMenuContainer" data-active="{if ENABLE_WOLTLAB_NEWS}news{else}system{/if}" data-store="activeTabMenuItem">
+<div class="section tabMenuContainer" data-active="{if ENABLE_WOLTLAB_NEWS}news{else}system{/if}" data-store="activeTabMenuItem">
        <nav class="tabMenu">
                <ul>
                        {if ENABLE_WOLTLAB_NEWS}<li><a href="{@$__wcf->getAnchor('news')}">{lang}wcf.acp.index.news{/lang}</a></li>{/if}
index 393d1d37f0880d79329499e35fdb9ce15c49adee..d017feed9e85683e848b8b47ea96b2aaf9646cef 100644 (file)
@@ -17,8 +17,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.label.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.label.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 
 {if $labelGroupList|count}
        <form method="post" action="{if $action == 'add'}{link controller='LabelAdd'}{/link}{else}{link controller='LabelEdit' object=$label}{/link}{/if}">
-               <div class="container containerPadding marginTop">
-                       <fieldset>
-                               <legend>{lang}wcf.global.form.data{/lang}</legend>
-                               
-                               <dl{if $errorField == 'groupID'} class="formError"{/if}>
-                                       <dt><label for="groupID">{lang}wcf.acp.label.group{/lang}</label></dt>
-                                       <dd>
-                                               <select id="groupID" name="groupID">
-                                                       <option value="0">{lang}wcf.global.noSelection{/lang}</option>
-                                                       {foreach from=$labelGroupList item=group}
-                                                               <option value="{@$group->groupID}"{if $group->groupID == $groupID} selected="selected"{/if}>{$group}{if $group->groupDescription} / {$group->groupDescription}{/if}</option>
-                                                       {/foreach}
-                                               </select>
-                                               {if $errorField == 'groupID'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.label.group.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               
-                               <dl{if $errorField == 'label'} class="formError"{/if}>
-                                       <dt><label for="label">{lang}wcf.acp.label.label{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="label" name="label" value="{$i18nPlainValues['label']}" autofocus="autofocus" class="long" />
-                                               {if $errorField == 'label'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {elseif $errorType == 'multilingual'}
-                                                                       {lang}wcf.global.form.error.multilingual{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.label.label.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               {include file='multipleLanguageInputJavascript' elementIdentifier='label' forceSelection=false}
-                               
-                               <dl{if $errorField == 'cssClassName'} class="formError"{/if}>
-                                       <dt><label for="cssClassName">{lang}wcf.acp.label.cssClassName{/lang}</label></dt>
-                                       <dd>
-                                               <ul id="labelList" class="inlineList">
-                                                       {foreach from=$availableCssClassNames item=className}
-                                                               {if $className == 'custom'}
-                                                                       <li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if} /> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long" /></span></li>
-                                                               {else}
-                                                                       <li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if} /> <span class="badge label{if $className != 'none'} {$className}{/if}">Label</span></label></li>
-                                                               {/if}
-                                                       {/foreach}
-                                               </ul>
-                                               
-                                               {if $errorField == 'cssClassName'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.label.cssClassName.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               
-                               {event name='dataFields'}
-                       </fieldset>
+               <div class="section">
+                       <dl{if $errorField == 'groupID'} class="formError"{/if}>
+                               <dt><label for="groupID">{lang}wcf.acp.label.group{/lang}</label></dt>
+                               <dd>
+                                       <select id="groupID" name="groupID">
+                                               <option value="0">{lang}wcf.global.noSelection{/lang}</option>
+                                               {foreach from=$labelGroupList item=group}
+                                                       <option value="{@$group->groupID}"{if $group->groupID == $groupID} selected="selected"{/if}>{$group}{if $group->groupDescription} / {$group->groupDescription}{/if}</option>
+                                               {/foreach}
+                                       </select>
+                                       {if $errorField == 'groupID'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.label.group.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
                        
-                       {event name='fieldsets'}
+                       <dl{if $errorField == 'label'} class="formError"{/if}>
+                               <dt><label for="label">{lang}wcf.acp.label.label{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="label" name="label" value="{$i18nPlainValues['label']}" autofocus="autofocus" class="long" />
+                                       {if $errorField == 'label'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {elseif $errorType == 'multilingual'}
+                                                               {lang}wcf.global.form.error.multilingual{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.label.label.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+                       {include file='multipleLanguageInputJavascript' elementIdentifier='label' forceSelection=false}
+                       
+                       <dl{if $errorField == 'cssClassName'} class="formError"{/if}>
+                               <dt><label for="cssClassName">{lang}wcf.acp.label.cssClassName{/lang}</label></dt>
+                               <dd>
+                                       <ul id="labelList" class="inlineList">
+                                               {foreach from=$availableCssClassNames item=className}
+                                                       {if $className == 'custom'}
+                                                               <li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if} /> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long" /></span></li>
+                                                       {else}
+                                                               <li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if} /> <span class="badge label{if $className != 'none'} {$className}{/if}">Label</span></label></li>
+                                                       {/if}
+                                               {/foreach}
+                                       </ul>
+                                       
+                                       {if $errorField == 'cssClassName'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.label.cssClassName.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+                       
+                       {event name='dataFields'}
                </div>
                
+               {event name='sections'}
+               
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                        {@SECURITY_TOKEN_INPUT_TAG}
index 9ec3cf64ed830d29a2bdbca7c0d072ebaa6d2425..5efe210d4daa8bf3666c69d219eedf213ce630c7 100644 (file)
@@ -20,8 +20,8 @@
 
 {assign var=labelForceSelection value=$forceSelection}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.label.group.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.label.group.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
@@ -41,7 +41,7 @@
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='LabelGroupAdd'}{/link}{else}{link controller='LabelGroupEdit' object=$labelGroup}{/link}{/if}">
-       <div class="tabMenuContainer">
+       <div class="section tabMenuContainer">
                <nav class="tabMenu">
                        <ul>
                                <li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.global.form.data{/lang}</a></li>
                        </ul>
                </nav>
                
-               <div id="general" class="container containerPadding tabMenuContent">
-                       <fieldset>
-                               <legend>{lang}wcf.global.form.data{/lang}</legend>
-                               
+               <div id="general" class="tabMenuContent">
+                       <div class="section">
                                <dl{if $errorField == 'groupName'} class="formError"{/if}>
                                        <dt><label for="groupName">{lang}wcf.global.title{/lang}</label></dt>
                                        <dd>
                                </dl>
                                
                                {event name='dataFields'}
-                       </fieldset>
+                       </div>
                        
-                       {event name='generalFieldsets'}
+                       {event name='generalSections'}
                </div>
                
-               <div id="connect" class="container containerPadding tabMenuContent">
-                       <fieldset>
-                               <legend>{lang}wcf.acp.label.group.category.connect{/lang}</legend>
-                               
+               <div id="connect" class="tabMenuContent">
+                       <div class="section">
                                {foreach from=$labelObjectTypeContainers item=container}
                                        {if $container->isBooleanOption()}
                                                <!-- TODO: Implement boolean option mode -->
                                                <dl>
                                                        <dt>{lang}wcf.acp.label.container.{$container->getObjectTypeName()}{/lang}</dt>
                                                        <dd>
-                                                               <ul class="container structuredList">
+                                                               <ul class="structuredList">
                                                                        {foreach from=$container item=objectType}
                                                                                <li class="{if $objectType->isCategory()} category{/if}"{if $objectType->getDepth()} style="padding-left: {21 * $objectType->getDepth()}px"{/if} data-depth="{@$objectType->getDepth()}">
                                                                                        <span>{$objectType->getLabel()}</span>
                                                </dl>
                                        {/if}
                                {/foreach}
-                       </fieldset>
+                       </div>
                        
-                       {event name='connectFieldsets'}
+                       {event name='connectSections'}
                </div>
        </div>
        
index 11e13adfe96ec78c8c82f482ed781c51576f47ab..d3e7e4042741227dd4f9734f03ba340fe8c2b982 100644 (file)
@@ -20,8 +20,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.label.group.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.label.group.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div id="labelGroupTableContainer" class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.label.group.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div id="labelGroupTableContainer" class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 99ec476251732e31babb182275c7eef8a8c00dca..06177ef9a0631785d38d2e2f9e34bd34595a4107 100644 (file)
@@ -20,8 +20,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.label.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.label.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div id="labelTableContainer" class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.label.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div id="labelTableContainer" class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index a5a8015c4c652e0b49572ad4bab99e3aaa37e5c4..4ffa6b46ebd3bde374dfda54f212a9ff61993236 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle="wcf.acp.language.$action"}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.language.{@$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.language.{@$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'edit'}{link controller='LanguageEdit' id=$languageID}{/link}{else}{link controller='LanguageAdd'}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'languageName'} class="formError"{/if}>
-                               <dt><label for="languageName">{lang}wcf.global.name{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="languageName" name="languageName" value="{$languageName}" class="long" required="required" />
-                                       {if $errorField == 'languageName'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.language.add.languageName.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.language.name.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'languageCode'} class="formError"{/if}>
-                               <dt><label for="languageCode">{lang}wcf.acp.language.code{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="languageCode" name="languageCode" value="{$languageCode}" class="medium" required="required" />
-                                       {if $errorField == 'languageCode'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.language.add.languageCode.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.language.code.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'countryCode'} class="formError"{/if}>
-                               <dt><label for="countryCode">{lang}wcf.acp.language.countryCode{/lang}</label></dt>
+       <section class="section">
+               <dl{if $errorField == 'languageName'} class="formError"{/if}>
+                       <dt><label for="languageName">{lang}wcf.global.name{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="languageName" name="languageName" value="{$languageName}" class="long" required="required" />
+                               {if $errorField == 'languageName'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.language.add.languageName.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.language.name.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'languageCode'} class="formError"{/if}>
+                       <dt><label for="languageCode">{lang}wcf.acp.language.code{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="languageCode" name="languageCode" value="{$languageCode}" class="medium" required="required" />
+                               {if $errorField == 'languageCode'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.language.add.languageCode.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.language.code.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'countryCode'} class="formError"{/if}>
+                       <dt><label for="countryCode">{lang}wcf.acp.language.countryCode{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="countryCode" name="countryCode" value="{$countryCode}" class="medium" required="required" />
+                               {if $errorField == 'countryCode'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.language.add.countryCode.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.language.countryCode.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {if $action == 'add'}
+                       <dl{if $errorField == 'sourceLanguageID'} class="formError"{/if}>
+                               <dt><label for="sourceLanguageID">{lang}wcf.acp.language.add.source{/lang}</label></dt>
                                <dd>
-                                       <input type="text" id="countryCode" name="countryCode" value="{$countryCode}" class="medium" required="required" />
-                                       {if $errorField == 'countryCode'}
+                                       <select id="sourceLanguageID" name="sourceLanguageID">
+                                               {foreach from=$languages item=language}
+                                                       <option value="{@$language->languageID}"{if $language->languageID == $sourceLanguageID} selected="selected"{/if}>{$language->languageName} ({$language->languageCode})</option>
+                                               {/foreach}
+                                       </select>
+                                       {if $errorField == 'sourceLanguageID'}
                                                <small class="innerError">
                                                        {if $errorType == 'empty'}
                                                                {lang}wcf.global.form.error.empty{/lang}
                                                        {else}
-                                                               {lang}wcf.acp.language.add.countryCode.error.{@$errorType}{/lang}
+                                                               {lang}wcf.acp.language.add.source.error.{@$errorType}{/lang}
                                                        {/if}
                                                </small>
                                        {/if}
-                                       <small>{lang}wcf.acp.language.countryCode.description{/lang}</small>
+                                       <small>{lang}wcf.acp.language.add.source.description{/lang}</small>
                                </dd>
                        </dl>
-                       
-                       {if $action == 'add'}
-                               <dl{if $errorField == 'sourceLanguageID'} class="formError"{/if}>
-                                       <dt><label for="sourceLanguageID">{lang}wcf.acp.language.add.source{/lang}</label></dt>
-                                       <dd>
-                                               <select id="sourceLanguageID" name="sourceLanguageID">
-                                                       {foreach from=$languages item=language}
-                                                               <option value="{@$language->languageID}"{if $language->languageID == $sourceLanguageID} selected="selected"{/if}>{$language->languageName} ({$language->languageCode})</option>
-                                                       {/foreach}
-                                               </select>
-                                               {if $errorField == 'sourceLanguageID'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.language.add.source.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                               <small>{lang}wcf.acp.language.add.source.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       {event name='fields'}
-               </fieldset>
+               {/if}
                
-               {event name='fieldsets'}
-       </div>
+               {event name='fields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 40c9b57e87f383fede3b702d89c5c9760a5e2e4f..1ad295723568d5d7cdb0af5e099ccc9114405f68 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.language.export'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.language.export{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.language.export{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageExport'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.language.export{/lang}</legend>
-                       
-                       <dl{if $errorField == 'languageID'} class="formError"{/if}>
-                               <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
-                               <dd>
-                                       {htmlOptions options=$languages selected=$languageID name='languageID' id='languageID'}
-                                       {if $errorField == 'languageID'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'noValidSelection'}
-                                                               {lang}wcf.global.form.error.noValidSelection{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.language.languageID.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="selectedPackages">{lang}wcf.acp.language.export.selectPackages{/lang}</label></dt>
-                               <dd>
-                                       <select id="selectedPackages" name="selectedPackages[]" multiple="multiple" size="20" class="long monospace" dir="ltr">
-                                               <option value="*"{if $selectAllPackages} selected="selected"{/if}>{lang}wcf.acp.language.export.allPackages{/lang}</option>
-                                               <option value="-">--------------------</option>
-                                               {foreach from=$packages item=package}
-                                                       {assign var=loop value=$packageNameLength-$package->packageNameLength}
-                                                       <option value="{@$package->packageID}"{if $selectedPackages[$package->packageID]|isset} selected="selected"{/if}>{lang}{$package->packageName}{/lang} {section name=i loop=$loop}&nbsp;{/section}&nbsp;&nbsp;{$package->package}</option>
-                                               {/foreach}
-                                       </select>
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label for="exportCustomValues"><input type="checkbox" name="exportCustomValues" id="exportCustomValues" value="1" /> {lang}wcf.acp.language.export.customValues{/lang}</label>
-                               </dd>
-                       </dl>
-                       
-                       {event name='exportFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'languageID'} class="formError"{/if}>
+                       <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
+                       <dd>
+                               {htmlOptions options=$languages selected=$languageID name='languageID' id='languageID'}
+                               {if $errorField == 'languageID'}
+                                       <small class="innerError">
+                                               {if $errorType == 'noValidSelection'}
+                                                       {lang}wcf.global.form.error.noValidSelection{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.language.languageID.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl>
+                       <dt><label for="selectedPackages">{lang}wcf.acp.language.export.selectPackages{/lang}</label></dt>
+                       <dd>
+                               <select id="selectedPackages" name="selectedPackages[]" multiple="multiple" size="20" class="long monospace" dir="ltr">
+                                       <option value="*"{if $selectAllPackages} selected="selected"{/if}>{lang}wcf.acp.language.export.allPackages{/lang}</option>
+                                       <option value="-">--------------------</option>
+                                       {foreach from=$packages item=package}
+                                               {assign var=loop value=$packageNameLength-$package->packageNameLength}
+                                               <option value="{@$package->packageID}"{if $selectedPackages[$package->packageID]|isset} selected="selected"{/if}>{lang}{$package->packageName}{/lang} {section name=i loop=$loop}&nbsp;{/section}&nbsp;&nbsp;{$package->package}</option>
+                                       {/foreach}
+                               </select>
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label for="exportCustomValues"><input type="checkbox" name="exportCustomValues" id="exportCustomValues" value="1" /> {lang}wcf.acp.language.export.customValues{/lang}</label>
+                       </dd>
+               </dl>
+               
+               {event name='exportFields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
                {@SECURITY_TOKEN_INPUT_TAG}
index ea91f2841ba9059ebe4631d43b4f051cccad93ed..06751fed8ce2fac93e8d91475198cccbe67c929e 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.language.import'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.language.import{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.language.import{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageImport'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'languageFile'} class="formError"{/if}>
-                               <dt><label for="languageFile">{lang}wcf.acp.language.import.source.file{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="languageFile" name="languageFile" value="{$languageFile}" class="long" />
-                                       {if $errorField == 'languageFile'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.language.import.error{/lang} {$errorType}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.language.import.source.file.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'languageUpload'} class="formError"{/if}>
-                               <dt><label for="languageUpload">{lang}wcf.acp.language.import.source.upload{/lang}</label></dt>
-                               <dd>
-                                       <input type="file" id="languageUpload" name="languageUpload" />
-                                       {if $errorField == 'languageUpload'}
-                                               <small class="innerError">
+       <div class="section">
+               <dl{if $errorField == 'languageFile'} class="formError"{/if}>
+                       <dt><label for="languageFile">{lang}wcf.acp.language.import.source.file{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="languageFile" name="languageFile" value="{$languageFile}" class="long" />
+                               {if $errorField == 'languageFile'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
                                                        {lang}wcf.acp.language.import.error{/lang} {$errorType}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       {event name='fields'}
-               </fieldset>
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.language.import.source.file.description{/lang}</small>
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl{if $errorField == 'languageUpload'} class="formError"{/if}>
+                       <dt><label for="languageUpload">{lang}wcf.acp.language.import.source.upload{/lang}</label></dt>
+                       <dd>
+                               <input type="file" id="languageUpload" name="languageUpload" />
+                               {if $errorField == 'languageUpload'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.language.import.error{/lang} {$errorType}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {event name='fields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index 0e22bd228616db816add116126661afd71f7c511..5505ea992b73136386581ae87263062181b785a2 100644 (file)
@@ -1,27 +1,30 @@
-<fieldset>
-       <legend><label for="overlayLanguageItemValue">{lang}wcf.acp.language.item.value{/lang}</label></legend>
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.acp.language.item.value{/lang}</h2>
        
        <dl class="wide">
+               <dt></dt>
                <dd>
                        <textarea rows="5" cols="60" name="languageItemValue" id="overlayLanguageItemValue"{if $item->languageItemOriginIsSystem} readonly="readonly"{/if}>{$item->languageItemValue}</textarea>
                </dd>
        </dl>
-</fieldset>
+</section>
 
 {if $item->languageItemOriginIsSystem}
-       <fieldset>
-               <legend><label for="overlayLanguageCustomItemValue">{lang}wcf.acp.language.item.customValue{/lang}</label></legend>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.language.item.customValue{/lang}</h2>
                
                <dl class="wide">
+                       <dt></dt>
                        <dd>
                                <textarea rows="5" cols="60" name="languageCustomItemValue" id="overlayLanguageCustomItemValue">{$item->languageCustomItemValue}</textarea>
                        </dd>
                </dl>
                
                <dl class="wide">
+                       <dt></dt>
                        <dd><label><input type="checkbox" name="languageUseCustomValue" id="overlayLanguageUseCustomValue" value="1" {if $item->languageUseCustomValue}checked="checked" {/if}/> {lang}wcf.acp.language.item.useCustomValue{/lang}</label></dd>
                </dl>
-       </fieldset>
+       </section>
 {/if}
 
 <input type="hidden" name="languageItemID" id="overlayLanguageItemID" value="{@$item->languageItemID}" />
index 0a3323224ebcfab4ab98a091cae492559d4ddc74..f0cd8c0c0f1b165ba83e879bfe16b80381c25a44 100644 (file)
@@ -9,62 +9,60 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.language.item.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.language.item.list{/lang}</h1>
 </header>
 
 {include file='formError'}
 
 <form method="post" action="{link controller='LanguageItemList'}{/link}" id="languageItemSearchForm">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.filter{/lang}</legend>
-                       
-                       <dl>
-                               <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
-                               <dd>
-                                       <select name="id" id="languageID">
-                                               {foreach from=$availableLanguages item=availableLanguage}
-                                                       <option value="{@$availableLanguage->languageID}"{if $availableLanguage->languageID == $languageID} selected="selected"{/if}>{$availableLanguage->languageName} ({$availableLanguage->languageCode})</option>
-                                               {/foreach}
-                                       </select>
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="languageCategoryID">{lang}wcf.acp.language.category{/lang}</label></dt>
-                               <dd>
-                                       <select name="languageCategoryID" id="languageCategoryID">
-                                               <option value="0">{lang}wcf.global.noSelection{/lang}</option>
-                                               {foreach from=$availableLanguageCategories item=availableLanguageCategory}
-                                                       <option value="{@$availableLanguageCategory->languageCategoryID}"{if $availableLanguageCategory->languageCategoryID == $languageCategoryID} selected="selected"{/if}>{$availableLanguageCategory->languageCategory}</option>
-                                               {/foreach}
-                                       </select>
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="languageItem">{lang}wcf.global.name{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="languageItem" name="languageItem" value="{$languageItem}" class="long" />
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="languageItemValue">{lang}wcf.acp.language.item.value{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="languageItemValue" name="languageItemValue" value="{$languageItemValue}" class="long" />
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" name="hasCustomValue" value="1" {if $hasCustomValue == 1}checked="checked" {/if}/> {lang}wcf.acp.language.item.customValues{/lang}</label>
-                               </dd>
-                       </dl>
-               </fieldset>
-       </div>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.global.filter{/lang}</h2>
+               
+               <dl>
+                       <dt><label for="languageID">{lang}wcf.user.language{/lang}</label></dt>
+                       <dd>
+                               <select name="id" id="languageID">
+                                       {foreach from=$availableLanguages item=availableLanguage}
+                                               <option value="{@$availableLanguage->languageID}"{if $availableLanguage->languageID == $languageID} selected="selected"{/if}>{$availableLanguage->languageName} ({$availableLanguage->languageCode})</option>
+                                       {/foreach}
+                               </select>
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt><label for="languageCategoryID">{lang}wcf.acp.language.category{/lang}</label></dt>
+                       <dd>
+                               <select name="languageCategoryID" id="languageCategoryID">
+                                       <option value="0">{lang}wcf.global.noSelection{/lang}</option>
+                                       {foreach from=$availableLanguageCategories item=availableLanguageCategory}
+                                               <option value="{@$availableLanguageCategory->languageCategoryID}"{if $availableLanguageCategory->languageCategoryID == $languageCategoryID} selected="selected"{/if}>{$availableLanguageCategory->languageCategory}</option>
+                                       {/foreach}
+                               </select>
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt><label for="languageItem">{lang}wcf.global.name{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="languageItem" name="languageItem" value="{$languageItem}" class="long" />
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt><label for="languageItemValue">{lang}wcf.acp.language.item.value{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="languageItemValue" name="languageItemValue" value="{$languageItemValue}" class="long" />
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" name="hasCustomValue" value="1" {if $hasCustomValue == 1}checked="checked" {/if}/> {lang}wcf.acp.language.item.customValues{/lang}</label>
+                       </dd>
+               </dl>
+       </section>
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
@@ -85,7 +83,7 @@
 </div>
 
 {if $objects|count}
-       <div class="container marginTop">
+       <div class="section sectionContainerList">
                <ol class="containerList">
                        {foreach from=$objects item=item}
                                <li>
@@ -95,7 +93,7 @@
                                                                <h3><a class="jsLanguageItem" data-language-item-id="{@$item->languageItemID}">{$item->languageItem}</a>{if $item->languageCustomItemValue !== null} <span class="icon icon16 fa-bookmark jsTooltip" title="{lang}wcf.acp.language.item.hasCustomValue{/lang}"></span>{/if}</h3>
                                                        </div>
                                                        
-                                                       <p>{if $item->languageUseCustomValue}{$item->languageCustomItemValue|truncate:255}{else}{$item->languageItemValue|truncate:255}{/if}</p>
+                                                       <p class="containerContent">{if $item->languageUseCustomValue}{$item->languageCustomItemValue|truncate:255}{else}{$item->languageItemValue|truncate:255}{/if}</p>
                                                </div>
                                        </div>
                                </li>
index 01ba805e75140971274dc175c4055c0a45a05ae1..06c9f9994ec8473f0476834f3f614914212d6d87 100644 (file)
@@ -17,8 +17,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.language.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.language.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div id="userTableContainer" class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.language.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div id="userTableContainer" class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 2c6d2c6bdebecc575b513e724e842a87d6f042a0..c4e448ae68c99cefeef182e578b563e7c619758c 100644 (file)
@@ -10,8 +10,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.language.multilingualism{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.language.multilingualism{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageMultilingualism'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend><label><input type="checkbox" id="enable" name="enable" value="1" {if $enable}checked="checked" {/if}/> {lang}wcf.acp.language.multilingualism.enable{/lang}</label></legend>
-                       <small>{lang}wcf.acp.language.multilingualism.enable.description{/lang}</small>
-                       
-                       <dl id="languageIDs" class="marginTop{if $errorField == 'languageIDs'} formError{/if}">
-                               <dt><label for="languageIDs">{lang}wcf.acp.language.multilingualism.languages{/lang}</label></dt>
-                               <dd class="floated">
-                                       {foreach from=$languages item='language'}
-                                               <label><input type="checkbox" name="languageIDs[]" value="{@$language->languageID}"{if $language->languageID == $defaultLanguageID} checked="checked" disabled="disabled"{elseif $language->languageID|in_array:$languageIDs} checked="checked"{/if} /> {$language}</label>
-                                       {/foreach}
-                                       
-                                       {if $errorField == 'languageIDs'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.language.multilingualism.languages.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       {event name='enableFields'}
-               </fieldset>
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle"><label><input type="checkbox" id="enable" name="enable" value="1" {if $enable}checked="checked" {/if}/> {lang}wcf.acp.language.multilingualism.enable{/lang}</label></h2>
+                       <small class="sectionDescription">{lang}wcf.acp.language.multilingualism.enable.description{/lang}</small>
+               </header>
                
-               {event name='fieldsets'}
-       </div>
+               <dl id="languageIDs"{if $errorField == 'languageIDs'} class="formError"{/if}>
+                       <dt><label for="languageIDs">{lang}wcf.acp.language.multilingualism.languages{/lang}</label></dt>
+                       <dd class="floated">
+                               {foreach from=$languages item='language'}
+                                       <label><input type="checkbox" name="languageIDs[]" value="{@$language->languageID}"{if $language->languageID == $defaultLanguageID} checked="checked" disabled="disabled"{elseif $language->languageID|in_array:$languageIDs} checked="checked"{/if} /> {$language}</label>
+                               {/foreach}
+                               
+                               {if $errorField == 'languageIDs'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.language.multilingualism.languages.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {event name='enableFields'}
+       </section>
        
+       {event name='sections'}
+               
        <div class="formSubmit">
                <input type="submit" accesskey="s" value="{lang}wcf.global.button.submit{/lang}" />
                {@SECURITY_TOKEN_INPUT_TAG}
index f54e5651f5b3eaba21133b041ffbc337c551defe..a6ea7722145e8a044f56c6ecb7c5978b4dd835ce 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.languageServer.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.languageServer.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.languageServer.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='LanguageServerAdd'}{/link}{else}{link controller='LanguageServerEdit' id=$languageServerID}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.languageServer.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'server'} class="formError"{/if}>
-                               <dt><label for="server">{lang}wcf.acp.languageServer.server{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" name="server" id="server" value="{$server}" autofocus="autofocus" class="long" />
-                                       {if $errorField == 'server'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                                       {if $errorType == 'notValid'}{lang}wcf.acp.languageServer.server.error.notValid{/lang}{/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.languageServer.server.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.languageServer.data{/lang}</h2>
                
-               {event name='fieldsets'}
-       </div>
+               <dl{if $errorField == 'server'} class="formError"{/if}>
+                       <dt><label for="server">{lang}wcf.acp.languageServer.server{/lang}</label></dt>
+                       <dd>
+                               <input type="text" name="server" id="server" value="{$server}" autofocus="autofocus" class="long" />
+                               {if $errorField == 'server'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                               {if $errorType == 'notValid'}{lang}wcf.acp.languageServer.server.error.notValid{/lang}{/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.languageServer.server.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 834151169923d050103a78ac342545a8d2f7a49b..6f838b54fe1957e254ebeefa83f3540cd1777218 100644 (file)
@@ -9,8 +9,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.languageServer.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.languageServer.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 {if !$languageServers|count}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>
 {else}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.languageServer.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
@@ -46,7 +42,7 @@
                                {foreach from=$languageServers item=languageServer}
                                        <tr class="jsLanguageServerRow">
                                                <td class="columnIcon">
-                                                       <span class="icon icon16 icon-check{if $languageServer->isDisabled}-empty{/if} jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if !$languageServer->isDisabled}disable{else}enable{/if}{/lang}" data-object-id="{@$languageServer->languageServerID}"></span>
+                                                       <span class="icon icon16 fa-{if !$languageServer->isDisabled}check-{/if}square-o jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if !$languageServer->isDisabled}disable{else}enable{/if}{/lang}" data-object-id="{@$languageServer->languageServerID}"></span>
                                                        <a href="{link controller='LanguageServerEdit' id=$languageServer->languageServerID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
                                                        
                                                        <span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$languageServer->languageServerID}" data-confirm-message="{lang}wcf.acp.languageServer.delete.sure{/lang}"></span>
index 3c3ddcfccfc122e1ee720da37a8d0a3d7ace6437..dd7340cd1bbf8b7692d81f6ea5ae36474378f770 100644 (file)
@@ -8,40 +8,36 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.masterPassword.enter{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.masterPassword.enter{/lang}</h1>
 </header>
 
 {include file='formError'}
 
 <form method="post" action="{link controller='MasterPassword'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.masterPassword.enter{/lang}</legend>
-                       
-                       <dl{if $errorField == 'masterPassword'} class="formError"{/if}>
-                               <dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
-                               <dd>
-                                       <input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
-                                       {if $errorField == 'masterPassword'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.masterPassword.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.masterPassword.enter.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='enterFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'masterPassword'} class="formError"{/if}>
+                       <dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
+                       <dd>
+                               <input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
+                               {if $errorField == 'masterPassword'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.masterPassword.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.masterPassword.enter.description{/lang}</small>
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               {event name='enterFields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="url" value="{$url}" />
index ebbc138353252c4be24f6f1d4024890e129d573b..2b1b4bcd0c7a9ac771db54ab06be90761ccdbf5c 100644 (file)
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.masterPassword.init{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.masterPassword.init{/lang}</h1>
 </header>
 
 {include file='formError'}
 
 <form method="post" action="{link controller='MasterPasswordInit'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.masterPassword.init{/lang}</legend>
-                       
-                       <dl{if $errorField == 'masterPassword'} class="formError"{/if}>
-                               <dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
-                               <dd>
-                                       <input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
-                                       {if $errorField == 'masterPassword'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.masterPassword.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.masterPassword.init.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'confirmMasterPassword'} class="formError"{/if}>
-                               <dt><label for="confirmMasterPassword">{lang}wcf.acp.masterPassword.confirm{/lang}</label></dt>
-                               <dd>
-                                       <input type="password" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" class="medium" />
-                                       {if $errorField == 'confirmMasterPassword'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.masterPassword.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="exampleMasterPassword">{lang}wcf.acp.masterPassword.example{/lang}</label></dt>
-                               <dd>
-                                       <p><a class="jsTooltip" id="setPassword" title="{lang}wcf.acp.masterPassword.example.set{/lang}">{@$exampleMasterPassword}</a></p>
-                                       <input type="hidden" id="exampleMasterPassword" name="exampleMasterPassword" value="{@$exampleMasterPassword}" />
-                               </dd>
-                       </dl>
-                       
-                       {event name='initFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'masterPassword'} class="formError"{/if}>
+                       <dt><label for="masterPassword">{lang}wcf.acp.masterPassword{/lang}</label></dt>
+                       <dd>
+                               <input type="password" id="masterPassword" name="masterPassword" value="{$masterPassword}" class="medium" />
+                               {if $errorField == 'masterPassword'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.masterPassword.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.masterPassword.init.description{/lang}</small>
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl{if $errorField == 'confirmMasterPassword'} class="formError"{/if}>
+                       <dt><label for="confirmMasterPassword">{lang}wcf.acp.masterPassword.confirm{/lang}</label></dt>
+                       <dd>
+                               <input type="password" id="confirmMasterPassword" name="confirmMasterPassword" value="{$confirmMasterPassword}" class="medium" />
+                               {if $errorField == 'confirmMasterPassword'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.masterPassword.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt><label for="exampleMasterPassword">{lang}wcf.acp.masterPassword.example{/lang}</label></dt>
+                       <dd>
+                               <p><a class="jsTooltip" id="setPassword" title="{lang}wcf.acp.masterPassword.example.set{/lang}">{@$exampleMasterPassword}</a></p>
+                               <input type="hidden" id="exampleMasterPassword" name="exampleMasterPassword" value="{@$exampleMasterPassword}" />
+                       </dd>
+               </dl>
+               
+               {event name='initFields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                <input type="hidden" name="url" value="{$url}" />
index fc28a3c9d289f37688e0791ac14f0b44f1c6c314..6604ce8eb3081c7190aef165e0dffb776362c1ed 100644 (file)
@@ -15,8 +15,8 @@
        </script>
 {/if}
 
-<header class="boxHeadline">
-       <h1 id="mediaActionTitle">{lang}wcf.acp.media.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 id="mediaActionTitle" class="contentTitle">{lang}wcf.acp.media.{$action}{/lang}</h1>
 </header>
 
 {if $action == 'edit'}
@@ -38,8 +38,8 @@
 </div>
 
 {if $action == 'add'}
-       <section class="marginTop">
-               <h1>{lang}wcf.media.file{/lang}</h1>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.media.file{/lang}</h2>
                
                <dl>
                        <dt></dt>
@@ -51,8 +51,8 @@
        </section>
 {else}
        <form method="post" action="{link controller='MediaEdit' object=$media}{/link}">
-               <section class="marginTop">
-                       <h1>{lang}wcf.global.form.data{/lang}</h1>
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.global.form.data{/lang}</h2>
                        
                        <dl>
                                <dt>{lang}wcf.media.file{/lang}</dt>
index 65172e57e88e47a7835e54d575dcfa460969cbe6..76adbad8600eee418d056da1449cfc10db683d35 100644 (file)
@@ -1,4 +1,4 @@
-<div id="mediaThumbnail" class="framed"></div>
+<div id="mediaThumbnail"></div>
 
 <div class="box48">
        <span id="mediaFileIcon" class="icon icon48 fa-file-o"></span>
@@ -18,8 +18,8 @@
        </dl>
 </div>
 
-<fieldset class="marginTop">
-       <legend>{lang}wcf.global.form.data{/lang}</legend>
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.global.form.data{/lang}</h2>
        
        <dl>
                <dt></dt>
@@ -34,7 +34,7 @@
        {include file='languageChooser' label='wcf.media.languageID'}
        
        <dl>
-               <dt>{lang}wcf.global.title{/lang}</dt>
+               <dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
                <dd>
                        <input type="text" id="title" name="title" class="long" />
                </dd>
@@ -42,7 +42,7 @@
        {include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=true}
        
        <dl>
-               <dt>{lang}wcf.media.caption{/lang}</dt>
+               <dt><label for="caption">{lang}wcf.media.caption{/lang}</label></dt>
                <dd>
                        <textarea id="caption" name="caption" cols="40" rows="3"></textarea>
                </dd>
@@ -50,7 +50,7 @@
        {include file='multipleLanguageInputJavascript' elementIdentifier='caption' forceSelection=true}
        
        <dl>
-               <dt>{lang}wcf.media.altText{/lang}</dt>
+               <dt><label for="altText">{lang}wcf.media.altText{/lang}</label></dt>
                <dd>
                        <input type="text" id="altText" name="altText" class="long" />
                </dd>
@@ -58,7 +58,7 @@
        {include file='multipleLanguageInputJavascript' elementIdentifier='altText' forceSelection=true}
        
        {event name='dataFields'}
-</fieldset>
+</section>
 
 <div class="formSubmit">
        <button data-type="submit" class="buttonPrimary">{lang}wcf.global.button.submit{/lang}</button>
index b50a49d87c79c93cd7e25f91a4a4da948e017175..bc653aa38ac71d0eb737ef24b4f3bcf75953308f 100644 (file)
@@ -43,9 +43,9 @@
        });
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.media.list{/lang}</h1>
-       <p>{lang}wcf.acp.media.stats{/lang}</p>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.media.list{/lang}</h1>
+       <p class="contentHeaderDescription">{lang}wcf.acp.media.stats{/lang}</p>
 </header>
 
 {include file='formError'}
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.media.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table jsClipboardContainer" data-type="com.woltlab.wcf.media">
                        <thead>
                                <tr>
index c2cf8c2bf34d3512611bc6914785a283725c6d02..52041ef4c355963d61b484bdc01257de54495d85 100644 (file)
 </div>
 
 {if $__wcf->session->getPermission('admin.content.cms.canManageMedia')}
-       <div id="mediaManagerMediaUploadButton" class="marginTop"></div>
+       <div id="mediaManagerMediaUploadButton"></div>
 {/if}
 
-<div class="jsClipboardContainer marginTop" data-type="com.woltlab.wcf.media">
+<div class="jsClipboardContainer" data-type="com.woltlab.wcf.media">
        <input type="checkbox" class="jsClipboardMarkAll" style="display: none;" />
        <ul id="mediaManagerMediaList">
                {include file='mediaListItems'}
index 8459533de3b9d1b183346f1966b3f23587fe67e8..ed1fbf900bc2a15dad6b127adb9115025811d612 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.menu.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.menu.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.menu.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
@@ -21,9 +21,7 @@
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='MenuAdd'}{/link}{else}{link controller='MenuEdit' id=$menuID}{/link}{/if}">
-       <section class="marginTop">
-               <h1>{lang}wcf.global.form.data{/lang}</h1>
-                       
+       <div class="section">
                <dl{if $errorField == 'title'} class="formError"{/if}>
                        <dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
                        <dd>
                {/if}
                
                {event name='dataFields'}
-       </section>
+       </div>
        
        {event name='sections'}
        
index 28c298511849d90beddf5a9c56781aa46d8c9e06..977a4d25bded5fe86bdd739ede20ab35884b0355 100644 (file)
@@ -24,8 +24,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.menu.item.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.menu.item.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
@@ -45,9 +45,7 @@
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='MenuItemAdd'}{/link}{else}{link controller='MenuItemEdit' id=$itemID}{/link}{/if}">
-       <section class="marginTop">
-               <h1>{lang}wcf.global.form.data{/lang}</h1>
-                       
+       <div class="class">
                <dl{if $errorField == 'parentItemID'} class="formError"{/if}>
                        <dt><label for="parentItemID">{lang}wcf.acp.menu.item.parentItem{/lang}</label></dt>
                        <dd>
@@ -89,7 +87,7 @@
                </dl>
                
                {event name='dataFields'}
-       </section>
+       </div>
        
        <section>
                <h1>{lang}wcf.acp.menu.item.link{/lang}</h1>
index 4f4f2adaf133f58f8843246a45a62a8f57304082..36470e5b42573258ea499d5e2c1bf6610b81c87e 100644 (file)
@@ -10,8 +10,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.menu.item.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.menu.item.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -25,7 +25,7 @@
 </div>
 
 {hascontent}
-       <div id="menuItemList" class="container containerPadding sortableListContainer marginTop">
+       <div id="menuItemList" class="section sortableListContainer">
                <ol class="sortableList" data-object-id="0">
                        {content}
                                {foreach from=$menuItemNodeList item=menuItemNode}
index b273eb5b89ee3c8210014f63bb0033c41d0ff574..09800b1a472d6428a2e0eabe7059c6b33cad70ec 100644 (file)
@@ -8,8 +8,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.menu.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.menu.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.menu.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 5cbfe15c94d2996b811b9fd1030255fd0eab0e4c..33e231e5a4b308cef917d4fefa5ccc68e8d11133 100644 (file)
@@ -24,8 +24,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.notice.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.notice.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form id="formContainer" method="post" action="{if $action == 'add'}{link controller='NoticeAdd'}{/link}{else}{link controller='NoticeEdit' object=$notice}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'noticeName'} class="formError"{/if}>
-                               <dt><label for="noticeName">{lang}wcf.global.name{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="noticeName" name="noticeName" value="{$noticeName}" required="required" autofocus="autofocus" class="long" />
-                                       {if $errorField == 'noticeName'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.notice.noticeName.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'notice'} class="formError"{/if}>
-                               <dt><label for="notice">{lang}wcf.acp.notice.notice{/lang}</label></dt>
-                               <dd>
-                                       <textarea id="notice" name="notice" cols="40" rows="10">{$i18nPlainValues['notice']}</textarea>
-                                       {if $errorField == 'notice'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {elseif $errorType == 'multilingual'}
-                                                               {lang}wcf.global.form.error.multilingual{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.notice.notice.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       {include file='multipleLanguageInputJavascript' elementIdentifier='notice' forceSelection=false}
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" id="noticeUseHtml" name="noticeUseHtml" value="1"{if $noticeUseHtml} checked="checked"{/if} /> {lang}wcf.acp.notice.noticeUseHtml{/lang}</label>
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="showOrder">{lang}wcf.acp.notice.showOrder{/lang}</label></dt>
-                               <dd>
-                                       <input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0" />
-                                       <small>{lang}wcf.acp.notice.showOrder.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'noticeName'} class="formError"{/if}>
+                       <dt><label for="noticeName">{lang}wcf.global.name{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="noticeName" name="noticeName" value="{$noticeName}" required="required" autofocus="autofocus" class="long" />
+                               {if $errorField == 'noticeName'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.notice.noticeName.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               <fieldset>
-                       <legend>{lang}wcf.global.settings{/lang}</legend>
-                       
-                       <dl>
-                               <dt><label for="cssClassName">{lang}wcf.acp.notice.cssClassName{/lang}</label></dt>
-                               <dd>
-                                       {foreach from=$availableCssClassNames item=className}
-                                               {if $className == 'custom'}
-                                                       <label><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if} /> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="medium" /></span></label>
+               <dl{if $errorField == 'notice'} class="formError"{/if}>
+                       <dt><label for="notice">{lang}wcf.acp.notice.notice{/lang}</label></dt>
+                       <dd>
+                               <textarea id="notice" name="notice" cols="40" rows="10">{$i18nPlainValues['notice']}</textarea>
+                               {if $errorField == 'notice'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {elseif $errorType == 'multilingual'}
+                                                       {lang}wcf.global.form.error.multilingual{/lang}
                                                {else}
-                                                       <label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if} /> <span>{lang}wcf.acp.notice.cssClassName.{$className}{/lang}</span></label>
+                                                       {lang}wcf.acp.notice.notice.error.{$errorType}{/lang}
                                                {/if}
-                                       {/foreach}
-                                       {if $errorField == 'cssClassName'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.notice.cssClassName.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               {include file='multipleLanguageInputJavascript' elementIdentifier='notice' forceSelection=false}
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" id="noticeUseHtml" name="noticeUseHtml" value="1"{if $noticeUseHtml} checked="checked"{/if} /> {lang}wcf.acp.notice.noticeUseHtml{/lang}</label>
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt><label for="showOrder">{lang}wcf.acp.notice.showOrder{/lang}</label></dt>
+                       <dd>
+                               <input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0" />
+                               <small>{lang}wcf.acp.notice.showOrder.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
+       </div>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.global.settings{/lang}</h2>
+               
+               <dl>
+                       <dt><label for="cssClassName">{lang}wcf.acp.notice.cssClassName{/lang}</label></dt>
+                       <dd>
+                               {foreach from=$availableCssClassNames item=className}
+                                       {if $className == 'custom'}
+                                               <label><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if} /> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="medium" /></span></label>
+                                       {else}
+                                               <label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if} /> <span>{lang}wcf.acp.notice.cssClassName.{$className}{/lang}</span></label>
                                        {/if}
-                                       <small>{lang}wcf.acp.notice.cssClassName.description{/lang}</small>
-                                       
-                                       <p class="info" id="cssClassNameExample">{lang}wcf.acp.notice.example{/lang}</p>
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.notice.isDisabled{/lang}</label>
-                               </dd>
-                       </dl>
-                       
+                               {/foreach}
+                               {if $errorField == 'cssClassName'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.notice.cssClassName.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.notice.cssClassName.description{/lang}</small>
+                               
+                               <p class="info" id="cssClassNameExample">{lang}wcf.acp.notice.example{/lang}</p>
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.notice.isDisabled{/lang}</label>
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" name="isDismissible" value="1"{if $isDismissible} checked="checked"{/if} /> {lang}wcf.acp.notice.isDismissible{/lang}</label>
+                               <small>{lang}wcf.acp.notice.isDismissible.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {if $action == 'edit' && $notice->isDismissible}
                        <dl>
                                <dt></dt>
                                <dd>
-                                       <label><input type="checkbox" name="isDismissible" value="1"{if $isDismissible} checked="checked"{/if} /> {lang}wcf.acp.notice.isDismissible{/lang}</label>
-                                       <small>{lang}wcf.acp.notice.isDismissible.description{/lang}</small>
+                                       <label><input type="checkbox" name="resetIsDismissed" value="1"{if $resetIsDismissed} checked="checked"{/if} /> {lang}wcf.acp.notice.resetIsDismissed{/lang}</label>
+                                       <small>{lang}wcf.acp.notice.resetIsDismissed.description{/lang}</small>
                                </dd>
                        </dl>
-                       
-                       {if $action == 'edit' && $notice->isDismissible}
-                               <dl>
-                                       <dt></dt>
-                                       <dd>
-                                               <label><input type="checkbox" name="resetIsDismissed" value="1"{if $resetIsDismissed} checked="checked"{/if} /> {lang}wcf.acp.notice.resetIsDismissed{/lang}</label>
-                                               <small>{lang}wcf.acp.notice.resetIsDismissed.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       {event name='settingsFields'}
-               </fieldset>
+               {/if}
                
-               {event name='fieldsets'}
-       </div>
+               {event name='settingsFields'}
+       </section>
        
-       <header class="boxHeadline boxSubHeadline">
-               <h2>{lang}wcf.acp.notice.conditions{/lang}</h2>
-               <small>{lang}wcf.acp.notice.conditions.description{/lang}</small>
-       </header>
+       {event name='sections'}
        
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.notice.conditions.page{/lang}</legend>
-                       <small>{lang}wcf.acp.notice.conditions.page.description{/lang}</small>
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.acp.notice.conditions{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.acp.notice.conditions.description{/lang}</small>
+               </header>
+               
+               <section class="section">
+                       <header class="sectionHeader">
+                               <h2 class="sectionTitle">{lang}wcf.acp.notice.conditions.page{/lang}</h2>
+                               <small class="sectionDescription">{lang}wcf.acp.notice.conditions.page.description{/lang}</small>
+                       </header>
                        
                        {foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.page'] item='pageConditionObjectType'}
                                {@$pageConditionObjectType->getProcessor()->getHtml()}
                        {/foreach}
-               </fieldset>
+               </section>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.notice.conditions.pointInTime{/lang}</legend>
-                       <small>{lang}wcf.acp.notice.conditions.pointInTime.description{/lang}</small>
+               <section class="section">
+                       <header class="sectionHeader">
+                               <h2 class="sectionTitle">{lang}wcf.acp.notice.conditions.pointInTime{/lang}</h2>
+                               <small class="sectionDescription">{lang}wcf.acp.notice.conditions.pointInTime.description{/lang}</small>
+                       </header>
                        
                        {foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.pointInTime'] item='pointInTimeConditionObjectType'}
                                {@$pointInTimeConditionObjectType->getProcessor()->getHtml()}
                        {/foreach}
-               </fieldset>
+               </section>
                
-               {event name='conditionTypeFieldsets'}
-       </div>
-       
-       <header class="boxHeadline boxSubHeadline">
-               <h2>{lang}wcf.acp.notice.conditions.user{/lang}</h2>
-               <small>{lang}wcf.acp.notice.conditions.user.description{/lang}</small>
-       </header>
+               {event name='conditionTypeSections'}
+       </section>
        
-       {include file='userConditions' groupedObjectTypes=$groupedConditionObjectTypes['com.woltlab.wcf.user']}
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.acp.notice.conditions.user{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.acp.notice.conditions.user.description{/lang}</small>
+               </header>
        
+               {include file='userConditions' groupedObjectTypes=$groupedConditionObjectTypes['com.woltlab.wcf.user']}
+       </section>      
+               
        {event name='conditionContainers'}
        
        <div class="formSubmit">
index b45c22a91d6efbd2a182d0911c6b90a2492640a5..ddb2bfb11ebb3ff04f27ce250b1a9056f0794f74 100644 (file)
@@ -10,8 +10,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.notice.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.notice.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -27,7 +27,7 @@
 </div>
 
 {if $objects|count}
-       <div class="container containerPadding sortableListContainer marginTop" id="noticeList">
+       <div class="section sortableListContainer" id="noticeList">
                <ol class="sortableList" data-object-id="0" start="{@($pageNo - 1) * $itemsPerPage + 1}">
                        {foreach from=$objects item='notice'}
                                <li class="sortableNode sortableNoNesting jsNotice" data-object-id="{@$notice->noticeID}">
index 74d411d8e36620ec197a5be785c8b02d447c81e3..7314de611766d4612b19e4591641eb04ce255a25 100644 (file)
@@ -3,7 +3,7 @@
 <script data-relocate="true">
        //<![CDATA[
        $(function() {
-               $('#notificationSettings > fieldset > dl > dd > label > input').each(function(index, value) {
+               $('#notificationSettings > section > dl > dd > label > input').each(function(index, value) {
                        var $input = $(value);
                        $input.on('click', function(event) {
                                var $input = $(event.currentTarget);
@@ -17,9 +17,9 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.notificationPresetSettings{/lang}</h1>
-       <p>{lang}wcf.acp.user.notificationPresetSettings.description{/lang}</p>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.notificationPresetSettings{/lang}</h1>
+       <p class="contentHeaderDescription">{lang}wcf.acp.user.notificationPresetSettings.description{/lang}</p>
 </header>
 
 {include file='formError'}
@@ -41,8 +41,8 @@
 </div>
 
 <form method="post" action="{link controller='NotificationPresetSettings'}{/link}">
-       <div class="container containerPadding marginTop" id="notificationSettings">
-               <fieldset>
+       <div id="notificationSettings">
+               <div class="section">
                        <dl>
                                <dt></dt>
                                <dd>
                                        <small>{lang}wcf.acp.user.notificationPresetSettings.applyChangesToExistingUsers.description{/lang}</small>     
                                </dd>
                        </dl>
-               </fieldset>
+               </div>
                
                {foreach from=$events key='eventCategory' item='eventList'}
-                       <fieldset>
-                               <legend>{lang}wcf.user.notification.{$eventCategory}{/lang}</legend>
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.user.notification.{$eventCategory}{/lang}</h2>
                                
                                <dl>
                                        {foreach from=$eventList item=event}
                                                </dd>
                                        {/foreach}
                                </dl>
-                       </fieldset>
+                       </section>
                {/foreach}
                
-               {event name='fieldsets'}
+               {event name='sections'}
        </div>
        
        <div class="formSubmit">
index d66f6a9c9d743339fa51f9ebee0b2ec94794befa..170a2460486d7156531061979fd88fe9cb0c7f5a 100644 (file)
@@ -24,9 +24,9 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.option.category.{$category->categoryName}{/lang}</h1>
-       {hascontent}<p>{content}{lang __optional=true}wcf.acp.option.category.{$category->categoryName}.description{/lang}{/content}</p>{/hascontent}
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.option.category.{$category->categoryName}{/lang}</h1>
+       {hascontent}<p class="contentHeaderDescription">{content}{lang __optional=true}wcf.acp.option.category.{$category->categoryName}.description{/lang}{/content}</p>{/hascontent}
 </header>
 
 {if $success|isset}
@@ -55,7 +55,7 @@
        <input style="display:none" type="text" name="fakeusernameremembered "/>
        <input style="display:none" type="password" name="fakepasswordremembered" />
        
-       <div class="tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
+       <div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
                <nav class="tabMenu">
                        <ul>
                                {foreach from=$optionTree item=categoryLevel1}
                </nav>
                
                {foreach from=$optionTree item=categoryLevel1}
-                       <div id="{@$categoryLevel1[object]->categoryName}" class="container containerPadding hidden tabMenuContent">
+                       <div id="{@$categoryLevel1[object]->categoryName}" class="hidden tabMenuContent">
                                {if $categoryLevel1[options]|count}
-                                       <fieldset>
-                                               <legend>{lang}wcf.acp.option.category.{$categoryLevel1[object]->categoryName}{/lang}</legend>
+                                       <section class="section">
+                                               <h2 class="sectionTitle">{lang}wcf.acp.option.category.{$categoryLevel1[object]->categoryName}{/lang}</h2>
+                                               
                                                {include file='optionFieldList' options=$categoryLevel1[options] langPrefix='wcf.acp.option.'}
-                                       </fieldset>
+                                       </section>
                                {/if}
                                
                                {if $categoryLevel1[categories]|count}
                                        {foreach from=$categoryLevel1[categories] item=categoryLevel2}
-                                               <fieldset>
-                                                       <legend>{lang}wcf.acp.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>
-                                                       {hascontent}<small>{content}{lang __optional=true}wcf.acp.option.category.{$categoryLevel2[object]->categoryName}.description{/lang}{/content}</small>{/hascontent}
+                                               <section class="section">
+                                                       <header class="sectionHeader">
+                                                               <h2 class="sectionTitle">{lang}wcf.acp.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</h2>
+                                                               {hascontent}<small class="sectionDescription">{content}{lang __optional=true}wcf.acp.option.category.{$categoryLevel2[object]->categoryName}.description{/lang}{/content}</small>{/hascontent}
+                                                       </header>
                                                        
                                                        {include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.acp.option.'}
-                                               </fieldset>
+                                               </section>
                                        {/foreach}
                                {/if}
                        </div>
index 9ac13b1a92fa3cb5d7e9fa2ba6064d92ae651bab..4e25b8c9918c5c2cf966f18748c442fb29f94956 100644 (file)
@@ -14,9 +14,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{$package->getName()}</h1>
-       <p>{$package->packageDescription|language}</p>
+<header class="contentHeader">
+       <h1 class="contentTitle">{$package->getName()}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -31,7 +30,7 @@
        {/hascontent}
 </div>
 
-<div class="tabMenuContainer">
+<div class="section tabMenuContainer">
        <nav class="tabMenu">
                <ul>
                        <li><a href="{@$__wcf->getAnchor('information')}">{lang}wcf.acp.package.information.title{/lang}</a></li>
                </ul>
        </nav>
        
-       <div id="information" class="container containerPadding hidden tabMenuContent">
-               <fieldset>
-                       <legend>{lang}wcf.acp.package.information.properties{/lang}</legend>
+       <div id="information" class="hidden tabMenuContent">
+               <div class="section">
+                       {if $package->packageDescription|language}
+                               <dl>
+                                       <dt>{lang}wcf.acp.package.description{/lang}</dt>
+                                       <dd>{$package->packageDescription|language}</dd>
+                               </dl>
+                       {/if}
                        
                        <dl>
                                <dt>{lang}wcf.acp.package.identifier{/lang}</dt>
                        </dl>
                        
                        {event name='propertyFields'}
-               </fieldset>
-               
-               {if $package->packageDescription|language}
-                       <fieldset>
-                               <legend>{lang}wcf.acp.package.description{/lang}</legend>
-                               
-                               <p>{$package->packageDescription|language}</p>
-                       </fieldset>
-               {/if}
+               </div>
                
                {event name='informationFieldsets'}
        </div>
        
        {if $package->getRequiredPackages()|count || $package->getDependentPackages()|count}
-               <div id="dependencies" class="container containerPadding tabMenuContainer tabMenuContent">
+               <div id="dependencies" class="tabMenuContainer tabMenuContent">
                        <nav class="menu">
                                <ul>
                                        {if $package->getRequiredPackages()|count}
index 14de2d5c5feda871856b9716f6effdd182b4f20d..09ca00b565bacd6ec81c1b72433a7abb307c2efa 100644 (file)
@@ -18,9 +18,9 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.package.{@$queue->action}.title{/lang}: {$archive->getLocalizedPackageInfo('packageName')}</h1>
-       <p>{$archive->getLocalizedPackageInfo('packageDescription')}</p>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.package.{@$queue->action}.title{/lang}: {$archive->getLocalizedPackageInfo('packageName')}</h1>
+       <p class="contentHeaderDescription">{$archive->getLocalizedPackageInfo('packageDescription')}</p>
 </header>
 
 {if !$validationPassed}
        <p class="info">{lang}wcf.acp.package.install.installingImportedStyle{/lang}</p>
 {/if}
 
-<div class="container containerPadding marginTop">
-       <fieldset>
-               <legend>{lang}wcf.acp.package.information.properties{/lang}</legend>
-               
-               <dl>
-                       <dt>{lang}wcf.acp.package.identifier{/lang}</dt>
-                       <dd>{$archive->getPackageInfo('name')}</dd>
-               </dl>
-               
-               <dl>
-                       <dt>{lang}wcf.acp.package.version{/lang}</dt>
-                       <dd>{$archive->getPackageInfo('version')}</dd>
-               </dl>
-               
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.acp.package.information.properties{/lang}</h2>
+       
+       <dl>
+               <dt>{lang}wcf.acp.package.identifier{/lang}</dt>
+               <dd>{$archive->getPackageInfo('name')}</dd>
+       </dl>
+       
+       <dl>
+               <dt>{lang}wcf.acp.package.version{/lang}</dt>
+               <dd>{$archive->getPackageInfo('version')}</dd>
+       </dl>
+       
+       <dl>
+               <dt>{lang}wcf.acp.package.packageDate{/lang}</dt>
+               <dd>{@$archive->getPackageInfo('date')|date}</dd>
+       </dl>
+       
+       {if $archive->getPackageInfo('packageURL') != ''}
                <dl>
-                       <dt>{lang}wcf.acp.package.packageDate{/lang}</dt>
-                       <dd>{@$archive->getPackageInfo('date')|date}</dd>
+                       <dt>{lang}wcf.acp.package.url{/lang}</dt>
+                       <dd><a href="{@$__wcf->getPath()}acp/dereferrer.php?url={$archive->getPackageInfo('packageURL')|rawurlencode}" class="externalURL">{$archive->getPackageInfo('packageURL')}</a></dd>
                </dl>
-               
-               {if $archive->getPackageInfo('packageURL') != ''}
-                       <dl>
-                               <dt>{lang}wcf.acp.package.url{/lang}</dt>
-                               <dd><a href="{@$__wcf->getPath()}acp/dereferrer.php?url={$archive->getPackageInfo('packageURL')|rawurlencode}" class="externalURL">{$archive->getPackageInfo('packageURL')}</a></dd>
-                       </dl>
-               {/if}
-               
-               <dl>
-                       <dt>{lang}wcf.acp.package.author{/lang}</dt>
-                       <dd>{if $archive->getAuthorInfo('authorURL')}<a href="{@$__wcf->getPath()}acp/dereferrer.php?url={$archive->getAuthorInfo('authorURL')|rawurlencode}" class="externalURL">{$archive->getAuthorInfo('author')}</a>{else}{$archive->getAuthorInfo('author')}{/if}</dd>
-               </dl>
-               
-               {event name='propertyFields'}
-       </fieldset>
-</div>
+       {/if}
+       
+       <dl>
+               <dt>{lang}wcf.acp.package.author{/lang}</dt>
+               <dd>{if $archive->getAuthorInfo('authorURL')}<a href="{@$__wcf->getPath()}acp/dereferrer.php?url={$archive->getAuthorInfo('authorURL')|rawurlencode}" class="externalURL">{$archive->getAuthorInfo('author')}</a>{else}{$archive->getAuthorInfo('author')}{/if}</dd>
+       </dl>
+       
+       {event name='propertyFields'}
+</section>
 
 {if !$validationPassed}
-       <div class="tabularBox tabularBoxTitle marginTop">
+       <div class="section tabularBox tabularBoxTitle">
                <header>
                        <h2>{lang}wcf.acp.package.validation{/lang}</h2>
                </header>
index 0358a18b097cc9a604889eddc7ce8a3a1c779187..ac92f20db741b72b0d41a6fe4bd9fbe62ab75f53 100644 (file)
@@ -11,8 +11,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.index.setup.title{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.index.setup.title{/lang}</h1>
 </header>
 
 <p>{lang}wcf.acp.index.setup.notice{/lang}</p>
index 8eb00a9427ff1aae063e06281ebb63984f00e453..0079df85d30208765561a92beb642360f7f6ee1f 100644 (file)
@@ -1,9 +1,9 @@
 <div id="packageInstallationDialogContainer">
-       <header class="box48 boxHeadline">
+       <header class="box48 contentHeader">
                <span class="icon icon48 fa-spinner jsPackageInstallationStatus"></span>
                
                <div>
-                       <h1>{lang}wcf.acp.package.{@$installationType}.title{/lang}</h1>
+                       <h1 class="contentTitle">{lang}wcf.acp.package.{@$installationType}.title{/lang}</h1>
                        <p id="packageInstallationAction">{lang}wcf.acp.package.{@$installationType}.step.prepare{/lang}</span></p>
                        <small><progress id="packageInstallationProgress" value="0" max="100">0%</progress> <span id="packageInstallationProgressLabel">0%</span></small>
                </div>
index a5552b2e813918d32489827bf194f6d4fa328fbb..ad6ae67c3ea66e7b7bb3e90591625d1220015948 100644 (file)
@@ -34,8 +34,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.package.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.package.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.package.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 58055794a19e8618364b96ca73471513dc832700..0f4e59f1148f7837af35b247eb1e1d5526e2d236 100644 (file)
@@ -1,5 +1,5 @@
 {hascontent}
-       <div class="tabularBox marginTop">
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 1d676871e1f5cdff50a32422bb25bbb671296001..da57694bd9b96a0b3582fb5db667beb6d8403c15 100644 (file)
@@ -20,8 +20,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}{@$pageTitle}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}{@$pageTitle}{/lang}</h1>
 </header>
 
 {if $errorField && $installingImportedStyle}
@@ -40,7 +40,7 @@
        </nav>
 </div>
 
-<div class="tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
+<div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
        <nav class="tabMenu">
                <ul>
                        <li><a href="{@$__wcf->getAnchor('packageSearch')}">{lang}wcf.acp.package.search{/lang}</a></li>
                </ul>
        </nav>
        
-       <div id="packageSearch" class="container containerPadding tabMenuContent">
-               <section>
-                       <h1>{lang}wcf.acp.package.search.conditions{/lang}</h1>
-                       
+       <div id="packageSearch" class="tabMenuContent">
+               <div class="section">
                        <dl>
                                <dt><label for="packageName">{lang}wcf.acp.package.search.packageName{/lang}</label></dt>
                                <dd><input type="text" id="packageName" value="" class="long" data-search-name="packageName" /></dd>
                                        <small>{lang}wcf.acp.package.search.package.description{/lang}</small>
                                </dd>
                        </dl>
-               </section>
+               </div>
                
                <div class="formSubmit">
                        <button class="jsButtonPackageSearch">{lang}wcf.global.button.submit{/lang}</button>
                </div>
                
-               <div id="packageSearchResultContainer" style="display: none;">
-                       <header class="boxHeadline boxSubHeadline">
-                               <h2>{lang}wcf.acp.package.search.resultList{/lang} <span class="badge">0</span></h2>
-                       </header>
+               <section class="section" id="packageSearchResultContainer" style="display: none;">
+                       <h2 class="sectionTitle">{lang}wcf.acp.package.search.resultList{/lang} <span class="badge">0</span></h2>
                        
                        <div id="packageSearchResultList"></div>
-               </div>
+               </section>
        </div>
        
-       <div id="upload" class="container containerPadding tabMenuContent">
+       <div id="upload" class="tabMenuContent">
                <form method="post" action="{link controller='PackageStartInstall'}{/link}" enctype="multipart/form-data">
-                       <section>
-                               <h1>{lang}wcf.acp.package.source{/lang}</h1>
-                               
+                       <div class="section">
                                <dl{if $errorField == 'uploadPackage'} class="formError"{/if}>
                                        <dt><label for="uploadPackage">{lang}wcf.acp.package.source.upload{/lang}</label></dt>
                                        <dd>
                                                <small>{lang}wcf.acp.package.source.upload.description{/lang}</small>
                                        </dd>
                                </dl>
-                       </section>
+                       </div>
                        
                        <div class="formSubmit">
                                <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 568e4ddbcf79a43e68b2b149474c3f390a1541fb..c6fdd8f467037227962b6037cc662fe4628fb6c6 100644 (file)
@@ -1,9 +1,9 @@
 <div id="packageInstallationDialogContainer">
-       <header class="box48 boxHeadline">
+       <header class="box48 contentHeader">
                <span class="icon icon48 fa-spinner"></span>
                
                <div>
-                       <h1>{lang}wcf.acp.package.uninstallation.title{/lang}</h1>
+                       <h1 class="contentTitle">{lang}wcf.acp.package.uninstallation.title{/lang}</h1>
                        <p id="packageInstallationAction">{lang}wcf.acp.package.uninstallation.step.prepare{/lang}</span></p>
                        <p><progress id="packageInstallationProgress" value="0" max="100">0%</progress></p>
                </div>
index 66317dadf94827b92571f8979c1ba30c1d8b6cf7..91b4da762b80e2f1d8f0d58f4af05cfd52941769 100644 (file)
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.package.update.title{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.package.update.title{/lang}</h1>
 </header>
 
-<div class="container containerPadding marginTop">
-       {foreach from=$availableUpdates item=update}
-               <fieldset class="jsPackageUpdate" data-package="{$update[package]}">
-                       <legend><label>
+{foreach from=$availableUpdates item=update}
+       <section class="section" class="jsPackageUpdate" data-package="{$update[package]}">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle"><label>
                                <input type="checkbox" value="1" checked="checked" />
                                {$update[packageName]|language}
-                       </label></legend>
-                       {if $update[packageDescription]}<small>{$update[packageDescription]|language}</small>{/if}
-                       
-                       <dl{if $update[packageDescription]} class="marginTop"{/if}>
-                               <dt>
-                                       {lang}wcf.acp.package.installedVersion{/lang}
-                               </dt>
-                               <dd>
-                                       {$update[packageVersion]} ({$update[packageDate]|date})
-                               </dd>
-                       </dl>
-                       <dl>
-                               <dt>
-                                       {lang}wcf.acp.package.availableVersions{/lang}
-                               </dt>
-                               <dd>
-                                       <select>
-                                               {foreach from=$update[versions] item=version}
-                                                       <option value="{@$version[packageVersion]}"{if $version[packageVersion] == $update[version][packageVersion]} selected="selected"{/if}>{$version[packageVersion]}</option>
-                                               {/foreach}
-                                       </select>
-                               </dd>
-                       </dl>
-               </fieldset>
-       {/foreach}
-</div>
+                       </label></h2>
+                       {if $update[packageDescription]}<small class="sectionDescription">{$update[packageDescription]|language}</small>{/if}
+               </header>
+               
+               <dl>
+                       <dt>
+                               {lang}wcf.acp.package.installedVersion{/lang}
+                       </dt>
+                       <dd>
+                               {$update[packageVersion]} ({$update[packageDate]|date})
+                       </dd>
+               </dl>
+               <dl>
+                       <dt>
+                               {lang}wcf.acp.package.availableVersions{/lang}
+                       </dt>
+                       <dd>
+                               <select>
+                                       {foreach from=$update[versions] item=version}
+                                               <option value="{@$version[packageVersion]}"{if $version[packageVersion] == $update[version][packageVersion]} selected="selected"{/if}>{$version[packageVersion]}</option>
+                                       {/foreach}
+                               </select>
+                       </dd>
+               </dl>
+       </section>
+{/foreach}
 
 <div class="formSubmit">
        <button>{lang}wcf.global.button.submit{/lang}</button>
index ace382e3c644a33ccfa01a607db98388bf7e0e02..888ab1bdabab82e797b2e2c376d74fc87a3ba3a4 100644 (file)
@@ -1,7 +1,9 @@
 {hascontent}
-       <fieldset>
-               <legend>{lang}wcf.acp.package.update.excludedPackages.excluding{/lang}</legend>
-               <small>{lang}wcf.acp.package.update.excludedPackages.excluding.description{/lang}</small>
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.acp.package.update.excludedPackages.excluding{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.acp.package.update.excludedPackages.excluding.description{/lang}</small>
+               </header>
                
                <ul class="nativeList">
                        {content}
                                {/foreach}
                        {/content}
                </ul>
-       </fieldset>
+       </section>
 {/hascontent}
 
 {hascontent}
-       <fieldset>
-               <legend>{lang}wcf.acp.package.update.excludedPackages.excluded{/lang}</legend>
-               <small>{lang}wcf.acp.package.update.excludedPackages.excluded.description{/lang}</small>
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.acp.package.update.excludedPackages.excluded{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.acp.package.update.excludedPackages.excluded.description{/lang}</small>
+               </header>
                
                <ul class="nativeList">
                        {content}
@@ -29,5 +33,5 @@
                                {/foreach}
                        {/content}
                </ul>
-       </fieldset>
+       </section>
 {/hascontent}
index 7ec44ee83862a378704f35676c3b83f7a58f03aa..1cb8eb12ac593b9c892f51587acece704216e9d1 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.updateServer.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.updateServer.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.updateServer.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='PackageUpdateServerAdd'}{/link}{else}{link controller='PackageUpdateServerEdit' id=$packageUpdateServerID}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.updateServer.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'serverURL'} class="formError"{/if}>
-                               <dt><label for="serverURL">{lang}wcf.acp.updateServer.serverURL{/lang}</label></dt>
-                               <dd>
-                                       <input type="url" id="serverURL" name="serverURL" value="{$serverURL}" required="required" autofocus="autofocus" class="long" />
-                                       {if $errorField == 'serverURL'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.updateServer.serverURL.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="loginUsername">{lang}wcf.acp.updateServer.loginUsername{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="medium" />
-                                       <small>{lang}wcf.acp.updateServer.loginUsername.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="loginPassword">{lang}wcf.acp.updateServer.loginPassword{/lang}</label></dt>
-                               <dd>
-                                       <input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="medium" autocomplete="off" />
-                                       <small>{lang}wcf.acp.updateServer.loginPassword.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'serverURL'} class="formError"{/if}>
+                       <dt><label for="serverURL">{lang}wcf.acp.updateServer.serverURL{/lang}</label></dt>
+                       <dd>
+                               <input type="url" id="serverURL" name="serverURL" value="{$serverURL}" required="required" autofocus="autofocus" class="long" />
+                               {if $errorField == 'serverURL'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.updateServer.serverURL.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl>
+                       <dt><label for="loginUsername">{lang}wcf.acp.updateServer.loginUsername{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="loginUsername" name="loginUsername" value="{$loginUsername}" class="medium" />
+                               <small>{lang}wcf.acp.updateServer.loginUsername.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt><label for="loginPassword">{lang}wcf.acp.updateServer.loginPassword{/lang}</label></dt>
+                       <dd>
+                               <input type="password" id="loginPassword" name="loginPassword" value="{$loginPassword}" class="medium" autocomplete="off" />
+                               <small>{lang}wcf.acp.updateServer.loginPassword.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index be59ff5ef7cf753ba2fd51597e6a002e750193da..e83ce2f5b0bc08a019e7b8f2ddd2e92081711436 100644 (file)
@@ -9,8 +9,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.updateServer.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.updateServer.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {hascontent}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.updateServer.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index f275fb5b8b50875d968687c850026e65e4217317..ee237ab899c667a5b63ee652c8092607b3c1d17e 100644 (file)
@@ -5,8 +5,8 @@
        <p class="{if $serverReply[statusCode] == 401}error{else}warning{/if}">{lang}wcf.acp.package.update.errorCode.{@$serverReply[statusCode]}{/lang}</p>
 {/if}
 
-<fieldset{if !$serverAuthData|empty} class="marginTop"{/if}>
-       <legend>{lang}wcf.acp.package.update.server{/lang}</legend>
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.acp.package.update.server{/lang}</h2>
        
        {if $packageUpdateVersion[packageName]|isset}
                <dl>
                <dt>{lang}wcf.acp.package.update.server.message{/lang}</dt>
                <dd>{$serverReply[body]}</dd>
        </dl>
-</fieldset>
+</section>
 
-<fieldset>
-       <legend>{lang}wcf.acp.package.update.credentials{/lang}</legend>
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.acp.package.update.credentials{/lang}</h2>
        
        <dl>
                <dt><label for="packageUpdateServerUsername">{lang}wcf.acp.package.update.{if $updateServer->requiresLicense()}licenseNo{else}username{/if}{/lang}</label></dt>
@@ -42,7 +42,7 @@
                <dt></dt>
                <dd><label><input type="checkbox" id="packageUpdateServerSaveCredentials" value="1" /> {lang}wcf.acp.package.update.saveCredentials{/lang}</label></dd>
        </dl>
-</fieldset>
+</section>
 
 <div class="formSubmit">
        <button data-package-update-server-id="{@$updateServer->packageUpdateServerID}">{lang}wcf.global.button.submit{/lang}</button>
index 25ab702c9a44bfcf7f48f631b102d5f4ec53d6cc..af67cc69417e9970c99c7217e0290450ba98a6bc 100644 (file)
@@ -24,8 +24,8 @@
        });
 </script>
 
-<header class="boxHeadline">
-       <h1>{if $action == 'add'}{if $isMultilingual}{lang}wcf.acp.page.addMultilingual{/lang}{else}{lang}wcf.acp.page.add{/lang}{/if}{else}{lang}wcf.acp.page.edit{/lang}{/if}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{if $action == 'add'}{if $isMultilingual}{lang}wcf.acp.page.addMultilingual{/lang}{else}{lang}wcf.acp.page.add{/lang}{/if}{else}{lang}wcf.acp.page.edit{/lang}{/if}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='PageAdd'}{/link}{else}{link controller='PageEdit' id=$pageID}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
+       <div class="section">
+               <dl{if $errorField == 'name'} class="formError"{/if}>
+                       <dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long" />
+                               {if $errorField == 'name'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.page.name.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {if $action == 'add' || !$page->controller}
+                       <dl{if $errorField == 'parentPageID'} class="formError"{/if}>
+                               <dt><label for="parentPageID">{lang}wcf.acp.page.parentPageID{/lang}</label></dt>
+                               <dd>
+                                       <select name="parentPageID" id="parentPageID">
+                                               <option value="0">{lang}wcf.acp.page.parentPageID.noParentPage{/lang}</option>
+                                               
+                                               {foreach from=$pageNodeList item=pageNode}
+                                                       <option value="{@$pageNode->getPage()->pageID}"{if $pageNode->getPage()->pageID == $parentPageID} selected="selected"{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->getPage()->name}</option>
+                                               {/foreach}
+                                       </select>
+                                       {if $errorField == 'parentPageID'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.page.parentPageID.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
                        
-                       <dl{if $errorField == 'name'} class="formError"{/if}>
-                               <dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
+                       <dl{if $errorField == 'packageID'} class="formError"{/if}>
+                               <dt><label for="packageID">{lang}wcf.acp.page.packageID{/lang}</label></dt>
                                <dd>
-                                       <input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long" />
-                                       {if $errorField == 'name'}
+                                       <select name="packageID" id="packageID">
+                                               {foreach from=$availableApplications item=availableApplication}
+                                                       <option value="{@$availableApplication->packageID}"{if $availableApplication->packageID == $packageID} selected="selected"{/if}>{$availableApplication->domainName}{$availableApplication->domainPath}</option>
+                                               {/foreach}
+                                       </select>
+                                       {if $errorField == 'parentPageID'}
                                                <small class="innerError">
                                                        {if $errorType == 'empty'}
                                                                {lang}wcf.global.form.error.empty{/lang}
                                                        {else}
-                                                               {lang}wcf.acp.page.name.error.{@$errorType}{/lang}
+                                                               {lang}wcf.acp.page.packageID.error.{@$errorType}{/lang}
                                                        {/if}
                                                </small>
                                        {/if}
                                </dd>
                        </dl>
+               {/if}
+               
+               {if !$isMultilingual}
+                       <dl{if $errorField == 'customURL'} class="formError"{/if}>
+                               <dt><label for="customURL">{lang}wcf.acp.page.customURL{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="customURL" name="customURL[0]" value="{if !$customURL[0]|empty}{$customURL[0]}{/if}" class="long" />
+                                       {if $errorField == 'customURL'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.page.customURL.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+               {/if}
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" id="isLandingPage" name="isLandingPage" value="1" {if $isLandingPage}checked="checked" {/if}{if $action == 'edit' && $page->isLandingPage}disabled="disabled" {/if}/> {lang}wcf.acp.page.isLandingPage{/lang}</label>
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" id="isDisabled" name="isDisabled" value="1" {if $isDisabled}checked="checked" {/if}/> {lang}wcf.acp.page.isDisabled{/lang}</label>
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
+       </div>
+       
+       {if $action == 'add' || !$page->controller}
+               {if !$isMultilingual}
+                       <section class="section">
+                               <h2 class="sectionTitle">content</h2>
                        
-                       {if $action == 'add' || !$page->controller}
-                               <dl{if $errorField == 'parentPageID'} class="formError"{/if}>
-                                       <dt><label for="parentPageID">{lang}wcf.acp.page.parentPageID{/lang}</label></dt>
+                               <dl{if $errorField == 'title'} class="formError"{/if}>
+                                       <dt><label for="title">{lang}wcf.acp.page.title{/lang}</label></dt>
                                        <dd>
-                                               <select name="parentPageID" id="parentPageID">
-                                                       <option value="0">{lang}wcf.acp.page.parentPageID.noParentPage{/lang}</option>
-                                                       
-                                                       {foreach from=$pageNodeList item=pageNode}
-                                                               <option value="{@$pageNode->getPage()->pageID}"{if $pageNode->getPage()->pageID == $parentPageID} selected="selected"{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->getPage()->name}</option>
-                                                       {/foreach}
-                                               </select>
-                                               {if $errorField == 'parentPageID'}
+                                               <input type="text" id="title" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long" />
+                                               {if $errorField == 'title'}
                                                        <small class="innerError">
                                                                {if $errorType == 'empty'}
                                                                        {lang}wcf.global.form.error.empty{/lang}
                                                                {else}
-                                                                       {lang}wcf.acp.page.parentPageID.error.{@$errorType}{/lang}
+                                                                       {lang}wcf.acp.page.title.error.{@$errorType}{/lang}
                                                                {/if}
                                                        </small>
                                                {/if}
                                        </dd>
                                </dl>
                                
-                               <dl{if $errorField == 'packageID'} class="formError"{/if}>
-                                       <dt><label for="packageID">{lang}wcf.acp.page.packageID{/lang}</label></dt>
+                               <dl{if $errorField == 'content'} class="formError"{/if}>
+                                       <dt><label for="content0">{lang}wcf.acp.page.content{/lang}</label></dt>
                                        <dd>
-                                               <select name="packageID" id="packageID">
-                                                       {foreach from=$availableApplications item=availableApplication}
-                                                               <option value="{@$availableApplication->packageID}"{if $availableApplication->packageID == $packageID} selected="selected"{/if}>{$availableApplication->domainName}{$availableApplication->domainPath}</option>
-                                                       {/foreach}
-                                               </select>
-                                               {if $errorField == 'parentPageID'}
+                                               <textarea name="content[0]" id="content0">{if !$content[0]|empty}{$content[0]}{/if}</textarea>
+                                               {if $errorField == 'content'}
                                                        <small class="innerError">
                                                                {if $errorType == 'empty'}
                                                                        {lang}wcf.global.form.error.empty{/lang}
                                                                {else}
-                                                                       {lang}wcf.acp.page.packageID.error.{@$errorType}{/lang}
+                                                                       {lang}wcf.acp.page.content.error.{@$errorType}{/lang}
                                                                {/if}
                                                        </small>
                                                {/if}
                                        </dd>
                                </dl>
-                       {/if}
-                       
-                       {if !$isMultilingual}
-                               <dl{if $errorField == 'customURL'} class="formError"{/if}>
-                                       <dt><label for="customURL">{lang}wcf.acp.page.customURL{/lang}</label></dt>
+                               
+                               <dl{if $errorField == 'metaKeywords'} class="formError"{/if}>
+                                       <dt><label for="metaKeywords">{lang}wcf.acp.page.metaKeywords{/lang}</label></dt>
                                        <dd>
-                                               <input type="text" id="customURL" name="customURL[0]" value="{if !$customURL[0]|empty}{$customURL[0]}{/if}" class="long" />
-                                               {if $errorField == 'customURL'}
+                                               <textarea name="metaKeywords[0]" id="metaKeywords">{if !$metaKeywords[0]|empty}{$metaKeywords[0]}{/if}</textarea>
+                                               {if $errorField == 'metaKeywords'}
                                                        <small class="innerError">
                                                                {if $errorType == 'empty'}
                                                                        {lang}wcf.global.form.error.empty{/lang}
                                                                {else}
-                                                                       {lang}wcf.acp.page.customURL.error.{@$errorType}{/lang}
+                                                                       {lang}wcf.acp.page.metaKeywords.error.{@$errorType}{/lang}
                                                                {/if}
                                                        </small>
                                                {/if}
                                        </dd>
                                </dl>
-                       {/if}
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" id="isLandingPage" name="isLandingPage" value="1" {if $isLandingPage}checked="checked" {/if}{if $action == 'edit' && $page->isLandingPage}disabled="disabled" {/if}/> {lang}wcf.acp.page.isLandingPage{/lang}</label>
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" id="isDisabled" name="isDisabled" value="1" {if $isDisabled}checked="checked" {/if}/> {lang}wcf.acp.page.isDisabled{/lang}</label>
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
-               
-               {if $action == 'add' || !$page->controller}
-                       {if !$isMultilingual}
-                               <fieldset>
-                                       <legend>content</legend>
                                
-                                       <dl{if $errorField == 'title'} class="formError"{/if}>
-                                               <dt><label for="title">{lang}wcf.acp.page.title{/lang}</label></dt>
-                                               <dd>
-                                                       <input type="text" id="title" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long" />
-                                                       {if $errorField == 'title'}
-                                                               <small class="innerError">
-                                                                       {if $errorType == 'empty'}
-                                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                                       {else}
-                                                                               {lang}wcf.acp.page.title.error.{@$errorType}{/lang}
+                               <dl{if $errorField == 'metaDescription'} class="formError"{/if}>
+                                       <dt><label for="metaDescription">{lang}wcf.acp.page.metaDescription{/lang}</label></dt>
+                                       <dd>
+                                               <textarea name="metaDescription[0]" id="metaDescription">{if !$metaDescription[0]|empty}{$metaDescription[0]}{/if}</textarea>
+                                               {if $errorField == 'metaDescription'}
+                                                       <small class="innerError">
+                                                               {if $errorType == 'empty'}
+                                                                       {lang}wcf.global.form.error.empty{/lang}
+                                                               {else}
+                                                                       {lang}wcf.acp.page.metaDescription.error.{@$errorType}{/lang}
+                                                               {/if}
+                                                       </small>
+                                               {/if}
+                                       </dd>
+                               </dl>
+                       </section>
+               {else}
+                       <div class="section tabMenuContainer">
+                               <nav class="tabMenu">
+                                       <ul>
+                                               {foreach from=$availableLanguages item=availableLanguage}
+                                                       {assign var='containerID' value='language'|concat:$availableLanguage->languageID}
+                                                       <li><a href="{@$__wcf->getAnchor($containerID)}">{$availableLanguage->languageName}</a></li>
+                                               {/foreach}
+                                       </ul>
+                               </nav>
+                               
+                               {foreach from=$availableLanguages item=availableLanguage}
+                                       <div id="language{@$availableLanguage->languageID}" class="tabMenuContent">
+                                               <div class="section">
+                                                       <dl{if $errorField == 'customURL'} class="formError"{/if}>
+                                                               <dt><label for="customURL{@$availableLanguage->languageID}">{lang}wcf.acp.page.customURL{/lang}</label></dt>
+                                                               <dd>
+                                                                       <input type="text" id="customURL{@$availableLanguage->languageID}" name="customURL[{@$availableLanguage->languageID}]" value="{if !$customURL[$availableLanguage->languageID]|empty}{$customURL[$availableLanguage->languageID]}{/if}" class="long" />
+                                                                       {if $errorField == 'customURL'}
+                                                                               <small class="innerError">
+                                                                                       {if $errorType == 'empty'}
+                                                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                                                       {else}
+                                                                                               {lang}wcf.acp.page.customURL.error.{@$errorType}{/lang}
+                                                                                       {/if}
+                                                                               </small>
                                                                        {/if}
-                                                               </small>
-                                                       {/if}
-                                               </dd>
-                                       </dl>
-                                       
-                                       <dl{if $errorField == 'content'} class="formError"{/if}>
-                                               <dt><label for="content0">{lang}wcf.acp.page.content{/lang}</label></dt>
-                                               <dd>
-                                                       <textarea name="content[0]" id="content0">{if !$content[0]|empty}{$content[0]}{/if}</textarea>
-                                                       {if $errorField == 'content'}
-                                                               <small class="innerError">
-                                                                       {if $errorType == 'empty'}
-                                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                                       {else}
-                                                                               {lang}wcf.acp.page.content.error.{@$errorType}{/lang}
+                                                               </dd>
+                                                       </dl>
+                                               
+                                                       <dl{if $errorField == 'title'} class="formError"{/if}>
+                                                               <dt><label for="title{@$availableLanguage->languageID}">{lang}wcf.acp.page.title{/lang}</label></dt>
+                                                               <dd>
+                                                                       <input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long" />
+                                                                       {if $errorField == 'title'}
+                                                                               <small class="innerError">
+                                                                                       {if $errorType == 'empty'}
+                                                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                                                       {else}
+                                                                                               {lang}wcf.acp.page.title.error.{@$errorType}{/lang}
+                                                                                       {/if}
+                                                                               </small>
                                                                        {/if}
-                                                               </small>
-                                                       {/if}
-                                               </dd>
-                                       </dl>
-                                       
-                                       <dl{if $errorField == 'metaKeywords'} class="formError"{/if}>
-                                               <dt><label for="metaKeywords">{lang}wcf.acp.page.metaKeywords{/lang}</label></dt>
-                                               <dd>
-                                                       <textarea name="metaKeywords[0]" id="metaKeywords">{if !$metaKeywords[0]|empty}{$metaKeywords[0]}{/if}</textarea>
-                                                       {if $errorField == 'metaKeywords'}
-                                                               <small class="innerError">
-                                                                       {if $errorType == 'empty'}
-                                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                                       {else}
-                                                                               {lang}wcf.acp.page.metaKeywords.error.{@$errorType}{/lang}
+                                                               </dd>
+                                                       </dl>
+                                                       
+                                                       <dl{if $errorField == 'content'} class="formError"{/if}>
+                                                               <dt><label for="content{@$availableLanguage->languageID}">{lang}wcf.acp.page.content{/lang}</label></dt>
+                                                               <dd>
+                                                                       <textarea name="content[{@$availableLanguage->languageID}]" id="content{@$availableLanguage->languageID}">{if !$content[$availableLanguage->languageID]|empty}{$content[$availableLanguage->languageID]}{/if}</textarea>
+                                                                       {if $errorField == 'content'}
+                                                                               <small class="innerError">
+                                                                                       {if $errorType == 'empty'}
+                                                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                                                       {else}
+                                                                                               {lang}wcf.acp.page.content.error.{@$errorType}{/lang}
+                                                                                       {/if}
+                                                                               </small>
                                                                        {/if}
-                                                               </small>
-                                                       {/if}
-                                               </dd>
-                                       </dl>
-                                       
-                                       <dl{if $errorField == 'metaDescription'} class="formError"{/if}>
-                                               <dt><label for="metaDescription">{lang}wcf.acp.page.metaDescription{/lang}</label></dt>
-                                               <dd>
-                                                       <textarea name="metaDescription[0]" id="metaDescription">{if !$metaDescription[0]|empty}{$metaDescription[0]}{/if}</textarea>
-                                                       {if $errorField == 'metaDescription'}
-                                                               <small class="innerError">
-                                                                       {if $errorType == 'empty'}
-                                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                                       {else}
-                                                                               {lang}wcf.acp.page.metaDescription.error.{@$errorType}{/lang}
+                                                               </dd>
+                                                       </dl>
+                                                       
+                                                       <dl{if $errorField == 'metaKeywords'} class="formError"{/if}>
+                                                               <dt><label for="metaKeywords{@$availableLanguage->languageID}">{lang}wcf.acp.page.metaKeywords{/lang}</label></dt>
+                                                               <dd>
+                                                                       <textarea name="metaKeywords[{@$availableLanguage->languageID}]" id="metaKeywords{@$availableLanguage->languageID}">{if !$metaKeywords[$availableLanguage->languageID]|empty}{$metaKeywords[$availableLanguage->languageID]}{/if}</textarea>
+                                                                       {if $errorField == 'metaKeywords'}
+                                                                               <small class="innerError">
+                                                                                       {if $errorType == 'empty'}
+                                                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                                                       {else}
+                                                                                               {lang}wcf.acp.page.metaKeywords.error.{@$errorType}{/lang}
+                                                                                       {/if}
+                                                                               </small>
                                                                        {/if}
-                                                               </small>
-                                                       {/if}
-                                               </dd>
-                                       </dl>
-                               </fieldset>
-                       {else}
-                               <div class="tabMenuContainer">
-                                       <nav class="tabMenu">
-                                               <ul>
-                                                       {foreach from=$availableLanguages item=availableLanguage}
-                                                               {assign var='containerID' value='language'|concat:$availableLanguage->languageID}
-                                                               <li><a href="{@$__wcf->getAnchor($containerID)}">{$availableLanguage->languageName}</a></li>
-                                                       {/foreach}
-                                               </ul>
-                                       </nav>
-                                       
-                                       {foreach from=$availableLanguages item=availableLanguage}
-                                               <div id="language{@$availableLanguage->languageID}" class="container containerPadding tabMenuContent">
-                                                       <fieldset>
-                                                               <dl{if $errorField == 'customURL'} class="formError"{/if}>
-                                                                       <dt><label for="customURL{@$availableLanguage->languageID}">{lang}wcf.acp.page.customURL{/lang}</label></dt>
-                                                                       <dd>
-                                                                               <input type="text" id="customURL{@$availableLanguage->languageID}" name="customURL[{@$availableLanguage->languageID}]" value="{if !$customURL[$availableLanguage->languageID]|empty}{$customURL[$availableLanguage->languageID]}{/if}" class="long" />
-                                                                               {if $errorField == 'customURL'}
-                                                                                       <small class="innerError">
-                                                                                               {if $errorType == 'empty'}
-                                                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                                                               {else}
-                                                                                                       {lang}wcf.acp.page.customURL.error.{@$errorType}{/lang}
-                                                                                               {/if}
-                                                                                       </small>
-                                                                               {/if}
-                                                                       </dd>
-                                                               </dl>
+                                                               </dd>
+                                                       </dl>
                                                        
-                                                               <dl{if $errorField == 'title'} class="formError"{/if}>
-                                                                       <dt><label for="title{@$availableLanguage->languageID}">{lang}wcf.acp.page.title{/lang}</label></dt>
-                                                                       <dd>
-                                                                               <input type="text" id="title{@$availableLanguage->languageID}" name="title[{@$availableLanguage->languageID}]" value="{if !$title[$availableLanguage->languageID]|empty}{$title[$availableLanguage->languageID]}{/if}" class="long" />
-                                                                               {if $errorField == 'title'}
-                                                                                       <small class="innerError">
-                                                                                               {if $errorType == 'empty'}
-                                                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                                                               {else}
-                                                                                                       {lang}wcf.acp.page.title.error.{@$errorType}{/lang}
-                                                                                               {/if}
-                                                                                       </small>
-                                                                               {/if}
-                                                                       </dd>
-                                                               </dl>
-                                                               
-                                                               <dl{if $errorField == 'content'} class="formError"{/if}>
-                                                                       <dt><label for="content{@$availableLanguage->languageID}">{lang}wcf.acp.page.content{/lang}</label></dt>
-                                                                       <dd>
-                                                                               <textarea name="content[{@$availableLanguage->languageID}]" id="content{@$availableLanguage->languageID}">{if !$content[$availableLanguage->languageID]|empty}{$content[$availableLanguage->languageID]}{/if}</textarea>
-                                                                               {if $errorField == 'content'}
-                                                                                       <small class="innerError">
-                                                                                               {if $errorType == 'empty'}
-                                                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                                                               {else}
-                                                                                                       {lang}wcf.acp.page.content.error.{@$errorType}{/lang}
-                                                                                               {/if}
-                                                                                       </small>
-                                                                               {/if}
-                                                                       </dd>
-                                                               </dl>
-                                                               
-                                                               <dl{if $errorField == 'metaKeywords'} class="formError"{/if}>
-                                                                       <dt><label for="metaKeywords{@$availableLanguage->languageID}">{lang}wcf.acp.page.metaKeywords{/lang}</label></dt>
-                                                                       <dd>
-                                                                               <textarea name="metaKeywords[{@$availableLanguage->languageID}]" id="metaKeywords{@$availableLanguage->languageID}">{if !$metaKeywords[$availableLanguage->languageID]|empty}{$metaKeywords[$availableLanguage->languageID]}{/if}</textarea>
-                                                                               {if $errorField == 'metaKeywords'}
-                                                                                       <small class="innerError">
-                                                                                               {if $errorType == 'empty'}
-                                                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                                                               {else}
-                                                                                                       {lang}wcf.acp.page.metaKeywords.error.{@$errorType}{/lang}
-                                                                                               {/if}
-                                                                                       </small>
-                                                                               {/if}
-                                                                       </dd>
-                                                               </dl>
-                                                               
-                                                               <dl{if $errorField == 'metaDescription'} class="formError"{/if}>
-                                                                       <dt><label for="metaDescription{@$availableLanguage->languageID}">{lang}wcf.acp.page.metaDescription{/lang}</label></dt>
-                                                                       <dd>
-                                                                               <textarea name="metaDescription[{@$availableLanguage->languageID}]" id="metaDescription{@$availableLanguage->languageID}">{if !$metaDescription[$availableLanguage->languageID]|empty}{$metaDescription[$availableLanguage->languageID]}{/if}</textarea>
-                                                                               {if $errorField == 'metaDescription'}
-                                                                                       <small class="innerError">
-                                                                                               {if $errorType == 'empty'}
-                                                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                                                               {else}
-                                                                                                       {lang}wcf.acp.page.metaDescription.error.{@$errorType}{/lang}
-                                                                                               {/if}
-                                                                                       </small>
-                                                                               {/if}
-                                                                       </dd>
-                                                               </dl>
-                                                       </fieldset>
+                                                       <dl{if $errorField == 'metaDescription'} class="formError"{/if}>
+                                                               <dt><label for="metaDescription{@$availableLanguage->languageID}">{lang}wcf.acp.page.metaDescription{/lang}</label></dt>
+                                                               <dd>
+                                                                       <textarea name="metaDescription[{@$availableLanguage->languageID}]" id="metaDescription{@$availableLanguage->languageID}">{if !$metaDescription[$availableLanguage->languageID]|empty}{$metaDescription[$availableLanguage->languageID]}{/if}</textarea>
+                                                                       {if $errorField == 'metaDescription'}
+                                                                               <small class="innerError">
+                                                                                       {if $errorType == 'empty'}
+                                                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                                                       {else}
+                                                                                               {lang}wcf.acp.page.metaDescription.error.{@$errorType}{/lang}
+                                                                                       {/if}
+                                                                               </small>
+                                                                       {/if}
+                                                               </dd>
+                                                       </dl>
                                                </div>
-                                       {/foreach}
-                               </div>
-                       {/if}
+                                       </div>
+                               {/foreach}
+                       </div>
                {/if}
-               
-               {event name='fieldsets'}
-       </div>
+       {/if}
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
index 844a40721328a451278763e1c50876c8f234e4d2..0aa3e49deabbae92ce257d8ce0fb011ecb3a7fc2 100644 (file)
@@ -3,11 +3,11 @@
                {if $__wcf->user->userID}
                        <!-- user menu -->
                        <li id="userMenu" class="dropdown">
-                               <a class="dropdownToggle framed" data-toggle="userMenu">{if PACKAGE_ID}{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)} {/if}{lang}wcf.user.userNote{/lang}</a>
+                               <a class="dropdownToggle" data-toggle="userMenu">{if PACKAGE_ID}{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)} {/if}{lang}wcf.user.userNote{/lang}</a>
                                <ul class="dropdownMenu">
                                        {if PACKAGE_ID > 1}
                                                <li><a href="{link controller='User' object=$__wcf->user forceFrontend=true}{/link}" class="box32">
-                                                               <div class="framed">{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)}</div>
+                                                               <div>{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32)}</div>
                                                                
                                                                <div class="containerHeadline">
                                                                        <h3>{$__wcf->user->username}</h3>
index 7d5729a7151f147f11dff35d56c8eb1780ddfdcc..94ed4225a2372af291c6967464459c6126b0bc2f 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.page.landing'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.page.landing{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.page.landing{/lang}</h1>
 </header>
 
 {include file='formError'}
@@ -21,7 +21,7 @@
 </div>
 
 <form method="post" action="{link controller='PageLanding'}{/link}">
-       <div class="tabularBox marginTop">
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 9dda58e620792d753a7e82502ead7e5fb0b5375d..518c6db6600fe746406c24bbabc344f79553ed7d 100644 (file)
@@ -9,8 +9,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.page.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.page.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.page.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 3eaae7665e0f0cfec87ae8f3d6252d7423421584..0b0244606e857d0727aef285cadda74105fb8c8d 100644 (file)
@@ -58,8 +58,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.pageMenu.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.pageMenu.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='PageMenuItemAdd'}{/link}{else}{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.pageMenu.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'menuPosition'} class="formError"{/if}>
-                               <dt><label for="menuPosition">{lang}wcf.acp.pageMenu.menuPosition{/lang}</label></dt>
-                               <dd>
-                                       <select name="menuPosition" id="menuPosition">
-                                               <option value="header"{if $menuPosition == 'header'} selected="selected"{/if}>{lang}wcf.acp.pageMenu.menuPosition.header{/lang}</option>
-                                               <option value="footer"{if $menuPosition == 'footer'} selected="selected"{/if}>{lang}wcf.acp.pageMenu.menuPosition.footer{/lang}</option>
-                                       </select>
-                                       {if $errorField == 'menuPosition'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.pageMenu.menuPosition.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl id="parentMenuItemContainer"{if $errorField == 'parentMenuItem'} class="formError"{/if}>
-                               <dt><label for="parentMenuItem">{lang}wcf.acp.pageMenu.parentMenuItem{/lang}</label></dt>
-                               <dd>
-                                       <select name="parentMenuItem" id="parentMenuItem">
-                                               <option value=""{if $parentMenuItem == ''} selected="selected"{/if}>{lang}wcf.global.noSelection{/lang}</option>
-                                               {foreach from=$availableParentMenuItems item=availableParentMenuItem}
-                                                       <option value="{$availableParentMenuItem->menuItem}"{if $parentMenuItem == $availableParentMenuItem->menuItem} selected="selected"{/if}>{$availableParentMenuItem}</option>
-                                               {/foreach}
-                                       </select>
-                                       {if $errorField == 'parentMenuItem'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.pageMenu.parentMenuItem.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'pageMenuItem'} class="formError"{/if}>
-                               <dt><label for="pageMenuItem">{lang}wcf.acp.pageMenu.pageMenuItem{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" name="pageMenuItem" id="pageMenuItem" value="{$i18nPlainValues['pageMenuItem']}" class="long" required="required" />
-                                       {if $errorField == 'pageMenuItem'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'multilingual'}
-                                                               {lang}wcf.global.form.error.multilingual{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.pageMenu.pageMenuItem.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       
-                                       {include file='multipleLanguageInputJavascript' elementIdentifier='pageMenuItem' forceSelection=true}
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'menuPosition'} class="formError"{/if}>
+                       <dt><label for="menuPosition">{lang}wcf.acp.pageMenu.menuPosition{/lang}</label></dt>
+                       <dd>
+                               <select name="menuPosition" id="menuPosition">
+                                       <option value="header"{if $menuPosition == 'header'} selected="selected"{/if}>{lang}wcf.acp.pageMenu.menuPosition.header{/lang}</option>
+                                       <option value="footer"{if $menuPosition == 'footer'} selected="selected"{/if}>{lang}wcf.acp.pageMenu.menuPosition.footer{/lang}</option>
+                               </select>
+                               {if $errorField == 'menuPosition'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.pageMenu.menuPosition.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.pageMenu.link{/lang}</legend>
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd class="floated">
-                                       <label><input type="radio" name="isInternalLink" value="1"{if $isInternalLink} checked="checked"{/if} /> {lang}wcf.acp.pageMenu.link.internal{/lang}</label>
-                                       <label><input type="radio" name="isInternalLink" value="0"{if !$isInternalLink} checked="checked"{/if} /> {lang}wcf.acp.pageMenu.link.external{/lang}</label>
-                               </dd>
-                       </dl>
-                       
-                       <dl id="menuItemPageContainer"{if $errorField == 'menuItemPage'} class="formError"{/if}>
-                               <dt><label for="menuItemPage">{lang}wcf.acp.pageMenu.menuItemPage{/lang}</label></dt>
-                               <dd>
-                                       <select name="menuItemPage" id="menuItemPage">
-                                               <option value="0">{lang}wcf.global.noSelection{/lang}</option>
-                                               {htmlOptions options=$pages selected=$menuItemPage}
-                                       </select>
-                                       {if $errorField == 'menuItemPage'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {elseif $errorType == 'noValidSelection'}
-                                                               {lang}wcf.global.form.error.noValidSelection{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.pageMenu.menuItemPage.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.pageMenu.menuItemPage.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl id="menuItemControllerContainer"{if $errorField == 'menuItemController'} class="formError"{/if}>
-                               <dt><label for="menuItemController">{lang}wcf.acp.pageMenu.menuItemController{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" name="menuItemController" id="menuItemController" value="{if !$pages[$menuItemPage]|isset}{$menuItemController}{/if}" class="long" />
-                                       {if $errorField == 'menuItemController'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.pageMenu.menuItemController.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.pageMenu.menuItemController.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl id="menuItemParametersContainer"{if $errorField == 'menuItemParameters'} class="formError"{/if}>
-                               <dt><label for="menuItemParameters">{lang}wcf.acp.pageMenu.menuItemParameters{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" name="menuItemParameters" id="menuItemParameters" value="{$menuItemParameters}" class="long" />
-                                       {if $errorField == 'menuItemParameters'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.pageMenu.menuItemParameters.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl id="menuItemLinkContainer"{if $errorField == 'menuItemLink'} class="formError"{/if}>
-                               <dt><label for="menuItemLink">{lang}wcf.acp.pageMenu.menuItemLink{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" name="menuItemLink" id="menuItemLink" value="{$menuItemLink}" class="long" />
-                                       {if $errorField == 'menuItemLink'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.pageMenu.menuItemLink.error.{$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       
-                                       {include file='multipleLanguageInputJavascript' elementIdentifier='menuItemLink' forceSelection=false}
-                               </dd>
-                       </dl>
-                       
-                       {event name='linkFields'}
-               </fieldset>
+               <dl id="parentMenuItemContainer"{if $errorField == 'parentMenuItem'} class="formError"{/if}>
+                       <dt><label for="parentMenuItem">{lang}wcf.acp.pageMenu.parentMenuItem{/lang}</label></dt>
+                       <dd>
+                               <select name="parentMenuItem" id="parentMenuItem">
+                                       <option value=""{if $parentMenuItem == ''} selected="selected"{/if}>{lang}wcf.global.noSelection{/lang}</option>
+                                       {foreach from=$availableParentMenuItems item=availableParentMenuItem}
+                                               <option value="{$availableParentMenuItem->menuItem}"{if $parentMenuItem == $availableParentMenuItem->menuItem} selected="selected"{/if}>{$availableParentMenuItem}</option>
+                                       {/foreach}
+                               </select>
+                               {if $errorField == 'parentMenuItem'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.pageMenu.parentMenuItem.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.pageMenu.advanced{/lang}</legend>
-                       
+               <dl{if $errorField == 'pageMenuItem'} class="formError"{/if}>
+                       <dt><label for="pageMenuItem">{lang}wcf.acp.pageMenu.pageMenuItem{/lang}</label></dt>
+                       <dd>
+                               <input type="text" name="pageMenuItem" id="pageMenuItem" value="{$i18nPlainValues['pageMenuItem']}" class="long" required="required" />
+                               {if $errorField == 'pageMenuItem'}
+                                       <small class="innerError">
+                                               {if $errorType == 'multilingual'}
+                                                       {lang}wcf.global.form.error.multilingual{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.pageMenu.pageMenuItem.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               
+                               {include file='multipleLanguageInputJavascript' elementIdentifier='pageMenuItem' forceSelection=true}
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
+       </div>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.pageMenu.link{/lang}</h2>
+               
+               <dl>
+                       <dt></dt>
+                       <dd class="floated">
+                               <label><input type="radio" name="isInternalLink" value="1"{if $isInternalLink} checked="checked"{/if} /> {lang}wcf.acp.pageMenu.link.internal{/lang}</label>
+                               <label><input type="radio" name="isInternalLink" value="0"{if !$isInternalLink} checked="checked"{/if} /> {lang}wcf.acp.pageMenu.link.external{/lang}</label>
+                       </dd>
+               </dl>
+               
+               <dl id="menuItemPageContainer"{if $errorField == 'menuItemPage'} class="formError"{/if}>
+                       <dt><label for="menuItemPage">{lang}wcf.acp.pageMenu.menuItemPage{/lang}</label></dt>
+                       <dd>
+                               <select name="menuItemPage" id="menuItemPage">
+                                       <option value="0">{lang}wcf.global.noSelection{/lang}</option>
+                                       {htmlOptions options=$pages selected=$menuItemPage}
+                               </select>
+                               {if $errorField == 'menuItemPage'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {elseif $errorType == 'noValidSelection'}
+                                                       {lang}wcf.global.form.error.noValidSelection{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.pageMenu.menuItemPage.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.pageMenu.menuItemPage.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl id="menuItemControllerContainer"{if $errorField == 'menuItemController'} class="formError"{/if}>
+                       <dt><label for="menuItemController">{lang}wcf.acp.pageMenu.menuItemController{/lang}</label></dt>
+                       <dd>
+                               <input type="text" name="menuItemController" id="menuItemController" value="{if !$pages[$menuItemPage]|isset}{$menuItemController}{/if}" class="long" />
+                               {if $errorField == 'menuItemController'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.pageMenu.menuItemController.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.pageMenu.menuItemController.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl id="menuItemParametersContainer"{if $errorField == 'menuItemParameters'} class="formError"{/if}>
+                       <dt><label for="menuItemParameters">{lang}wcf.acp.pageMenu.menuItemParameters{/lang}</label></dt>
+                       <dd>
+                               <input type="text" name="menuItemParameters" id="menuItemParameters" value="{$menuItemParameters}" class="long" />
+                               {if $errorField == 'menuItemParameters'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.pageMenu.menuItemParameters.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl id="menuItemLinkContainer"{if $errorField == 'menuItemLink'} class="formError"{/if}>
+                       <dt><label for="menuItemLink">{lang}wcf.acp.pageMenu.menuItemLink{/lang}</label></dt>
+                       <dd>
+                               <input type="text" name="menuItemLink" id="menuItemLink" value="{$menuItemLink}" class="long" />
+                               {if $errorField == 'menuItemLink'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.pageMenu.menuItemLink.error.{$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               
+                               {include file='multipleLanguageInputJavascript' elementIdentifier='menuItemLink' forceSelection=false}
+                       </dd>
+               </dl>
+               
+               {event name='linkFields'}
+       </section>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.pageMenu.advanced{/lang}</h2>
+               
+               <dl>
+                       <dt><label for="showOrder">{lang}wcf.acp.pageMenu.showOrder{/lang}</label></dt>
+                       <dd>
+                               <input type="number" name="showOrder" id="showOrder" value="{@$showOrder}" class="tiny" min="0" />
+                       </dd>
+               </dl>
+               
+               {if $action == 'add' || !$menuItem->isLandingPage}
                        <dl>
-                               <dt><label for="showOrder">{lang}wcf.acp.pageMenu.showOrder{/lang}</label></dt>
+                               <dt></dt>
                                <dd>
-                                       <input type="number" name="showOrder" id="showOrder" value="{@$showOrder}" class="tiny" min="0" />
+                                       <label><input type="checkbox" name="isDisabled" id="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> <span>{lang}wcf.acp.pageMenu.isDisabled{/lang}</span></label>
                                </dd>
                        </dl>
-                       
-                       {if $action == 'add' || !$menuItem->isLandingPage}
-                               <dl>
-                                       <dt></dt>
-                                       <dd>
-                                               <label><input type="checkbox" name="isDisabled" id="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> <span>{lang}wcf.acp.pageMenu.isDisabled{/lang}</span></label>
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       {event name='advancedFields'}
-               </fieldset>
+               {/if}
                
-               {event name='fields'}
-       </div>
+               {event name='advancedFields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" />
index cf56e71bbdd1284fe3fdec55c3e7c1c27d58b985..35016d5f57910ab2d5a9b80bc875f250c1aa54dc 100644 (file)
@@ -16,8 +16,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.pageMenu.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.pageMenu.list{/lang}</h1>
 </header>
 
 <p class="info">{lang}wcf.acp.pageMenu.landingPage.description{/lang}</p>
 </div>
 
 {hascontent}
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.pageMenu.header{/lang}</legend>
-                       
-                       <div id="pageMenuItemHeaderList" class="sortableListContainer">
-                               <ol class="sortableList" data-object-id="0">
-                                       {content}
-                                               {foreach from=$headerItems item=menuItem}
-                                                       <li class="sortableNode" data-object-id="{@$menuItem->menuItemID}">
-                                                               <span class="sortableNodeLabel">
-                                                                       <a href="{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}">{lang}{$menuItem->menuItem}{/lang}</a>
-                                                                       <span class="statusDisplay sortableButtonContainer">
-                                                                               {if $menuItem->canDisable()}
-                                                                                       <span class="icon icon16 fa-{if !$menuItem->isDisabled}check-{/if}square-o jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $menuItem->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$menuItem->menuItemID}"></span>
-                                                                               {else}
-                                                                                       <span class="icon icon16 fa-{if !$menuItem->isDisabled}check-{/if}square-o disabled" title="{lang}wcf.global.button.{if $menuItem->isDisabled}enable{else}disable{/if}{/lang}"></span>
-                                                                               {/if}
-                                                                               <a href="{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><span class="icon icon16 fa-pencil"></span></a>
-                                                                               {if $menuItem->canDelete()}
-                                                                                       <span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menuItem->menuItemID}" data-confirm-message="{lang __menuItem=$menuItem}wcf.acp.pageMenu.delete.sure{/lang}"></span>
-                                                                               {else}
-                                                                                       <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
-                                                                               {/if}
-                                                                               
-                                                                               {event name='headerItemButtons'}
-                                                                       </span>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.pageMenu.header{/lang}</h2>
+               
+               <div id="pageMenuItemHeaderList" class="sortableListContainer">
+                       <ol class="sortableList" data-object-id="0">
+                               {content}
+                                       {foreach from=$headerItems item=menuItem}
+                                               <li class="sortableNode" data-object-id="{@$menuItem->menuItemID}">
+                                                       <span class="sortableNodeLabel">
+                                                               <a href="{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}">{lang}{$menuItem->menuItem}{/lang}</a>
+                                                               <span class="statusDisplay sortableButtonContainer">
+                                                                       {if $menuItem->canDisable()}
+                                                                               <span class="icon icon16 fa-{if !$menuItem->isDisabled}check-{/if}square-o jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $menuItem->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$menuItem->menuItemID}"></span>
+                                                                       {else}
+                                                                               <span class="icon icon16 fa-{if !$menuItem->isDisabled}check-{/if}square-o disabled" title="{lang}wcf.global.button.{if $menuItem->isDisabled}enable{else}disable{/if}{/lang}"></span>
+                                                                       {/if}
+                                                                       <a href="{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><span class="icon icon16 fa-pencil"></span></a>
+                                                                       {if $menuItem->canDelete()}
+                                                                               <span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menuItem->menuItemID}" data-confirm-message="{lang __menuItem=$menuItem}wcf.acp.pageMenu.delete.sure{/lang}"></span>
+                                                                       {else}
+                                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                                       {/if}
+                                                                       
+                                                                       {event name='headerItemButtons'}
                                                                </span>
-                                                               {if $menuItem|count}
-                                                                       <ol class="sortableList" data-object-id="{@$menuItem->menuItemID}">
-                                                                               {foreach from=$menuItem item=childMenuItem}
-                                                                                       <li class="sortableNode sortableNoNesting" data-object-id="{@$childMenuItem->menuItemID}">
-                                                                                               <span class="sortableNodeLabel">
-                                                                                                       <a href="{link controller='PageMenuItemEdit' id=$childMenuItem->menuItemID}{/link}">{lang}{$childMenuItem->menuItem}{/lang}</a>
-                                                                                                       <span class="statusDisplay sortableButtonContainer">
-                                                                                                               <span class="icon icon16 fa-{if !$childMenuItem->isDisabled}check-{/if}square-o jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $childMenuItem->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$childMenuItem->menuItemID}"></span>
-                                                                                                               <a href="{link controller='PageMenuItemEdit' id=$childMenuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><span class="icon icon16 fa-pencil"></span></a>
-                                                                                                               {if $childMenuItem->canDelete()}
-                                                                                                                       <span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$childMenuItem->menuItemID}" data-confirm-message="{lang __menuItem=$childMenuItem}wcf.acp.pageMenu.delete.sure{/lang}"></span>
-                                                                                                               {else}
-                                                                                                                       <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
-                                                                                                               {/if}
-                                                                                                               
-                                                                                                               {event name='subHeaderItemButtons'}
-                                                                                                       </span>
+                                                       </span>
+                                                       {if $menuItem|count}
+                                                               <ol class="sortableList" data-object-id="{@$menuItem->menuItemID}">
+                                                                       {foreach from=$menuItem item=childMenuItem}
+                                                                               <li class="sortableNode sortableNoNesting" data-object-id="{@$childMenuItem->menuItemID}">
+                                                                                       <span class="sortableNodeLabel">
+                                                                                               <a href="{link controller='PageMenuItemEdit' id=$childMenuItem->menuItemID}{/link}">{lang}{$childMenuItem->menuItem}{/lang}</a>
+                                                                                               <span class="statusDisplay sortableButtonContainer">
+                                                                                                       <span class="icon icon16 fa-{if !$childMenuItem->isDisabled}check-{/if}square-o jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $childMenuItem->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$childMenuItem->menuItemID}"></span>
+                                                                                                       <a href="{link controller='PageMenuItemEdit' id=$childMenuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><span class="icon icon16 fa-pencil"></span></a>
+                                                                                                       {if $childMenuItem->canDelete()}
+                                                                                                               <span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$childMenuItem->menuItemID}" data-confirm-message="{lang __menuItem=$childMenuItem}wcf.acp.pageMenu.delete.sure{/lang}"></span>
+                                                                                                       {else}
+                                                                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                                                                       {/if}
+                                                                                                       
+                                                                                                       {event name='subHeaderItemButtons'}
                                                                                                </span>
-                                                                                       </li>
-                                                                               {/foreach}
-                                                                       </ol>
-                                                               {/if}
-                                                       </li>
-                                               {/foreach}
-                                       {/content}
-                               </ol>
-                               
-                               <div class="formSubmit">
-                                       <button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
-                               </div>
+                                                                                       </span>
+                                                                               </li>
+                                                                       {/foreach}
+                                                               </ol>
+                                                       {/if}
+                                               </li>
+                                       {/foreach}
+                               {/content}
+                       </ol>
+                       
+                       <div class="formSubmit">
+                               <button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
                        </div>
-               </fieldset>
-       </div>
+               </div>
+       </section>
 {/hascontent}
 
 {hascontent}
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.pageMenu.footer{/lang}</legend>
-                       
-                       <div id="pageMenuItemFooterList" class="sortableListContainer">
-                               <ol class="sortableList simpleSortableList" data-object-id="0">
-                                       {content}
-                                               {foreach from=$footerItems item=menuItem}
-                                                       <li class="sortableNode" data-object-id="{@$menuItem->menuItemID}">
-                                                               <span class="sortableNodeLabel">
-                                                                       <a href="{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}">{lang}{$menuItem->menuItem}{/lang}</a>
-                                                                       <span class="statusDisplay sortableButtonContainer">
-                                                                               <span class="icon icon16 fa-{if !$menuItem->isDisabled}check-{/if}square-o jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $menuItem->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$menuItem->menuItemID}"></span>
-                                                                               <a href="{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><span class="icon icon16 fa-pencil"></span></a>
-                                                                               {if $menuItem->canDelete()}
-                                                                                       <span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menuItem->menuItemID}" data-confirm-message="{lang __menuItem=$menuItem}wcf.acp.pageMenu.delete.sure{/lang}"></span>
-                                                                               {else}
-                                                                                       <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
-                                                                               {/if}
-                                                                               
-                                                                               {event name='footerItemButtons'}
-                                                                       </span>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.pageMenu.footer{/lang}</h2>
+               
+               <div id="pageMenuItemFooterList" class="sortableListContainer">
+                       <ol class="sortableList simpleSortableList" data-object-id="0">
+                               {content}
+                                       {foreach from=$footerItems item=menuItem}
+                                               <li class="sortableNode" data-object-id="{@$menuItem->menuItemID}">
+                                                       <span class="sortableNodeLabel">
+                                                               <a href="{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}">{lang}{$menuItem->menuItem}{/lang}</a>
+                                                               <span class="statusDisplay sortableButtonContainer">
+                                                                       <span class="icon icon16 fa-{if !$menuItem->isDisabled}check-{/if}square-o jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $menuItem->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$menuItem->menuItemID}"></span>
+                                                                       <a href="{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><span class="icon icon16 fa-pencil"></span></a>
+                                                                       {if $menuItem->canDelete()}
+                                                                               <span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menuItem->menuItemID}" data-confirm-message="{lang __menuItem=$menuItem}wcf.acp.pageMenu.delete.sure{/lang}"></span>
+                                                                       {else}
+                                                                               <span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+                                                                       {/if}
+                                                                       
+                                                                       {event name='footerItemButtons'}
                                                                </span>
-                                                       </li>
-                                               {/foreach}
-                                       {/content}
-                               </ol>
-                               
-                               <div class="formSubmit">
-                                       <button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
-                               </div>
+                                                       </span>
+                                               </li>
+                                       {/foreach}
+                               {/content}
+                       </ol>
+                       
+                       <div class="formSubmit">
+                               <button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
                        </div>
-               </fieldset>
-       </div>
+               </div>
+       </section>
 {/hascontent}
 
 <div class="contentNavigation">
index a3f3dc61515031f86d6874277fbe12ccd673ae65..da9ba339d4298eae2c5e33a314b07678b47707f6 100644 (file)
@@ -19,8 +19,8 @@
 {include file='multipleLanguageInputJavascript' elementIdentifier='description' forceSelection=false}
 {include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=false}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.paidSubscription.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='PaidSubscriptionAdd'}{/link}{else}{link controller='PaidSubscriptionEdit' id=$subscriptionID}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'title'} class="formError"{/if}>
-                               <dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus="autofocus" class="medium" />
-                                       {if $errorField == 'title'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {elseif $errorType == 'multilingual'}
-                                                               {lang}wcf.global.form.error.multilingual{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.paidSubscription.title.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'description'} class="formError"{/if}>
-                               <dt><label for="description">{lang}wcf.global.description{/lang}</label></dt>
-                               <dd>
-                                       <textarea id="description" name="description" cols="40" rows="10">{$i18nPlainValues[description]}</textarea>
-                                       {if $errorField == 'description'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.paidSubscription.description.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt><label for="showOrder">{lang}wcf.acp.paidSubscription.showOrder{/lang}</label></dt>
-                               <dd>
-                                       <input type="number" id="showOrder" name="showOrder" value="{if $showOrder}{@$showOrder}{/if}" class="tiny" min="0" />
-                                       <small>{lang}wcf.acp.paidSubscription.showOrder.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" name="isDisabled" value="1" {if $isDisabled}checked="checked" {/if}/> {lang}wcf.acp.paidSubscription.isDisabled{/lang}</label>
-                                       <small>{lang}wcf.acp.paidSubscription.isDisabled.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {if $availableSubscriptions|count}
-                               <dl>
-                                       <dt>{lang}wcf.acp.paidSubscription.excludedSubscriptions{/lang}</dt>
-                                       <dd>
-                                               {foreach from=$availableSubscriptions item=availableSubscription}
-                                                       <label><input type="checkbox" name="excludedSubscriptionIDs[]" value="{@$availableSubscription->subscriptionID}" {if $availableSubscription->subscriptionID|in_array:$excludedSubscriptionIDs}checked="checked" {/if}/> {$availableSubscription->title|language}</label>
-                                               {/foreach}
-                                               <small>{lang}wcf.acp.paidSubscription.excludedSubscriptions.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'title'} class="formError"{/if}>
+                       <dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus="autofocus" class="medium" />
+                               {if $errorField == 'title'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {elseif $errorType == 'multilingual'}
+                                                       {lang}wcf.global.form.error.multilingual{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.paidSubscription.title.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.paidSubscription.paymentOptions{/lang}</legend>
+               <dl{if $errorField == 'description'} class="formError"{/if}>
+                       <dt><label for="description">{lang}wcf.global.description{/lang}</label></dt>
+                       <dd>
+                               <textarea id="description" name="description" cols="40" rows="10">{$i18nPlainValues[description]}</textarea>
+                               {if $errorField == 'description'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.paidSubscription.description.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-                       <dl{if $errorField == 'cost'} class="formError"{/if}>
-                               <dt><label for="cost">{lang}wcf.acp.paidSubscription.cost{/lang}</label></dt>
-                               <dd>
-                                       <input type="number" id="cost" name="cost" value="{$cost}" class="tiny" step="0.01" min="0" />
-                                       <select name="currency" id="currency">
-                                               {htmlOptions values=$availableCurrencies output=$availableCurrencies selected=$currency}
-                                       </select>
-                                       {if $errorField == 'cost'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.paidSubscription.cost.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
+               <dl>
+                       <dt><label for="showOrder">{lang}wcf.acp.paidSubscription.showOrder{/lang}</label></dt>
+                       <dd>
+                               <input type="number" id="showOrder" name="showOrder" value="{if $showOrder}{@$showOrder}{/if}" class="tiny" min="0" />
+                               <small>{lang}wcf.acp.paidSubscription.showOrder.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" name="isDisabled" value="1" {if $isDisabled}checked="checked" {/if}/> {lang}wcf.acp.paidSubscription.isDisabled{/lang}</label>
+                               <small>{lang}wcf.acp.paidSubscription.isDisabled.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {if $availableSubscriptions|count}
                        <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" id="subscriptionLengthPermanent" name="subscriptionLengthPermanent" value="1" {if !$subscriptionLength}checked="checked" {/if}/> {lang}wcf.acp.paidSubscription.subscriptionLength.permanent{/lang}</label>
-                               </dd>
-                       </dl>
-                       
-                       <dl id="subscriptionLengthDL"{if $errorField == 'subscriptionLength'} class="formError"{/if}>
-                               <dt><label for="subscriptionLength">{lang}wcf.acp.paidSubscription.subscriptionLength{/lang}</label></dt>
-                               <dd>
-                                       <input type="number" id="subscriptionLength" name="subscriptionLength" value="{@$subscriptionLength}" class="tiny" />
-                                       <select name="subscriptionLengthUnit" id="subscriptionLengthUnit">
-                                               <option value="D"{if $subscriptionLengthUnit == 'D'} selected="selected"{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.D{/lang}</option>
-                                               <option value="M"{if $subscriptionLengthUnit == 'M'} selected="selected"{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.M{/lang}</option>
-                                               <option value="Y"{if $subscriptionLengthUnit == 'Y'} selected="selected"{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.Y{/lang}</option>
-                                       </select>
-                                       {if $errorField == 'subscriptionLength'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.paidSubscription.subscriptionLength.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl id="isRecurringDL">
-                               <dt></dt>
+                               <dt>{lang}wcf.acp.paidSubscription.excludedSubscriptions{/lang}</dt>
                                <dd>
-                                       <label><input type="checkbox" name="isRecurring" value="1" {if $isRecurring}checked="checked" {/if}/> {lang}wcf.acp.paidSubscription.isRecurring{/lang}</label>
-                                       <small>{lang}wcf.acp.paidSubscription.isRecurring.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'groupIDs'} class="formError"{/if}>
-                               <dt><label>{lang}wcf.acp.paidSubscription.userGroups{/lang}</label></dt>
-                               <dd>
-                                       {foreach from=$availableUserGroups item=userGroup}
-                                               <label><input type="checkbox" name="groupIDs[]" value="{@$userGroup->groupID}" {if $userGroup->groupID|in_array:$groupIDs}checked="checked" {/if}/> {$userGroup->groupName|language}</label>
+                                       {foreach from=$availableSubscriptions item=availableSubscription}
+                                               <label><input type="checkbox" name="excludedSubscriptionIDs[]" value="{@$availableSubscription->subscriptionID}" {if $availableSubscription->subscriptionID|in_array:$excludedSubscriptionIDs}checked="checked" {/if}/> {$availableSubscription->title|language}</label>
                                        {/foreach}
-                                       {if $errorField == 'groupIDs'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.paidSubscription.userGroups.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.paidSubscription.userGroups.description{/lang}</small>
-                                       
+                                       <small>{lang}wcf.acp.paidSubscription.excludedSubscriptions.description{/lang}</small>
                                </dd>
                        </dl>
-               </fieldset>
+               {/if}
                
-               {event name='fieldsets'}
+               {event name='dataFields'}
        </div>
        
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.paidSubscription.paymentOptions{/lang}</h2>
+       
+               <dl{if $errorField == 'cost'} class="formError"{/if}>
+                       <dt><label for="cost">{lang}wcf.acp.paidSubscription.cost{/lang}</label></dt>
+                       <dd>
+                               <input type="number" id="cost" name="cost" value="{$cost}" class="tiny" step="0.01" min="0" />
+                               <select name="currency" id="currency">
+                                       {htmlOptions values=$availableCurrencies output=$availableCurrencies selected=$currency}
+                               </select>
+                               {if $errorField == 'cost'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.paidSubscription.cost.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" id="subscriptionLengthPermanent" name="subscriptionLengthPermanent" value="1" {if !$subscriptionLength}checked="checked" {/if}/> {lang}wcf.acp.paidSubscription.subscriptionLength.permanent{/lang}</label>
+                       </dd>
+               </dl>
+               
+               <dl id="subscriptionLengthDL"{if $errorField == 'subscriptionLength'} class="formError"{/if}>
+                       <dt><label for="subscriptionLength">{lang}wcf.acp.paidSubscription.subscriptionLength{/lang}</label></dt>
+                       <dd>
+                               <input type="number" id="subscriptionLength" name="subscriptionLength" value="{@$subscriptionLength}" class="tiny" />
+                               <select name="subscriptionLengthUnit" id="subscriptionLengthUnit">
+                                       <option value="D"{if $subscriptionLengthUnit == 'D'} selected="selected"{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.D{/lang}</option>
+                                       <option value="M"{if $subscriptionLengthUnit == 'M'} selected="selected"{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.M{/lang}</option>
+                                       <option value="Y"{if $subscriptionLengthUnit == 'Y'} selected="selected"{/if}>{lang}wcf.acp.paidSubscription.subscriptionLengthUnit.Y{/lang}</option>
+                               </select>
+                               {if $errorField == 'subscriptionLength'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.paidSubscription.subscriptionLength.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl id="isRecurringDL">
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" name="isRecurring" value="1" {if $isRecurring}checked="checked" {/if}/> {lang}wcf.acp.paidSubscription.isRecurring{/lang}</label>
+                               <small>{lang}wcf.acp.paidSubscription.isRecurring.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'groupIDs'} class="formError"{/if}>
+                       <dt><label>{lang}wcf.acp.paidSubscription.userGroups{/lang}</label></dt>
+                       <dd>
+                               {foreach from=$availableUserGroups item=userGroup}
+                                       <label><input type="checkbox" name="groupIDs[]" value="{@$userGroup->groupID}" {if $userGroup->groupID|in_array:$groupIDs}checked="checked" {/if}/> {$userGroup->groupName|language}</label>
+                               {/foreach}
+                               {if $errorField == 'groupIDs'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.paidSubscription.userGroups.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.paidSubscription.userGroups.description{/lang}</small>
+                               
+                       </dd>
+               </dl>
+       </section>
+       
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index bf7ce5bf9125eb7056a5ba61d156fe03bc34cb42..94f601010af85252d25d60ab1170d55f5399fc31 100644 (file)
@@ -9,8 +9,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.paidSubscription.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.paidSubscription.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 0eb6d8c3b7a26629df24ecd306a90e578ed2122b..6ff090a232c681d9d93d88cead9e61b24096e0fb 100644 (file)
@@ -1,8 +1,8 @@
 {capture assign='pageTitle'}{lang}wcf.acp.paidSubscription.transactionLog{/lang}: {@$log->logID}{/capture}
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.paidSubscription.transactionLog{/lang}: {@$log->logID}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.transactionLog{/lang}: {@$log->logID}</h1>
 </header>
 
 <div class="contentNavigation">
        </nav>
 </div>
 
-<div class="container containerPadding marginTop">
-       <fieldset>
-               <legend>{lang}wcf.acp.paidSubscription.transactionLog{/lang}: {@$log->logID}</legend>
-               
-               <dl>
-                       <dt>{lang}wcf.acp.paidSubscription.transactionLog.logMessage{/lang}</dt>
-                       <dd>{$log->logMessage}</dd>
-                       
-                       {if $log->userID}
-                               <dt>{lang}wcf.user.username{/lang}</dt>
-                               <dd><a href="{link controller='UserEdit' id=$log->userID}{/link}" title="{lang}wcf.acp.user.edit{/lang}">{$log->getUser()->username}</a></dd>
-                       {/if}
-                       
-                       {if $log->subscriptionID}
-                               <dt>{lang}wcf.acp.paidSubscription.subscription{/lang}</dt>
-                               <dd>{$log->getSubscription()->title|language}</dd>
-                       {/if}
-                       
-                       <dt>{lang}wcf.acp.paidSubscription.transactionLog.paymentMethod{/lang}</dt>
-                       <dd>{lang}wcf.payment.{@$log->getPaymentMethodName()}{/lang}</dd>
-                       
-                       <dt>{lang}wcf.acp.paidSubscription.transactionLog.transactionID{/lang}</dt>
-                       <dd>{$log->transactionID}</dd>
-                       
-                       <dt>{lang}wcf.acp.paidSubscription.transactionLog.logTime{/lang}</dt>
-                       <dd>{@$log->logTime|time}</dd>
-               </dl>
-       </fieldset>
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.acp.paidSubscription.transactionLog{/lang}: {@$log->logID}</h2>
        
-       <fieldset>
-               <legend>{lang}wcf.acp.paidSubscription.transactionLog.transactionDetails{/lang}</legend>
-       
-               <dl>
-                       {foreach from=$log->getTransactionDetails() key=key item=value}
-                               <dt>{$key}</dt>
-                               <dd>{$value}</dd>
-                       {/foreach}
-               </dl>
-       </fieldset>
-</div>
+       <dl>
+               <dt>{lang}wcf.acp.paidSubscription.transactionLog.logMessage{/lang}</dt>
+               <dd>{$log->logMessage}</dd>
+               
+               {if $log->userID}
+                       <dt>{lang}wcf.user.username{/lang}</dt>
+                       <dd><a href="{link controller='UserEdit' id=$log->userID}{/link}" title="{lang}wcf.acp.user.edit{/lang}">{$log->getUser()->username}</a></dd>
+               {/if}
+               
+               {if $log->subscriptionID}
+                       <dt>{lang}wcf.acp.paidSubscription.subscription{/lang}</dt>
+                       <dd>{$log->getSubscription()->title|language}</dd>
+               {/if}
+               
+               <dt>{lang}wcf.acp.paidSubscription.transactionLog.paymentMethod{/lang}</dt>
+               <dd>{lang}wcf.payment.{@$log->getPaymentMethodName()}{/lang}</dd>
+               
+               <dt>{lang}wcf.acp.paidSubscription.transactionLog.transactionID{/lang}</dt>
+               <dd>{$log->transactionID}</dd>
+               
+               <dt>{lang}wcf.acp.paidSubscription.transactionLog.logTime{/lang}</dt>
+               <dd>{@$log->logTime|time}</dd>
+       </dl>
+</section>
+
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.acp.paidSubscription.transactionLog.transactionDetails{/lang}</h2>
+
+       <dl>
+               {foreach from=$log->getTransactionDetails() key=key item=value}
+                       <dt>{$key}</dt>
+                       <dd>{$value}</dd>
+               {/foreach}
+       </dl>
+</section>
+
+{event name='sections'}
 
 <div class="contentNavigation">
        <nav>
index 1bdc173c23445148cc669bcfe70d1f4b183ef4e6..4300ed4eb0aea4972c4dedf20eacde46816709cd 100644 (file)
@@ -9,44 +9,42 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.paidSubscription.transactionLog.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.transactionLog.list{/lang}</h1>
 </header>
 
 <form method="post" action="{link controller='PaidSubscriptionTransactionLogList'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.filter{/lang}</legend>
-                       
-                       <dl>
-                               <dt><label for="transactionID">{lang}wcf.acp.paidSubscription.transactionLog.transactionID{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="transactionID" name="transactionID" value="{$transactionID}" class="long" />
-                               </dd>
-                       </dl>
-                       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.global.filter{/lang}</h2>
+               
+               <dl>
+                       <dt><label for="transactionID">{lang}wcf.acp.paidSubscription.transactionLog.transactionID{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="transactionID" name="transactionID" value="{$transactionID}" class="long" />
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="username" name="username" value="{$username}" class="long" />
+                       </dd>
+               </dl>
+               
+               {if $availableSubscriptions|count}
                        <dl>
-                               <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                               <dt><label for="subscriptionID">{lang}wcf.acp.paidSubscription.subscription{/lang}</label></dt>
                                <dd>
-                                       <input type="text" id="username" name="username" value="{$username}" class="long" />
+                                       <select name="subscriptionID" id="subscriptionID">
+                                               <option value="0">{lang}wcf.global.noSelection{/lang}</option>
+                                               {foreach from=$availableSubscriptions item=availableSubscription}
+                                                       <option value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID == $subscriptionID} selected="selected"{/if}>{$availableSubscription->title|language}</option>
+                                               {/foreach}
+                                       </select>
                                </dd>
                        </dl>
-                       
-                       {if $availableSubscriptions|count}
-                               <dl>
-                                       <dt><label for="subscriptionID">{lang}wcf.acp.paidSubscription.subscription{/lang}</label></dt>
-                                       <dd>
-                                               <select name="subscriptionID" id="subscriptionID">
-                                                       <option value="0">{lang}wcf.global.noSelection{/lang}</option>
-                                                       {foreach from=$availableSubscriptions item=availableSubscription}
-                                                               <option value="{@$availableSubscription->subscriptionID}"{if $availableSubscription->subscriptionID == $subscriptionID} selected="selected"{/if}>{$availableSubscription->title|language}</option>
-                                                       {/foreach}
-                                               </select>
-                                       </dd>
-                               </dl>
-                       {/if}
-               </fieldset>
-       </div>
+               {/if}
+       </section>
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.paidSubscription.transactionLog.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index bb3ff93b229fab526f540b4568bc1f8623b78d64..36f17e521fdcfd68bf3238d8eae07bec6721069b 100644 (file)
@@ -9,9 +9,9 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.paidSubscription.user.add{/lang}</h1>
-       <p>{$subscription->title|language}</p>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.user.add{/lang}</h1>
+       <p class="contentHeaderDescription">{$subscription->title|language}</p>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{link controller='PaidSubscriptionUserAdd' id=$subscriptionID}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'username'} class="formError"{/if}>
-                               <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+       <div class="section">
+               <dl{if $errorField == 'username'} class="formError"{/if}>
+                       <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="username" name="username" value="{$username}" autofocus="autofocus" class="medium" />
+                               {if $errorField == 'username'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.user.username.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {if $subscription->subscriptionLength}
+                       <dl{if $errorField == 'endDate'} class="formError"{/if}>
+                               <dt><label for="endDate">{lang}wcf.acp.paidSubscription.user.endDate{/lang}</label></dt>
                                <dd>
-                                       <input type="text" id="username" name="username" value="{$username}" autofocus="autofocus" class="medium" />
-                                       {if $errorField == 'username'}
+                                       <input type="date" id="endDate" name="endDate" value="{$endDate}" class="medium" data-ignore-timezone="true" />
+                                       {if $errorField == 'endDate'}
                                                <small class="innerError">
                                                        {if $errorType == 'empty'}
                                                                {lang}wcf.global.form.error.empty{/lang}
                                                        {else}
-                                                               {lang}wcf.user.username.error.{@$errorType}{/lang}
+                                                               {lang}wcf.acp.paidSubscription.user.endDate.error.{@$errorType}{/lang}
                                                        {/if}
                                                </small>
                                        {/if}
                                </dd>
                        </dl>
-                       
-                       {if $subscription->subscriptionLength}
-                               <dl{if $errorField == 'endDate'} class="formError"{/if}>
-                                       <dt><label for="endDate">{lang}wcf.acp.paidSubscription.user.endDate{/lang}</label></dt>
-                                       <dd>
-                                               <input type="date" id="endDate" name="endDate" value="{$endDate}" class="medium" data-ignore-timezone="true" />
-                                               {if $errorField == 'endDate'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.paidSubscription.user.endDate.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                       {/if}
-               </fieldset>
-               
-               {event name='fieldsets'}
+               {/if}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index 2e053b16294051da22d0c6a7841e816e3a2dd160..11f240ab515fd3906dfedf528266db5ee054a2d5 100644 (file)
@@ -8,8 +8,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.paidSubscription.user.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.paidSubscription.user.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.paidSubscription.user.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index c02fc0393a06257db503e413b8cc808bec1fe91b..05ff6971e1e41b5090363cee6bdded1448d62eec 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header'}
 
-<header class="boxHeadline">
-       <h1>PHP Version {PHP_VERSION}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">PHP Version {PHP_VERSION}</h1>
 </header>
 
 {@$phpInfo}
index b0759a15c46603e38f4479cc96b0b6934ae34024..9ef6c2b684ddfcf3c4335146f9fe80884e2e3fe9 100644 (file)
@@ -2,9 +2,11 @@
        <p class="error">{lang}wcf.acp.pluginStore.authorization.credentials.rejected{/lang}</p>
 {/if}
 
-<fieldset{if $rejected} class="marginTop"{/if}>
-       <legend>{lang}wcf.acp.pluginStore.authorization.credentials{/lang}</legend>
-       <small>{lang}wcf.acp.pluginStore.authorization.credentials.description{/lang}</small>
+<section class="section">
+       <header class="sectionHeader">
+               <h2 class="sectionTitle">{lang}wcf.acp.pluginStore.authorization.credentials{/lang}</h2>
+               <small class="sectionDescription">{lang}wcf.acp.pluginStore.authorization.credentials.description{/lang}</small>
+       </header>
        
        <dl>
                <dt><label for="pluginStoreUsername">{lang}wcf.acp.pluginStore.authorization.username{/lang}</label></dt>
@@ -15,7 +17,7 @@
                <dt><label for="pluginStorePassword">{lang}wcf.acp.pluginStore.authorization.password{/lang}</label></dt>
                <dd><input type="password" id="pluginStorePassword" value="" class="long" autocomplete="off" /></dd>
        </dl>
-</fieldset>
+</section>
 
 <div class="formSubmit">
        <button>{lang}wcf.global.button.submit{/lang}</button>
index c98a5b6b85efc5e4930cb266f314370f1feb2548..2bd6a5174a0156c745a9324a2f44098d3b1a8659 100644 (file)
        });
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.pluginStore.purchasedItems{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.pluginStore.purchasedItems{/lang}</h1>
 </header>
 
-{*<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='PageMenuItemAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.pageMenu.add{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtonsTop'}
-               </ul>
-       </nav>
-</div>*}
-
 {foreach from=$wcfMajorReleases item=wcfMajorRelease}
        {if !$productData[$wcfMajorRelease]|empty}
                {if !$updateServers[$wcfMajorRelease]|isset}
                        <p class="warning">{lang}wcf.acp.pluginStore.purchasedItems.updateServer.requireUpdate{/lang}</p>
                {/if}
                
-               <div class="tabularBox tabularBoxTitle marginTop">
-                       <header>
-                               <h2>{lang}wcf.acp.pluginStore.purchasedItems.wcfMajorRelease{/lang} <span class="badge badgeInverse">{#$productData[$wcfMajorRelease]|count}</span></h2>
-                       </header>
-                       
+               <div class="section tabularBox">
                        <table class="table">
                                <thead>
                                        <tr>
        {/if}
 {/foreach}
 
-{*<div class="contentNavigation">
-       <nav>
-               <ul>
-                       <li><a href="{link controller='PageMenuItemAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.pageMenu.add{/lang}</span></a></li>
-                       
-                       {event name='contentNavigationButtonsBottom'}
-               </ul>
-       </nav>
-</div>*}
-
 {include file='footer'}
index 795fdf58c997beec2410a5a895716267417c4c5c..65fdb1610968a993ab1465aeff988f7ddfeb2480 100644 (file)
@@ -8,8 +8,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.rebuildData{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.rebuildData{/lang}</h1>
 </header>
 
 {if $showInnoDBWarning}
        {/hascontent}
 </div>
 
-<div class="container containerPadding marginTop">
-       <fieldset>
-               <legend>{lang}wcf.acp.rebuildData{/lang}</legend>
-               <small>{lang}wcf.acp.rebuildData.description{/lang}</small>
-               
-               {foreach from=$objectTypes item=objectType}
-                       <dl class="wide">
-                               <dd>
-                                       <a class="button small" id="rebuildData{@$objectType->objectTypeID}">{lang}wcf.acp.rebuildData.{@$objectType->objectType}{/lang}</a>
-                                       <small>{lang}wcf.acp.rebuildData.{@$objectType->objectType}.description{/lang}</small>
-                                       
-                                       <script data-relocate="true">
-                                               //<![CDATA[
-                                               $(function() {
-                                                       $('#rebuildData{@$objectType->objectTypeID}').click(function () {
-                                                               new WCF.ACP.Worker('cache', '{@$objectType->className|encodeJS}', '{lang}wcf.acp.rebuildData.{@$objectType->objectType}{/lang}');
-                                                       });
+<section class="section">
+       <header class="sectionHeader">
+               <h2 class="sectionTitle">{lang}wcf.acp.rebuildData{/lang}</h2>
+               <small class="sectionDescription">{lang}wcf.acp.rebuildData.description{/lang}</small>
+       </header>
+       
+       {foreach from=$objectTypes item=objectType}
+               <dl class="wide">
+                       <dd>
+                               <a class="button small" id="rebuildData{@$objectType->objectTypeID}">{lang}wcf.acp.rebuildData.{@$objectType->objectType}{/lang}</a>
+                               <small>{lang}wcf.acp.rebuildData.{@$objectType->objectType}.description{/lang}</small>
+                               
+                               <script data-relocate="true">
+                                       //<![CDATA[
+                                       $(function() {
+                                               $('#rebuildData{@$objectType->objectTypeID}').click(function () {
+                                                       new WCF.ACP.Worker('cache', '{@$objectType->className|encodeJS}', '{lang}wcf.acp.rebuildData.{@$objectType->objectType}{/lang}');
                                                });
-                                               //]]>
-                                       </script>
-                               </dd>
-                       </dl>
-               {/foreach}
-       </fieldset>
-</div>
+                                       });
+                                       //]]>
+                               </script>
+                       </dd>
+               </dl>
+       {/foreach}
+</section>
 
 <div class="contentNavigation">
        {hascontent}
index c9e3c2a1b530aadc10a9b343305dd92ec347a893..870bffedba8859fd036fa5520d6864a81a351ffe 100644 (file)
@@ -3,9 +3,11 @@
 {else}
        {* No explicit keys were set, use legacy V1 API and WoltLab's OEM keys *}
        {if RECAPTCHA_PUBLICKEY === '' || RECAPTCHA_PRIVATEKEY === ''}
-       <fieldset>
-               <legend><label for="recaptcha_response_field">{lang}wcf.recaptcha.title{/lang}</label></legend>
-               <small>{lang}wcf.recaptcha.description{/lang}</small>
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.recaptcha.title{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.recaptcha.description{/lang}</small>
+               </header>
                
                <dl class="wide reCaptcha{if $errorField|isset && $errorField == 'recaptchaString'} formError{/if}">
                        {if !$ajaxCaptcha|isset || !$ajaxCaptcha}
@@ -22,8 +24,8 @@
                                <label for="recaptcha_response_field">reCAPTCHA</label>
                        </dt>
                        <dd class="jsOnly">
-                               <div id="recaptcha_image" class="framed"></div>
-                               <input type="text" id="recaptcha_response_field" name="recaptcha_response_field" class="medium marginTop" />
+                               <div id="recaptcha_image"></div>
+                               <input type="text" id="recaptcha_response_field" name="recaptcha_response_field" class="medium" />
                                {if (($errorType|isset && $errorType|is_array && $errorType[recaptchaString]|isset) || ($errorField|isset && $errorField == 'recaptchaString'))}
                                        {if $errorType|is_array && $errorType[recaptchaString]|isset}
                                                {assign var='__errorType' value=$errorType[recaptchaString]}
                                </script>
                        {/if}
                </dl>
-       </fieldset>
+       </section>
        {else}
-       <fieldset>
-               <legend>{lang}wcf.recaptcha.title{/lang}</legend>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.recaptcha.title{/lang}</h2>
                {assign var="recaptchaBucketID" value=true|microtime|sha1}
                <dl class="{if $errorField|isset && $errorField == 'recaptchaString'}formError{/if}">
                        <dt></dt>
                if (!window.grecaptcha) $.getScript('https://www.google.com/recaptcha/api.js?render=explicit&onload=recaptchaCallback');
                //]]>
                </script>
-       </fieldset>
+       </section>
        {/if}
 {/if}
index daf1c4552235211c161979fd33587fedb5def23f..3d6535422f1d0693c66dd500c818188b6f224119 100644 (file)
@@ -32,9 +32,9 @@
                        <div id="content" class="content">
 
 {* content above was taken from 'header.tpl' *}
-
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.rescueMode{/lang}</h1>
+                               
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.rescueMode{/lang}</h1>
 </header>
 
 <p class="info">{lang}wcf.acp.rescueMode.description{/lang}</p>
index 160631c9ec3f2fa1c024d9eaedfede0f394cc3b1..f787e081c4b714cd0c5bada092712766e0071221 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.smiley.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.smiley.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.smiley.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='SmileyAdd'}{/link}{else}{link controller='SmileyEdit' id=$smiley->smileyID}{/link}{/if}" enctype="multipart/form-data">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'smileyTitle'} class="formError"{/if}>
-                               <dt><label for="smileyTitle">{lang}wcf.acp.smiley.title{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="smileyTitle" name="smileyTitle" value="{$i18nPlainValues['smileyTitle']}" autofocus="autofocus" class="long" />
-                                       
-                                       {if $errorField == 'smileyTitle'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty' || $errorType == 'multilingual'}
-                                                               {lang}wcf.global.form.error.{$errorType}{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.smiley.smileyTitle.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       {include file='multipleLanguageInputJavascript' elementIdentifier='smileyTitle' forceSelection=false}
-                       
-                       <dl{if $errorField == 'categoryID'} class="formError"{/if}>
-                               <dt><label for="categoryID">{lang}wcf.acp.smiley.categoryID{/lang}</label></dt>
-                               <dd>
-                                       <select id="categoryID" name="categoryID">
-                                               <option value="0"{if $categoryID === null} selected="selected"{/if}>{lang}wcf.acp.smiley.categoryID.default{/lang}</option>
-                                               {include file='categoryOptionList'}
-                                       </select>
-                                       
-                                       {if $errorField == 'categoryID'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.smiley.categoryID.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'smileyCode'} class="formError"{/if}>
-                               <dt><label for="smileyCode">{lang}wcf.acp.smiley.smileyCode{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="smileyCode" name="smileyCode" value="{$smileyCode}" required="required" class="medium" />
-                                       
-                                       {if $errorField == 'smileyCode'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.smiley.smileyCode.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'aliases'} class="formError"{/if}>
-                               <dt><label for="aliases">{lang}wcf.acp.smiley.aliases{/lang}</label></dt>
-                               <dd>
-                                       <textarea id="aliases" name="aliases" cols="40" rows="10">{$aliases}</textarea>
-                                       
-                                       {if $errorField == 'aliases'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.smiley.aliases.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'showOrder'} class="formError"{/if}>
-                               <dt><label for="showOrder">{lang}wcf.acp.smiley.showOrder{/lang}</label></dt>
-                               <dd>
-                                       <input type="number" id="showOrder" name="showOrder" value="{$showOrder}" min="0" class="short" />
-                                       
-                                       {if $errorField == 'showOrder'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.smiley.showOrder.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'smileyTitle'} class="formError"{/if}>
+                       <dt><label for="smileyTitle">{lang}wcf.acp.smiley.title{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="smileyTitle" name="smileyTitle" value="{$i18nPlainValues['smileyTitle']}" autofocus="autofocus" class="long" />
+                               
+                               {if $errorField == 'smileyTitle'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty' || $errorType == 'multilingual'}
+                                                       {lang}wcf.global.form.error.{$errorType}{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.smiley.smileyTitle.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               {include file='multipleLanguageInputJavascript' elementIdentifier='smileyTitle' forceSelection=false}
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.smiley.smileyFile{/lang}</legend>
-                       
-                       <dl{if $errorField == 'fileUpload'} class="formError"{/if}>
-                               <dt><label for="fileUpload">{lang}wcf.acp.smiley.fileUpload{/lang}</label></dt>
-                               <dd>
-                                       {if $uploadedFilename}
-                                               <img src="{@$__wcf->getPath()}images/smilies/{$uploadedFilename}" alt="" />
-                                               <input type="hidden" name="uploadedFilename" value="{$uploadedFilename}" />
-                                       {/if}
-                                       <input type="file" id="fileUpload" name="fileUpload" value="" />
-                                       
-                                       {if $errorField == 'fileUpload'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.smiley.fileUpload.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.smiley.fileUpload.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'smileyPath'} class="formError"{/if}>
-                               <dt><label for="smileyPath">{lang}wcf.acp.smiley.smileyPath{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="smileyPath" name="smileyPath" value="{$smileyPath}" class="long" />
-                                       
-                                       {if $errorField == 'smileyPath'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.smiley.smileyPath.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.smiley.smileyPath.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='smileyFileFields'}
-               </fieldset>
+               <dl{if $errorField == 'categoryID'} class="formError"{/if}>
+                       <dt><label for="categoryID">{lang}wcf.acp.smiley.categoryID{/lang}</label></dt>
+                       <dd>
+                               <select id="categoryID" name="categoryID">
+                                       <option value="0"{if $categoryID === null} selected="selected"{/if}>{lang}wcf.acp.smiley.categoryID.default{/lang}</option>
+                                       {include file='categoryOptionList'}
+                               </select>
+                               
+                               {if $errorField == 'categoryID'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.smiley.categoryID.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
-       </div>
+               <dl{if $errorField == 'smileyCode'} class="formError"{/if}>
+                       <dt><label for="smileyCode">{lang}wcf.acp.smiley.smileyCode{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="smileyCode" name="smileyCode" value="{$smileyCode}" required="required" class="medium" />
+                               
+                               {if $errorField == 'smileyCode'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.smiley.smileyCode.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'aliases'} class="formError"{/if}>
+                       <dt><label for="aliases">{lang}wcf.acp.smiley.aliases{/lang}</label></dt>
+                       <dd>
+                               <textarea id="aliases" name="aliases" cols="40" rows="10">{$aliases}</textarea>
+                               
+                               {if $errorField == 'aliases'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.smiley.aliases.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'showOrder'} class="formError"{/if}>
+                       <dt><label for="showOrder">{lang}wcf.acp.smiley.showOrder{/lang}</label></dt>
+                       <dd>
+                               <input type="number" id="showOrder" name="showOrder" value="{$showOrder}" min="0" class="short" />
+                               
+                               {if $errorField == 'showOrder'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.smiley.showOrder.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
+       </section>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.smiley.smileyFile{/lang}</h2>
+               
+               <dl{if $errorField == 'fileUpload'} class="formError"{/if}>
+                       <dt><label for="fileUpload">{lang}wcf.acp.smiley.fileUpload{/lang}</label></dt>
+                       <dd>
+                               {if $uploadedFilename}
+                                       <img src="{@$__wcf->getPath()}images/smilies/{$uploadedFilename}" alt="" />
+                                       <input type="hidden" name="uploadedFilename" value="{$uploadedFilename}" />
+                               {/if}
+                               <input type="file" id="fileUpload" name="fileUpload" value="" />
+                               
+                               {if $errorField == 'fileUpload'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.smiley.fileUpload.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.smiley.fileUpload.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'smileyPath'} class="formError"{/if}>
+                       <dt><label for="smileyPath">{lang}wcf.acp.smiley.smileyPath{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="smileyPath" name="smileyPath" value="{$smileyPath}" class="long" />
+                               
+                               {if $errorField == 'smileyPath'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.smiley.smileyPath.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.smiley.smileyPath.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {event name='smileyFileFields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 7c8dc9c5cc7e8b644ce8d3ca8ca8bebe8dcf7e32..3200e2108a45f2c287bfe131fd483d17fd354aab 100644 (file)
@@ -11,8 +11,8 @@
        </script>
 {/if}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.smiley.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.smiley.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
@@ -27,8 +27,8 @@
        </nav>
 </div>
 {if $smileyCount}
-       <div class="tabMenuContainer container containerPadding marginTop">
-               <nav class="menu">
+       <div class="section tabMenuContainer">
+               <nav class="menu">{*todo*}
                        <ul>
                                {foreach from=$categories item=categoryLoop}
                                        <li{if (!$category && !$categoryLoop->categoryID) || ($category && $category->categoryID == $categoryLoop->categoryID)} class="ui-state-active"{/if}><a href="{if $categoryLoop->categoryID}{link controller='SmileyList' object=$categoryLoop}{/link}{else}{link controller='SmileyList'}{/link}{/if}">{$categoryLoop->title|language}</a></li>
index 2b89b22a1569838f962b11fc4febbc4fcc60c92e..84f84fda88083ccb8420e46098611e708268a1a1 100644 (file)
        });
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.stat{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.stat{/lang}</h1>
 </header>
 
-<div class="container containerPadding marginTop">
-       <fieldset>
-               <legend>{lang}wcf.acp.stat{/lang}</legend>
-               
-               <div id="chart" style="height: 400px"></div>
-       </fieldset>
+<div class="section">
+       <div id="chart" style="height: 400px"></div>
+</div>
+
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.acp.stat.settings{/lang}</h2>
        
-       <fieldset>
-               <legend>{lang}wcf.acp.stat.settings{/lang}</legend>
-               
-               <dl>
-                       <dt><label for="startDate">{lang}wcf.acp.stat.period{/lang}</label></dt>
-                       <dd>
-                               <input type="date" id="startDate" name="startDate" value="{$startDate}" data-placeholder="{lang}wcf.date.period.start{/lang}" />
-                               &ndash;
-                               <input type="date" id="endDate" name="endDate" value="{$endDate}" data-placeholder="{lang}wcf.date.period.end{/lang}" />
-                       </dd>
-               </dl>
-               
-               <dl>
-                       <dt><label>{lang}wcf.acp.stat.dateGrouping{/lang}</label></dt>
-                       <dd>
-                               <label><input type="radio" name="dateGrouping" value="daily" checked="checked" /> {lang}wcf.acp.stat.dateGrouping.daily{/lang}</label>
-                               <label><input type="radio" name="dateGrouping" value="weekly" /> {lang}wcf.acp.stat.dateGrouping.weekly{/lang}</label>
-                               <label><input type="radio" name="dateGrouping" value="monthly" /> {lang}wcf.acp.stat.dateGrouping.monthly{/lang}</label>
-                               <label><input type="radio" name="dateGrouping" value="yearly" /> {lang}wcf.acp.stat.dateGrouping.yearly{/lang}</label>
-                       </dd>
-               </dl>
-               
+       <dl>
+               <dt><label for="startDate">{lang}wcf.acp.stat.period{/lang}</label></dt>
+               <dd>
+                       <input type="date" id="startDate" name="startDate" value="{$startDate}" data-placeholder="{lang}wcf.date.period.start{/lang}" />
+                       &ndash;
+                       <input type="date" id="endDate" name="endDate" value="{$endDate}" data-placeholder="{lang}wcf.date.period.end{/lang}" />
+               </dd>
+       </dl>
+       
+       <dl>
+               <dt><label>{lang}wcf.acp.stat.dateGrouping{/lang}</label></dt>
+               <dd>
+                       <label><input type="radio" name="dateGrouping" value="daily" checked="checked" /> {lang}wcf.acp.stat.dateGrouping.daily{/lang}</label>
+                       <label><input type="radio" name="dateGrouping" value="weekly" /> {lang}wcf.acp.stat.dateGrouping.weekly{/lang}</label>
+                       <label><input type="radio" name="dateGrouping" value="monthly" /> {lang}wcf.acp.stat.dateGrouping.monthly{/lang}</label>
+                       <label><input type="radio" name="dateGrouping" value="yearly" /> {lang}wcf.acp.stat.dateGrouping.yearly{/lang}</label>
+               </dd>
+       </dl>
+       
+       <dl>
+               <dt><label>{lang}wcf.acp.stat.value{/lang}</label></dt>
+               <dd>
+                       <label><input type="radio" name="value" value="counter" checked="checked" /> {lang}wcf.acp.stat.value.counter{/lang}</label>
+                       <label><input type="radio" name="value" value="total" /> {lang}wcf.acp.stat.value.total{/lang}</label>
+               </dd>
+       </dl>
+</section>
+
+<section class="section">
+       <h2 class="sectionTitle">{lang}wcf.acp.stat.types{/lang}</h2>
+       
+       {foreach from=$availableObjectTypes key=categoryName item=objectTypes}
                <dl>
-                       <dt><label>{lang}wcf.acp.stat.value{/lang}</label></dt>
+                       <dt><label>{lang}wcf.acp.stat.category.{@$categoryName}{/lang}</label></dt>
                        <dd>
-                               <label><input type="radio" name="value" value="counter" checked="checked" /> {lang}wcf.acp.stat.value.counter{/lang}</label>
-                               <label><input type="radio" name="value" value="total" /> {lang}wcf.acp.stat.value.total{/lang}</label>
+                               {foreach from=$objectTypes item=objectType}
+                                       <label><input type="checkbox" name="objectTypeID" value="{@$objectType->objectTypeID}" {if $objectType->default}checked="checked" {/if}/> {lang}wcf.acp.stat.{@$objectType->objectType}{/lang}</label>
+                               {/foreach}
                        </dd>
                </dl>
-       </fieldset>
-       
-       <fieldset>
-               <legend>{lang}wcf.acp.stat.types{/lang}</legend>
-               
-               {foreach from=$availableObjectTypes key=categoryName item=objectTypes}
-                       <dl>
-                               <dt><label>{lang}wcf.acp.stat.category.{@$categoryName}{/lang}</label></dt>
-                               <dd>
-                                       {foreach from=$objectTypes item=objectType}
-                                               <label><input type="checkbox" name="objectTypeID" value="{@$objectType->objectTypeID}" {if $objectType->default}checked="checked" {/if}/> {lang}wcf.acp.stat.{@$objectType->objectType}{/lang}</label>
-                                       {/foreach}
-                               </dd>
-                       </dl>
-               {/foreach}
-       </fieldset>
-</div>
+       {/foreach}
+</section>
 
 <div class="formSubmit">
        <button class="buttonPrimary" id="statRefreshButton">{lang}wcf.global.button.refresh{/lang}</button>
index 4fe6eb34078c12d3a5dd172f23477227f6fdeb49..6d767c8ebbce289da679122dc236a3607349850d 100644 (file)
                }).trigger('change');
        });
 </script>
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.style.{$action}{/lang}</h1>
-       {if $action == 'edit'}<p>{$styleName}</p>{/if}
+
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.style.{$action}{/lang}</h1>
+       {if $action == 'edit'}<p class="contentHeaderDescription">{$styleName}</p>{/if}
 </header>
 
+<p class="info">{lang}wcf.acp.style.protected{/lang}</p>
+
 {include file='formError'}
 
 {if $success|isset}
@@ -68,7 +71,7 @@
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='StyleAdd'}{/link}{else}{link controller='StyleEdit' id=$styleID}{/link}{/if}">
-       <div class="tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem" id="styleTabMenuContainer">
+       <div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem" id="styleTabMenuContainer">
                <nav class="tabMenu">
                        <ul>
                                <li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.acp.style.general{/lang}</a></li>
                </nav>
                
                {* general *}
-               <div id="general" class="container containerPadding tabMenuContent">
-                       <p class="info">{lang}wcf.acp.style.protected{/lang}</p>
-                       
-                       <fieldset class="marginTop">
-                               <legend>{lang}wcf.acp.style.general.data{/lang}</legend>
-                               
+               <div id="general" class="tabMenuContent">
+                       <div class="section">
                                <dl{if $errorField == 'styleName'} class="formError"{/if}>
                                        <dt><label for="styleName">{lang}wcf.acp.style.styleName{/lang}</label></dt>
                                        <dd>
                                </dl>
                                
                                {event name='dataFields'}
-                       </fieldset>
+                       </div>
                        
-                       <fieldset>
-                               <legend>{lang}wcf.acp.style.general.files{/lang}</legend>
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.acp.style.general.files{/lang}</h2>
                                
                                <dl{if $errorField == 'image'} class="formError"{/if}>
                                        <dt><label for="image">{lang}wcf.acp.style.image{/lang}</label></dt>
-                                       <dd class="framed">
+                                       <dd>
                                                <img src="{if $action == 'add'}{@$__wcf->getPath()}images/stylePreview.png{else}{@$style->getPreviewImage()}{/if}" alt="" id="styleImage" />
                                                <div id="uploadImage"></div>
                                                {if $errorField == 'image'}
                                </dl>
                                
                                {event name='fileFields'}
-                       </fieldset>
+                       </section>
                        
                        {event name='generalFieldsets'}
                </div>
                
                {* globals *}
-               <div id="globals" class="container containerPadding tabMenuContent">
+               <div id="globals" class="tabMenuContent">
                        {* layout *}
-                       <fieldset>
-                               <legend>{lang}wcf.acp.style.globals.layout{/lang}</legend>
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.acp.style.globals.layout{/lang}</h2>
                                
                                <dl>
                                        <dt></dt>
                                </dl>
                                
                                {event name='layoutFields'}
-                       </fieldset>
+                       </section>
                        
                        {* logo *}
-                       <fieldset>
-                               <legend>{lang}wcf.acp.style.globals.pageLogo{/lang}</legend>
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.acp.style.globals.pageLogo{/lang}</h2>
                                
                                <dl>
                                        <dt><label for="pageLogo">{lang}wcf.acp.style.globals.pageLogo{/lang}</label></dt>
-                                       <dd class="framed">
+                                       <dd>
                                                <img src="" alt="" id="styleLogo" style="max-width: 100%" />
                                                <div id="uploadLogo"></div>
                                                {if $errorField == 'image'}
                                </dl>
                                
                                {event name='logoFields'}
-                       </fieldset>
+                       </section>
                        
                        {* font *}
-                       <fieldset>
-                               <legend>{lang}wcf.acp.style.globals.font{/lang}</legend>
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.acp.style.globals.font{/lang}</h2>
                                
                                <dl>
                                        <dt><label for="wcfFontSizeDefault">{lang}wcf.acp.style.globals.fontSizeDefault{/lang}</label></dt>
                                        </dd>
                                </dl>
                                
-                               <dl class="marginTop">
+                               <dl>
                                        <dt></dt>
                                        <dd><label>
                                                <input type="checkbox" id="useGoogleFont" name="useGoogleFont" value="1"{if $variables[useGoogleFont]} checked="checked"{/if} />
                                </dl>
                                
                                {event name='fontFields'}
-                       </fieldset>
+                       </section>
                        
                        {event name='globalFieldsets'}
                </div>
                
                {* colors *}
-               <div id="colors" class="container containerPadding tabMenuContainer tabMenuContent">
-                       <div id="spWrapper">
-                               <div id="spWindow">
-                                       <div id="spHeader" data-region="wcfHeader">
-                                               <div class="spBoundary">
-                                                       <div id="spLogo"><img src="{@$__wcf->getPath()}acp/images/wcfLogo.png"></div>
-                                                       <div id="spSearch"><input type="search" id="spSearchBox" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" autocomplete="off" data-region="wcfHeaderSearchBox"></div>
-                                                       <div id="spMenu">
-                                                               <ol class="inlineList" data-region="wcfHeaderMenu">
+               <div id="colors" class="tabMenuContent">
+                       <div class="section">
+                               <div id="spWrapper">
+                                       <div id="spWindow">
+                                               <div id="spHeader" data-region="wcfHeader">
+                                                       <div class="spBoundary">
+                                                               <div id="spLogo"><img src="{@$__wcf->getPath()}acp/images/wcfLogo.png"></div>
+                                                               <div id="spSearch"><input type="search" id="spSearchBox" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" autocomplete="off" data-region="wcfHeaderSearchBox"></div>
+                                                               <div id="spMenu">
+                                                                       <ol class="inlineList" data-region="wcfHeaderMenu">
+                                                                               <li><a>Lorem</a></li>
+                                                                               <li><a>Ipsum Dolor</a></li>
+                                                                               <li class="active">
+                                                                                       <a>Sit Amet</a>
+                                                                                       <ol id="spSubMenu" data-region="wcfHeaderMenuDropdown">
+                                                                                               <li><a>Lorem</a></li>
+                                                                                               <li><a>Ipsum</a></li>
+                                                                                               <li class="active"><a>Dolor Sit</a></li>
+                                                                                       </ol>
+                                                                               </li>
+                                                                       </ol>
+                                                               </div>
+                                                               <div id="spUser"></div>
+                                                       </div>
+                                               </div>
+                                               
+                                               <div id="spNavigation" data-region="wcfNavigation">
+                                                       <div class="spBoundary">
+                                                               <ol class="inlineList">
                                                                        <li><a>Lorem</a></li>
-                                                                       <li><a>Ipsum Dolor</a></li>
-                                                                       <li class="active">
-                                                                               <a>Sit Amet</a>
-                                                                               <ol id="spSubMenu" data-region="wcfHeaderMenuDropdown">
-                                                                                       <li><a>Lorem</a></li>
-                                                                                       <li><a>Ipsum</a></li>
-                                                                                       <li class="active"><a>Dolor Sit</a></li>
-                                                                               </ol>
-                                                                       </li>
+                                                                       <li><a>Ipsum</a></li>
                                                                </ol>
                                                        </div>
-                                                       <div id="spUser"></div>
-                                               </div>
-                                       </div>
-                                       
-                                       <div id="spNavigation" data-region="wcfNavigation">
-                                               <div class="spBoundary">
-                                                       <ol class="inlineList">
-                                                               <li><a>Lorem</a></li>
-                                                               <li><a>Ipsum</a></li>
-                                                       </ol>
                                                </div>
-                                       </div>
-                                       
-                                       <div id="spContent">
-                                               <div class="spBoundary">
-                                                       <div id="spContentWrapper">
-                                                               <div class="spHeadline" data-region="wcfContentHeadline">Lorem Ipsum</div>
-                                                               
-                                                               <p data-region="wcfContent">
-                                                                       Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. <a>At vero eos</a> et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-                                                               
-                                                                       <div id="spContentBorderInner"></div>
+                                               
+                                               <div id="spContent">
+                                                       <div class="spBoundary">
+                                                               <div id="spContentWrapper">
+                                                                       <div class="spHeadline" data-region="wcfContentHeadline">Lorem Ipsum</div>
                                                                        
-                                                                       Stet clita kasd gubergren, no sea <a>takimata</a> sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor <a>invidunt</a> ut labore et dolore magna aliquyam erat, sed diam voluptua.
+                                                                       <p data-region="wcfContent">
+                                                                               Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. <a>At vero eos</a> et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
                                                                        
-                                                                       <div id="spContentBorder"></div>
+                                                                               <div id="spContentBorderInner"></div>
+                                                                               
+                                                                               Stet clita kasd gubergren, no sea <a>takimata</a> sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor <a>invidunt</a> ut labore et dolore magna aliquyam erat, sed diam voluptua.
+                                                                               
+                                                                               <div id="spContentBorder"></div>
+                                                                               
+                                                                               <div id="spContentDimmed" data-region="wcfContentDimmed">
+                                                                                       Stet clita kasd gubergren, <a>no sea takimata</a> sanctus est Lorem ipsum dolor sit amet.
+                                                                               </div>
+                                                                       </p>
+                                                                       
+                                                                       <div class="spHeadline">Tabular Box</div>
+                                                                       
+                                                                       <table id="spTable" data-region="wcfTabularBox">
+                                                                               <thead>
+                                                                                       <tr>
+                                                                                               <th><a>Lorem</a></th>
+                                                                                               <th><a>Ipsum</a></th>
+                                                                                               <th><a>Dolor Sit Amet</a></th>
+                                                                                       </tr>
+                                                                               </thead>
+                                                                               
+                                                                               <tbody>
+                                                                                       <tr>
+                                                                                               <td>Lorem ipsum dolor</td><td>sit amet, consetetur sadipscing elitr</td><td>sed diam nonumy</td>
+                                                                                       </tr>
+                                                                                       <tr>
+                                                                                               <td>eirmod tempor</td><td>invidunt ut labore et dolore</td><td>magna aliquyam erat</td>
+                                                                                       </tr>
+                                                                                       <tr>
+                                                                                               <td>sed diam voluptua</td><td>At vero eos</td><td>et accusam et justo</td>
+                                                                                       </tr>
+                                                                               </tbody>
+                                                                       </table>
+                                                                       
+                                                                       <div class="spHeadline">Input</div>
+                                                                       
+                                                                       <dl data-region="wcfInput">
+                                                                               <dt><label for="spInput">Lorem Ipsum</label></dt>
+                                                                               <dd><input type="text" id="spInput" class="long" value="Consetetur sadipscing elitr"></dd>
+                                                                       </dl>
+                                                                       <dl data-region="wcfInputDisabled">
+                                                                               <dt><label for="spInputDisabled">Dolor Sit Amet</label></dt>
+                                                                               <dd><input type="text" id="spInputDisabled" class="long" placeholder="Disabled" disabled></dd>
+                                                                       </dl>
                                                                        
-                                                                       <div id="spContentDimmed" data-region="wcfContentDimmed">
-                                                                               Stet clita kasd gubergren, <a>no sea takimata</a> sanctus est Lorem ipsum dolor sit amet.
+                                                                       <div class="spHeadline">Button</div>
+                                                                       
+                                                                       <ol id="spButton" class="inlineList" data-region="wcfButton">
+                                                                               <li><a class="button">Button</a></li>
+                                                                               <li><a class="button active">Button (Active)</a></li>
+                                                                               <li><a class="button disabled" data-region="wcfButtonDisabled">Button (Disabled)</a></li>
+                                                                       </ol>
+                                                                       
+                                                                       <ol id="spButtonPrimary" class="inlineList" data-region="wcfButtonPrimary">
+                                                                               <li><a class="button buttonPrimary">Primary Button</a></li>
+                                                                               <li><a class="button buttonPrimary active">Primary Button (Active)</a></li>
+                                                                               <li><a class="button disabled">Primary Button (Disabled)</a></li>
+                                                                       </ol>
+                                                                       
+                                                                       <div class="spHeadline">Dropdown</div>
+                                                                       
+                                                                       <div style="position: relative">
+                                                                               <ul class="dropdownMenu" id="spDropdown" data-region="wcfDropdown">
+                                                                                       <li><a>Lorem Ipsum</a></li>
+                                                                                       <li class="active"><a>Dolor Sit Amet</a></li>
+                                                                                       <li><a>Consetetur Sadipscing</a></li>
+                                                                                       <li class="dropdownDivider"></li>
+                                                                                       <li><a>Sed diam nonumy</a></li>
+                                                                               </ul>
                                                                        </div>
-                                                               </p>
-                                                               
-                                                               <div class="spHeadline">Tabular Box</div>
-                                                               
-                                                               <table id="spTable" data-region="wcfTabularBox">
-                                                                       <thead>
-                                                                               <tr>
-                                                                                       <th><a>Lorem</a></th>
-                                                                                       <th><a>Ipsum</a></th>
-                                                                                       <th><a>Dolor Sit Amet</a></th>
-                                                                               </tr>
-                                                                       </thead>
                                                                        
-                                                                       <tbody>
-                                                                               <tr>
-                                                                                       <td>Lorem ipsum dolor</td><td>sit amet, consetetur sadipscing elitr</td><td>sed diam nonumy</td>
-                                                                               </tr>
-                                                                               <tr>
-                                                                                       <td>eirmod tempor</td><td>invidunt ut labore et dolore</td><td>magna aliquyam erat</td>
-                                                                               </tr>
-                                                                               <tr>
-                                                                                       <td>sed diam voluptua</td><td>At vero eos</td><td>et accusam et justo</td>
-                                                                               </tr>
-                                                                       </tbody>
-                                                               </table>
-                                                               
-                                                               <div class="spHeadline">Input</div>
-                                                               
-                                                               <dl data-region="wcfInput">
-                                                                       <dt><label for="spInput">Lorem Ipsum</label></dt>
-                                                                       <dd><input type="text" id="spInput" class="long" value="Consetetur sadipscing elitr"></dd>
-                                                               </dl>
-                                                               <dl data-region="wcfInputDisabled">
-                                                                       <dt><label for="spInputDisabled">Dolor Sit Amet</label></dt>
-                                                                       <dd><input type="text" id="spInputDisabled" class="long" placeholder="Disabled" disabled></dd>
-                                                               </dl>
-                                                               
-                                                               <div class="spHeadline">Button</div>
-                                                               
-                                                               <ol id="spButton" class="inlineList" data-region="wcfButton">
-                                                                       <li><a class="button">Button</a></li>
-                                                                       <li><a class="button active">Button (Active)</a></li>
-                                                                       <li><a class="button disabled" data-region="wcfButtonDisabled">Button (Disabled)</a></li>
-                                                               </ol>
-                                                               
-                                                               <ol id="spButtonPrimary" class="inlineList marginTop" data-region="wcfButtonPrimary">
-                                                                       <li><a class="button buttonPrimary">Primary Button</a></li>
-                                                                       <li><a class="button buttonPrimary active">Primary Button (Active)</a></li>
-                                                                       <li><a class="button disabled">Primary Button (Disabled)</a></li>
-                                                               </ol>
-                                                               
-                                                               <div class="spHeadline">Dropdown</div>
-                                                               
-                                                               <div style="position: relative">
-                                                                       <ul class="dropdownMenu" id="spDropdown" data-region="wcfDropdown">
-                                                                               <li><a>Lorem Ipsum</a></li>
-                                                                               <li class="active"><a>Dolor Sit Amet</a></li>
-                                                                               <li><a>Consetetur Sadipscing</a></li>
-                                                                               <li class="dropdownDivider"></li>
-                                                                               <li><a>Sed diam nonumy</a></li>
-                                                                       </ul>
+                                                                       <div class="spHeadline">Status</div>
+                                                                       
+                                                                       <ol id="spStatus">
+                                                                               <li>
+                                                                                       <div id="spStatusInfo" data-region="wcfStatusInfo">Lorem ipsum dolor <a>sit amet</a>.</div>
+                                                                               </li>
+                                                                               <li>
+                                                                                       <div id="spStatusSuccess" data-region="wcfStatusSuccess"><a>Sed diam nonumy</a> eirmod tempor.</div>
+                                                                               </li>
+                                                                               <li>
+                                                                                       <div id="spStatusWarning" data-region="wcfStatusWarning">At vero eos <a>et accusam et justo duo</a>.</div>
+                                                                               </li>
+                                                                               <li>
+                                                                                       <div id="spStatusError" data-region="wcfStatusError">Stet clita <a>kasd gubergren</a>, no sea.</div>
+                                                                               </li>
+                                                                       </ol>
                                                                </div>
                                                                
-                                                               <div class="spHeadline">Status</div>
-                                                               
-                                                               <ol id="spStatus">
-                                                                       <li>
-                                                                               <div id="spStatusInfo" data-region="wcfStatusInfo">Lorem ipsum dolor <a>sit amet</a>.</div>
-                                                                       </li>
-                                                                       <li>
-                                                                               <div id="spStatusSuccess" data-region="wcfStatusSuccess"><a>Sed diam nonumy</a> eirmod tempor.</div>
-                                                                       </li>
-                                                                       <li>
-                                                                               <div id="spStatusWarning" data-region="wcfStatusWarning">At vero eos <a>et accusam et justo duo</a>.</div>
-                                                                       </li>
-                                                                       <li>
-                                                                               <div id="spStatusError" data-region="wcfStatusError">Stet clita <a>kasd gubergren</a>, no sea.</div>
-                                                                       </li>
-                                                               </ol>
+                                                               <div id="spContentSidebar">
+                                                                       <div class="spContentSidebarBox" data-region="wcfSidebar">
+                                                                               <div class="spContentSidebarHeadline" data-region="wcfSidebarHeadline">Sidebar</div>
+                                                                               
+                                                                               <p>
+                                                                                       Lorem ipsum dolor sit amet, consetetur sadipscing elitr, <a>sed diam nonumy eirmod tempor</a> invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam <a>et justo</a> duo dolores et ea rebum.
+                                                                               </p>
+                                                                       </div>
+                                                                       
+                                                                       <div class="spContentSidebarBox">
+                                                                               <div class="spContentSidebarHeadline"><a>Dolor Sit Amet</a></div>
+                                                                               
+                                                                               <p>
+                                                                                       <a>Stet clita kasd gubergren</a>, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut <a>labore et dolore magna</a> aliquyam erat, sed diam voluptua.
+                                                                               </p>
+                                                                               
+                                                                               <div id="spContentSidebarBoxDimmed" style="margin-top: 10px;" data-region="wcfSidebarDimmed">
+                                                                                       Stet clita kasd gubergren, <a>no sea takimata</a> sanctus est Lorem ipsum dolor sit amet.
+                                                                               </div>
+                                                                       </div>
+                                                               </div>
                                                        </div>
-                                                       
-                                                       <div id="spContentSidebar">
-                                                               <div class="spContentSidebarBox" data-region="wcfSidebar">
-                                                                       <div class="spContentSidebarHeadline" data-region="wcfSidebarHeadline">Sidebar</div>
+                                               </div>
+                                               
+                                               <div id="spFooterBox" data-region="wcfFooterBox">
+                                                       <div class="spBoundary">
+                                                               <div class="spFooterBoxItem">
+                                                                       <div class="spFooterBoxHeadline" data-region="wcfFooterBoxHeadline">Lorem Ipsum</div>
                                                                        
                                                                        <p>
-                                                                               Lorem ipsum dolor sit amet, consetetur sadipscing elitr, <a>sed diam nonumy eirmod tempor</a> invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam <a>et justo</a> duo dolores et ea rebum.
+                                                                               Lorem ipsum dolor sit amet, consetetur <a>sadipscing elitr</a>, sed diam nonumy eirmod tempor <a>invidunt ut labore</a> et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
                                                                        </p>
                                                                </div>
                                                                
-                                                               <div class="spContentSidebarBox">
-                                                                       <div class="spContentSidebarHeadline"><a>Dolor Sit Amet</a></div>
+                                                               <div class="spFooterBoxItem">
+                                                                       <div class="spFooterBoxHeadline"><a>Dolor Sit Amet</a></div>
                                                                        
                                                                        <p>
-                                                                               <a>Stet clita kasd gubergren</a>, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut <a>labore et dolore magna</a> aliquyam erat, sed diam voluptua.
+                                                                               Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, <a>sed diam voluptua</a>.
                                                                        </p>
-                                                                       
-                                                                       <div id="spContentSidebarBoxDimmed" style="margin-top: 10px;" data-region="wcfSidebarDimmed">
-                                                                               Stet clita kasd gubergren, <a>no sea takimata</a> sanctus est Lorem ipsum dolor sit amet.
-                                                                       </div>
                                                                </div>
                                                        </div>
                                                </div>
+                                               
+                                               <div id="spFooter" data-region="wcfFooter">
+                                                       <div class="spBoundary">
+                                                               Copyright &copy; 1970-2038 <a>Example Company</a>
+                                                       </div>
+                                               </div>
                                        </div>
-                                       
-                                       <div id="spFooterBox" data-region="wcfFooterBox">
-                                               <div class="spBoundary">
-                                                       <div class="spFooterBoxItem">
-                                                               <div class="spFooterBoxHeadline" data-region="wcfFooterBoxHeadline">Lorem Ipsum</div>
-                                                               
-                                                               <p>
-                                                                       Lorem ipsum dolor sit amet, consetetur <a>sadipscing elitr</a>, sed diam nonumy eirmod tempor <a>invidunt ut labore</a> et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-                                                               </p>
+                                       <div id="spSidebar">
+                                               <div id="spVariablesWrapper">
+                                                       <div class="spSidebarBox">
+                                                               <label class="selectDropdown">
+                                                                       <select id="spCategories">
+                                                                               <option value="none" selected>{lang}wcf.global.noSelection{/lang}</option>
+                                                                               {foreach from=$colorCategories key=spName item=spCategory}
+                                                                                       <optgroup label="{$spName}">
+                                                                                               {if $spCategory|is_array}
+                                                                                                       {foreach from=$spCategory item=spChildCategory}
+                                                                                                               <option value="{$spChildCategory}">{$spChildCategory}</option>
+                                                                                                       {/foreach}
+                                                                                               {else}
+                                                                                                       <option value="{$spCategory}">{$spCategory}</option>
+                                                                                               {/if}
+                                                                                       </optgroup>
+                                                                               {/foreach}
+                                                                       </select>
+                                                               </label>
                                                        </div>
                                                        
-                                                       <div class="spFooterBoxItem">
-                                                               <div class="spFooterBoxHeadline"><a>Dolor Sit Amet</a></div>
-                                                               
-                                                               <p>
-                                                                       Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, <a>sed diam voluptua</a>.
-                                                               </p>
+                                                       <div class="spSidebarBox" data-category="none">
+                                                               foo
                                                        </div>
+                                                       
+                                                       {foreach from=$colors key=spCategory item=spColors}
+                                                               <div class="spSidebarBox" data-category="{$spCategory}" style="display: none;">
+                                                                       <ul>
+                                                                               {foreach from=$spColors item=spType}
+                                                                                       {capture assign=spColor}{$spCategory}{$spType|ucfirst}{/capture}
+                                                                                       <li class="box24 spColor">
+                                                                                               <div class="spColorBox">
+                                                                                                       <span class="styleVariableColor jsColorPicker" style="background-color: {$variables[$spColor]};" data-color="{$variables[$spColor]}" data-store="{$spColor}_value"></span>
+                                                                                                       <input type="hidden" id="{$spColor}_value" name="{$spColor}" value="{$variables[$spColor]}" />
+                                                                                               </div>
+                                                                                               <div>
+                                                                                                       <span class="spVariable">${$spColor}</span>
+                                                                                                       <span class="spDescription">{$spType}</span>
+                                                                                               </div>
+                                                                                       </li>
+                                                                               {/foreach}
+                                                                       </ul>
+                                                               </div>
+                                                       {/foreach}
                                                </div>
                                        </div>
-                                       
-                                       <div id="spFooter" data-region="wcfFooter">
-                                               <div class="spBoundary">
-                                                       Copyright &copy; 1970-2038 <a>Example Company</a>
-                                               </div>
-                                       </div>
-                               </div>
-                               <div id="spSidebar">
-                                       <div id="spVariablesWrapper">
-                                               <div class="spSidebarBox">
-                                                       <label class="selectDropdown">
-                                                               <select id="spCategories">
-                                                                       <option value="none" selected>{lang}wcf.global.noSelection{/lang}</option>
-                                                                       {foreach from=$colorCategories key=spName item=spCategory}
-                                                                               <optgroup label="{$spName}">
-                                                                                       {if $spCategory|is_array}
-                                                                                               {foreach from=$spCategory item=spChildCategory}
-                                                                                                       <option value="{$spChildCategory}">{$spChildCategory}</option>
-                                                                                               {/foreach}
-                                                                                       {else}
-                                                                                               <option value="{$spCategory}">{$spCategory}</option>
-                                                                                       {/if}
-                                                                               </optgroup>
-                                                                       {/foreach}
-                                                               </select>
-                                                       </label>
-                                               </div>
-                                               
-                                               <div class="spSidebarBox" data-category="none">
-                                                       foo
-                                               </div>
-                                               
-                                               {foreach from=$colors key=spCategory item=spColors}
-                                                       <div class="spSidebarBox" data-category="{$spCategory}" style="display: none;">
-                                                               <ul>
-                                                                       {foreach from=$spColors item=spType}
-                                                                               {capture assign=spColor}{$spCategory}{$spType|ucfirst}{/capture}
-                                                                               <li class="box24 spColor">
-                                                                                       <div class="spColorBox">
-                                                                                               <span class="styleVariableColor jsColorPicker" style="background-color: {$variables[$spColor]};" data-color="{$variables[$spColor]}" data-store="{$spColor}_value"></span>
-                                                                                               <input type="hidden" id="{$spColor}_value" name="{$spColor}" value="{$variables[$spColor]}" />
-                                                                                       </div>
-                                                                                       <div>
-                                                                                               <span class="spVariable">${$spColor}</span>
-                                                                                               <span class="spDescription">{$spType}</span>
-                                                                                       </div>
-                                                                               </li>
-                                                                       {/foreach}
-                                                               </ul>
-                                                       </div>
-                                               {/foreach}
-                                       </div>
                                </div>
-                       </div>
+                       </div>  
                </div>
                
                <script>
                </script>
                
                {* advanced *}
-               <div id="advanced" class="container containerPadding tabMenuContainer tabMenuContent">
+               <div id="advanced" class="tabMenuContainer tabMenuContent">
                        {if !$isTainted}
                                <nav class="menu">
                                        <ul>
                                        </ul>
                                </nav>
                                
-                               <p class="info">{lang}wcf.acp.style.protected{/lang}</p>
-                               
                                {* custom declarations *}
                                <div id="advanced-custom" class="tabMenuContent">
-                                       <fieldset class="marginTop">
-                                               <legend>{lang}wcf.acp.style.advanced.individualLess{/lang}</legend>
+                                       <section class="section">
+                                               <h2 class="sectionTitle">{lang}wcf.acp.style.advanced.individualLess{/lang}</h2>
                                                
                                                <dl class="wide">
+                                                       <dt></dt>
                                                        <dd>
                                                                <textarea id="individualLessCustom" rows="20" cols="40" name="individualLessCustom">{$variables[individualLessCustom]}</textarea>
                                                                <small>{lang}wcf.acp.style.advanced.individualLess.description{/lang}</small>
                                                        </dd>
                                                </dl>
-                                       </fieldset>
+                                       </section>
                                        
-                                       <fieldset{if $errorField == 'overrideLessCustom'} class="formError"{/if}>
-                                               <legend>{lang}wcf.acp.style.advanced.overrideLess{/lang}</legend>
+                                       <section class="section{if $errorField == 'overrideLessCustom'} formError{/if}">
+                                               <h2 class="sectionTitle">{lang}wcf.acp.style.advanced.overrideLess{/lang}</h2>
                                                
                                                <dl class="wide">
+                                                       <dt></dt>
                                                        <dd>
                                                                <textarea id="overrideLessCustom" rows="20" cols="40" name="overrideLessCustom">{$variables[overrideLessCustom]}</textarea>
                                                                {if $errorField == 'overrideLessCustom'}
                                                                <small>{lang}wcf.acp.style.advanced.overrideLess.description{/lang}</small>
                                                        </dd>
                                                </dl>
-                                       </fieldset>
+                                       </section>
                                        {include file='codemirror' codemirrorMode='text/x-less' codemirrorSelector='#individualLessCustom, #overrideLessCustom'}
                                        
                                        {event name='syntaxFieldsetsCustom'}
                                <div id="advanced-original">
                        {/if}
                        
-                       <fieldset class="marginTop">
-                               <legend>{lang}wcf.acp.style.advanced.individualLess{/lang}{if !$isTainted} ({lang}wcf.acp.style.protected.less{/lang}){/if}</legend>
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.acp.style.advanced.individualLess{/lang}{if !$isTainted} ({lang}wcf.acp.style.protected.less{/lang}){/if}</h2>
                                
                                <dl class="wide">
+                                       <dt></dt>
                                        <dd>
                                                <textarea id="individualLess" rows="20" cols="40" name="individualLess">{$variables[individualLess]}</textarea>
                                                <small>{lang}wcf.acp.style.advanced.individualLess.description{/lang}</small>
                                        </dd>
                                </dl>
-                       </fieldset>
+                       </section>
                        
-                       <fieldset{if $errorField == 'overrideLess'} class="formError"{/if}>
-                               <legend>{lang}wcf.acp.style.advanced.overrideLess{/lang}{if !$isTainted} ({lang}wcf.acp.style.protected.less{/lang}){/if}</legend>
+                       <section class="section{if $errorField == 'overrideLess'} formError{/if}">
+                               <h2 class="sectionTitle">{lang}wcf.acp.style.advanced.overrideLess{/lang}{if !$isTainted} ({lang}wcf.acp.style.protected.less{/lang}){/if}</h2>
                                
                                <dl class="wide">
+                                       <dt></dt>
                                        <dd>
                                                <textarea id="overrideLess" rows="20" cols="40" name="overrideLess">{$variables[overrideLess]}</textarea>
                                                {if $errorField == 'overrideLess'}
                                                <small>{lang}wcf.acp.style.advanced.overrideLess.description{/lang}</small>
                                        </dd>
                                </dl>
-                       </fieldset>
+                       </section>
                        {include file='codemirror' codemirrorMode='text/x-less' codemirrorSelector='#individualLess, #overrideLess' editable=$isTainted}
                        
                        {event name='syntaxFieldsetsOriginal'}
 <div id="styleDisableProtection" class="jsStaticDialogContent" data-title="{lang}wcf.acp.style.protected.title{/lang}">
        <p>{lang}wcf.acp.style.protected.description{/lang}</p>
        
-       <dl class="marginTop">
+       <dl>
                <dt></dt>
                <dd><label for="styleDisableProtectionConfirm"><input type="checkbox" id="styleDisableProtectionConfirm"> {lang}wcf.acp.style.protected.confirm{/lang}</label></dd>
        </dl>
index 7018c31215770abb975a44802ec23c3d43fb5eb0..b622494ab7626d33d2d02783565a5ed3daf6c9d7 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.style.exportStyle'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.style.exportStyle{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.style.exportStyle{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{link controller='StyleExport' id=$styleID}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.style.exportStyle.components{/lang}</legend>
-                       <small>{lang}wcf.acp.style.exportStyle.components.description{/lang}</small>
-                       
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" name="exportImages" value="1"{if $exportImages} checked="checked"{/if}{if !$canExportImages} disabled="disabled"{/if} /> <span>{lang}wcf.acp.style.exportImages{/lang}</span></label>
-                               </dd>
-                       </dl>
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.acp.style.exportStyle.components{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.acp.style.exportStyle.components.description{/lang}</small>
+               </header>
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" name="exportImages" value="1"{if $exportImages} checked="checked"{/if}{if !$canExportImages} disabled="disabled"{/if} /> <span>{lang}wcf.acp.style.exportImages{/lang}</span></label>
+                       </dd>
+               </dl>
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" name="exportTemplates" value="1"{if $exportTemplates} checked="checked"{/if}{if !$canExportTemplates} disabled="disabled"{/if} /> <span>{lang}wcf.acp.style.exportTemplates{/lang}</span></label>
+                       </dd>
+               </dl>
+               
+               {event name='componentFields'}
+       </section>
+       
+       {if $style->packageName}
+               <section class="section">
+                       <header class="sectionHeader">
+                               <h2 class="sectionTitle">{lang}wcf.acp.style.exportStyle.asPackage{/lang}</h2>
+                               <small class="sectionDescription">{lang}wcf.acp.style.exportStyle.asPackage.description{/lang}</small>
+                       </header>
+                               
                        <dl>
                                <dt></dt>
                                <dd>
-                                       <label><input type="checkbox" name="exportTemplates" value="1"{if $exportTemplates} checked="checked"{/if}{if !$canExportTemplates} disabled="disabled"{/if} /> <span>{lang}wcf.acp.style.exportTemplates{/lang}</span></label>
+                                       <label><input type="checkbox" id="exportAsPackage" name="exportAsPackage" value="1"{if $exportAsPackage} checked="checked"{/if} /> <span>{lang}wcf.acp.style.exportAsPackage{/lang}</span></label>
                                </dd>
                        </dl>
                        
-                       {event name='componentFields'}
-               </fieldset>
-               
-               {if $style->packageName}
-                       <fieldset>
-                               <legend>{lang}wcf.acp.style.exportStyle.asPackage{/lang}</legend>
-                               <small>{lang}wcf.acp.style.exportStyle.asPackage.description{/lang}</small>
-                               
-                               <dl>
-                                       <dt></dt>
-                                       <dd>
-                                               <label><input type="checkbox" id="exportAsPackage" name="exportAsPackage" value="1"{if $exportAsPackage} checked="checked"{/if} /> <span>{lang}wcf.acp.style.exportAsPackage{/lang}</span></label>
-                                       </dd>
-                               </dl>
-                               
-                               {event name='exportAsPackageFields'}
-                       </fieldset>
-               {/if}
-               
-               {event name='fieldsets'}
-       </div>
+                       {event name='exportAsPackageFields'}
+               </section>
+       {/if}
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.acp.style.button.exportStyle{/lang}" accesskey="s" />
index 6cb9661e653b03c90e3578f0342586b071cb3b15..a9926e2d47ec19d9a1e7fe41e764e91496c71757 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.style.importStyle'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.style.importStyle{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.style.importStyle{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{link controller='StyleImport'}{/link}" enctype="multipart/form-data">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.style.import.source{/lang}</legend>
-                       
-                       <dl{if $errorField == 'source'} class="formError"{/if}>
-                               <dt><label for="source">{lang}wcf.acp.style.import.source.upload{/lang}</label></dt>
-                               <dd>
-                                       <input type="file" id="source" name="source" value="" />
-                                       {if $errorField == 'source'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.style.import.source.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.style.import.source.upload.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='sourceFields'}
-               </fieldset>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.style.import.source{/lang}</h2>
                
-               {event name='fieldsets'}
-       </div>
+               <dl{if $errorField == 'source'} class="formError"{/if}>
+                       <dt><label for="source">{lang}wcf.acp.style.import.source.upload{/lang}</label></dt>
+                       <dd>
+                               <input type="file" id="source" name="source" value="" />
+                               {if $errorField == 'source'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.style.import.source.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.style.import.source.upload.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {event name='sourceFields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" name="submitButton" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 5f54d1657897c6df54e7f5e0a3655292dbabba4c..7de91a4ffe073252a59836eaee693ecb2780281f 100644 (file)
@@ -10,8 +10,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.style.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.style.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
        </nav>
 </div>
 
-<div class="container marginTop">
+<div class="section sectionContainerList">
        <ol class="containerList styleList">
                {foreach from=$objects item=style}
                        <li>
                                <div class="box64">
-                                       <span class="framed"><img src="{@$style->getPreviewImage()}" alt="" /></span>
+                                       <span><img src="{@$style->getPreviewImage()}" alt="" /></span>
                                        <div class="details">
                                                <div class="containerHeadline">
                                                        <h3><a href="{link controller='StyleEdit' id=$style->styleID}{/link}">{$style->styleName}</a></h3>
index ef46460f3c1881ff455ddc4ddacd1006ee572821..990535f6d0fd9c181e9da41c761ceb79f5407bea 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.tag.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.tag.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.tag.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='TagAdd'}{/link}{else}{link controller='TagEdit' object=$tagObj}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'name'} class="formError"{/if}>
-                               <dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
+       <div class="section">
+               <dl{if $errorField == 'name'} class="formError"{/if}>
+                       <dt><label for="name">{lang}wcf.global.name{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long" />
+                               {if $errorField == 'name'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {elseif $errorType == 'duplicate'}
+                                                       {lang}wcf.acp.tag.error.name.duplicate{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {hascontent}
+                       <dl{if $errorField == 'languageID' || $action == 'edit'} class="{if $action == 'edit'}disabled{else}formError{/if}"{/if}>
+                               <dt><label for="languageID">{lang}wcf.acp.tag.languageID{/lang}</label></dt>
                                <dd>
-                                       <input type="text" id="name" name="name" value="{$name}" required="required" autofocus="autofocus" class="long" />
-                                       {if $errorField == 'name'}
+                                       <select id="languageID" name="languageID"{if $action == 'edit'} disabled="disabled"{/if}>
+                                               {content}
+                                                       {foreach from=$availableLanguages item=language}
+                                                               <option value="{@$language->languageID}"{if $languageID == $language->languageID} selected="selected"{/if}>{$language->languageName} ({$language->languageCode})</option>
+                                                       {/foreach}
+                                               {/content}
+                                       </select>
+                                       {if $errorField == 'languageID'}
                                                <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {elseif $errorType == 'duplicate'}
-                                                               {lang}wcf.acp.tag.error.name.duplicate{/lang}
-                                                       {/if}
+                                                       {lang}wcf.acp.tag.error.languageID.{$errorType}{/lang}
                                                </small>
                                        {/if}
                                </dd>
                        </dl>
+               {/hascontent}
+               
+               {if !$tagObj|isset || $tagObj->synonymFor === null}
+                       <dl>
+                               <dt><label for="synonyms">{lang}wcf.acp.tag.synonyms{/lang}</label></dt>
+                               <dd>
+                                       <div id="synonymList" class="editableItemList"></div>
+                                       <input id="synonyms" type="text" value="" class="long" />
+                               </dd>
+                       </dl>
                        
-                       {hascontent}
-                               <dl{if $errorField == 'languageID' || $action == 'edit'} class="{if $action == 'edit'}disabled{else}formError{/if}"{/if}>
-                                       <dt><label for="languageID">{lang}wcf.acp.tag.languageID{/lang}</label></dt>
-                                       <dd>
-                                               <select id="languageID" name="languageID"{if $action == 'edit'} disabled="disabled"{/if}>
-                                                       {content}
-                                                               {foreach from=$availableLanguages item=language}
-                                                                       <option value="{@$language->languageID}"{if $languageID == $language->languageID} selected="selected"{/if}>{$language->languageName} ({$language->languageCode})</option>
-                                                               {/foreach}
-                                                       {/content}
-                                               </select>
-                                               {if $errorField == 'languageID'}
-                                                       <small class="innerError">
-                                                               {lang}wcf.acp.tag.error.languageID.{$errorType}{/lang}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                       {/hascontent}
-                       
-                       {if !$tagObj|isset || $tagObj->synonymFor === null}
-                               <dl>
-                                       <dt><label for="synonyms">{lang}wcf.acp.tag.synonyms{/lang}</label></dt>
-                                       <dd>
-                                               <div id="synonymList" class="editableItemList"></div>
-                                               <input id="synonyms" type="text" value="" class="long" />
-                                       </dd>
-                               </dl>
-                               
-                               <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Tagging.js?v={@LAST_UPDATE_TIME}"></script>
-                               <script data-relocate="true">
-                                       //<![CDATA[
-                                       $(function() {
-                                               var $tagList = new WCF.Tagging.TagList('#synonymList', '#synonyms');
-                                               
-                                               {if $synonyms|isset && $synonyms|count}
-                                                       $tagList.load([ {implode from=$synonyms item='synonym'}'{$synonym|encodeJS}'{/implode} ]);
-                                               {/if}
-                                       });
-                                       //]]>
-                               </script>
-                       {elseif $tagObj|isset}
-                               <dl>
-                                       <dt><label for="synonyms">{lang}wcf.acp.tag.synonymFor{/lang}</label></dt>
-                                       <dd>
-                                               <a href="{link controller='TagEdit' id=$tagObj->synonymFor}{/link}" class="badge tag">{$synonym->name}</a>
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       {event name='dataFields'}
-               </fieldset>
+                       <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Tagging.js?v={@LAST_UPDATE_TIME}"></script>
+                       <script data-relocate="true">
+                               //<![CDATA[
+                               $(function() {
+                                       var $tagList = new WCF.Tagging.TagList('#synonymList', '#synonyms');
+                                       
+                                       {if $synonyms|isset && $synonyms|count}
+                                               $tagList.load([ {implode from=$synonyms item='synonym'}'{$synonym|encodeJS}'{/implode} ]);
+                                       {/if}
+                               });
+                               //]]>
+                       </script>
+               {elseif $tagObj|isset}
+                       <dl>
+                               <dt><label for="synonyms">{lang}wcf.acp.tag.synonymFor{/lang}</label></dt>
+                               <dd>
+                                       <a href="{link controller='TagEdit' id=$tagObj->synonymFor}{/link}" class="badge tag">{$synonym->name}</a>
+                               </dd>
+                       </dl>
+               {/if}
                
-               {event name='fieldsets'}
+               {event name='dataFields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index 7e5e416e9d9816925465fd2b75fe6924df896091..9deffc9800168f8f0e2b56d9b387de319018f570 100644 (file)
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.tag.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.tag.list{/lang}</h1>
 </header>
 
 {include file='formError'}
 
 {if $items}
        <form action="{link controller='TagList'}{/link}" method="post">
-               <div class="container containerPadding marginTop">
-                       <fieldset>
-                               <legend>{lang}wcf.acp.tag.list.search{/lang}</legend>
-                               
-                               <dl>
-                                       <dt><label for="tagSearch">{lang}wcf.acp.tag.list.search.query{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="tagSearch" name="search" value="{$search}" autofocus="autofocus" class="medium" />
-                                       </dd>
-                               </dl>
-                       </fieldset>
-               </div>
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.tag.list.search{/lang}</h2>
+                       
+                       <dl>
+                               <dt><label for="tagSearch">{lang}wcf.acp.tag.list.search.query{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="tagSearch" name="search" value="{$search}" autofocus="autofocus" class="medium" />
+                               </dd>
+                       </dl>
+               </section>
                
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.tag.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table data-type="com.woltlab.wcf.tag" class="table jsClipboardContainer">
                        <thead>
                                <tr>
index 3b4d88e530393f337291018c1c9ec8121d4a86ff..506ffd52c36366923c0fbdfd733059f51fabb7a5 100644 (file)
@@ -1,6 +1,6 @@
 <p>{lang}wcf.acp.tag.setAsSynonyms.description{/lang}</p>
 
-<ul class="marginTop containerBoxList">
+<ul class="containerBoxList">
        {foreach from=$tags item=tag}
                <li>
                        <label><input type="radio" name="tagID" value="{@$tag->tagID}" /> <span class="badge tag">{$tag->name}</span></label>
index 64f3a636229ed555db1649a09abbc5d174eb733a..3530dd9e5b3bed2440e96a5b141508b7f4631d59 100644 (file)
@@ -1,8 +1,8 @@
 {include file='header' pageTitle='wcf.acp.template.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.template.{$action}{/lang}</h1>
-       {if $action == 'edit'}<p>{$template->getPath()}</p>{/if}
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.template.{$action}{/lang}</h1>
+       {if $action == 'edit'}<p class="contentHeaderDescription">{$template->getPath()}</p>{/if}
 </header>
 
 {include file='formError'}
 
 {if $availableTemplateGroups|count}
        <form method="post" action="{if $action == 'add'}{link controller='TemplateAdd'}{/link}{else}{link controller='TemplateEdit' id=$templateID}{/link}{/if}">
-               <div class="container containerPadding marginTop">
-                       <fieldset>
-                               <legend>{lang}wcf.global.form.data{/lang}</legend>
-                               
-                               <dl>
-                                       <dt><label for="templateGroupID">{lang}wcf.acp.template.group{/lang}</label></dt>
-                                       <dd>
-                                               <select name="templateGroupID" id="templateGroupID">
-                                                       {htmlOptions options=$availableTemplateGroups selected=$templateGroupID disableEncoding=true}
-                                               </select>
-                                       </dd>
-                               </dl>
-                               
-                               <dl{if $errorField == 'tplName'} class="formError"{/if}>
-                                       <dt><label for="tplName">{lang}wcf.global.name{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="tplName" name="tplName" value="{$tplName}" required="required" class="long" />
-                                               {if $errorField == 'tplName'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.template.name.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               
-                               {event name='dataFields'}
-                       </fieldset>
+               <div class="section">
+                       <dl>
+                               <dt><label for="templateGroupID">{lang}wcf.acp.template.group{/lang}</label></dt>
+                               <dd>
+                                       <select name="templateGroupID" id="templateGroupID">
+                                               {htmlOptions options=$availableTemplateGroups selected=$templateGroupID disableEncoding=true}
+                                       </select>
+                               </dd>
+                       </dl>
                        
-                       <fieldset>
-                               <legend><label for="templateSource">{lang}wcf.acp.template.source{/lang}</label></legend>
-                               
-                               <dl class="wide">
-                                       <dt><label for="templateSource">{lang}wcf.acp.template.source{/lang}</label></dt>
-                                       <dd>
-                                               <textarea id="templateSource" name="templateSource" cols="40" rows="20">{$templateSource}</textarea>
-                                               {include file='codemirror' codemirrorMode='smarty' codemirrorSelector='#templateSource'}
-                                       </dd>
-                               </dl>
-                       </fieldset>
+                       <dl{if $errorField == 'tplName'} class="formError"{/if}>
+                               <dt><label for="tplName">{lang}wcf.global.name{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="tplName" name="tplName" value="{$tplName}" required="required" class="long" />
+                                       {if $errorField == 'tplName'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.template.name.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
                        
-                       {event name='fieldsets'}
+                       {event name='dataFields'}
                </div>
                
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.template.source{/lang}</h2>
+                       
+                       <dl class="wide">
+                               <dt><label for="templateSource">{lang}wcf.acp.template.source{/lang}</label></dt>
+                               <dd>
+                                       <textarea id="templateSource" name="templateSource" cols="40" rows="20">{$templateSource}</textarea>
+                                       {include file='codemirror' codemirrorMode='smarty' codemirrorSelector='#templateSource'}
+                               </dd>
+                       </dl>
+               </section>
+               
+               {event name='sections'}
+               
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                        {if $copy}<input type="hidden" name="copy" value="{@$copy}" />{/if}
index d1d8f94eed393766f3d4dd475a2e2a3fc9433a61..e43853d03312a458511d5d6faee7958d314c31f7 100644 (file)
@@ -1,31 +1,29 @@
 {include file='header' pageTitle="wcf.acp.template.diff"}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.template.diff{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.template.diff{/lang}</h1>
 </header>
 
 {include file='formError'}
 
 <form method="post" action="{link controller='TemplateDiff'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.template.group{/lang}</legend>
-                       
-                       <dl>
-                               <dt><label for="parentID">{lang}wcf.acp.template.diff.compareWith{/lang}</label></dt>
-                               <dd>
-                                       <select name="parentID" id="{lang}wcf.acp.template.group.default{/lang}ID">
-                                               <option value="0"></option>
-                                               {assign var=depth value=0}
-                                               {foreach from=$templateGroupHierarchy item='templateGroup' key='templateGroupID'}
-                                                       <option{if $templateGroup[hasTemplate] !== false && $templateGroup[hasTemplate] != $templateID} value="{$templateGroup[hasTemplate]}"{if $parent->templateID == $templateGroup[hasTemplate]} selected="selected"{/if}{else} disabled="disabled"{/if}>{@'&nbsp;'|str_repeat:$depth * 4}{if $templateGroupID}{$templateGroup[group]->templateGroupName}{else}{lang}wcf.acp.template.group.default{/lang}{/if}</option>
-                                                       {assign var=depth value=$depth + 1}
-                                               {/foreach}
-                                       </select>
-                               </dd>
-                       </dl>
-               </fieldset>
-       </div>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.template.group{/lang}</h2>
+               
+               <dl>
+                       <dt><label for="parentID">{lang}wcf.acp.template.diff.compareWith{/lang}</label></dt>
+                       <dd>
+                               <select name="parentID" id="{lang}wcf.acp.template.group.default{/lang}ID">
+                                       <option value="0"></option>
+                                       {assign var=depth value=0}
+                                       {foreach from=$templateGroupHierarchy item='templateGroup' key='templateGroupID'}
+                                               <option{if $templateGroup[hasTemplate] !== false && $templateGroup[hasTemplate] != $templateID} value="{$templateGroup[hasTemplate]}"{if $parent->templateID == $templateGroup[hasTemplate]} selected="selected"{/if}{else} disabled="disabled"{/if}>{@'&nbsp;'|str_repeat:$depth * 4}{if $templateGroupID}{$templateGroup[group]->templateGroupName}{else}{lang}wcf.acp.template.group.default{/lang}{/if}</option>
+                                               {assign var=depth value=$depth + 1}
+                                       {/foreach}
+                               </select>
+                       </dd>
+               </dl>
+       </section>
        
        <div class="formSubmit">
                {@SID_INPUT_TAG}
                        </nav>
                </div>
                
-               <div class="container marginTop sideBySide">
-                       <div class="containerPadding">
-                               <header class="boxHeadline boxSubHeadline">
-                                       <h1>
+               <div class="sideBySide">
+                       <div class="section">
+                               <header class="sectionHeader">
+                                       <h2 class="sectionTitle">
                                                {if $parent->templateGroupID}{$templateGroupHierarchy[$parent->templateGroupID][group]->templateGroupName}{else}{lang}wcf.acp.template.group.default{/lang}{/if}
-                                       </h1>
-                                       <p>{lang}wcf.acp.template.lastModificationTime{/lang}: {@$parent->lastModificationTime|time}</p>
+                                       </h2>
+                                       <p class="sectionDescription">{lang}wcf.acp.template.lastModificationTime{/lang}: {@$parent->lastModificationTime|time}</p>
                                </header>
                                
                                {assign var=removeOffset value=0}
                                {assign var=lineNo value=0}
-                               <pre id="left" class="marginTop monospace" style="overflow: auto; height: 700px;">{*
+                               <pre id="left" class="monospace" style="overflow: auto; height: 700px;">{*
                                        *}<ol class="nativeList">{*
                                                *}{foreach from=$diff->getRawDiff() item='line'}{*
                                                        *}{if $line[0] == ' '}{*
                                        </div>
                                {/if}
                        </div>
-                       <div class="containerPadding">
-                               <header class="boxHeadline boxSubHeadline">
-                                       <h1>
+                       <div class="section">
+                               <header class="sectionHeader">
+                                       <h2 class="sectionTitle">
                                                {if $template->templateGroupID}{$templateGroupHierarchy[$template->templateGroupID][group]->templateGroupName}{else}{lang}wcf.acp.template.group.default{/lang}{/if}
-                                       </h1>
-                                       <p>{lang}wcf.acp.template.lastModificationTime{/lang}: {@$template->lastModificationTime|time}</p>
+                                       </h2>
+                                       <p class="sectionDescription">{lang}wcf.acp.template.lastModificationTime{/lang}: {@$template->lastModificationTime|time}</p>
                                </header>
                                {assign var=removeOffset value=0}
                                {assign var=lineNo value=0}
-                               <pre id="right" class="marginTop monospace" style="overflow: auto; height: 700px;">{*
+                               <pre id="right" class="monospace" style="overflow: auto; height: 700px;">{*
                                        *}<ol class="nativeList">{*
                                                *}{foreach from=$diff->getRawDiff() item='line'}{*
                                                        *}{if $line[0] == ' '}{*
index d01d22fe8e2ea4437ab705d3074bf75f38d60ea8..539bfcd4eafdf77031ace62e0452a54670c02c78 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.template.group.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.template.group.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.template.group.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='TemplateGroupAdd'}{/link}{else}{link controller='TemplateGroupEdit' id=$templateGroupID}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       {if $availableTemplateGroups|count}
-                               <dl>
-                                       <dt><label for="parentTemplateGroupID">{lang}wcf.acp.template.group.parentTemplateGroup{/lang}</label></dt>
-                                       <dd>
-                                               <select name="parentTemplateGroupID" id="parentTemplateGroupID">
-                                                       <option value="0">{lang}wcf.acp.template.group.default{/lang}</option>
-                                                       {htmlOptions options=$availableTemplateGroups selected=$parentTemplateGroupID disableEncoding=true}
-                                               </select>
-                                               {if $errorField == 'parentTemplateGroupID'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                               {lang}wcf.acp.template.group.parentTemplateGroupID.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       <dl{if $errorField == 'templateGroupName'} class="formError"{/if}>
-                               <dt><label for="templateGroupName">{lang}wcf.global.name{/lang}</label></dt>
+       <div class="section">
+               {if $availableTemplateGroups|count}
+                       <dl>
+                               <dt><label for="parentTemplateGroupID">{lang}wcf.acp.template.group.parentTemplateGroup{/lang}</label></dt>
                                <dd>
-                                       <input type="text" id="templateGroupName" name="templateGroupName" value="{$templateGroupName}" required="required" class="long" />
-                                       {if $errorField == 'templateGroupName'}
+                                       <select name="parentTemplateGroupID" id="parentTemplateGroupID">
+                                               <option value="0">{lang}wcf.acp.template.group.default{/lang}</option>
+                                               {htmlOptions options=$availableTemplateGroups selected=$parentTemplateGroupID disableEncoding=true}
+                                       </select>
+                                       {if $errorField == 'parentTemplateGroupID'}
                                                <small class="innerError">
                                                        {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {lang}wcf.global.form.error.empty{/lang}
                                                        {else}
-                                                               {lang}wcf.acp.template.group.name.error.{@$errorType}{/lang}
+                                                       {lang}wcf.acp.template.group.parentTemplateGroupID.error.{@$errorType}{/lang}
                                                        {/if}
                                                </small>
                                        {/if}
                                </dd>
                        </dl>
-                       
-                       <dl{if $errorField == 'templateGroupFolderName'} class="formError"{/if}>
-                               <dt><label for="templateGroupFolderName">{lang}wcf.acp.template.group.folderName{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="templateGroupFolderName" name="templateGroupFolderName" value="{$templateGroupFolderName}" required="required" class="long" />
-                                       {if $errorField == 'templateGroupFolderName'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.template.group.folderName.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+               {/if}
                
-               {event name='fieldsets'}
+               <dl{if $errorField == 'templateGroupName'} class="formError"{/if}>
+                       <dt><label for="templateGroupName">{lang}wcf.global.name{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="templateGroupName" name="templateGroupName" value="{$templateGroupName}" required="required" class="long" />
+                               {if $errorField == 'templateGroupName'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.template.group.name.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'templateGroupFolderName'} class="formError"{/if}>
+                       <dt><label for="templateGroupFolderName">{lang}wcf.acp.template.group.folderName{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="templateGroupFolderName" name="templateGroupFolderName" value="{$templateGroupFolderName}" required="required" class="long" />
+                               {if $errorField == 'templateGroupFolderName'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.template.group.folderName.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index 6bfb66206e03b04c258cce3d198b43c721e8ee28..e75b06c14fcbd907855e6df63b820d96ad701bfd 100644 (file)
@@ -1,27 +1,27 @@
 {include file='header' pageTitle='wcf.acp.template.group.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.template.group.list{/lang}</h1>
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.Action.Delete('wcf\\data\\template\\group\\TemplateGroupAction', '.jsTemplateGroupRow');
-                       
-                       var options = { };
-                       {if $pages > 1}
-                               options.refreshPage = true;
-                               {if $pages == $pageNo}
-                                       options.updatePageNumber = -1;
-                               {/if}
-                       {else}
-                               options.emptyMessage = '{lang}wcf.global.noItems{/lang}';
-                       {/if}
-                       
-                       new WCF.Table.EmptyTableHandler($('#templateGroupTableContainer'), 'jsTemplateGroupRow', options);
-               });
-               //]]>
-       </script>
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.Action.Delete('wcf\\data\\template\\group\\TemplateGroupAction', '.jsTemplateGroupRow');
+               
+               var options = { };
+               {if $pages > 1}
+               options.refreshPage = true;
+               {if $pages == $pageNo}
+               options.updatePageNumber = -1;
+               {/if}
+               {else}
+               options.emptyMessage = '{lang}wcf.global.noItems{/lang}';
+               {/if}
+               
+               new WCF.Table.EmptyTableHandler($('#templateGroupTableContainer'), 'jsTemplateGroupRow', options);
+       });
+       //]]>
+</script>
+
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.template.group.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div id="templateGroupTableContainer" class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.template.group.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div id="templateGroupTableContainer" class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 7343b8702553aee70efccedbe3d67d8cb2dbec41..e8461949a699649db0eb037b9274b0287107811e 100644 (file)
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.template.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.template.list{/lang}</h1>
 </header>
 
 {include file='formError'}
 
 <form method="post" action="{link controller='TemplateList'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.filter{/lang}</legend>
-                       
-                       <dl>
-                               <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>
-                       
-                       <dl>
-                               <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>
-                       
-                       <dl>
-                               <dt><label for="searchTemplateName">{lang}wcf.global.name{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="searchTemplateName" name="searchTemplateName" value="{$searchTemplateName}" class="long" />
-                               </dd>
-                       </dl>
-               </fieldset>
-       </div>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.global.filter{/lang}</h2>
+               
+               <dl>
+                       <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>
+               
+               <dl>
+                       <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>
+               
+               <dl>
+                       <dt><label for="searchTemplateName">{lang}wcf.global.name{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="searchTemplateName" name="searchTemplateName" value="{$searchTemplateName}" class="long" />
+                       </dd>
+               </dl>
+       </section>
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
 </div>
 
 {if $objects|count}
-       <div id="templateTableContainer" class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.template.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div id="templateTableContainer" class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 4986c1dfaf5f35e69e8d0adf807e3f49d127dfa5..60292f8158b2ea01df65da0739ba70b3320641d3 100644 (file)
@@ -12,8 +12,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.activityPoint.option{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.activityPoint.option{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{link controller='UserActivityPointOption'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.user.activityPoint.pointsPerObject{/lang}</legend>
-                       {foreach from=$objectTypes item='objectType'}
-                               <dl{if $errorField == $objectType->objectTypeID} class="formError"{/if}>
-                                       <dt><label for="{@$objectType->objectType}">{lang}wcf.user.activityPoint.objectType.{$objectType->objectType}{/lang}</label></dt>
-                                       <dd>
-                                               <input type="number" id="{@$objectType->objectType}" name="points[{@$objectType->objectTypeID}]" value="{$points[$objectType->objectTypeID]}" required="required" min="0" class="tiny" />
-                                               {if $errorField == $objectType->objectTypeID}
-                                                       <small class="innerError">
-                                                               {lang greaterThan=-1}wcf.global.form.error.greaterThan{/lang}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                       {/foreach}
-               </fieldset>
-       </div>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.user.activityPoint.pointsPerObject{/lang}</h2>
+               {foreach from=$objectTypes item='objectType'}
+                       <dl{if $errorField == $objectType->objectTypeID} class="formError"{/if}>
+                               <dt><label for="{@$objectType->objectType}">{lang}wcf.user.activityPoint.objectType.{$objectType->objectType}{/lang}</label></dt>
+                               <dd>
+                                       <input type="number" id="{@$objectType->objectType}" name="points[{@$objectType->objectTypeID}]" value="{$points[$objectType->objectTypeID]}" required="required" min="0" class="tiny" />
+                                       {if $errorField == $objectType->objectTypeID}
+                                               <small class="innerError">
+                                                       {lang greaterThan=-1}wcf.global.form.error.greaterThan{/lang}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+               {/foreach}
+       </section>
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index b74fa085a8996cd728226a2ad8befa358ede8668..b3d2f9f15982a5f40534873d2a58703a0591687e 100644 (file)
@@ -8,9 +8,9 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.{@$action}{/lang}</h1>
-       {if $action == 'edit'}<p>{$user->username}</p>{/if}
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.{@$action}{/lang}</h1>
+       {if $action == 'edit'}<p class="contentHeaderDescription">{$user->username}</p>{/if}
 </header>
 
 {include file='formError'}
@@ -34,7 +34,7 @@
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='UserAdd'}{/link}{else}{link controller='UserEdit' id=$userID}{/link}{/if}">
-       <div class="tabMenuContainer">
+       <div class="section tabMenuContainer">
                <nav class="tabMenu">
                        <ul>
                                <li><a href="{@$__wcf->getAnchor('__essentials')}">{lang}wcf.global.form.data{/lang}</a></li>
                        </ul>
                </nav>
                
-               <div id="__essentials" class="container containerPadding tabMenuContent hidden">
-                       <fieldset>
-                               <legend>{lang}wcf.acp.user.general{/lang}</legend>
-                               
+               <div id="__essentials" class="tabMenuContent hidden">
+                       <div class="section">
                                <dl{if $errorType.username|isset} class="formError"{/if}>
                                        <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
                                        <dd>
                                {/if}
                                
                                {event name='generalFields'}
-                       </fieldset>
+                       </div>
                        
                        {if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditMailAddress')}
-                               <fieldset>
-                                       <legend>{lang}wcf.user.email{/lang}</legend>
+                               <section class="section">
+                                       <h2 class="sectionTitle">{lang}wcf.user.email{/lang}</h2>
                                        
                                        <dl{if $errorType.email|isset} class="formError"{/if}>
                                                <dt><label for="email">{lang}wcf.user.email{/lang}</label></dt>
                                        </dl>
                                        
                                        {event name='emailFields'}
-                               </fieldset>
+                               </section>
                        {/if}
                        
                        {if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditPassword')}
-                               <fieldset>
-                                       <legend>{lang}wcf.user.password{/lang}</legend>
+                               <section class="section">
+                                       <h2 class="sectionTitle">{lang}wcf.user.password{/lang}</h2>
                                        
                                        <dl{if $errorType.password|isset} class="formError"{/if}>
                                                <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
                                        </dl>
                                        
                                        {event name='passwordFields'}
-                               </fieldset>
+                               </section>
                        {/if}
                        
                        {if $action == 'edit' && $__wcf->session->getPermission('admin.user.canBanUser') && $__wcf->user->userID != $userID}
-                               <fieldset>
-                                       <legend>{lang}wcf.acp.user.banUser{/lang}</legend>
+                               <section class="section">
+                                       <h2 class="sectionTitle">{lang}wcf.acp.user.banUser{/lang}</h2>
                                        
                                        <dl>
                                                <dt></dt>
                                        </dl>
                                        
                                        {event name='banFields'}
-                               </fieldset>
+                               </section>
                                
                                <script data-relocate="true">
                                        //<![CDATA[
                                </script>
                        {/if}
                        
-                       {event name='fieldsets'}
+                       {event name='sections'}
                </div>
                
                {foreach from=$optionTree item=categoryLevel1}
-                       <div id="{@$categoryLevel1[object]->categoryName}" class="container containerPadding tabMenuContent hidden">
+                       <div id="{@$categoryLevel1[object]->categoryName}" class="tabMenuContent hidden">
                                {foreach from=$categoryLevel1[categories] item=categoryLevel2}
-                                       <fieldset>
-                                               <legend>{lang}wcf.user.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>
+                                       <section class="section">
+                                               <h2 class="sectionTitle">{lang}wcf.user.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</h2>
                                                
                                                {if $categoryLevel2[object]->categoryName == 'settings.general' && $availableLanguages|count > 1}
                                                        <dl>
                                                                {include file='optionFieldList' options=$categoryLevel3[options] langPrefix='wcf.user.option.'}
                                                        {/foreach}
                                                {/if}
-                                       </fieldset>
+                                       </section>
                                {/foreach}
                        </div>
                {/foreach}
                
                {if MODULE_USER_SIGNATURE}
-                       <div id="signatureManagement" class="container containerPadding tabMenuContent hidden">
-                               <fieldset>
-                                       <legend>{lang}wcf.user.signature{/lang}</legend>
+                       <div id="signatureManagement" class="tabMenuContent hidden">
+                               <section class="section">
+                                       <h2 class="sectionTitle">{lang}wcf.user.signature{/lang}</h2>
                                        
                                        <dl>
                                                <dt><label for="signature">{lang}wcf.user.signature{/lang}</label></dt>
                                        </dl>
                                        
                                        {event name='signatureFields'}
-                               </fieldset>
+                               </section>
                                
                                {if $__wcf->session->getPermission('admin.user.canDisableSignature')}
-                                       <fieldset>
-                                               <legend>{lang}wcf.acp.user.disableSignature{/lang}</legend>
+                                       <section class="section">
+                                               <h2 class="sectionTitle">{lang}wcf.acp.user.disableSignature{/lang}</h2>
                                                
                                                <dl>
                                                        <dt></dt>
                                                </dl>
 
                                                {event name='disableSignatureFields'}
-                                       </fieldset>
+                                       </section>
                                        
                                        <script data-relocate="true">
                                                //<![CDATA[
                {/if}
                
                {if $action == 'edit'}
-                       <div id="avatarForm" class="container containerPadding tabMenuContent hidden">
-                               <fieldset>
-                                       <legend>{lang}wcf.user.avatar{/lang}</legend>
+                       <div id="avatarForm" class="tabMenuContent hidden">
+                               <section class="section">
+                                       <h2 class="sectionTitle">{lang}wcf.user.avatar{/lang}</h2>
                                        
                                        <dl>
                                                <dt></dt>
                                        </dl>
                                        
                                        <dl class="jsOnly{if $errorType[customAvatar]|isset} formError{/if}" id="avatarUpload">
-                                               <dt class="framed">
+                                               <dt>
                                                        {if $avatarType == 'custom'}
                                                                {assign var='__customAvatar' value=$userAvatar->getImageTag(96)}
                                                                {if $userAvatar->canCrop()}
                                                                
                                                                {@$__customAvatar}
                                                        {else}
-                                                               <img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="icon96" />
+                                                               <img src="{@$__wcf->getPath()}images/avatars/avatar-default.svg" alt="" class="userAvatarImage icon96" />
                                                        {/if}
                                                </dt>
                                                <dd>
                                        
                                        {if MODULE_GRAVATAR}
                                                <dl{if $errorType[gravatar]|isset} class="formError"{/if}>
-                                                       <dt class="framed"><img src="https://secure.gravatar.com/avatar/{@$user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="icon96" /></dt>
+                                                       <dt><img src="https://secure.gravatar.com/avatar/{@$user->email|strtolower|md5}?s=96{if GRAVATAR_DEFAULT_TYPE != '404'}&amp;d={@GRAVATAR_DEFAULT_TYPE}{/if}" alt="" class="userAvatarImage icon96" /></dt>
                                                        <dd>
                                                                <label><input type="radio" name="avatarType" value="gravatar" {if $avatarType == 'gravatar'}checked="checked" {/if}/> {lang}wcf.user.avatar.type.gravatar{/lang}</label>
                                                                
                                        {/if}
 
                                        {event name='avatarFields'}
-                               </fieldset>
+                               </section>
                                
                                {if $__wcf->session->getPermission('admin.user.canDisableAvatar')}
-                                       <fieldset>
-                                               <legend>{lang}wcf.acp.user.disableAvatar{/lang}</legend>
+                                       <section class="section">
+                                               <h2 class="sectionTitle">{lang}wcf.acp.user.disableAvatar{/lang}</h2>
                                                
                                                <dl>
                                                        <dt></dt>
                                                </dl>
 
                                                {event name='disableAvatarFields'}
-                                       </fieldset>
+                                       </section>
                                        
                                        <script data-relocate="true">
                                                //<![CDATA[
index 4dd485f3df403a225e23560ccd2fbbb0b6a8b243..9ff5a06f437e2136df8cc175ce97b7cd687a4b25 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.assignToGroup'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.assignToGroup{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.assignToGroup{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{link controller='UserAssignToGroup'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.assignToGroup.markedUsers{/lang}</legend>
-                       
-                       <div>
-                               {implode from=$users item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
-                       </div>
-                       
-                       {event name='markedUserFields'}
-               </fieldset>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.assignToGroup.markedUsers{/lang}</h2>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.groups{/lang}</legend>
-                       
-                       <dl{if $errorField == 'groupIDs'} class="formError"{/if}>
-                               <dd>
-                                       {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
-                                       {if $errorField == 'groupIDs'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                               </small>
-                                       {/if}
-                               <dd>
-                       </dl>
-                       
-                       {event name='userGroupFields'}
-               </fieldset>
+               <div>
+                       {implode from=$users item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
+               </div>
                
-               {event name='fieldsets'}
-       </div>
+               {event name='markedUserFields'}
+       </section>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.groups{/lang}</h2>
+               
+               <dl{if $errorField == 'groupIDs'} class="formError"{/if}>
+                       <dd>
+                               {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
+                               {if $errorField == 'groupIDs'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                       </small>
+                               {/if}
+                       <dd>
+               </dl>
+               
+               {event name='userGroupFields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 61b9346bdc0fc8f66b6e2619bc7fcdc2b498e336..8ead4d53c21414badcd8e005d7ff2d5a04599971 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.authentication.failure.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.authentication.failure.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.authentication.failure.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.user.authentication.failure.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 1fdcb12201d710eda3b92f7b20e966a08608c11a..ec162001ac739137c5b6dd6e6e3620e05efe8f7c 100644 (file)
@@ -1,6 +1,6 @@
 {if !$groupedObjectTypes|isset && $conditions|isset}{assign var='groupedObjectTypes' value=$conditions}{/if}
 
-<div class="tabMenuContainer">
+<div class="section tabMenuContainer">
        <nav class="tabMenu">
                <ul>
                        {foreach from=$groupedObjectTypes key='conditionGroup' item='conditionObjectTypes'}
        </nav>
        
        {foreach from=$groupedObjectTypes key='conditionGroup' item='conditionObjectTypes'}
-               <div id="user_{$conditionGroup}" class="container containerPadding tabMenuContent">
+               <div id="user_{$conditionGroup}" class="tabMenuContent">
                        {if $conditionGroup != 'userOptions'}
-                               <fieldset>
-                                       <legend>{lang}wcf.user.condition.conditionGroup.{$conditionGroup}{/lang}</legend>
+                               <section class="section">
+                                       <h2 class="sectionTitle">{lang}wcf.user.condition.conditionGroup.{$conditionGroup}{/lang}</h2>
                        {/if}
                        
                        {foreach from=$conditionObjectTypes item='condition'}
@@ -22,7 +22,7 @@
                        {/foreach}
                        
                        {if $conditionGroup != 'userOptions'}
-                               </fieldset>
+                               </section>
                        {/if}
                </div>
        {/foreach}
index 5a6cfa6c978f334ae012fb161032a64591f40a62..3eecb0b316c8de4390af1e577088d2eb0bd6d792 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.revertChanges'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.revertChanges{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.revertChanges{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{link controller='UserContentRevertChanges'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.revertChanges.markedUsers{/lang}</legend>
-                       
-                       <div>
-                               {implode from=$users item='user'}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
-                       </div>
-                       
-                       {event name='markedUserFields'}
-               </fieldset>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.revertChanges.markedUsers{/lang}</h2>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.revertChanges.timeframe{/lang}</legend>
-                       
-                       <dl{if $errorField == 'timeframe'} class="formError"{/if}>
-                               <dt><label for="timeframe">{lang}wcf.acp.user.revertChanges.timeframe{/lang}</label></dt>
-                               <dd>
-                                       <input name="timeframe" type="number" min="0" value="{$timeframe}" />
-                                       
-                                       {if $errorField == 'timeframe'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.user.revertChanges.timeframe.description{/lang}</small>
-                               <dd>
-                       </dl>
-                       
-                       {event name='mergeFields'}
-               </fieldset>
+               <div>
+                       {implode from=$users item='user'}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
+               </div>
                
-               {event name='fieldsets'}
-       </div>
+               {event name='markedUserFields'}
+       </section>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.revertChanges.timeframe{/lang}</h2>
+               
+               <dl{if $errorField == 'timeframe'} class="formError"{/if}>
+                       <dt><label for="timeframe">{lang}wcf.acp.user.revertChanges.timeframe{/lang}</label></dt>
+                       <dd>
+                               <input name="timeframe" type="number" min="0" value="{$timeframe}" />
+                               
+                               {if $errorField == 'timeframe'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.user.revertChanges.timeframe.description{/lang}</small>
+                       <dd>
+               </dl>
+               
+               {event name='mergeFields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index bee6eb312a7ec42419ce0ee8e2bb2e6f05e3360e..2fa5fb202dca50a5193b635b7be8b2f0c7143424 100644 (file)
@@ -8,8 +8,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.exportEmailAddress{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.exportEmailAddress{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{link controller='UserEmailAddressExport'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang}</legend>
-                       
-                       <div>
-                               {implode from=$users item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
-                       </div>
-                       
-                       {event name='markedUserFields'}
-               </fieldset>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang}</h2>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.exportEmailAddress.format{/lang}</legend>
-                       
-                       <dl>
-                               <dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
-                               <dd>
-                                       <label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}class="jsEnablesOptions" data-disable-options="[ ]" data-enable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
-                                       <label><input type="radio" class="jsEnablesOptions" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}data-disable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" data-enable-options="[ ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
-                               </dd>
-                       </dl>
-                       
-                       <dl id="separatorDiv">
-                               <dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="separator" name="separator" value="{$separator}" class="medium" />
-                               </dd>
-                       </dl>
-                       
-                       <dl id="textSeparatorDiv">
-                               <dt><label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
-                               </dd>
-                       </dl>
-                       
-                       {event name='emailAddressFormatFields'}
-               </fieldset>
+               <div>
+                       {implode from=$users item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
+               </div>
                
-               {event name='fieldsets'}
-       </div>
+               {event name='markedUserFields'}
+       </section>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.exportEmailAddress.format{/lang}</h2>
+               
+               <dl>
+                       <dt><label>{lang}wcf.acp.user.exportEmailAddress.fileType{/lang}</label></dt>
+                       <dd>
+                               <label><input type="radio" name="fileType" value="csv" {if $fileType == 'csv'}checked="checked" {/if}class="jsEnablesOptions" data-disable-options="[ ]" data-enable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.csv{/lang}</label>
+                               <label><input type="radio" class="jsEnablesOptions" name="fileType" value="xml" {if $fileType == 'xml'}checked="checked" {/if}data-disable-options="[ 'separatorDiv', 'textSeparatorDiv' ]" data-enable-options="[ ]" /> {lang}wcf.acp.user.exportEmailAddress.fileType.xml{/lang}</label>
+                       </dd>
+               </dl>
+               
+               <dl id="separatorDiv">
+                       <dt><label for="separator">{lang}wcf.acp.user.exportEmailAddress.separator{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="separator" name="separator" value="{$separator}" class="medium" />
+                       </dd>
+               </dl>
+               
+               <dl id="textSeparatorDiv">
+                       <dt><label for="textSeparator">{lang}wcf.acp.user.exportEmailAddress.textSeparator{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="textSeparator" name="textSeparator" value="{$textSeparator}" class="medium" />
+                       </dd>
+               </dl>
+               
+               {event name='emailAddressFormatFields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 632686f829acb33b672d3af47f6554ebbd56c085..470f52fd741a0e3546f6d8cac693b0288a9c2737 100644 (file)
@@ -24,8 +24,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.group.{@$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.group.{@$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='UserGroupAdd'}{/link}{else}{link controller='UserGroupEdit' id=$groupID}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorType.groupName|isset} class="formError"{/if}>
-                               <dt><label for="groupName">{lang}wcf.global.name{/lang}</label></dt>
+       <div class="section">
+               <dl{if $errorType.groupName|isset} class="formError"{/if}>
+                       <dt><label for="groupName">{lang}wcf.global.name{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="groupName" name="groupName" value="{$i18nPlainValues['groupName']}" autofocus="autofocus" class="medium" />
+                               {if $errorType.groupName|isset}
+                                       <small class="innerError">
+                                               {if $errorType.groupName == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {elseif $errorType.groupName == 'multilingual'}
+                                                       {lang}wcf.global.form.error.multilingual{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.group.groupName.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               
+                               {include file='multipleLanguageInputJavascript' elementIdentifier='groupName' forceSelection=false}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorType.groupDescription|isset} class="formError"{/if}>
+                       <dt><label for="groupDescription">{lang}wcf.acp.group.description{/lang}</label></dt>
+                       <dd>
+                               <textarea id="groupDescription" name="groupDescription" cols="40" rows="3">{$i18nPlainValues['groupDescription']}</textarea>
+                               {if $errorType.groupDescription|isset}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.group.description.error.{@$errorType.groupDescription}{/lang}
+                                       </small>
+                               {/if}
+                               
+                               {include file='multipleLanguageInputJavascript' elementIdentifier='groupDescription' forceSelection=false}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorType.priority|isset} class="formError"{/if}>
+                       <dt><label for="priority">{lang}wcf.acp.group.priority{/lang}</label></dt>
+                       <dd>
+                               <input type="number" id="priority" name="priority" value="{@$priority}" class="tiny" max="8388607" />
+                               {if $errorType.priority|isset}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.group.priority.error.{@$errorType.priority}{/lang}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.group.priority.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {if MODULE_USERS_ONLINE}
+                       <dl{if $errorType.userOnlineMarking|isset} class="formError"{/if}>
+                               <dt><label for="userOnlineMarking">{lang}wcf.acp.group.userOnlineMarking{/lang}</label></dt>
                                <dd>
-                                       <input type="text" id="groupName" name="groupName" value="{$i18nPlainValues['groupName']}" autofocus="autofocus" class="medium" />
-                                       {if $errorType.groupName|isset}
+                                       <input type="text" id="userOnlineMarking" name="userOnlineMarking" value="{$userOnlineMarking}" class="long" />
+                                       {if $errorType.userOnlineMarking|isset}
                                                <small class="innerError">
-                                                       {if $errorType.groupName == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {elseif $errorType.groupName == 'multilingual'}
-                                                               {lang}wcf.global.form.error.multilingual{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.group.groupName.error.{@$errorType}{/lang}
-                                                       {/if}
+                                                       {lang}wcf.acp.group.userOnlineMarking.error.{@$errorType.userOnlineMarking}{/lang}
                                                </small>
                                        {/if}
-                                       
-                                       {include file='multipleLanguageInputJavascript' elementIdentifier='groupName' forceSelection=false}
+                                       <small>{lang}wcf.acp.group.userOnlineMarking.description{/lang}</small>
                                </dd>
                        </dl>
-                       
-                       <dl{if $errorType.groupDescription|isset} class="formError"{/if}>
-                               <dt><label for="groupDescription">{lang}wcf.acp.group.description{/lang}</label></dt>
+               {/if}
+               
+               {if MODULE_TEAM_PAGE && ($action == 'add' || $group->groupType > 3)}
+                       <dl>
+                               <dt></dt>
                                <dd>
-                                       <textarea id="groupDescription" name="groupDescription" cols="40" rows="3">{$i18nPlainValues['groupDescription']}</textarea>
-                                       {if $errorType.groupDescription|isset}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.group.description.error.{@$errorType.groupDescription}{/lang}
-                                               </small>
-                                       {/if}
-                                       
-                                       {include file='multipleLanguageInputJavascript' elementIdentifier='groupDescription' forceSelection=false}
+                                       <label><input type="checkbox" id="showOnTeamPage" name="showOnTeamPage" value="1" {if $showOnTeamPage}checked="checked" {/if}/> {lang}wcf.acp.group.showOnTeamPage{/lang}</label>
                                </dd>
                        </dl>
-                       
-                       <dl{if $errorType.priority|isset} class="formError"{/if}>
-                               <dt><label for="priority">{lang}wcf.acp.group.priority{/lang}</label></dt>
-                               <dd>
-                                       <input type="number" id="priority" name="priority" value="{@$priority}" class="tiny" max="8388607" />
-                                       {if $errorType.priority|isset}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.group.priority.error.{@$errorType.priority}{/lang}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.group.priority.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {if MODULE_USERS_ONLINE}
-                               <dl{if $errorType.userOnlineMarking|isset} class="formError"{/if}>
-                                       <dt><label for="userOnlineMarking">{lang}wcf.acp.group.userOnlineMarking{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="userOnlineMarking" name="userOnlineMarking" value="{$userOnlineMarking}" class="long" />
-                                               {if $errorType.userOnlineMarking|isset}
-                                                       <small class="innerError">
-                                                               {lang}wcf.acp.group.userOnlineMarking.error.{@$errorType.userOnlineMarking}{/lang}
-                                                       </small>
-                                               {/if}
-                                               <small>{lang}wcf.acp.group.userOnlineMarking.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       {if MODULE_TEAM_PAGE && ($action == 'add' || $group->groupType > 3)}
-                               <dl>
-                                       <dt></dt>
-                                       <dd>
-                                               <label><input type="checkbox" id="showOnTeamPage" name="showOnTeamPage" value="1" {if $showOnTeamPage}checked="checked" {/if}/> {lang}wcf.acp.group.showOnTeamPage{/lang}</label>
-                                       </dd>
-                               </dl>
-                       {/if}
-                       
-                       {event name='dataFields'}
-               </fieldset>
+               {/if}
                
-               {event name='fieldsets'}
+               {event name='dataFields'}
+       </div>
+       
+       {event name='sections'}
+       
+       <div class="section tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
+               <nav class="tabMenu">
+                       <ul>
+                               {foreach from=$optionTree item=categoryLevel1}
+                                       <li><a href="{@$__wcf->getAnchor($categoryLevel1[object]->categoryName)}">{lang}wcf.acp.group.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</a></li>
+                               {/foreach}
+                       </ul>
+               </nav>
                
-               <div class="tabMenuContainer" data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem">
-                       <nav class="tabMenu">
-                               <ul>
-                                       {foreach from=$optionTree item=categoryLevel1}
-                                               <li><a href="{@$__wcf->getAnchor($categoryLevel1[object]->categoryName)}">{lang}wcf.acp.group.option.category.{@$categoryLevel1[object]->categoryName}{/lang}</a></li>
-                                       {/foreach}
-                               </ul>
-                       </nav>
-                       
-                       {foreach from=$optionTree item=categoryLevel1}
-                               <div id="{@$categoryLevel1[object]->categoryName}" class="container containerPadding tabMenuContainer tabMenuContent">
-                                       <nav class="menu">
-                                               <ul>
-                                                       {foreach from=$categoryLevel1[categories] item=$categoryLevel2}
-                                                               {assign var=__categoryLevel2Name value=$categoryLevel1[object]->categoryName|concat:'-':$categoryLevel2[object]->categoryName}
-                                                               <li><a href="{@$__wcf->getAnchor($__categoryLevel2Name)}">{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</a></li>
-                                                       {/foreach}
-                                               </ul>
-                                       </nav>
-                                       
-                                       {foreach from=$categoryLevel1[categories] item=categoryLevel2}
-                                               <div id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}" class="tabMenuContent hidden">
-                                                       {if $categoryLevel2[options]|count}
-                                                               <fieldset>
-                                                                       <legend>{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>
-                                                                       {hascontent}<small>{content}{lang __optional=true}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}.description{/lang}{/content}</small>{/hascontent}
+               {foreach from=$optionTree item=categoryLevel1}
+                       <div id="{@$categoryLevel1[object]->categoryName}" class="tabMenuContainer tabMenuContent">
+                               <nav class="menu">
+                                       <ul>
+                                               {foreach from=$categoryLevel1[categories] item=$categoryLevel2}
+                                                       {assign var=__categoryLevel2Name value=$categoryLevel1[object]->categoryName|concat:'-':$categoryLevel2[object]->categoryName}
+                                                       <li><a href="{@$__wcf->getAnchor($__categoryLevel2Name)}">{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</a></li>
+                                               {/foreach}
+                                       </ul>
+                               </nav>
+                               
+                               {foreach from=$categoryLevel1[categories] item=categoryLevel2}
+                                       <div id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}" class="tabMenuContent hidden">
+                                               {if $categoryLevel2[options]|count}
+                                                       <section class="section">
+                                                               <header class="sectionHeader">
+                                                                       <h2 class="sectionTitle">{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</h2>
+                                                                       {hascontent}<small class="sectionDescription">{content}{lang __optional=true}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}.description{/lang}{/content}</small>{/hascontent}
+                                                               </header>
                                                                
-                                                                       {include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.acp.group.option.'}
-                                                               </fieldset>
-                                                       {/if}
-                                                       
-                                                       {if $categoryLevel2[categories]|count}
-                                                               {foreach from=$categoryLevel2[categories] item=categoryLevel3}
-                                                                       <fieldset>
-                                                                               <legend>{lang}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}{/lang}</legend>
-                                                                               {hascontent}<small>{content}{lang __optional=true}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}.description{/lang}{/content}</small>{/hascontent}
+                                                               {include file='optionFieldList' options=$categoryLevel2[options] langPrefix='wcf.acp.group.option.'}
+                                                       </section>
+                                               {/if}
+                                               
+                                               {if $categoryLevel2[categories]|count}
+                                                       {foreach from=$categoryLevel2[categories] item=categoryLevel3}
+                                                               <section class="section">
+                                                                       <header class="sectionHeader">
+                                                                               <h2 class="sectionTitle">{lang}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}{/lang}</h2>
+                                                                               {hascontent}<small class="sectionDescription">{content}{lang __optional=true}wcf.acp.group.option.category.{@$categoryLevel3[object]->categoryName}.description{/lang}{/content}</small>{/hascontent}
+                                                                       </header>
                                                                                
-                                                                               {include file='optionFieldList' options=$categoryLevel3[options] langPrefix='wcf.acp.group.option.'}
-                                                                       </fieldset>
-                                                               {/foreach}
-                                                       {/if}
-                                               </div>
-                                       {/foreach}
-                               </div>
-                       {/foreach}
-               </div>
+                                                                       {include file='optionFieldList' options=$categoryLevel3[options] langPrefix='wcf.acp.group.option.'}
+                                                               </section>
+                                                       {/foreach}
+                                               {/if}
+                                       </div>
+                               {/foreach}
+                       </div>
+               {/foreach}
        </div>
        
        <div class="formSubmit">
index 11f1a835a953f0b758e9d9daa610a9c8c2fa9e52..feae7d1c3d6d7892353ccc24ca687dd30dc102cf 100644 (file)
@@ -8,8 +8,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.group.assignment.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.group.assignment.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='UserGroupAssignmentAdd'}{/link}{else}{link controller='UserGroupAssignmentEdit' object=$assignment}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'title'} class="formError"{/if}>
-                               <dt><label for="title">{lang}wcf.global.name{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="title" name="title" value="{$title}" class="long" />
-                                       {if $errorField == 'title'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.group.assignment.title.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'groupID'} class="formError"{/if}>
-                               <dt><label for="groupID">{lang}wcf.user.group{/lang}</label></dt>
-                               <dd>
-                                       {htmlOptions name='groupID' options=$userGroups selected=$groupID}
-                                       {if $errorField == 'groupID'}
-                                               <small class="innerError">{lang}wcf.acp.group.assignment.groupID.error.{@$errorType}{/lang}</small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       
-                       <dl class="formError">
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.group.assignment.isDisabled{/lang}</label>
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'title'} class="formError"{/if}>
+                       <dt><label for="title">{lang}wcf.global.name{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="title" name="title" value="{$title}" class="long" />
+                               {if $errorField == 'title'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.group.assignment.title.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'groupID'} class="formError"{/if}>
+                       <dt><label for="groupID">{lang}wcf.user.group{/lang}</label></dt>
+                       <dd>
+                               {htmlOptions name='groupID' options=$userGroups selected=$groupID}
+                               {if $errorField == 'groupID'}
+                                       <small class="innerError">{lang}wcf.acp.group.assignment.groupID.error.{@$errorType}{/lang}</small>
+                               {/if}
+                       </dd>
+               </dl>
                
-               {event name='fieldsets'}
+               <dl class="formError">
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked="checked"{/if} /> {lang}wcf.acp.group.assignment.isDisabled{/lang}</label>
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
        </div>
        
-       <header class="boxHeadline boxSubHeadline">
-               <h2>{lang}wcf.acp.group.assignment.conditions{/lang}</h2>
-               <small>{lang}wcf.acp.group.assignment.conditions.description{/lang}</small>
-       </header>
-       
-       {if $errorField == 'conditions'}
-               <p class="error">{lang}wcf.acp.group.assignment.error.noConditions{/lang}</p>
-       {/if}
+       {event name='sections'}
        
-       {include file='userConditions'}
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.acp.group.assignment.conditions{/lang}</h2>
+                       <small class="sectionDescription">{lang}wcf.acp.group.assignment.conditions.description{/lang}</small>
+               </header>
+               
+               {if $errorField == 'conditions'}
+                       <p class="error">{lang}wcf.acp.group.assignment.error.noConditions{/lang}</p>
+               {/if}
+               
+               {include file='userConditions'}
+       </section>
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index fa9a9de9876400f30d4fb7a43918bcdc0281104f..20f09eb386dca3bcee332bc113edb9590f11375d 100644 (file)
@@ -21,8 +21,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.group.assignment.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.group.assignment.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop" id="userGroupAssignmentTableContainer">
-               <header>
-                       <h2>{lang}wcf.acp.group.assignment.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox" id="userGroupAssignmentTableContainer">
                <table class="table">
                        <thead>
                                <tr>
index 1e72f9a6dcf096b0d5a2638bde6063231d952d78..76d15bde1a01efd7f047ec805869d725ab836e74 100644 (file)
@@ -8,8 +8,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.group.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.group.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
        {/hascontent}
 </div>
 
-<div class="tabularBox tabularBoxTitle marginTop">
-       <header>
-               <h2>{lang}wcf.acp.group.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-       </header>
-       
+<div class="section tabularBox">
        <table class="table">
                <thead>
                        <tr>
index 7849d28cf2f0519889c84dd45b94256ca91c9846..47b863a6b6242d7099d2a9ddb189efc5d0b22e2c 100644 (file)
@@ -45,8 +45,8 @@
        })();
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.group.option.editingOption{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.group.option.editingOption{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{link controller='UserGroupOption' id=$userGroupOption->optionID}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset id="optionValueContainer">
-                       <legend>{lang}wcf.acp.group.option.{$userGroupOption->optionName}{/lang}</legend>
-                       
-                       <small>{implode from=$parentCategories item=parentCategory glue=' &raquo; '}{lang}wcf.acp.group.option.category.{@$parentCategory->categoryName}{/lang}{/implode}</small>
-                       
-                       {foreach from=$groups item=group}
-                               <dl>
-                                       <dt><label for="userGroupOption{@$group->groupID}">{lang}{$group->groupName}{/lang}</label></dt>
-                                       <dd>
-                                               {@$formElements[$group->groupID]}
-                                               
-                                               {if $errorType[$group->groupID]|isset}
-                                                       <small class="innerError">
-                                                               {lang}wcf.acp.group.option.error.{$errorType[$group->groupID]}{/lang}
-                                                       </small>
-                                               {/if}
-                                               {hascontent}<small>{content}{lang __optional=true}wcf.acp.group.option.{@$userGroupOption->optionName}.description{/lang}{/content}</small>{/hascontent}
-                                       </dd>
-                               </dl>
-                       {/foreach}
-               </fieldset>
+       <section class="section" id="optionValueContainer">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.acp.group.option.{$userGroupOption->optionName}{/lang}</h2>
+                       <small class="sectionDescription">{implode from=$parentCategories item=parentCategory glue=' &raquo; '}{lang}wcf.acp.group.option.category.{@$parentCategory->categoryName}{/lang}{/implode}</small>
+               </header>
                
-               {event name='fieldsets'}
-       </div>
+               {foreach from=$groups item=group}
+                       <dl>
+                               <dt><label for="userGroupOption{@$group->groupID}">{lang}{$group->groupName}{/lang}</label></dt>
+                               <dd>
+                                       {@$formElements[$group->groupID]}
+                                       
+                                       {if $errorType[$group->groupID]|isset}
+                                               <small class="innerError">
+                                                       {lang}wcf.acp.group.option.error.{$errorType[$group->groupID]}{/lang}
+                                               </small>
+                                       {/if}
+                                       {hascontent}<small>{content}{lang __optional=true}wcf.acp.group.option.{@$userGroupOption->optionName}.description{/lang}{/content}</small>{/hascontent}
+                               </dd>
+                       </dl>
+               {/foreach}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" />
index c24767a4598a5870a18c3b5bedccab5fbdce4215..5d03ec098c00131454b673399d27b2e4967f399b 100644 (file)
@@ -48,8 +48,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}{@$pageTitle}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}{@$pageTitle}{/lang}</h1>
 </header>
 
 {assign var=encodedURL value=$url|rawurlencode}
 </div>
 
 {if $users|count}
-       <div id="userTableContainer" class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.user.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div id="userTableContainer" class="section tabularBox">
                <table data-type="com.woltlab.wcf.user" class="table jsClipboardContainer">
                        <thead>
                                <tr>
                                                        {event name='rowButtons'}
                                                </td>
                                                <td class="columnID columnUserID">{@$user->userID}</td>
-                                               <td class="columnIcon"><p class="framed">{@$user->getAvatar()->getImageTag(24)}</p></td>
+                                               <td class="columnIcon">{@$user->getAvatar()->getImageTag(24)}</td>
                                                <td class="columnTitle columnUsername">{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="{link controller='UserEdit' id=$user->userID}{/link}">{$user->username}</a>{else}{$user->username}{/if}{if MODULE_USER_RANK}{if $user->getUserTitle()} <span class="badge userTitleBadge{if $user->getRank() && $user->getRank()->cssClassName} {@$user->getRank()->cssClassName}{/if}">{$user->getUserTitle()}</span>{/if}{if $user->getRank() && $user->getRank()->rankImage} <span class="userRankImage">{@$user->getRank()->getImage()}</span>{/if}{/if}</td>
                                                
                                                {foreach from=$columnHeads key=column item=columnLanguageVariable}
index 6885f27814e29d7b43499655b7635a1d51402ce3..fcce3550c1f6e7a3a8399d330e91c789de66841f 100644 (file)
@@ -22,8 +22,8 @@
        </script>
 {/if}
 
-<header class="boxHeadline">
-       <h1>{lang}{@$pageTitle}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}{@$pageTitle}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{link controller='UserMail'}{/link}">
-       <div class="container containerPadding marginTop">
-               {if $action == ''}
-                       <fieldset>
-                               <legend>{lang}wcf.acp.user.sendMail.markedUsers{/lang}</legend>
-                               
-                               <div>
-                                       {implode from=$userList item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
-                               </div>
-                               
-                               {event name='markedUserFields'}
-                       </fieldset>
-               {/if}
-               
-               {if $action == 'group'}
-                       <fieldset>
-                               <legend>{lang}wcf.acp.user.sendMail.groups{/lang}</legend>
-                               
-                               <dl{if $errorField == 'groupIDs'} class="formError"{/if}>
-                                       <dd>
-                                               {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
-                                               {if $errorField == 'groupIDs'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.user.sendMail.groups.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               
-                               {event name='userGroupFields'}
-                       </fieldset>
-               {/if}
-               
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.sendMail.mail{/lang}</legend>
+       {if $action == ''}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.user.sendMail.markedUsers{/lang}</h2>
                        
-                       <dl{if $errorField == 'subject'} class="formError"{/if}>
-                               <dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="subject" name="subject" value="{$subject}" autofocus="autofocus" class="long" />
-                                       {if $errorField == 'subject'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.user.sendMail.subject.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
+                       <div>
+                               {implode from=$userList item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
+                       </div>
                        
-                       <dl{if $errorField == 'from'} class="formError"{/if}>
-                               <dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="from" name="from" value="{$from}" class="long" />
-                                       {if $errorField == 'from'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.user.sendMail.subject.from.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       {* TODO: Add field for Human readable name for new mail system *}
-                                       <small>{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
-                               </dd>
-                       </dl>
+                       {event name='markedUserFields'}
+               </section>
+       {/if}
+       
+       {if $action == 'group'}
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.user.sendMail.groups{/lang}</h2>
                        
-                       <dl{if $errorField == 'text'} class="formError"{/if}>
-                               <dt><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
+                       <dl{if $errorField == 'groupIDs'} class="formError"{/if}>
                                <dd>
-                                       <textarea id="text" name="text" rows="15" cols="40" class="long">{$text}</textarea>
-                                       {if $errorField == 'text'}
+                                       {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
+                                       {if $errorField == 'groupIDs'}
                                                <small class="innerError">
                                                        {if $errorType == 'empty'}
                                                                {lang}wcf.global.form.error.empty{/lang}
                                                        {else}
-                                                               {lang}wcf.acp.user.sendMail.text.error.{@$errorType}{/lang}
+                                                               {lang}wcf.acp.user.sendMail.groups.error.{@$errorType}{/lang}
                                                        {/if}
                                                </small>
                                        {/if}
                                </dd>
                        </dl>
                        
-                       <dl>
-                               <dt></dt>
-                               <dd>
-                                       <label><input type="checkbox" id="enableHTML" name="enableHTML" {if $enableHTML == 1}checked="checked" {/if}value="1" /> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
-                               </dd>
-                       </dl>
-                       
-                       {event name='mailFields'}
-               </fieldset>
+                       {event name='userGroupFields'}
+               </section>
+       {/if}
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.sendMail.mail{/lang}</h2>
                
-               {event name='fieldsets'}
-       </div>
+               <dl{if $errorField == 'subject'} class="formError"{/if}>
+                       <dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="subject" name="subject" value="{$subject}" autofocus="autofocus" class="long" />
+                               {if $errorField == 'subject'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.user.sendMail.subject.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'from'} class="formError"{/if}>
+                       <dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="from" name="from" value="{$from}" class="long" />
+                               {if $errorField == 'from'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.user.sendMail.subject.from.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               {* TODO: Add field for Human readable name for new mail system *}
+                               <small>{lang}wcf.acp.user.sendMail.from.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'text'} class="formError"{/if}>
+                       <dt><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
+                       <dd>
+                               <textarea id="text" name="text" rows="15" cols="40" class="long">{$text}</textarea>
+                               {if $errorField == 'text'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.user.sendMail.text.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               
+               <dl>
+                       <dt></dt>
+                       <dd>
+                               <label><input type="checkbox" id="enableHTML" name="enableHTML" {if $enableHTML == 1}checked="checked" {/if}value="1" /> {lang}wcf.acp.user.sendMail.enableHTML{/lang}</label>
+                       </dd>
+               </dl>
+               
+               {event name='mailFields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index a6095b48e960fd08ed4c5e20a64467695a995c15..b8956662ab125b49929264d60301e051a0e51180 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.merge'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.merge{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.merge{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{link controller='UserMerge'}{/link}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.merge.markedUsers{/lang}</legend>
-                       
-                       <div>
-                               {implode from=$users item='user'}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
-                       </div>
-                       
-                       {event name='markedUserFields'}
-               </fieldset>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.merge.markedUsers{/lang}</h2>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.merge.destination{/lang}</legend>
-                       
-                       <dl{if $errorField == 'destinationUserID'} class="formError"{/if}>
-                               <dt><label for="destinationUserID">{lang}wcf.acp.user.merge.destination{/lang}</label></dt>
-                               <dd>
-                                       <select name="destinationUserID" id="destinationUserID">
-                                               <option value="0">{lang}wcf.global.noSelection{/lang}</option>
-                                               {foreach from=$users item=user}
-                                                       <option value="{@$user->userID}">{$user->username}</option>
-                                               {/foreach}
-                                       </select>
-                                       
-                                       {if $errorField == 'destinationUserID'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.user.merge.destination.description{/lang}</small>
-                               <dd>
-                       </dl>
-                       
-                       {event name='mergeFields'}
-               </fieldset>
+               <div>
+                       {implode from=$users item='user'}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
+               </div>
                
-               {event name='fieldsets'}
-       </div>
+               {event name='markedUserFields'}
+       </section>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.merge.destination{/lang}</h2>
+               
+               <dl{if $errorField == 'destinationUserID'} class="formError"{/if}>
+                       <dt><label for="destinationUserID">{lang}wcf.acp.user.merge.destination{/lang}</label></dt>
+                       <dd>
+                               <select name="destinationUserID" id="destinationUserID">
+                                       <option value="0">{lang}wcf.global.noSelection{/lang}</option>
+                                       {foreach from=$users item=user}
+                                               <option value="{@$user->userID}">{$user->username}</option>
+                                       {/foreach}
+                               </select>
+                               
+                               {if $errorField == 'destinationUserID'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.user.merge.destination.description{/lang}</small>
+                       <dd>
+               </dl>
+               
+               {event name='mergeFields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 7443412cfc2446dc52a4b7befe2df5c28d8446eb..8dd038f222a337b81e71f07b4d397b82f41bcecd 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.option.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.option.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.option.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 
 {if !$availableCategories|empty}
        <form method="post" action="{if $action == 'add'}{link controller='UserOptionAdd'}{/link}{else}{link controller='UserOptionEdit' id=$optionID}{/link}{/if}">
-               <div class="container containerPadding marginTop">
-                       <fieldset>
-                               <legend>{lang}wcf.global.form.data{/lang}</legend>
-                               
-                               <dl{if $errorField == 'optionName'} class="formError"{/if}>
-                                       <dt><label for="optionName">{lang}wcf.global.name{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="optionName" name="optionName" value="{$i18nPlainValues['optionName']}" required="required" autofocus="autofocus" class="long" />
-                                               {if $errorField == 'optionName'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'multilingual'}
-                                                                       {lang}wcf.global.form.error.multilingual{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.user.option.name.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               {include file='multipleLanguageInputJavascript' elementIdentifier='optionName' forceSelection=true}
-                               
-                               <dl{if $errorField == 'optionDescription'} class="formError"{/if}>
-                                       <dt><label for="optionDescription">{lang}wcf.acp.user.option.description{/lang}</label></dt>
-                                       <dd>
-                                               {* dirty work-around for non-i18n environments *}
-                                               {capture assign=__optionDescription}{lang __optional=true}{$i18nPlainValues['optionDescription']}{/lang}{/capture}
-                                               {if !$__optionDescription && !"~^[a-zA-Z0-9\-\_\.]+$~"|preg_match:$i18nPlainValues['optionDescription']}{assign var=__optionDescription value=$i18nPlainValues['optionDescription']}{/if}
-                                               
-                                               <textarea name="optionDescription" id="optionDescription" cols="40" rows="10">{$__optionDescription}</textarea>
-                                               {if $errorField == 'optionDescription'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.user.option.description.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               {include file='multipleLanguageInputJavascript' elementIdentifier='optionDescription' forceSelection=true}
-                               
-                               <dl{if $errorField == 'categoryName'} class="formError"{/if}>
-                                       <dt><label for="categoryName">{lang}wcf.acp.user.option.categoryName{/lang}</label></dt>
-                                       <dd>
-                                               <select name="categoryName" id="categoryName">
-                                                       {foreach from=$availableCategories item=availableCategory}
-                                                               <option value="{$availableCategory->categoryName}"{if $availableCategory->categoryName == $categoryName} selected="selected"{/if}>{lang}wcf.user.option.category.{$availableCategory->categoryName}{/lang}</option>
-                                                       {/foreach}
-                                               </select>
-                                               
-                                               {if $errorField == 'categoryName'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.user.option.categoryName.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                       </dd>
-                               </dl>
-                               
-                               <dl>
-                                       <dt><label for="showOrder">{lang}wcf.acp.user.option.showOrder{/lang}</label></dt>
-                                       <dd>
-                                               <input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short" />
-                                       </dd>
-                               </dl>
-                               
-                               {event name='dataFields'}
-                       </fieldset>
+               <div class="section">
+                       <dl{if $errorField == 'optionName'} class="formError"{/if}>
+                               <dt><label for="optionName">{lang}wcf.global.name{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="optionName" name="optionName" value="{$i18nPlainValues['optionName']}" required="required" autofocus="autofocus" class="long" />
+                                       {if $errorField == 'optionName'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'multilingual'}
+                                                               {lang}wcf.global.form.error.multilingual{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.user.option.name.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+                       {include file='multipleLanguageInputJavascript' elementIdentifier='optionName' forceSelection=true}
                        
-                       <fieldset>
-                               <legend>{lang}wcf.acp.user.option.typeData{/lang}</legend>
-                               
-                               <dl{if $errorField == 'optionType'} class="formError"{/if}>
-                                       <dt><label for="optionType">{lang}wcf.acp.user.option.optionType{/lang}</label></dt>
-                                       <dd>
-                                               <select name="optionType" id="optionType">
-                                                       {foreach from=$availableOptionTypes item=availableOptionType}
-                                                               <option value="{$availableOptionType}"{if $availableOptionType == $optionType} selected="selected"{/if}>{$availableOptionType}</option>
-                                                       {/foreach}
-                                               </select>
-                                               {if $errorField == 'optionType'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.user.option.optionType.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                               <small>{lang}wcf.acp.user.option.optionType.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                               
-                               <dl>
-                                       <dt><label for="defaultValue">{lang}wcf.acp.user.option.defaultValue{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="defaultValue" name="defaultValue" value="{$defaultValue}" class="long" />
-                                               <small>{lang}wcf.acp.user.option.defaultValue.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                               
-                               <dl{if $errorField == 'selectOptions'} class="formError"{/if}>
-                                       <dt><label for="selectOptions">{lang}wcf.acp.user.option.selectOptions{/lang}</label></dt>
-                                       <dd>
-                                               <textarea name="selectOptions" id="selectOptions" cols="40" rows="10">{$selectOptions}</textarea>
-                                               {if $errorField == 'selectOptions'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.user.option.selectOptions.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                               <small>{lang}wcf.acp.user.option.selectOptions.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                               
-                               <dl{if $errorField == 'outputClass'} class="formError"{/if}>
-                                       <dt><label for="outputClass">{lang}wcf.acp.user.option.outputClass{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="outputClass" name="outputClass" value="{$outputClass}" class="long" />
-                                               {if $errorField == 'outputClass'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.user.option.outputClass.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                               <small>{lang}wcf.acp.user.option.outputClass.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                               
-                               {event name='typeDataFields'}
-                       </fieldset>
+                       <dl{if $errorField == 'optionDescription'} class="formError"{/if}>
+                               <dt><label for="optionDescription">{lang}wcf.acp.user.option.description{/lang}</label></dt>
+                               <dd>
+                                       {* dirty work-around for non-i18n environments *}
+                                       {capture assign=__optionDescription}{lang __optional=true}{$i18nPlainValues['optionDescription']}{/lang}{/capture}
+                                       {if !$__optionDescription && !"~^[a-zA-Z0-9\-\_\.]+$~"|preg_match:$i18nPlainValues['optionDescription']}{assign var=__optionDescription value=$i18nPlainValues['optionDescription']}{/if}
+                                       
+                                       <textarea name="optionDescription" id="optionDescription" cols="40" rows="10">{$__optionDescription}</textarea>
+                                       {if $errorField == 'optionDescription'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.user.option.description.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
+                       {include file='multipleLanguageInputJavascript' elementIdentifier='optionDescription' forceSelection=true}
                        
-                       <fieldset>
-                               <legend>{lang}wcf.acp.user.option.access{/lang}</legend>
-                               
-                               <dl>
-                                       <dt><label for="editable">{lang}wcf.acp.user.option.editable{/lang}</label></dt>
-                                       <dd>
-                                               <select name="editable" id="editable">
-                                                       <option value="1"{if $editable == 1} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.1{/lang}</option>
-                                                       <option value="2"{if $editable == 2} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.2{/lang}</option>
-                                                       <option value="3"{if $editable == 3} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.3{/lang}</option>
-                                                       <option value="6"{if $editable == 6} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.6{/lang}</option>
-                                               </select>
-                                       </dd>
-                               </dl>
-                               
-                               <dl>
-                                       <dt><label for="visible">{lang}wcf.acp.user.option.visible{/lang}</label></dt>
-                                       <dd>
-                                               <select name="visible" id="visible">
-                                                       <option value="0"{if $visible == 0} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.0{/lang}</option>
-                                                       <option value="1"{if $visible == 1} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.1{/lang}</option>
-                                                       <option value="2"{if $visible == 2} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.2{/lang}</option>
-                                                       <option value="3"{if $visible == 3} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.3{/lang}</option>
-                                                       <option value="7"{if $visible == 7} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.7{/lang}</option>
-                                                       <option value="15"{if $visible == 15} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.15{/lang}</option>
-                                               </select>
-                                       </dd>
-                               </dl>
-                               
-                               <dl{if $errorField == 'validationPattern'} class="formError"{/if}>
-                                       <dt><label for="validationPattern">{lang}wcf.acp.user.option.validationPattern{/lang}</label></dt>
-                                       <dd>
-                                               <input type="text" id="validationPattern" name="validationPattern" value="{$validationPattern}" class="long" />
-                                               {if $errorField == 'validationPattern'}
-                                                       <small class="innerError">
-                                                               {if $errorType == 'empty'}
-                                                                       {lang}wcf.global.form.error.empty{/lang}
-                                                               {else}
-                                                                       {lang}wcf.acp.user.option.validationPattern.error.{@$errorType}{/lang}
-                                                               {/if}
-                                                       </small>
-                                               {/if}
-                                               <small>{lang}wcf.acp.user.option.validationPattern.description{/lang}</small>
-                                       </dd>
-                               </dl>
-                               
-                               <dl>
-                                       <dt></dt>
-                                       <dd>
-                                               <label><input type="checkbox" name="required" id="required" value="1" {if $required == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.required{/lang}</label>
-                                               <label><input type="checkbox" name="askDuringRegistration" id="askDuringRegistration" value="1" {if $askDuringRegistration == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.askDuringRegistration{/lang}</label>
-                                               <label><input type="checkbox" name="searchable" id="searchable" value="1" {if $searchable == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.searchable{/lang}</label>
-                                       </dd>
-                               </dl>
-                               
-                               {event name='accessFields'}
-                       </fieldset>
+                       <dl{if $errorField == 'categoryName'} class="formError"{/if}>
+                               <dt><label for="categoryName">{lang}wcf.acp.user.option.categoryName{/lang}</label></dt>
+                               <dd>
+                                       <select name="categoryName" id="categoryName">
+                                               {foreach from=$availableCategories item=availableCategory}
+                                                       <option value="{$availableCategory->categoryName}"{if $availableCategory->categoryName == $categoryName} selected="selected"{/if}>{lang}wcf.user.option.category.{$availableCategory->categoryName}{/lang}</option>
+                                               {/foreach}
+                                       </select>
+                                       
+                                       {if $errorField == 'categoryName'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.user.option.categoryName.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                               </dd>
+                       </dl>
                        
-                       {event name='fieldsets'}
+                       <dl>
+                               <dt><label for="showOrder">{lang}wcf.acp.user.option.showOrder{/lang}</label></dt>
+                               <dd>
+                                       <input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short" />
+                               </dd>
+                       </dl>
+                       
+                       {event name='dataFields'}
                </div>
                
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.user.option.typeData{/lang}</h2>
+                       
+                       <dl{if $errorField == 'optionType'} class="formError"{/if}>
+                               <dt><label for="optionType">{lang}wcf.acp.user.option.optionType{/lang}</label></dt>
+                               <dd>
+                                       <select name="optionType" id="optionType">
+                                               {foreach from=$availableOptionTypes item=availableOptionType}
+                                                       <option value="{$availableOptionType}"{if $availableOptionType == $optionType} selected="selected"{/if}>{$availableOptionType}</option>
+                                               {/foreach}
+                                       </select>
+                                       {if $errorField == 'optionType'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.user.option.optionType.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                                       <small>{lang}wcf.acp.user.option.optionType.description{/lang}</small>
+                               </dd>
+                       </dl>
+                       
+                       <dl>
+                               <dt><label for="defaultValue">{lang}wcf.acp.user.option.defaultValue{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="defaultValue" name="defaultValue" value="{$defaultValue}" class="long" />
+                                       <small>{lang}wcf.acp.user.option.defaultValue.description{/lang}</small>
+                               </dd>
+                       </dl>
+                       
+                       <dl{if $errorField == 'selectOptions'} class="formError"{/if}>
+                               <dt><label for="selectOptions">{lang}wcf.acp.user.option.selectOptions{/lang}</label></dt>
+                               <dd>
+                                       <textarea name="selectOptions" id="selectOptions" cols="40" rows="10">{$selectOptions}</textarea>
+                                       {if $errorField == 'selectOptions'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.user.option.selectOptions.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                                       <small>{lang}wcf.acp.user.option.selectOptions.description{/lang}</small>
+                               </dd>
+                       </dl>
+                       
+                       <dl{if $errorField == 'outputClass'} class="formError"{/if}>
+                               <dt><label for="outputClass">{lang}wcf.acp.user.option.outputClass{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="outputClass" name="outputClass" value="{$outputClass}" class="long" />
+                                       {if $errorField == 'outputClass'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.user.option.outputClass.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                                       <small>{lang}wcf.acp.user.option.outputClass.description{/lang}</small>
+                               </dd>
+                       </dl>
+                       
+                       {event name='typeDataFields'}
+               </section>
+               
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.user.option.access{/lang}</h2>
+                       
+                       <dl>
+                               <dt><label for="editable">{lang}wcf.acp.user.option.editable{/lang}</label></dt>
+                               <dd>
+                                       <select name="editable" id="editable">
+                                               <option value="1"{if $editable == 1} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.1{/lang}</option>
+                                               <option value="2"{if $editable == 2} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.2{/lang}</option>
+                                               <option value="3"{if $editable == 3} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.3{/lang}</option>
+                                               <option value="6"{if $editable == 6} selected="selected"{/if}>{lang}wcf.acp.user.option.editable.6{/lang}</option>
+                                       </select>
+                               </dd>
+                       </dl>
+                       
+                       <dl>
+                               <dt><label for="visible">{lang}wcf.acp.user.option.visible{/lang}</label></dt>
+                               <dd>
+                                       <select name="visible" id="visible">
+                                               <option value="0"{if $visible == 0} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.0{/lang}</option>
+                                               <option value="1"{if $visible == 1} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.1{/lang}</option>
+                                               <option value="2"{if $visible == 2} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.2{/lang}</option>
+                                               <option value="3"{if $visible == 3} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.3{/lang}</option>
+                                               <option value="7"{if $visible == 7} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.7{/lang}</option>
+                                               <option value="15"{if $visible == 15} selected="selected"{/if}>{lang}wcf.acp.user.option.visible.15{/lang}</option>
+                                       </select>
+                               </dd>
+                       </dl>
+                       
+                       <dl{if $errorField == 'validationPattern'} class="formError"{/if}>
+                               <dt><label for="validationPattern">{lang}wcf.acp.user.option.validationPattern{/lang}</label></dt>
+                               <dd>
+                                       <input type="text" id="validationPattern" name="validationPattern" value="{$validationPattern}" class="long" />
+                                       {if $errorField == 'validationPattern'}
+                                               <small class="innerError">
+                                                       {if $errorType == 'empty'}
+                                                               {lang}wcf.global.form.error.empty{/lang}
+                                                       {else}
+                                                               {lang}wcf.acp.user.option.validationPattern.error.{@$errorType}{/lang}
+                                                       {/if}
+                                               </small>
+                                       {/if}
+                                       <small>{lang}wcf.acp.user.option.validationPattern.description{/lang}</small>
+                               </dd>
+                       </dl>
+                       
+                       <dl>
+                               <dt></dt>
+                               <dd>
+                                       <label><input type="checkbox" name="required" id="required" value="1" {if $required == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.required{/lang}</label>
+                                       <label><input type="checkbox" name="askDuringRegistration" id="askDuringRegistration" value="1" {if $askDuringRegistration == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.askDuringRegistration{/lang}</label>
+                                       <label><input type="checkbox" name="searchable" id="searchable" value="1" {if $searchable == 1}checked="checked" {/if}/> {lang}wcf.acp.user.option.searchable{/lang}</label>
+                               </dd>
+                       </dl>
+                       
+                       {event name='accessFields'}
+               </section>
+               
+               {event name='sections'}
+               
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                        {@SECURITY_TOKEN_INPUT_TAG}
index e654cc0268c2814533122bc0d74a3033861ac25e..c0af44bfe6791f3ea00a76cbb67bcfa2e2a9b1e9 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.option.category.'|concat:$action}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.option.category.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.option.category.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='UserOptionCategoryAdd'}{/link}{else}{link controller='UserOptionCategoryEdit' id=$categoryID}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'categoryName'} class="formError"{/if}>
-                               <dt><label for="categoryName">{lang}wcf.global.name{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="categoryName" name="categoryName" value="{$i18nPlainValues['categoryName']}" required="required" autofocus="autofocus" class="long" />
-                                       {if $errorField == 'categoryName'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'multilingual'}
-                                                               {lang}wcf.global.form.error.multilingual{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.user.option.category.name.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       {include file='multipleLanguageInputJavascript' elementIdentifier='categoryName' forceSelection=true}
-                       
-                       <dl>
-                               <dt><label for="showOrder">{lang}wcf.acp.user.option.category.showOrder{/lang}</label></dt>
-                               <dd>
-                                       <input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short" />
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'categoryName'} class="formError"{/if}>
+                       <dt><label for="categoryName">{lang}wcf.global.name{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="categoryName" name="categoryName" value="{$i18nPlainValues['categoryName']}" required="required" autofocus="autofocus" class="long" />
+                               {if $errorField == 'categoryName'}
+                                       <small class="innerError">
+                                               {if $errorType == 'multilingual'}
+                                                       {lang}wcf.global.form.error.multilingual{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.user.option.category.name.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               {include file='multipleLanguageInputJavascript' elementIdentifier='categoryName' forceSelection=true}
                
-               {event name='fieldsets'}
+               <dl>
+                       <dt><label for="showOrder">{lang}wcf.acp.user.option.category.showOrder{/lang}</label></dt>
+                       <dd>
+                               <input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short" />
+                       </dd>
+               </dl>
+               
+               {event name='dataFields'}
        </div>
        
+       {event name='sections'}
+       
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                {@SECURITY_TOKEN_INPUT_TAG}
index a56565d38d1fd3586b768133ef70bfbf5e2b3403..5efb45f364281c1ff8be957053861a90dfb9b794 100644 (file)
@@ -1,17 +1,18 @@
 {include file='header' pageTitle='wcf.acp.user.option.category.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.option.category.list{/lang}</h1>
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.Action.Delete('wcf\\data\\user\\option\\category\\UserOptionCategoryAction', '.jsCategoryRow');
-               });
-               //]]>
-       </script>
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.Action.Delete('wcf\\data\\user\\option\\category\\UserOptionCategoryAction', '.jsCategoryRow');
+       });
+       //]]>
+</script>
+
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.option.category.list{/lang}</h1>
 </header>
 
+
 <div class="contentNavigation">
        {pages print=true assign=pagesLinks controller="UserOptionCategoryList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
        
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.user.option.category.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 2bacd29d0644f70704aa5ed045e7f0166b3b1166..4fd081f9696c438d918038eacb8da95da103d78e 100644 (file)
@@ -1,16 +1,16 @@
 {include file='header' pageTitle='wcf.acp.user.option.list'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.option.list{/lang}</h1>
-       
-       <script data-relocate="true">
-               //<![CDATA[
-               $(function() {
-                       new WCF.Action.Delete('wcf\\data\\user\\option\\UserOptionAction', '.jsOptionRow');
-                       new WCF.Action.Toggle('wcf\\data\\user\\option\\UserOptionAction', $('.jsOptionRow'));
-               });
-               //]]>
-       </script>
+<script data-relocate="true">
+       //<![CDATA[
+       $(function() {
+               new WCF.Action.Delete('wcf\\data\\user\\option\\UserOptionAction', '.jsOptionRow');
+               new WCF.Action.Toggle('wcf\\data\\user\\option\\UserOptionAction', $('.jsOptionRow'));
+       });
+       //]]>
+</script>
+
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.option.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {if $objects|count}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.user.option.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 5b90aca72440d16cff0bace102b87fc93b8af007..a1faa0a7d2614d5c8665bfa0744bdff23e185c3e 100644 (file)
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.option.setDefaults'}
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.option.setDefaults{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.option.setDefaults{/lang}</h1>
 </header>
 
 {include file='formError'}
 
 {if !$optionTree|empty}
        <form method="post" action="{link controller='UserOptionSetDefaults'}{/link}">
-               <div class="container containerPadding marginTop">
-                       <fieldset>
-                               <dl>
-                                       <dt></dt>
-                                       <dd>
-                                               <label><input type="checkbox" name="applyChangesToExistingUsers" value="1" {if $applyChangesToExistingUsers}checked="checked" {/if}/> {lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers{/lang}</label>
-                                               <small>{lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers.description{/lang}</small>     
-                                       </dd>
-                               </dl>
-                       </fieldset>
-                       
-                       {foreach from=$optionTree[0][categories] item=optionCategory}
-                               <fieldset>
-                                       <legend>{lang}wcf.user.option.category.{@$optionCategory[object]->categoryName}{/lang}</legend>
-                                       
-                                       {include file='optionFieldList' options=$optionCategory[options] langPrefix='wcf.user.option.'}
-                                       
-                                       {if $optionCategory[categories]|count}
-                                               {foreach from=$optionCategory[categories] item=optionCategory2}
-                                                       {include file='optionFieldList' options=$optionCategory2[options] langPrefix='wcf.user.option.'}
-                                               {/foreach}
-                                       {/if}
-                               </fieldset>
-                       {/foreach}
-                       
-                       {event name='fieldsets'}
+               <div class="section">
+                       <dl>
+                               <dt></dt>
+                               <dd>
+                                       <label><input type="checkbox" name="applyChangesToExistingUsers" value="1" {if $applyChangesToExistingUsers}checked="checked" {/if}/> {lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers{/lang}</label>
+                                       <small>{lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers.description{/lang}</small>     
+                               </dd>
+                       </dl>
                </div>
                
+               {foreach from=$optionTree[0][categories] item=optionCategory}
+                       <section class="section">
+                               <h2 class="sectionTitle">{lang}wcf.user.option.category.{@$optionCategory[object]->categoryName}{/lang}</h2>
+                               
+                               {include file='optionFieldList' options=$optionCategory[options] langPrefix='wcf.user.option.'}
+                               
+                               {if $optionCategory[categories]|count}
+                                       {foreach from=$optionCategory[categories] item=optionCategory2}
+                                               {include file='optionFieldList' options=$optionCategory2[options] langPrefix='wcf.user.option.'}
+                                       {/foreach}
+                               {/if}
+                       </section>
+               {/foreach}
+               
+               {event name='sections'}
+               
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
                        {@SECURITY_TOKEN_INPUT_TAG}
index 874b6355002fbf4c519578cb6001984748688a9b..4e63dfa41c9258a4531ad81e94cc0a35e1ae837c 100644 (file)
@@ -1,8 +1,10 @@
 {foreach from=$optionTree item='category'}
-       <fieldset>
-               <legend>{lang}wcf.user.option.category.{@$category[object]->categoryName}{/lang}</legend>
-               {hascontent}<p>{content}{lang __optional=true}wcf.user.option.category.{@$category[object]->categoryName}.description{/lang}{/content}</p>{/hascontent}
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.user.option.category.{@$category[object]->categoryName}{/lang}</h2>
+                       {hascontent}<small class="sectionDescription">{content}{lang __optional=true}wcf.user.option.category.{@$category[object]->categoryName}.description{/lang}{/content}</small>{/hascontent}
+               </header>
                
                {include file='optionFieldList' options=$category[options] langPrefix='wcf.user.option.'}
-       </fieldset>
+       </section>
 {/foreach}
index 21df1c311aee46407fb9a2223fe41b8eeaa8086f..d269dcb9c0ae907c9d8af45fb1644b964185bd16 100644 (file)
@@ -8,8 +8,8 @@
        });
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.rank.{$action}{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.rank.{$action}{/lang}</h1>
 </header>
 
 {include file='formError'}
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='UserRankAdd'}{/link}{else}{link controller='UserRankEdit' id=$rankID}{/link}{/if}">
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.global.form.data{/lang}</legend>
-                       
-                       <dl{if $errorField == 'rankTitle'} class="formError"{/if}>
-                               <dt><label for="rankTitle">{lang}wcf.acp.user.rank.title{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="rankTitle" name="rankTitle" value="{$i18nPlainValues['rankTitle']}" required="required" autofocus="autofocus" class="long" />
-                                       {if $errorField == 'rankTitle'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {elseif $errorType == 'multilingual'}
-                                                               {lang}wcf.global.form.error.multilingual{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.user.rank.title.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                               </dd>
-                       </dl>
-                       {include file='multipleLanguageInputJavascript' elementIdentifier='rankTitle' forceSelection=false}
-                       
-                       <dl{if $errorField == 'cssClassName'} class="formError"{/if}>
-                               <dt><label for="cssClassName">{lang}wcf.acp.user.rank.cssClassName{/lang}</label></dt>
-                               <dd>
-                                       <ul id="labelList">
-                                               {foreach from=$availableCssClassNames item=className}
-                                                       {if $className == 'custom'}
-                                                               <li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if} /> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long" /></span></li>
-                                                       {else}
-                                                               <li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if} /> <span class="badge label{if $className != 'none'} {$className}{/if}">{lang}wcf.acp.user.rank.title{/lang}</span></label></li>
-                                                       {/if}
-                                               {/foreach}
-                                       </ul>
-                                       
-                                       {if $errorField == 'cssClassName'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.user.rank.cssClassName.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.user.rank.cssClassName.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {event name='dataFields'}
-               </fieldset>
+       <div class="section">
+               <dl{if $errorField == 'rankTitle'} class="formError"{/if}>
+                       <dt><label for="rankTitle">{lang}wcf.acp.user.rank.title{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="rankTitle" name="rankTitle" value="{$i18nPlainValues['rankTitle']}" required="required" autofocus="autofocus" class="long" />
+                               {if $errorField == 'rankTitle'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {elseif $errorType == 'multilingual'}
+                                                       {lang}wcf.global.form.error.multilingual{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.user.rank.title.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                       </dd>
+               </dl>
+               {include file='multipleLanguageInputJavascript' elementIdentifier='rankTitle' forceSelection=false}
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.rank.image{/lang}</legend>
-                       
-                       <dl{if $errorField == 'rankImage'} class="formError"{/if}>
-                               <dt><label for="rankImage">{lang}wcf.acp.user.rank.image{/lang}</label></dt>
-                               <dd>
-                                       <input type="text" id="rankImage" name="rankImage" value="{$rankImage}" class="long" />
-                                       {if $errorField == 'rankImage'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.user.rank.image.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.user.rank.rankImage.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'repeatImage'} class="formError"{/if}>
-                               <dt><label for="repeatImage">{lang}wcf.acp.user.rank.repeatImage{/lang}</label></dt>
-                               <dd>
-                                       <input type="number" id="repeatImage" name="repeatImage" value="{@$repeatImage}" min="1" class="tiny" />
-                                       {if $errorField == 'rankImage'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.user.rank.repeatImage.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.user.rank.repeatImage.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       {if $action == 'edit' && $rank->rankImage}
-                               <dl>
-                                       <dt><label>{lang}wcf.acp.user.rank.currentImage{/lang}</label></dt>
-                                       <dd>{@$rank->getImage()}</dd>
-                               </dl>
-                       {/if}
-                       
-                       {event name='imageFields'}
-               </fieldset>
+               <dl{if $errorField == 'cssClassName'} class="formError"{/if}>
+                       <dt><label for="cssClassName">{lang}wcf.acp.user.rank.cssClassName{/lang}</label></dt>
+                       <dd>
+                               <ul id="labelList">
+                                       {foreach from=$availableCssClassNames item=className}
+                                               {if $className == 'custom'}
+                                                       <li class="labelCustomClass"><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked="checked"{/if} /> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="long" /></span></li>
+                                               {else}
+                                                       <li><label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked="checked"{/if} /> <span class="badge label{if $className != 'none'} {$className}{/if}">{lang}wcf.acp.user.rank.title{/lang}</span></label></li>
+                                               {/if}
+                                       {/foreach}
+                               </ul>
+                               
+                               {if $errorField == 'cssClassName'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.user.rank.cssClassName.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.user.rank.cssClassName.description{/lang}</small>
+                       </dd>
+               </dl>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.rank.requirement{/lang}</legend>
-                       
-                       <dl{if $errorField == 'groupID'} class="formError"{/if}>
-                               <dt><label for="groupID">{lang}wcf.user.group{/lang}</label></dt>
-                               <dd>
-                                       <select id="groupID" name="groupID">
-                                               {foreach from=$availableGroups item=group}
-                                                       <option value="{@$group->groupID}"{if $group->groupID == $groupID} selected="selected"{/if}>{$group->groupName|language}</option>
-                                               {/foreach}
-                                       </select>
-                                       {if $errorField == 'groupID'}
-                                               <small class="innerError">
-                                                       {if $errorType == 'empty'}
-                                                               {lang}wcf.global.form.error.empty{/lang}
-                                                       {else}
-                                                               {lang}wcf.acp.user.rank.userGroup.error.{@$errorType}{/lang}
-                                                       {/if}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.user.rank.userGroup.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'requiredGender'} class="formError"{/if}>
-                               <dt><label for="requiredGender">{lang}wcf.user.option.gender{/lang}</label></dt>
-                               <dd>
-                                       <select id="requiredGender" name="requiredGender">
-                                               <option value="0">{lang}wcf.global.noSelection{/lang}</option>
-                                               <option value="1"{if $requiredGender == 1} selected="selected"{/if}>{lang}wcf.user.gender.male{/lang}</option>
-                                               <option value="2"{if $requiredGender == 2} selected="selected"{/if}>{lang}wcf.user.gender.female{/lang}</option>
-                                       </select>
-                                       {if $errorField == 'requiredGender'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.user.rank.requiredGender.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.user.rank.requiredGender.description{/lang}</small>
-                               </dd>
-                       </dl>
-                       
-                       <dl{if $errorField == 'requiredPoints'} class="formError"{/if}>
-                               <dt><label for="requiredPoints">{lang}wcf.acp.user.rank.requiredPoints{/lang}</label></dt>
-                               <dd>
-                                       <input type="number" id="requiredPoints" name="requiredPoints" value="{@$requiredPoints}" min="0" class="tiny" />
-                                       {if $errorField == 'requiredPoints'}
-                                               <small class="innerError">
-                                                       {lang}wcf.acp.user.rank.requiredPoints.error.{@$errorType}{/lang}
-                                               </small>
-                                       {/if}
-                                       <small>{lang}wcf.acp.user.rank.requiredPoints.description{/lang}</small>
-                               </dd>
+               {event name='dataFields'}
+       </div>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.rank.image{/lang}</h2>
+               
+               <dl{if $errorField == 'rankImage'} class="formError"{/if}>
+                       <dt><label for="rankImage">{lang}wcf.acp.user.rank.image{/lang}</label></dt>
+                       <dd>
+                               <input type="text" id="rankImage" name="rankImage" value="{$rankImage}" class="long" />
+                               {if $errorField == 'rankImage'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.user.rank.image.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.user.rank.rankImage.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'repeatImage'} class="formError"{/if}>
+                       <dt><label for="repeatImage">{lang}wcf.acp.user.rank.repeatImage{/lang}</label></dt>
+                       <dd>
+                               <input type="number" id="repeatImage" name="repeatImage" value="{@$repeatImage}" min="1" class="tiny" />
+                               {if $errorField == 'rankImage'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.user.rank.repeatImage.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.user.rank.repeatImage.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {if $action == 'edit' && $rank->rankImage}
+                       <dl>
+                               <dt><label>{lang}wcf.acp.user.rank.currentImage{/lang}</label></dt>
+                               <dd>{@$rank->getImage()}</dd>
                        </dl>
-                       
-                       {event name='requirementFields'}
-               </fieldset>
+               {/if}
                
-               {event name='fieldsets'}
-       </div>
+               {event name='imageFields'}
+       </section>
+       
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.rank.requirement{/lang}</h2>
+               
+               <dl{if $errorField == 'groupID'} class="formError"{/if}>
+                       <dt><label for="groupID">{lang}wcf.user.group{/lang}</label></dt>
+                       <dd>
+                               <select id="groupID" name="groupID">
+                                       {foreach from=$availableGroups item=group}
+                                               <option value="{@$group->groupID}"{if $group->groupID == $groupID} selected="selected"{/if}>{$group->groupName|language}</option>
+                                       {/foreach}
+                               </select>
+                               {if $errorField == 'groupID'}
+                                       <small class="innerError">
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.acp.user.rank.userGroup.error.{@$errorType}{/lang}
+                                               {/if}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.user.rank.userGroup.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'requiredGender'} class="formError"{/if}>
+                       <dt><label for="requiredGender">{lang}wcf.user.option.gender{/lang}</label></dt>
+                       <dd>
+                               <select id="requiredGender" name="requiredGender">
+                                       <option value="0">{lang}wcf.global.noSelection{/lang}</option>
+                                       <option value="1"{if $requiredGender == 1} selected="selected"{/if}>{lang}wcf.user.gender.male{/lang}</option>
+                                       <option value="2"{if $requiredGender == 2} selected="selected"{/if}>{lang}wcf.user.gender.female{/lang}</option>
+                               </select>
+                               {if $errorField == 'requiredGender'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.user.rank.requiredGender.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.user.rank.requiredGender.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               <dl{if $errorField == 'requiredPoints'} class="formError"{/if}>
+                       <dt><label for="requiredPoints">{lang}wcf.acp.user.rank.requiredPoints{/lang}</label></dt>
+                       <dd>
+                               <input type="number" id="requiredPoints" name="requiredPoints" value="{@$requiredPoints}" min="0" class="tiny" />
+                               {if $errorField == 'requiredPoints'}
+                                       <small class="innerError">
+                                               {lang}wcf.acp.user.rank.requiredPoints.error.{@$errorType}{/lang}
+                                       </small>
+                               {/if}
+                               <small>{lang}wcf.acp.user.rank.requiredPoints.description{/lang}</small>
+                       </dd>
+               </dl>
+               
+               {event name='requirementFields'}
+       </section>
+       
+       {event name='sections'}
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index fd330b8d6ccf785a5cfb52efeb93216af54bac43..85c08493e59fd85e8f21c2ab42647b3263fd0dad 100644 (file)
@@ -8,8 +8,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.rank.list{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.rank.list{/lang}</h1>
 </header>
 
 <div class="contentNavigation">
 </div>
 
 {hascontent}
-       <div class="tabularBox tabularBoxTitle marginTop">
-               <header>
-                       <h2>{lang}wcf.acp.user.rank.list{/lang} <span class="badge badgeInverse">{#$items}</span></h2>
-               </header>
-               
+       <div class="section tabularBox">
                <table class="table">
                        <thead>
                                <tr>
index 642dbab8d80b75f2d23827ba983796275f2d8752..21a8ec33e136748b2e1e972a49a4a22d64ec1393 100644 (file)
@@ -9,8 +9,8 @@
        //]]>
 </script>
 
-<header class="boxHeadline">
-       <h1>{lang}wcf.acp.user.search{/lang}</h1>
+<header class="contentHeader">
+       <h1 class="contentTitle">{lang}wcf.acp.user.search{/lang}</h1>
 </header>
 
 {if $errorField == 'search'}
 </div>
 
 <form method="post" action="{link controller='UserSearch'}{/link}">
-       <header class="boxHeadline boxSubHeadline">
-               <h2>{lang}wcf.acp.user.search.conditions{/lang}</h2>
-       </header>
-       
-       {include file='userConditions'}
-       
-       <header class="boxHeadline boxSubHeadline">
-               <h2>{lang}wcf.acp.user.search.display{/lang}</h2>
-       </header>
+       <section class="section">
+               <header class="sectionHeader">
+                       <h2 class="sectionTitle">{lang}wcf.acp.user.search.conditions{/lang}</h2>
+               </header>
+               
+               {include file='userConditions'}
+       </section>
        
-       <div class="container containerPadding marginTop">
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.search.display.general{/lang}</legend>
+       <section class="section">
+               <h2 class="sectionTitle">{lang}wcf.acp.user.search.display{/lang}</h2>
+               
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.user.search.display.general{/lang}</h2>
                        
                        <dl>
                                <dt><label for="sortField">{lang}wcf.acp.user.search.display.sort{/lang}</label></dt>
                        </dl>
                        
                        {event name='searchDisplayFields'}
-               </fieldset>
+               </section>
                
-               <fieldset>
-                       <legend>{lang}wcf.acp.user.search.display.columns{/lang}</legend>
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.user.search.display.columns{/lang}</h2>
                        
                        {if $columnOptions|count}
                                <dl>
                        </dl>
                        
                        {event name='searchDisplayColumnFields'}
-               </fieldset>
+               </section>
                
-               {event name='resultOptionFieldsets'}
-       </div>
+               {event name='resultOptionSections'}
+       </section>      
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
index 08e0ca1a31ff2d6d16062fd83b3780eb45fffce2..27e816a5340b37ccd20135c15f19d79cc4f9bc65 100644 (file)
@@ -1,9 +1,9 @@
 <div id="workerContainer">
-       <header class="box48 boxHeadline">
+       <header class="box48 contentHeader">
                <span class="icon icon48 fa-spinner"></span>
                
                <div>
-                       <h1>{lang}wcf.global.worker.executing{/lang}</h1>
+                       <h1 class="contentTitle">{lang}wcf.global.worker.executing{/lang}</h1>
                        <small><progress value="0" max="100">0%</progress> <span>0%</span></small>
                </div>
        </header>
index 84b40172fac9d6a956813b5408b9964bcbcb0053..878541e0e1f550ff6581848b1530d94b81998575 100644 (file)
@@ -821,7 +821,7 @@ $.widget('ui.wcfImageViewer', {
                this._ui = {
                        buttonNext: $imageList.children('span.wcfImageViewerButtonNext'),
                        buttonPrevious: $imageList.children('span.wcfImageViewerButtonPrevious'),
-                       header: $('<header><div' + (this.options.staticViewer ? '>' : ' class="box64"><a class="framed jsTooltip"><img /></a>' ) + '<h1 /><h2 /><h3 /></div></header>').appendTo(this._container),
+                       header: $('<header><div' + (this.options.staticViewer ? '>' : ' class="box64"><a class="jsTooltip"><img /></a>' ) + '<h1 /><h2 /><h3 /></div></header>').appendTo(this._container),
                        imageContainer: $imageContainer,
                        images: [
                                $imageContainer.children('img:eq(0)').on('webkitTransitionEnd transitionend msTransitionEnd oTransitionEnd', function() { $(this).removeClass('animateTransformation'); }),
index 070ca5ee69a96b677e41e4ac16fd79a4eaf79a8c..f6d7e585d2474ce88d3e82b0fd077c012ba9b20a 100644 (file)
@@ -646,7 +646,7 @@ WCF.Location.GoogleMaps.SuggestionMap = WCF.Location.GoogleMaps.LargeMap.extend(
        addMarker: function(latitude, longitude, title, icon, information) {
                var $infoWindow = $(information);
                var $useLocation = $('<a class="googleMapsUseLocationSuggestionLink" />').text(WCF.Language.get('wcf.map.useLocationSuggestion')).click(this._suggestionSelectionCallback);
-               $infoWindow.append($('<p class="marginTopTiny" />').append($useLocation));
+               $infoWindow.append($('<p />').append($useLocation));
                
                var $marker = this._super(latitude, longitude, title, '//mt.google.com/vt/icon/name=icons/spotlight/spotlight-waypoint-a.png', $infoWindow.get(0));
                
index 0998800a4b452dbfa9f9b9497fba5ab02f1066e8..1b8c44702b9f247af880f2dff232f41a071fc385 100644 (file)
@@ -477,7 +477,7 @@ WCF.Message.DefaultPreview = WCF.Message.Preview.extend({
        _handleResponse: function(data) {
                var $preview = $('#previewContainer');
                if (!$preview.length) {
-                       $preview = $('<div class="container containerPadding marginTop" id="previewContainer"><fieldset><legend>' + WCF.Language.get('wcf.global.preview') + '</legend><div class="messageTextPreview"></div></fieldset>').prependTo($('#messageContainer')).wcfFadeIn();
+                       $preview = $('<section class="section" id="previewContainer"><h2 class="sectionTitle">' + WCF.Language.get('wcf.global.preview') + '</h2><div class="messageTextPreview"></div></section>').prependTo($('#messageContainer')).wcfFadeIn();
                }
                
                $preview.find('div:eq(0)').html(data.returnValues.message);
@@ -2175,15 +2175,15 @@ WCF.Message.Share.Content = Class.extend({
                        }
                        
                        // permalink (plain text)
-                       var $fieldset = $('<fieldset><legend><label for="__sharePermalink">' + WCF.Language.get('wcf.message.share.permalink') + '</label></legend></fieldset>').appendTo(this._dialog);
+                       var $fieldset = $('<section class="section"><h2 class="sectionTitle"><label for="__sharePermalink">' + WCF.Language.get('wcf.message.share.permalink') + '</label></h2></section>').appendTo(this._dialog);
                        $('<input type="text" id="__sharePermalink" class="long" readonly="readonly" />').attr('value', $link).appendTo($fieldset);
                        
                        // permalink (BBCode)
-                       var $fieldset = $('<fieldset><legend><label for="__sharePermalinkBBCode">' + WCF.Language.get('wcf.message.share.permalink.bbcode') + '</label></legend></fieldset>').appendTo(this._dialog);
+                       var $fieldset = $('<section class="section"><h2 class="sectionTitle"><label for="__sharePermalinkBBCode">' + WCF.Language.get('wcf.message.share.permalink.bbcode') + '</label></h2></section>').appendTo(this._dialog);
                        $('<input type="text" id="__sharePermalinkBBCode" class="long" readonly="readonly" />').attr('value', '[url=\'' + $link + '\']' + $title + '[/url]').appendTo($fieldset);
                        
                        // permalink (HTML)
-                       var $fieldset = $('<fieldset><legend><label for="__sharePermalinkHTML">' + WCF.Language.get('wcf.message.share.permalink.html') + '</label></legend></fieldset>').appendTo(this._dialog);
+                       var $fieldset = $('<section class="section"><h2 class="sectionTitle"><label for="__sharePermalinkHTML">' + WCF.Language.get('wcf.message.share.permalink.html') + '</label></h2></section>').appendTo(this._dialog);
                        $('<input type="text" id="__sharePermalinkHTML" class="long" readonly="readonly" />').attr('value', '<a href="' + $link + '">' + WCF.String.escapeHTML($title) + '</a>').appendTo($fieldset);
                        
                        this._cache[$key] = this._dialog.html();
@@ -2653,7 +2653,7 @@ WCF.Message.UserMention = Class.extend({
                var $listItem = $('<li />').data('username', listItemData.label).click($.proxy(this._click, this)).appendTo(this._dropdownMenu);
                
                var $box16 = $('<div />').addClass('box16').appendTo($listItem);
-               $box16.append($(listItemData.icon).addClass('framed'));
+               $box16.append($(listItemData.icon));
                $box16.append($('<div />').append($('<span />').text(listItemData.label)));
        },
        
index 5065459080a84f4df25b2f6c14010ee6c33c3f51..993c1456ed5e0b69a07baa2fb5dd6214822163fe 100644 (file)
@@ -609,7 +609,7 @@ WCF.Moderation.Report.Management = WCF.Moderation.Management.extend({
                
                this._super(queueID, redirectURL, 'wcf.moderation.report.{actionName}.confirmMessage');
                
-               this._confirmationTemplate.removeContent = $('<fieldset><dl><dt><label for="message">' + WCF.Language.get('wcf.moderation.report.removeContent.reason') + '</label></dt><dd><textarea name="message" id="message" cols="40" rows="3" /></dd></dl></fieldset>');
+               this._confirmationTemplate.removeContent = $('<div class="section"><dl><dt><label for="message">' + WCF.Language.get('wcf.moderation.report.removeContent.reason') + '</label></dt><dd><textarea name="message" id="message" cols="40" rows="3" /></dd></dl></div>');
        }
 });
 
index 0031b347aad816e17dfb9eaf1ecfb132eacc5c30..ec132c808c55181b228668e30c6c28336c8d9655 100644 (file)
@@ -1810,7 +1810,7 @@ WCF.User.SignaturePreview = WCF.Message.Preview.extend({
                // get preview container
                var $preview = $('#previewContainer');
                if (!$preview.length) {
-                       $preview = $('<fieldset id="previewContainer"><legend>' + WCF.Language.get('wcf.global.preview') + '</legend><div></div></fieldset>').insertBefore($('#signatureContainer')).wcfFadeIn();
+                       $preview = $('<section class="section" id="previewContainer"><h2 class="sectionTitle">' + WCF.Language.get('wcf.global.preview') + '</h2><div></div></section>').insertBefore($('#signatureContainer')).wcfFadeIn();
                }
                
                $preview.children('div').first().html(data.returnValues.message);
@@ -3327,7 +3327,7 @@ WCF.User.InlineEditor = WCF.InlineEditor.extend({
                
                // create dialog
                this._dialog = $('<div />').hide().appendTo(document.body);
-               this._dialog.append($('<fieldset><dl><dt><label for="' + optionName + 'Reason">' + WCF.Language.get('wcf.global.reason') + '</label></dt><dd><textarea id="' + optionName + 'Reason" cols="40" rows="3" />' + (WCF.Language.get('wcf.user.' + optionName + '.reason.description') != 'wcf.user.' + optionName + '.reason.description' ? '<small>' + WCF.Language.get('wcf.user.' + optionName + '.reason.description') + '</small>' : '') + '</dd></dl><dl><dt></dt><dd><label for="' + optionName + 'NeverExpires"><input type="checkbox" name="' + optionName + 'NeverExpires" id="' + optionName + 'NeverExpires" checked="checked" /> ' + WCF.Language.get('wcf.user.' + optionName + '.neverExpires') + '</label></dd></dl><dl id="' + optionName + 'ExpiresSettings" style="display: none;"><dt><label for="' + optionName + 'Expires">' + WCF.Language.get('wcf.user.' + optionName + '.expires') + '</label></dt><dd><input type="date" name="' + optionName + 'Expires" id="' + optionName + 'Expires" class="medium" min="' + new Date(TIME_NOW * 1000).toISOString() + '" data-ignore-timezone="true" /><small>' + WCF.Language.get('wcf.user.' + optionName + '.expires.description') + '</small></dd></dl></fieldset>'));
+               this._dialog.append($('<div class="section"><dl><dt><label for="' + optionName + 'Reason">' + WCF.Language.get('wcf.global.reason') + '</label></dt><dd><textarea id="' + optionName + 'Reason" cols="40" rows="3" />' + (WCF.Language.get('wcf.user.' + optionName + '.reason.description') != 'wcf.user.' + optionName + '.reason.description' ? '<small>' + WCF.Language.get('wcf.user.' + optionName + '.reason.description') + '</small>' : '') + '</dd></dl><dl><dt></dt><dd><label for="' + optionName + 'NeverExpires"><input type="checkbox" name="' + optionName + 'NeverExpires" id="' + optionName + 'NeverExpires" checked="checked" /> ' + WCF.Language.get('wcf.user.' + optionName + '.neverExpires') + '</label></dd></dl><dl id="' + optionName + 'ExpiresSettings" style="display: none;"><dt><label for="' + optionName + 'Expires">' + WCF.Language.get('wcf.user.' + optionName + '.expires') + '</label></dt><dd><input type="date" name="' + optionName + 'Expires" id="' + optionName + 'Expires" class="medium" min="' + new Date(TIME_NOW * 1000).toISOString() + '" data-ignore-timezone="true" /><small>' + WCF.Language.get('wcf.user.' + optionName + '.expires.description') + '</small></dd></dl></div>'));
                this._dialog.append($('<div class="formSubmit"><button class="buttonPrimary" accesskey="s">' + WCF.Language.get('wcf.global.button.submit') + '</button></div>'));
                
                this._dialog.data('optionName', optionName).data('userID', userID);
index 5a8d5df987bf78e0334fa92695d8b575c96ae362..1a1e2c35cd2aaff82dd2edc45172a0db3e4168f9 100755 (executable)
@@ -5764,7 +5764,7 @@ WCF.System.Worker = Class.extend({
                else {
                        // exchange icon
                        this._dialog.find('.fa-spinner').removeClass('fa-spinner').addClass('fa-check green');
-                       this._dialog.find('.boxHeadline h1').text(WCF.Language.get('wcf.global.worker.completed'));
+                       this._dialog.find('.contentHeader h1').text(WCF.Language.get('wcf.global.worker.completed'));
                        
                        // display continue button
                        var $formSubmit = $('<div class="formSubmit" />').appendTo(this._dialog);
@@ -7280,7 +7280,7 @@ WCF.Language.Chooser = Class.extend({
                
                for (var $languageID in languages) {
                        var $language = languages[$languageID];
-                       var $item = $('<li class="boxFlag"><a class="box24"><div class="framed"><img src="' + $language.iconPath + '" alt="" class="iconFlag" /></div> <div><h3>' + $language.languageName + '</h3></div></a></li>').appendTo($dropdownMenu);
+                       var $item = $('<li class="boxFlag"><a class="box24"><div><img src="' + $language.iconPath + '" alt="" class="iconFlag" /></div> <div><h3>' + $language.languageName + '</h3></div></a></li>').appendTo($dropdownMenu);
                        $item.data('languageID', $languageID).click($.proxy(this._click, this));
                        
                        // update dropdown label
index 624def2268e3a2f2ededd792d5a64c40f55788aa..c4bb3d71b8a7f8f9804b118d19ee652e39af20f2 100644 (file)
@@ -112,7 +112,7 @@ define(['Dictionary', 'Language', 'Dom/Traverse', 'Dom/Util', 'ObjectMap', 'Ui/S
                                        listItem.appendChild(a);
                                        
                                        div = elCreate('div');
-                                       div.className = 'framed';
+                                       //div.className = 'framed';
                                        a.appendChild(div);
                                        
                                        img = elCreate('img');
index b56ecedd52a0f412007dfe7147b15031a733eae1..f62eeb0282aca3a17dc20a6bac5104cc2ce0e8b7 100644 (file)
@@ -221,7 +221,6 @@ define(
                 */
                _setData: function() {
                        this._elements.thumbnail.innerHTML = '';
-                       this._elements.fileIcon.parentNode.classList.remove('marginTop');
                        
                        this._elements.filename.textContent = this._media.filename;
                        this._elements.filesize.textContent = this._media.formattedFilesize;
@@ -247,8 +246,6 @@ define(
                                        elAttr(img, 'alt', '');
                                        
                                        this._elements.thumbnail.appendChild(img);
-                                       
-                                       this._elements.fileIcon.parentNode.classList.add('marginTop');
                                }
                                
                                this._elements.imageDimensions.textContent = Language.get('wcf.media.imageDimensions.value', {
index e21f3a4a694c57e004d3d212c672aab7f43b5eb3..c979895b35ef666eca5673e5aad69982f4d9029a 100644 (file)
@@ -208,10 +208,6 @@ define(
                        
                        if (!listItems.length) {
                                this._search.hideSearch();
-                               
-                               if (true) {
-                                       elById('mediaManagerMediaUploadButton').classList.remove('marginTop');
-                               }
                        }
                },
                
@@ -277,10 +273,6 @@ define(
                        
                        if (this._media.size === 1) {
                                this._search.showSearch();
-                               
-                               if (true) {
-                                       elById('mediaManagerMediaUploadButton').classList.add('marginTop');
-                               }
                        }
                },
                
index e8e8c553f4172cbcf23eb5cfed9efb35be3d53c9..9c8f43ece13e5e8a53bf758e3ee210579fbb6246 100644 (file)
@@ -244,7 +244,7 @@ define(['Ajax', 'Environment', 'EventHandler', 'Ui/Alignment'], function(Ajax, E
                                link = elCreate('a');
                                link.addEventListener('click', callbackClick);
                                link.className = 'box16';
-                               link.innerHTML = '<span class="framed">' + user.icon + '</span> <span>' + user.label + '</span>';
+                               link.innerHTML = '<span>' + user.icon + '</span> <span>' + user.label + '</span>';
                                elData(link, 'user-id', user.objectID);
                                elData(link, 'username', user.label);
                                
index ef93475f226bf2e78e3728b17c9fb4048caf70de..21bba7a7cd68e2fadb21b346cb6a2101753f7352 100644 (file)
@@ -46,10 +46,10 @@ class PHPInfoPage extends AbstractPage {
                $info = preg_replace('%<img([^>]*)>%s', '<img style="float:right" \\1>', $info, 1);
                
                // fix tables
-               $info = preg_replace('%<h2>(.*?)</h2>\s*<table( border="0" cellpadding="3" width="600")?>%', '<div class="tabularBox tabularBoxTitle marginTop"><header><h2>\\1</h2></header><table class="table" style="table-layout:fixed;">', $info);
-               $info = preg_replace('%<table( border="0" cellpadding="3" width="600")?>%', '<div class="tabularBox marginTop"><table class="table" style="table-layout:fixed;">', $info);
+               $info = preg_replace('%<h2>(.*?)</h2>\s*<table( border="0" cellpadding="3" width="600")?>%', '<section class="section tabularBox"><h2 class="sectionTitle">\\1</h2><table class="table" style="table-layout:fixed;">', $info);
+               $info = preg_replace('%<table( border="0" cellpadding="3" width="600")?>%', '<section class="section tabularBox"><table class="table" style="table-layout:fixed;">', $info);
                $info = preg_replace('%<tr><td class="e">(\w+ )<\/td><\/tr>%', '<tr><td class="e">\\1</td><td></td></tr>', $info);
-               $info = str_replace('</table>', '</table></div>', $info);
+               $info = str_replace('</table>', '</table></section>', $info);
                
                // fix display of disable_functions & disable_classes
                $info = preg_replace_callback('%<td class="e">disable_(?P<t>functions|classes)</td><td class="v">(?P<l>.*?)</td><td class="v">(?P<m>.*?)</td>%s', function ($match) {
index 14df947dfc921f18cf6050585a38b2e48980bc47..700967f1094dfd186fb398ccf1702077e1a51450 100644 (file)
@@ -22,13 +22,14 @@ class GroupFormElementContainer extends AbstractFormElementContainer {
                }
                
                return <<<HTML
-<fieldset>
-       <legend>{$this->getLabel()}</legend>
-       
-       <small>{$this->getDescription()}</small>
+<section class="section">
+       <header class="sectionHeader">
+               <h2 class="sectionTitle">{$this->getLabel()}</h2>
+               <small class="sectionDescription">{$this->getDescription()}</small>
+       </header>
        
        {$content}
-</fieldset>
+</section>
 HTML;
        }
 }
index a33c6a04f1ebe3a3578e22de1c379db564566661..965aab992e7956c7d5bbbd633d3b628c997e2c76 100644 (file)
@@ -37,15 +37,16 @@ class MultipleSelectionFormElementContainer extends SelectionFormElementContaine
                }
                
                return <<<HTML
-<fieldset class="marginTop">
-       <legend>{$this->getLabel()}</legend>
-       
-       <small>{$this->getDescription()}</small>
+<section class="section">
+       <header class="sectionHeader">
+               <h2 class="sectionTitle">{$this->getLabel()}</h2>
+               <small class="sectionDescription">{$this->getDescription()}</small>
+       </header>
        
        <dl class="wide">
                {$content}
        </dl>
-</fieldset>
+</section>
 HTML;
        }
 }
index ea4e7791fb4c468e2821f23f4599868f2f00dab1..b1537c2671de70b9c901eb8fda3569ee77488b09 100644 (file)
@@ -45,15 +45,16 @@ class SingleSelectionFormElementContainer extends SelectionFormElementContainer
                }
                
                return <<<HTML
-<fieldset>
-       <legend>{$this->getLabel()}</legend>
-       
-       <small>{$this->getDescription()}</small>
+<section class="section">
+       <header class="sectionHeader">
+               <h2 class="sectionTitle">{$this->getLabel()}</h2>
+               <small class="sectionDescription">{$this->getDescription()}</small>
+       </header>
        
        <dl>
                <dd>{$content}</dd>
        </dl>
-</fieldset>
+</section>
 HTML;
        }
 }
index a7c46f9da865092eb336d58600e07ef0ddaddec0..bcab9e0f3219b6c1af828dc4f87c5c71852e68d9 100644 (file)
@@ -2,15 +2,13 @@ dl {
        &:not(.plain) {
                display: block;
                
-               &:not(:first-child) {
-                       margin-top: 10px;
-               }
-               
                &:not(:last-child) {
-                       margin-bottom: 10px;
+                       margin-bottom: 20px;
                }
                
                > dt {
+                       color: $wcfInputLabel;
+                       
                        display: block;
                        
                        &:not(:empty) {
@@ -62,10 +60,6 @@ dl {
                &.wide > dt {
                        display: none;
                }
-               
-               & + dl:not(.plain) {
-                       padding-top: 10px;
-               }
        }
        
        &.dataList {
@@ -73,7 +67,7 @@ dl {
                
                > dt {
                        clear: right;
-                       color: rgba(128, 128, 128, 1);
+                       color: $wcfContentDimmedText;
                        float: left;
                        margin-right: 4px;
                        text-align: left;
@@ -140,8 +134,4 @@ dl {
                        white-space: nowrap;
                }
        }
-}
-
-dt {
-       color: $wcfInputLabel;
-}
+}
\ No newline at end of file
index c1c7ec9f3f18933e997041a5d6fc15fd0510f9fd..7f3d62c8fbef446bc7496e515a496dda2d356e42 100644 (file)
@@ -1,3 +1,3 @@
 label {
-       color: $wcfInputLabel;
+       //color: $wcfInputLabel;
 }
index e7ec8f3da30beca725b06d57f26e40b28199025c..046c711f4e595edbbd1b5c62b56c538a0b781952 100644 (file)
        @extend .wcfFontHeadline;
        
        & + .boxContent {
-               margin-top: 15px;
+               margin-top: 20px;
+       }
+       
+       .badge {
+               top: -2px;
        }
 }
 
        
        .boxTitle {
                @extend .wcfFontTitle;
-               
-               & + .boxContent {
-                       margin-top: 20px;
-               }
        }
        
        .boxWithImage {
        
        .box {
                flex: 0 0 25%;
+               overflow: hidden;
                padding-left: 10px;
                padding-right: 10px;
-                               
+               
                &:nth-child(4n+1):not(:first-child) {
                        margin-top: 20px;
                }
                padding: 20px;
                
                &:not(:first-child) {
-                       margin-top: 20px;
+                       margin-top: 30px;
                }
                
                &.boxAlternative {
 }
 
 .boxesContentTop {
-       margin-bottom: 40px;
+       margin-bottom: 30px;
 }
 
 .boxesContentBottom {
-       margin-top: 40px;
+       margin-top: 30px;
 }
 
 /* styling for boxes in <footerBoxes> position */
        .boxContainer {
                display: flex;
                flex-wrap: wrap;
+               margin-bottom: -40px;
                margin-left: -10px;
                margin-right: -10px;
                padding: 40px 0;
        
        .box {
                flex: 0 0 50%;
+               overflow: hidden;
                padding-left: 10px;
                padding-right: 10px;
+               margin-bottom: 40px;
                
-               &:nth-child(n+3) {
-                       margin-top: 40px;
+               &.boxFullWith {
+                       flex-basis: 100%;
                }
        }
        
 
 /* styling for boxes in <footer> position */
 .boxesFooter {
-       margin-bottom: 40px;
-       
        .box {
                &:not(:first-child) {
-                       margin-top: 40px;
+                       margin-top: 20px;
                }
        }
        
index 7a0784e2bdde9ae1c848810a59900428ef69105b..4e362dc039c1b338f73778ebb7824d498e37f475 100644 (file)
        &.tripleColumned {
                display: flex;
                flex-wrap: wrap;
-               margin-bottom: -10px;
+               margin-bottom: -15px;
                
                > li {
-                       margin-bottom: 10px;
+                       overflow: hidden;
+                       padding-right: 15px;
+                       margin-bottom: 15px;
+                       
+                       .containerBoxContent {
+                               overflow: hidden;
+                               
+                               h3 {
+                                       overflow: hidden;
+                                       text-overflow: ellipsis;
+                                       white-space: nowrap;
+                               }
+                       }
                }
        }
        
        }
        
        &.tripleColumned > li {
-               flex: 0 0 auto;
+               flex: 0 0 calc(100% / 3);
                /* work-around for IE10 */
                width: calc(unquote("100% / 3"));
        }
 }
-
-
-
-/*
-.userList .userInformation {
-       position: relative;
-       
-       
-       
-       > 
-}
-*/
\ No newline at end of file
index 4d644e75fe66361c7a28f7f9bfec8d30fd917cdb..5fc58e8e4a197980b053192840c2046f1c3c1b75 100644 (file)
@@ -3,7 +3,7 @@
 .contentHeader,
 .boxHeadline { // deprecated
        color: $wcfContentHeadlineText; // todo: rename variable
-       margin-bottom: 30px;
+       margin-bottom: 40px;
        
        .contentTitle,
        > h1 { // deprecated
                }
        }
        
+       .contentHeaderDescription {
+               color: $wcfContentDimmedText;
+       }
+       
        .contentHeaderMetaData {
                color: $wcfContentDimmedText;
                
 
 /* legacy styling for sub headlines (deprecated; use .section > .sectionTitle instead) */
 .boxHeadline.boxSubHeadline {
-       margin-top: 30px;
+       margin-top: 40px;
        margin-bottom: 20px;
        
        > h2 {
                color: $wcfContentHeadlineText; // todo: rename variable
                
-               @extend .wcfFontHeadline;
+               @extend .wcfFontSection;
                
                a {
                        color: $wcfContentHeadlineLink; // todo: rename variable
 
 /* content sections */
 .section {
-       margin-top: 30px;       
+       margin-top: 40px;       
+       
+       .sectionHeader {
+               position: relative;
+               
+               .buttonGroupNavigation {
+                       position: absolute;
+                       right: 0;
+                       top: 4px;
+               }
+       }
        
        .sectionTitle {
                color: $wcfContentHeadlineText; // todo: rename variable
                
-               @extend .wcfFontHeadline;
+               @extend .wcfFontSection;
                
                a {
                        color: $wcfContentHeadlineLink; // todo: rename variable
                        padding-bottom: 10px;
                }
        }
+       
+       &.tabularBox {
+               > .sectionHeader,
+               > .sectionTitle {
+                       border-color: $wcfTabularBoxHeadline;
+                       margin-bottom: 0;
+               }
+       }
+       
+       .section {
+               margin-top: 20px;
+               
+               .sectionTitle {
+                       @extend .wcfFontHeadline;
+               }
+               
+               > .sectionHeader,
+               > .sectionTitle {
+                       margin-bottom: 15px;
+               }
+       }
 }
 
 /* fieldset styling (old sections / deprecated) */
 fieldset {
-       margin-top: 30px;
+       margin-top: 40px;
        
        > legend {
                border-bottom: 1px solid $wcfContentBorderInner;
@@ -117,7 +152,7 @@ fieldset {
                padding-bottom: 10px;
                width: 100%;
                
-               @extend .wcfFontHeadline;
+               @extend .wcfFontSection;
                
                a {
                        color: $wcfContentHeadlineLink; // todo: rename variable
@@ -142,6 +177,17 @@ fieldset {
                }
        }
 }
+.section {
+       fieldset {
+               margin-top: 20px;
+               
+               > legend {
+                       margin-bottom: 15px;
+                       
+                       @extend .wcfFontHeadline;
+               }
+       }       
+}
 
 /* styling for container headlines */
 .containerHeadline {
@@ -167,11 +213,11 @@ fieldset {
        justify-content: flex-end;
        
        &:not(:first-child) {
-               margin-top: 30px;
+               margin-top: 40px;
        }
        
        &:not(:last-child) {
-               margin-bottom: 30px;
+               margin-bottom: 40px;
        }
        
        > nav {
index fb82b29e51fa2ac2c74f1f9a2179026be30fc805..bcb876c03ad08dc370e472fc7a27f72b3e70872f 100644 (file)
        }
 }
 
-.marginTop {
-       margin-top: 30px;
-}
-
 .invisible {
        display: none;
 }
 
 .wcfFontHeadline {
        font-size: $wcfFontSizeHeadline;
-       font-weight: 400;
+       font-weight: 300;
 }
 
 .wcfFontSection {
        font-size: $wcfFontSizeSection;
-       font-weight: 400;
+       font-weight: 300;
 }
 
 .wcfFontTitle {
@@ -161,11 +157,15 @@ ol.nativeList {
        }
        
        h2 {
+               @extend .wcfFontSection;
+       }
+       
+       h3 {
                @extend .wcfFontHeadline;
        }
        
        h1, h2, h3, h4, h5, h6 {
-               margin: 1em 0;
+               margin: 1.5em 0 1em 0;
        }
        
        ul, ol {
index 981925b502bde8322a6a649ad2b3f859fe630e08..01e9536ed581dda3a39a8fec62554d22ee277581 100644 (file)
@@ -40,7 +40,7 @@ a {
        background-color: $wcfContentBackground;
        color: $wcfContentText;
        flex: 1 0 auto;
-       padding: 40px 0;
+       padding: 60px 0;
        z-index: 50;
        
        a {
index 101c3daa1cad1aec88724651ce125fd02088d961..6c73738ecd4f7a8952df78289159387324b37321 100644 (file)
                }
        }
        
-       // copyright link styling
+       // copyright and benchmark link styling
+       // benchmark link styling
+       .benchmark,
        .copyright {
-               text-align: center;
+               margin-top: 20px;
                
                a {
                        // use text color instead
                        color: $wcfFooterText;
                }
        }
+       
+       .footerContent:first-child > div:first-child {
+               margin-top: 0;
+       }
 }
index 9debf41f4d3ecce148c2f9550013fb91fbcee241..c4ba60c3052f9425df8e9e9af96ef159a8c593b6 100644 (file)
                        padding: 20px;
                        
                        &:not(:first-child) {
-                               margin-top: 20px;
+                               margin-top: 30px;
                        }
                }
                
                section:not(.box) > h1,
                fieldset > legend {
                        color: $wcfSidebarHeadlineText;
+                       border-bottom-width: 0;
                        margin-bottom: 15px;
+                       padding: 0;
                        
                        @extend .wcfFontHeadline;
                        
@@ -70,7 +72,7 @@
        .boxTitle {
                .badge {
                        float: right;
-                       margin-top: 3px;
+                       top: 2px;
                }
        }
 }
index 70c8ca795194d767be49ed25eb0a8b52935b3b76..cd80e46ed55554ca169b4d068fbee14a613205cc 100644 (file)
@@ -4,6 +4,7 @@
 .warning {
        border-left: 5px solid transparent;
        padding: 10px 20px;
+       margin-bottom: 20px;
 }
 
 .error {
index 061bc88cf4a1f84b988920092354ccbc0723a0ba..0a4516e997e9ac4cd8d81cd0259352e181abd451 100644 (file)
        display: none;
 }
 
-/* package (un-)installation */
+/* package (un-)installation (todo: obsolete?) */
 #packageInstallationDialogContainer > .boxHeadline {
        margin-top: 0;
 }
index 452e26318d5c2a9926530e8b2ff4cb95266a2525..9699e5bbd156cb84edfabe7c8923ac7f23da4534 100644 (file)
                &.active {
                        background-color: $wcfDropdownBackgroundActive;
                        color: $wcfDropdownLinkActive;
+                       
+                       > a {
+                               color: $wcfDropdownLinkActive;
+                       }
                }
                
                &.dropdownDivider {
                
                > a {
                        color: $wcfDropdownLink;
-                       
-                       &:hover {
-                               color: $wcfDropdownLinkActive;
-                       }
                }
                
                > a > small {
index 682ca19a6621235ae7628cd2ed3dc13d9e344a41..a1851989cae01d04f0d1d47a87b7e2be217a8ec7 100644 (file)
@@ -4,8 +4,7 @@
        margin: 30px 0;
        
        > li {
-               margin-top: 0;
-               padding: 30px 0;
+               padding: 40px 0;
                
                &:not(:first-child) {
                        border-top: 1px solid $wcfContentBorder;
index 63d27469dec0c84c579e3ee83a3afc66cf868832..1b077601a81f778a7badd1d6e35c2600ce886fd9 100644 (file)
@@ -1,7 +1,3 @@
-.tabMenuContainer:not(:first-child) {
-       //margin-top: 30px;
-}
-
 /* main tabs */
 .tabMenu {
        //margin-bottom: 20px;
@@ -25,7 +21,7 @@
                                display: block;
                                padding: 5px 0;
                                
-                               @extend .wcfFontHeadline;
+                               @extend .wcfFontSection;
                        }
                }
        }
        > .containerList:first-child > li:first-child {
                border-top-width: 0;
        }
-       
 }
 
 /* sub tabs */
 .menu {
-       margin: -10px 0 40px 0;
+       margin-top: 10px;
        position: relative;
        
        > ul {
                @extend .inlineList;
                
-               > li:not(:last-child) {
-                       margin-right: 20px;
+               > li {
+                       &:not(:last-child) {
+                               margin-right: 20px;
+                       }
+                       
+                       &.active > a {
+                               cursor: default;
+                       }
                }
        }
        
index 266e1073daf46cd95241136b6576da3361b021b5..39ee05f124f7fc12ab30bfb8115ca42496f2e9f6 100644 (file)
@@ -1,7 +1,3 @@
-.tabularBox > .content {
-       border-width: 0;
-}
-
 .tabularList {
        border-bottom: 1px solid $wcfContentBorder;
        display: flex;
 }
 
 .tabularListRowHead > .tabularListColumns > li {
+       color: $wcfTabularBoxHeadline;
+       
+       @extend .wcfFontHeadline;
+       
        > a {
                color: $wcfTabularBoxHeadline;
                display: block;
-               
-               @extend .wcfFontHeadline;
        }
        
        &.ASC > a,
                        + small {
                                display: block;
                        }
+                       
+                       .badge {
+                               top: -2px;
+                       }
                }
                
                a,
 
 /* table */
 .table {
-       border-bottom: 1px solid $wcfContentBorder;
+       border-bottom: 1px solid $wcfTabularBoxHeadline;
        border-spacing: 0;
        width: 100%;
        
        
        th {
                border-bottom: 2px solid currentColor;
-               color: $wcfContentBorder;
+               color: $wcfTabularBoxHeadline;
                text-align: left;
                white-space: nowrap;
                
                }
        }
 }
-
-// TODO below
-/*.table {
-       tr {
-               &.jsMarked {
-                       color: @wcfSelectedColor;
-                       
-                       > td {
-                               background-color: @wcfSelectedBackgroundColor !important;
-                       }
-                       
-                       a:not(.badge) {
-                               color: @wcfSelectedColor;
-                       }
-               }
-       }
-}*/
index c4e466b742bf522bd472e683c027868e6f38f55a..46727f22ace375f0a1e6dbc76309cb247367db27 100644 (file)
                }
        }
 }
+
+.section.userProfile {
+       margin-top: 0;
+}
\ No newline at end of file