From 6c80f0dfb3ec67d2285ba4625a2341a12261fad5 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Wed, 2 Jan 2013 01:01:31 +0100 Subject: [PATCH] Merged com.woltlab.wcf.acp.style --- com.woltlab.wcf/acpMenu.xml | 72 ++- com.woltlab.wcf/userGroupOption.xml | 21 + .../install/files/acp/js/WCF.ACP.Style.js | 240 ++++++++ .../install/files/acp/templates/styleAdd.tpl | 502 ++++++++++++++++ .../files/acp/templates/styleExport.tpl | 75 +++ .../files/acp/templates/styleImport.tpl | 60 ++ .../install/files/acp/templates/styleList.tpl | 95 +++ .../acp/templates/styleVariableColor.tpl | 5 + .../files/acp/templates/styleVariableUnit.tpl | 12 + .../files/lib/acp/form/StyleAddForm.class.php | 540 ++++++++++++++++++ .../lib/acp/form/StyleEditForm.class.php | 137 +++++ .../lib/acp/form/StyleExportForm.class.php | 197 +++++++ .../lib/acp/form/StyleImportForm.class.php | 91 +++ .../lib/acp/page/StyleListPage.class.php | 49 ++ wcfsetup/install/files/style/styleEditor.less | 37 ++ wcfsetup/install/lang/de.xml | 91 +++ 16 files changed, 2202 insertions(+), 22 deletions(-) create mode 100644 wcfsetup/install/files/acp/js/WCF.ACP.Style.js create mode 100644 wcfsetup/install/files/acp/templates/styleAdd.tpl create mode 100644 wcfsetup/install/files/acp/templates/styleExport.tpl create mode 100644 wcfsetup/install/files/acp/templates/styleImport.tpl create mode 100644 wcfsetup/install/files/acp/templates/styleList.tpl create mode 100644 wcfsetup/install/files/acp/templates/styleVariableColor.tpl create mode 100644 wcfsetup/install/files/acp/templates/styleVariableUnit.tpl create mode 100644 wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php create mode 100644 wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php create mode 100644 wcfsetup/install/files/lib/acp/form/StyleExportForm.class.php create mode 100644 wcfsetup/install/files/lib/acp/form/StyleImportForm.class.php create mode 100644 wcfsetup/install/files/lib/acp/page/StyleListPage.class.php create mode 100644 wcfsetup/install/files/style/styleEditor.less diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml index e54538c985..1a8f1ba5c4 100644 --- a/com.woltlab.wcf/acpMenu.xml +++ b/com.woltlab.wcf/acpMenu.xml @@ -254,7 +254,55 @@ 3 - + + + wcf.acp.menu.link.display + + + + + wcf.acp.menu.link.pageMenu + admin.display.canManagePageMenu + 1 + + + + + wcf.acp.menu.link.pageMenu + admin.display.canManagePageMenu + 2 + + + + + + wcf.acp.menu.link.display + 1 + + + + + wcf.acp.menu.link.style + admin.style.canEditStyle,admin.style.canDeleteStyle + 1 + + + + + wcf.acp.menu.link.style + admin.style.canAddStyle + 2 + + + + + wcf.acp.menu.link.style + admin.style.canAddStyle + 3 + + + + wcf.acp.menu.link.display @@ -292,27 +340,7 @@ wcf.acp.menu.link.language.server admin.language.canAddServer - - - - - wcf.acp.menu.link.display - - - - - wcf.acp.menu.link.pageMenu - admin.display.canManagePageMenu - 1 - - - - - wcf.acp.menu.link.pageMenu - admin.display.canManagePageMenu - 2 - - + 4 diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml index d1069f6033..70782701b0 100644 --- a/com.woltlab.wcf/userGroupOption.xml +++ b/com.woltlab.wcf/userGroupOption.xml @@ -208,6 +208,27 @@ 0 1 + + +