From 184a8d6d0388491a5b12f1172a0192953b37a071 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Tue, 27 Mar 2012 15:51:13 +0200 Subject: [PATCH] Reworked templates, added LESS-based stylesheets --- com.woltlab.wcf/template/benchmark.tpl | 2 +- com.woltlab.wcf/template/breadcrumbs.tpl | 2 +- com.woltlab.wcf/template/footer.tpl | 57 +- com.woltlab.wcf/template/headInclude.tpl | 42 +- com.woltlab.wcf/template/header.tpl | 33 +- com.woltlab.wcf/template/mainMenu.tpl | 4 +- com.woltlab.wcf/template/mainMenuSubMenu.tpl | 12 +- wcfsetup/install/files/acp/js/WCF.ACP.js | 18 +- wcfsetup/install/files/acp/style/wcf.css | 4657 --------------- .../files/acp/templates/acpSessionLog.tpl | 16 +- .../files/acp/templates/acpSessionLogList.tpl | 20 +- .../install/files/acp/templates/benchmark.tpl | 2 +- .../install/files/acp/templates/cacheList.tpl | 27 +- .../files/acp/templates/cronjobAdd.tpl | 51 +- .../files/acp/templates/cronjobList.tpl | 42 +- .../files/acp/templates/cronjobLogList.tpl | 21 +- .../install/files/acp/templates/footer.tpl | 28 +- .../install/files/acp/templates/header.tpl | 62 +- .../install/files/acp/templates/login.tpl | 17 +- .../install/files/acp/templates/option.tpl | 23 +- .../files/acp/templates/optionFieldList.tpl | 2 +- .../files/acp/templates/optionImport.tpl | 31 +- .../acp/templates/packageAutoUpdateList.tpl | 11 +- .../files/acp/templates/packageList.tpl | 24 +- .../acp/templates/packageListDetailed.tpl | 38 +- .../acp/templates/packageStartInstall.tpl | 32 +- .../acp/templates/packageUpdateSearch.tpl | 17 +- .../files/acp/templates/updateServerAdd.tpl | 29 +- .../files/acp/templates/updateServerList.tpl | 32 +- .../install/files/acp/templates/userAdd.tpl | 56 +- .../files/acp/templates/userGroupAdd.tpl | 39 +- .../files/acp/templates/userGroupList.tpl | 32 +- .../install/files/acp/templates/userList.tpl | 35 +- .../install/files/acp/templates/userMail.tpl | 39 +- .../files/acp/templates/userSearch.tpl | 39 +- .../acp/templates/usersMassProcessing.tpl | 53 +- .../install/files/js/3rdParty/less.min.js | 6 +- wcfsetup/install/files/js/WCF.js | 258 +- wcfsetup/install/files/style/alerts.less | 96 + wcfsetup/install/files/style/badge.less | 24 + wcfsetup/install/files/style/bbcode.less | 179 - wcfsetup/install/files/style/bootstrap.less | 34 + wcfsetup/install/files/style/breadcrumbs.less | 89 + wcfsetup/install/files/style/button.less | 90 + wcfsetup/install/files/style/codebox.less | 182 + wcfsetup/install/files/style/comments.less | 152 + wcfsetup/install/files/style/content.less | 50 + wcfsetup/install/files/style/dialog.less | 97 + wcfsetup/install/files/style/dropdown.less | 165 + wcfsetup/install/files/style/extra/print.css | 269 - wcfsetup/install/files/style/footer.less | 20 + wcfsetup/install/files/style/forms.less | 192 + wcfsetup/install/files/style/import.less | 5 - wcfsetup/install/files/style/inputs.less | 164 + wcfsetup/install/files/style/layout.less | 233 + wcfsetup/install/files/style/logo.less | 19 + wcfsetup/install/files/style/message.less | 1146 ++-- wcfsetup/install/files/style/mixins.less | 101 + wcfsetup/install/files/style/navigation.less | 256 + wcfsetup/install/files/style/pagination.less | 96 + wcfsetup/install/files/style/reset.less | 52 + wcfsetup/install/files/style/tabs.less | 127 + wcfsetup/install/files/style/tabular.less | 186 + wcfsetup/install/files/style/tooltip.less | 43 + wcfsetup/install/files/style/user.less | 399 -- wcfsetup/install/files/style/userPanel.less | 65 + wcfsetup/install/files/style/variables.less | 89 + wcfsetup/install/files/style/wbb.less | 270 + wcfsetup/install/files/style/wcf.less | 5051 ----------------- 69 files changed, 3895 insertions(+), 11955 deletions(-) delete mode 100644 wcfsetup/install/files/acp/style/wcf.css create mode 100644 wcfsetup/install/files/style/alerts.less create mode 100644 wcfsetup/install/files/style/badge.less delete mode 100755 wcfsetup/install/files/style/bbcode.less create mode 100644 wcfsetup/install/files/style/bootstrap.less create mode 100644 wcfsetup/install/files/style/breadcrumbs.less create mode 100644 wcfsetup/install/files/style/button.less create mode 100644 wcfsetup/install/files/style/codebox.less create mode 100644 wcfsetup/install/files/style/comments.less create mode 100644 wcfsetup/install/files/style/content.less create mode 100644 wcfsetup/install/files/style/dialog.less create mode 100644 wcfsetup/install/files/style/dropdown.less delete mode 100644 wcfsetup/install/files/style/extra/print.css create mode 100644 wcfsetup/install/files/style/footer.less create mode 100644 wcfsetup/install/files/style/forms.less delete mode 100644 wcfsetup/install/files/style/import.less create mode 100644 wcfsetup/install/files/style/inputs.less create mode 100644 wcfsetup/install/files/style/layout.less create mode 100644 wcfsetup/install/files/style/logo.less mode change 100755 => 100644 wcfsetup/install/files/style/message.less create mode 100644 wcfsetup/install/files/style/mixins.less create mode 100644 wcfsetup/install/files/style/navigation.less create mode 100644 wcfsetup/install/files/style/pagination.less create mode 100644 wcfsetup/install/files/style/reset.less create mode 100644 wcfsetup/install/files/style/tabs.less create mode 100644 wcfsetup/install/files/style/tabular.less create mode 100644 wcfsetup/install/files/style/tooltip.less mode change 100755 => 100644 wcfsetup/install/files/style/user.less create mode 100644 wcfsetup/install/files/style/userPanel.less create mode 100644 wcfsetup/install/files/style/variables.less create mode 100644 wcfsetup/install/files/style/wbb.less delete mode 100644 wcfsetup/install/files/style/wcf.less diff --git a/com.woltlab.wcf/template/benchmark.tpl b/com.woltlab.wcf/template/benchmark.tpl index 046494099d..ce53d47ebf 100644 --- a/com.woltlab.wcf/template/benchmark.tpl +++ b/com.woltlab.wcf/template/benchmark.tpl @@ -1,4 +1,4 @@ -

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()}

+

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}