Merge branch 'chatTplRedesign' of github.com:wbbaddons/Tims-Chat into chatTplRedesign

Conflicts:
	file/js/jCounter.jQuery.coffee

.gitignore

@@ -48,3 +48,6 @@ nbactions.xml
 # Ignore packages build directly in the workspace. They can however be added manually via git add, if wanted.
 *.tar
 *.tar.gz
+
+# Javascript - CoffeeScript is used instead ;)
+*.js

file/js/TimWolla.WCF.Chat.coffee

@@ -178,7 +178,8 @@ TimWolla.WCF ?= {}
 			
 			$.ajax $('#chatForm').attr('action'), 
 				data:
-					text: $('#chatInput').val()
+					text: $('#chatInput').val(),
+					smilies: $('#chatSmilies').data('status')
 				type: 'POST',
 				beforeSend: (jqXHR) ->
 					$('#chatInput').addClass 'ajaxLoad'

file/js/jCounter.jQuery.coffee

@@ -7,27 +7,38 @@
 # @package	jQuery.jCounter
 ###
 (($) ->
-	$.fn.jCounter = (max = 140, options) ->
+	$.fn.jCounter = (container, options) ->
 		options = $.extend
-			container: '<span></span>'
+			max: 0
 			counterClass: 'counter'
 			countUp: false
 		, options
 		
-		jCounterContainer = $ options.container
+		if this.attr('maxlength')
+			max = this.attr('maxlength')
+		else max = options.max
 		
-		this.on 'keypress keydown keyup', $.proxy () ->
+		if !container
+			this.wrap('<div class="counterContainer"><div></div></div>').parent().append('<div class="' + options.counterClass + ' color-1">' + max + '</div>');
+			jCounterContainer = $(this).parent().children('.' + options.counterClass)
+		else
+			if `typeof container == "object"`
+				jCounterContainer = container
+			else
+				jCounterContainer = $ container
+		
+		this.on 'keypress keyup', $.proxy () ->
 			if options.countUp
 				length = this.val().length
 			else
-				length = maxChars - this.val().length
+				length = max - this.val().length
 			
 			if options.countUp
 				color = 1
 			else
-				if length > maxChars / 2
+				if length > max / 2
 					color = 1
-				else if length <= maxChars / 2 and length >= maxChars / 6
+				else if length <= max / 2 and length >= max / 6
 					color = 2
 				else
 					color = 3

file/lib/data/chat/message/ChatMessage.class.php

@@ -59,7 +59,7 @@ public function getFormattedMessage() {
 			break;
 			case self::TYPE_NORMAL:
 				if (!$this->enableHTML) {
-					$message = \wcf\system\bbcode\SimpleMessageParser::getInstance()->parse($message, $this->enableSmilies);
+					$message = \wcf\system\bbcode\SimpleMessageParser::getInstance()->parse($message, true, $this->enableSmilies);
 				}
 		}
 		return $message;

file/lib/form/ChatForm.class.php

@@ -3,8 +3,6 @@
 use \wcf\data\chat;
 use \wcf\system\exception\PermissionDeniedException;
 use \wcf\system\exception\UserInputException;
-use \wcf\system\package\PackageDependencyHandler;
-use \wcf\system\user\storage\UserStorageHandler;
 use \wcf\system\WCF;
 use \wcf\util\StringUtil;
 
@@ -19,6 +17,7 @@
  */
 class ChatForm extends AbstractForm {
 	public $message = '';
+	public $enableSmilies = 1;
 	public $userData = array();
 	public $useTemplate = false;
 	
@@ -26,7 +25,9 @@ class ChatForm extends AbstractForm {
 	 * @see	\wcf\page\AbstractPage::readData()
 	 */
 	public function readData() {
-		$this->readUserData();
+		$this->userData['color'] = \wcf\util\ChatUtil::readUserData('color');
+		$this->userData['roomID'] = \wcf\util\ChatUtil::readUserData('roomID');
+		
 		parent::readData();
 	}
 	
@@ -37,34 +38,7 @@ public function readFormParameters() {
 		parent::readFormParameters();
 		
 		if (isset($_REQUEST['text'])) $this->message = StringUtil::trim($_REQUEST['text']);
-	}
-	
-	/**
-	 * Reads user data.
-	 */
-	public function readUserData() {
-		// TODO: Move this into ChatUtil
-		$ush = UserStorageHandler::getInstance();
-		$packageID = PackageDependencyHandler::getPackageID('timwolla.wcf.chat');
-		
-		// load storage
-		$ush->loadStorage(array(WCF::getUser()->userID), $packageID);
-		$data = $ush->getStorage(array(WCF::getUser()->userID), 'color', $packageID);
-		
-		if ($data[WCF::getUser()->userID] === null) {
-			// set defaults
-			$data[WCF::getUser()->userID] = array(1 => 0xFF0000, 2 => 0x00FF00); // TODO: Change default values
-			$ush->update(WCF::getUser()->userID, 'color', serialize($data[WCF::getUser()->userID]), $packageID);
-		}
-		else {
-			// load existing data
-			$data[WCF::getUser()->userID] = unserialize($data[WCF::getUser()->userID]);
-		}
-		
-		$this->userData['color'] = $data[WCF::getUser()->userID];
-		
-		$data = $ush->getStorage(array(WCF::getUser()->userID), 'roomID', $packageID);
-		$this->userData['roomID'] = $data[WCF::getUser()->userID];
+		if (isset($_REQUEST['smilies'])) $this->enableSmilies = intval($_REQUEST['smilies']);
 	}
 	
 	/**
@@ -96,6 +70,7 @@ public function save() {
 				'time' => TIME_NOW,
 				'type' => chat\message\ChatMessage::TYPE_NORMAL,
 				'message' => $this->message,
+				'enableSmilies' => $this->enableSmilies,
 				'color1' => $this->userData['color'][1],
 				'color2' => $this->userData['color'][2]
 			)

file/lib/page/ChatPage.class.php

@@ -2,8 +2,6 @@
 namespace wcf\page;
 use \wcf\data\chat;
 use \wcf\system\cache\CacheHandler;
-use \wcf\system\package\PackageDependencyHandler;
-use \wcf\system\user\storage\UserStorageHandler;
 use \wcf\system\WCF;
 
 /**
@@ -66,7 +64,9 @@ public function readData() {
 		parent::readData();
 		
 		$this->readRoom();		
-		$this->readUserData();
+		$this->userData['color'] = \wcf\util\ChatUtil::readUserData('color');
+		\wcf\util\ChatUtil::writeUserData(array('roomID' => $this->room->roomID));
+		
 		if (CHAT_DISPLAY_JOIN_LEAVE) {
 			$messageAction = new chat\message\ChatMessageAction(array(), 'create', array(
 				'data' => array(
@@ -146,33 +146,6 @@ public function readRoom() {
 		if (!$this->room) throw new \wcf\system\exception\IllegalLinkException();
 	}
 	
-	/**
-	 * Reads user data.
-	 */
-	public function readUserData() {
-		// TODO: Move this into ChatUtil
-		$ush = UserStorageHandler::getInstance();
-		$packageID = PackageDependencyHandler::getPackageID('timwolla.wcf.chat');
-		
-		// load storage
-		$ush->loadStorage(array(WCF::getUser()->userID), $packageID);
-		$data = $ush->getStorage(array(WCF::getUser()->userID), 'color', $packageID);
-		
-		if ($data[WCF::getUser()->userID] === null) {
-			// set defaults
-			$data[WCF::getUser()->userID] = array(1 => 0xFF0000, 2 => 0x00FF00); // TODO: Change default values
-			$ush->update(WCF::getUser()->userID, 'color', serialize($data[WCF::getUser()->userID]), $packageID);
-		}
-		else {
-			// load existing data
-			$data[WCF::getUser()->userID] = unserialize($data[WCF::getUser()->userID]);
-		}
-		
-		$this->userData['color'] = $data[WCF::getUser()->userID];
-		
-		$ush->update(WCF::getUser()->userID, 'roomID', $this->room->roomID, $packageID);
-	}
-	
 	/**
 	 * @see	\wcf\page\IPage::show()
 	 */

file/lib/page/ChatRefreshRoomListPage.class.php

@@ -2,8 +2,6 @@
 namespace wcf\page;
 use \wcf\data\chat;
 use \wcf\system\cache\CacheHandler;
-use \wcf\system\package\PackageDependencyHandler;
-use \wcf\system\user\storage\UserStorageHandler;
 use \wcf\system\WCF;
 
 /**
@@ -28,32 +26,13 @@ class ChatRefreshRoomListPage extends AbstractPage {
 	 */
 	public function readData() {
 		parent::readData();
-		$this->readUserData();
+		$this->roomID = \wcf\util\ChatUtil::readUserData('roomID');
 		$this->rooms = chat\room\ChatRoom::getCache();
 		
 		$this->room = $this->rooms->search($this->roomID);
 		if (!$this->room) throw new \wcf\system\exception\IllegalLinkException();
 	}
 	
-	/**
-	 * Reads user data.
-	 */
-	public function readUserData() {
-		// TODO: Move this into ChatUtil
-		$ush = UserStorageHandler::getInstance();
-		$packageID = PackageDependencyHandler::getPackageID('timwolla.wcf.chat');
-		
-		// load storage
-		$ush->loadStorage(array(WCF::getUser()->userID), $packageID);
-		$data = $ush->getStorage(array(WCF::getUser()->userID), 'roomID', $packageID);
-		
-		if ($data[WCF::getUser()->userID] === null) {
-			throw new \wcf\system\exception\IllegalLinkException();
-		}
-		
-		$this->roomID = $data[WCF::getUser()->userID];
-	}
-	
 	/**
 	 * @see	\wcf\page\IPage::show()
 	 */

file/lib/util/ChatUtil.class.php

@@ -1,5 +1,8 @@
 <?php
 namespace wcf\util;
+use \wcf\system\user\storage\UserStorageHandler;
+use \wcf\system\package\PackageDependencyHandler;
+use \wcf\system\WCF;
 
 /**
  * Chat utilities
@@ -19,6 +22,8 @@ class ChatUtil {
 	 */
 	const TIME_MODIFIER_REGEX = '((?:[0-9]+[s|h|d|w|m|y|S|H|D|W|M|Y]?,?)+)';
 	
+	public static $serialize = array('color' => true);
+	
 	/**
 	 * Creates a gradient out of two colors represented by an integer.
 	 * The first byte is red, the second byte is green, the third one is blue.
@@ -27,7 +32,7 @@ class ChatUtil {
 	 * @param	string	$string
 	 * @param	integer	$start
 	 * @param	integer	$end
-	 * @returen	string
+	 * @return	string
 	 */
 	public static function gradient($string, $start, $end) {
 		$string = self::str_split($string);
@@ -45,6 +50,47 @@ public static function gradient($string, $start, $end) {
 		return $result;
 	}
 	
+	/**
+	 * Reads user data.
+	 *
+	 * @param	string $field
+	 * @return	mixed
+	 */
+	public static function readUserData($field) {
+		$ush = UserStorageHandler::getInstance();
+		$packageID = PackageDependencyHandler::getPackageID('timwolla.wcf.chat');
+		
+		// load storage
+		$ush->loadStorage(array(WCF::getUser()->userID), $packageID);
+		$data = $ush->getStorage(array(WCF::getUser()->userID), $field, $packageID);
+		
+		if ($data[WCF::getUser()->userID] === null) {
+			switch ($field) {
+				case 'color':
+					$data[WCF::getUser()->userID] = array(1 => 0xFF0000, 2 => 0x00FF00);
+				break;
+			}
+			static::writeUserData(array($field => $data[WCF::getUser()->userID]));
+		}
+		
+		if (isset(static::$serialize[$field])) return unserialize($data[WCF::getUser()->userID]);
+		else return $data[WCF::getUser()->userID];
+	}
+	
+	/**
+	 * Writes user data
+	 * 
+	 * @param	array $data
+	 */
+	public static function writeUserData(array $data) {
+		$ush = UserStorageHandler::getInstance();
+		$packageID = PackageDependencyHandler::getPackageID('timwolla.wcf.chat');
+		
+		foreach($data as $key => $value) {
+			$ush->update(WCF::getUser()->userID, $key, (isset(static::$serialize[$key])) ? serialize($value) : $value, $packageID);
+		}
+	}
+	
 	/**
 	 * Splits a string into smaller chunks.
 	 * UTF-8 safe version of str_split().

install.sql

@@ -21,7 +21,7 @@ CREATE TABLE wcf1_chat_message (
 DROP TABLE IF EXISTS wcf1_chat_room;
 CREATE TABLE wcf1_chat_room (
   roomID int(10) NOT NULL AUTO_INCREMENT,
-  title varchar(255) NOT NULL,
+  title varchar(25) NOT NULL,
   topic varchar(255) NOT NULL,
   position int(10) NOT NULL DEFAULT 0,
   permanent tinyint(1) NOT NULL DEFAULT 1,

language/de.xml

@@ -31,7 +31,20 @@
 		<item name="wcf.chat.title"><![CDATA[Chat]]></item>
 		<item name="wcf.chat.protocol"><![CDATA[Protokoll]]></item>
 		<item name="wcf.chat.rooms"><![CDATA[Räume]]></item>
+		<item name="wcf.chat.users"><![CDATA[Nutzer]]></item>
 		<item name="wcf.chat.copyright"><![CDATA[<a href="http://timwolla.wbbaddons.de">Chat{if CHAT_SHOW_VERSION == 1} Version {$chatVersion}{/if} entwickelt von TimWolla</a>]]></item>
+		
+		<item name="wcf.chat.submit.default"><![CDATA[Zum Senden Enter drücker]]></item>
+		<item name="wcf.chat.scroll"><![CDATA[Scrollen]]></item>
+		<item name="wcf.chat.notify"><![CDATA[Benachrichtigen]]></item>
+		<item name="wcf.chat.smilies"><![CDATA[Smilies]]></item>
+		<item name="wcf.chat.clear"><![CDATA[Chat leeren]]></item>
+		<item name="wcf.chat.mark"><![CDATA[Markieren]]></item>
+		
+		<item name="wcf.chat.query"><![CDATA[Privates Gespräch]]></item>
+		<item name="wcf.chat.kick"><![CDATA[Kicken]]></item>
+		<item name="wcf.chat.ban"><![CDATA[Bannen]]></item>
+		<item name="wcf.chat.profile"><![CDATA[Profil]]></item>
 	</category>
 	<category name="wcf.chat.message">
 		<!-- 1 = TYPE_JOIN -->

template/chat.tpl

@@ -22,10 +22,14 @@
 			margin-bottom: -20px !important;
 		}
 		
-		aside {
+		.left aside {
 			overflow: auto;
 			padding: 0 1px 0 0;
-			width: 190px;
+		}
+		
+		.right aside {
+			overflow: auto;
+			padding: 0 0 1px 0;
 		}
 		
 		aside h2 {
@@ -130,6 +134,10 @@
 			background-image: url({icon size='S'}toLeft1{/icon});
 		}
 		
+		.chatMessageContainer {
+			padding-left: 7px !important;
+		}
+		
 		.ajaxLoad {
 			background-position: right center;
 			background-repeat: no-repeat;
@@ -141,33 +149,74 @@
 		}
 		
 		.chatSidebarTabs {
-			height: 30px;
-			background-color: #FFFFFF;
+		    height: 32px;
+		    z-index: 101;
+		    position: relative;
+		}
+		
+		.left .chatSidebarTabs {
+			margin-right: 1px;
+		}
+		
+		.right .chatSidebarTabs {
+			margin-left: 1px;
+		}
+		
+		.chatSidebarTabs ul {
+			background-color: rgba(0, 0, 0, 0.2);
+			border-bottom: 1px solid #FFFFFF;
+			height: 31px;
 		}
 
 		.chatSidebarTabs ul li {
 			width: 50%;
 			float: left;
 			text-align: center;
-			border-bottom: 1px solid #BBCCDD;
 		}
 		
 		.chatSidebarTabs ul li a {
-			padding: 7px 0px 0px 0px;
-			color: #666666;
-			height: 23px;
-			background-color: rgba(0, 0, 0, 0.05);
-		}
+			color: rgba(0, 0, 0, 0.4);
+			text-shadow: none;
+			height: 22px;
+			padding: 9px 0 0;
 			
-		.chatSidebarTabs ul li:first-child a {
-			border-right: 1px solid #BBCCDD;
+			-moz-transition-property: border-radius, background-color, font-size; -moz-transition-duration: .2s; 
+ 			-webkit-transition-property: border-radius, background-color, font-size; -webkit-transition-duration: .2s; 
+ 			transition-property: border-radius, background-color, font-size; transition-duration: .2s; 
 		}
 		
 		.chatSidebarTabs ul li.active a {
+			background-color: #FFFFFF;
+			border-bottom: 1px solid #BBCCDD;
+			border-radius: 0 0 7px 7px;
+			color: #000000;
 			font-size: 130%;
 			font-weight: bold;
-			color: #000000;
-			background-color: #FFFFFF;
+			
+			height: 23px;
+			padding: 7px 0 0;
+		}
+		
+		.collapsed .chatSidebarTabs ul li a {
+			border: none !important;
+		}
+		
+		.chatSidebarTabs ul li:first-child.active a {
+			border-radius: 0 0 7px 0;
+			border-right: 1px solid #BBCCDD;
+		}
+		
+		.chatSidebarTabs ul li:last-child.active a {
+			border-radius: 0 0 0 7px;
+			border-left: 1px solid #BBCCDD;
+		}
+		
+		.left .chatSidebarTabs ul li:last-child.active a {
+			margin-right: -1px;
+		}
+		
+		.right .chatSidebarTabs ul li:first-child.active a {
+			margin-left: -1px;
 		}
 		
 		#chatRoomList {
@@ -231,8 +280,8 @@
 <div id="sidebar">
 	<nav class="chatSidebarTabs">
 		<ul>
-			<li id="toggleUsers" class="active"><a href="javascript:;" title="{lang}wcf.chat.users{/lang}">{lang}wcf.chat.users{/lang}</a></li>
 			<li id="toggleRooms"><a href="javascript:;" title="{lang}wcf.chat.rooms{/lang}" data-refresh-url="{link controller="Chat" action="RefreshRoomList"}{/link}">{lang}wcf.chat.rooms{/lang}</a></li>
+			<li id="toggleUsers" class="active"><a href="javascript:;" title="{lang}wcf.chat.users{/lang}">{lang}wcf.chat.users{/lang}</a></li>
 		</ul>
 	</nav>
 	
@@ -243,10 +292,10 @@
 				<span class="bgFix"><a class="chatUserLink" href="javascript:;">User {$user}</a></span>
 				<ul class="chatUserMenu">
 					<li>
-						<a href="javascript:;">Query</a>
-						<a href="javascript:;">Kick</a>
-						<a href="javascript:;">Ban</a>
-						<a href="{link controller="User" id=$user}{/link}">Profile</a>
+						<a href="javascript:;">{lang}wcf.chat.query{/lang}</a>
+						<a href="javascript:;">{lang}wcf.chat.kick{/lang}</a>
+						<a href="javascript:;">{lang}wcf.chat.ban{/lang}</a>
+						<a href="{link controller="User" id=$user}{/link}">{lang}wcf.chat.profile{/lang}</a>
 					</li>
 				</ul>
 			</li>
@@ -275,10 +324,7 @@
 	</div>
 	
 	<form id="chatForm" action="{link controller="Chat" action="Send"}{/link}" method="post">
-		<div class="counterContainer"><div>
-			<input type="text" id="chatInput" class="inputText long counterInput" name="text" autocomplete="off" maxlength="{CHAT_LENGTH}" required="required" placeholder="{lang}wcf.chat.submit.default{/lang}" />
-			<div class="counter color-1">{CHAT_LENGTH}</div>
-		</div></div>
+		<input type="text" id="chatInput" class="inputText long counterInput" name="text" autocomplete="off" maxlength="{CHAT_LENGTH}" required="required" placeholder="{lang}wcf.chat.submit.default{/lang}" />
 	</form>
 	
 	<div id="chatControls">
@@ -304,6 +350,11 @@
 							<img alt="" src="{icon}disabled1{/icon}" /> <span>{lang}wcf.chat.notify{/lang}</span>
 						</a>
 					</li>
+					<li>
+						<a id="chatSmilies" href="javascript:;" class="chatToggle balloonTooltip" title="{lang}wcf.global.button.disable{/lang}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}" data-status="1">
+							<img alt="" src="{icon}enabled1{/icon}" /> <span>{lang}wcf.chat.smilies{/lang}</span>
+						</a>
+					</li>
 					<li>
 						<a id="chatClear" href="javascript:;" class="balloonTooltip" title="Clear the chat">
 							<img alt="" src="{icon}delete1{/icon}" /> <span>{lang}wcf.chat.clear{/lang}</span>
@@ -338,7 +389,7 @@
 					maxTextLength: {CHAT_LENGTH}
 		}
 
-		$('#chatInput').jCounter($('#chatInput').attr('maxlength'), { container: '.counter' });
+		$('#chatInput').jCounter();
 		$('#sidebar').wcfSidebar();
 	//]]>
 </script>