From dc75c38b3f14c50663a76273ad12b1feed9e3d51 Mon Sep 17 00:00:00 2001 From: max-m Date: Sun, 27 Jan 2013 15:16:29 +0100 Subject: [PATCH] Edited copyright, moved JavaScript to head, fixed logPage --- file/lib/page/CopyrightPage.class.php | 2 + file/lib/page/LogPage.class.php | 2 +- file/style/be.bastelstu.wcf.chat.less | 2 +- language/de.xml | 2 +- package.xml | 2 + template/__copyright.tpl | 47 +++++++++++ template/chat.tpl | 117 +++++++++++++------------- template/copyright.tpl | 50 ----------- template/log.tpl | 2 +- templateListener.xml | 11 +++ 10 files changed, 124 insertions(+), 113 deletions(-) create mode 100644 template/__copyright.tpl delete mode 100644 template/copyright.tpl create mode 100644 templateListener.xml diff --git a/file/lib/page/CopyrightPage.class.php b/file/lib/page/CopyrightPage.class.php index 79191f9..904379d 100644 --- a/file/lib/page/CopyrightPage.class.php +++ b/file/lib/page/CopyrightPage.class.php @@ -29,6 +29,8 @@ class CopyrightPage extends \wcf\page\AbstractPage { */ public $request = null; + public $templateName = '__copyright'; + /** * Disallows direct access. * diff --git a/file/lib/page/LogPage.class.php b/file/lib/page/LogPage.class.php index ec91805..3ac05bb 100644 --- a/file/lib/page/LogPage.class.php +++ b/file/lib/page/LogPage.class.php @@ -106,7 +106,7 @@ public function readData() { $this->room = $cache[$this->roomID]; if (!$this->room->canEnter()) throw new \wcf\system\exception\PermissionDeniedException(); - $ph = new \wcf\system\chat\permission\ChatPermissionHandler(); + $ph = new \chat\system\permission\PermissionHandler(); if (!$ph->getPermission($this->room, 'mod.canReadLog')) throw new \wcf\system\exception\PermissionDeniedException(); // TODO: actually read the correct messages diff --git a/file/style/be.bastelstu.wcf.chat.less b/file/style/be.bastelstu.wcf.chat.less index 00e7efe..3409f3a 100644 --- a/file/style/be.bastelstu.wcf.chat.less +++ b/file/style/be.bastelstu.wcf.chat.less @@ -302,7 +302,7 @@ } #timsChatCopyrightDialog { - background-position: right 45px; + background-position: right center; background-repeat: no-repeat; min-height: 50%; } diff --git a/language/de.xml b/language/de.xml index 8eb27b8..7956a30 100644 --- a/language/de.xml +++ b/language/de.xml @@ -66,7 +66,7 @@ Hinweis: Setzen Sie diese Einstellung nur, wenn Sie wissen, was sie bewirkt. Die - Chat: Tims Chat{if CHAT_SHOW_VERSION && $chatVersion|isset} {$chatVersion}{/if}, entwickelt von TimWolla]]> + Tims Chat{if CHAT_SHOW_VERSION && $chatVersion|isset} {$chatVersion}{/if}, entwickelt in Tims Bastelstube]]> diff --git a/package.xml b/package.xml index d45cf32..1818c26 100644 --- a/package.xml +++ b/package.xml @@ -29,6 +29,7 @@ install.sql objectType.xml option.xml + templateListener.xml pagemenu.xml eventListener.xml acloptions.xml @@ -45,6 +46,7 @@ acptemplate.tar objectType.xml option.xml + templateListener.xml pagemenu.xml eventListener.xml acloptions.xml diff --git a/template/__copyright.tpl b/template/__copyright.tpl new file mode 100644 index 0000000..8c99c05 --- /dev/null +++ b/template/__copyright.tpl @@ -0,0 +1,47 @@ +{if $__chat->isActiveApplication()} + {if $templateName != '__copyright'} + {elseif $templateName == '__copyright'} +
+
{lang}chat.general.copyright.leader{/lang}
+
+ +
+
+
+
{lang}chat.general.copyright.developer{/lang}
+
+ +
+
+
+
{lang}chat.general.copyright.graphics{/lang}
+
+ +
+
+ {*
+
{lang}chat.general.copyright.translation{/lang}
+
+ +
+
*} +
+
{lang}chat.general.copyright.thanks{/lang}
+
+ +
+
+ {/if} +{/if} \ No newline at end of file diff --git a/template/chat.tpl b/template/chat.tpl index 682e12e..bd64cb6 100644 --- a/template/chat.tpl +++ b/template/chat.tpl @@ -4,6 +4,63 @@ {$room} - {lang}chat.general.title{/lang} - {PAGE_TITLE|language} {include file='headInclude' sandbox=false} + {include file='javascriptInclude'} + +