From d5b3af6b1e76bd041c5a8b3c9252a19db6410b03 Mon Sep 17 00:00:00 2001
From: talonos <talonos@users.noreply.github.com>
Date: Thu, 18 Feb 2016 19:51:31 +0000
Subject: [PATCH] 1.0.0.rc1 update

---
 styles/prosilver/template/mchat.js            | 35 +++++--------
 styles/prosilver/template/mchat_body.html     | 23 ++++-----
 styles/prosilver/template/mchat_messages.html |  8 +--
 .../prosilver/template/mchat_portal_body.html | 51 +++----------------
 styles/prosilver/template/mchat_rules.html    |  6 +--
 5 files changed, 36 insertions(+), 87 deletions(-)

diff --git a/styles/prosilver/template/mchat.js b/styles/prosilver/template/mchat.js
index 5beda7d..c62f20a 100644
--- a/styles/prosilver/template/mchat.js
+++ b/styles/prosilver/template/mchat.js
@@ -74,9 +74,11 @@ jQuery(function($) {
 		sound: function(file) {
 			if (!mChat.pageIsUnloading && !Cookies.get('mchat_no_sound')) {
 				var audio = mChat.$$('sound-' + file).get(0);
-				audio.pause();
-				audio.currentTime = 0;
-				audio.play();
+				if (audio.duration) {
+					audio.pause();
+					audio.currentTime = 0;
+					audio.play();
+				}
 			}
 		},
 		notice: function() {
@@ -259,19 +261,6 @@ jQuery(function($) {
 				}
 			});
 		},
-		clean: function() {
-			mChat.$$('confirm').find('textarea').hide();
-			mChat.$$('confirm').find('p').text(mChat.cleanConfirm);
-			phpbb.confirm(mChat.$$('confirm'), function() {
-				mChat.pauseSession();
-				ajaxRequest('clean', true, {}).done(function() {
-					phpbb.alert('mChat', mChat.cleanDone);
-					setTimeout(function() {
-						location.reload();
-					}, 2000);
-				});
-			});
-		},
 		timeLeft: function(sessionTime) {
 			return (new Date(sessionTime * 1000)).toUTCString().match(/(\d\d:\d\d:\d\d)/)[0];
 		},
@@ -457,12 +446,14 @@ jQuery(function($) {
 			}
 		});
 
-		$('#mchat-form').on('keypress', function(e) {
-			if (e.which == 13) {
-				mChat.add();
-				e.preventDefault();
-			}
-		});
+		if (mChat.$$('input').is('input')) {
+			$('#mchat-form').on('keypress', function(e) {
+				if (e.which == 13) {
+					mChat.add();
+					e.preventDefault();
+				}
+			});
+		}
 
 		mChat.$$('input').autoGrowInput();
 	}
diff --git a/styles/prosilver/template/mchat_body.html b/styles/prosilver/template/mchat_body.html
index c53c5d0..0a38e46 100644
--- a/styles/prosilver/template/mchat_body.html
+++ b/styles/prosilver/template/mchat_body.html
@@ -20,12 +20,14 @@
 <!-- ENDIF -->
 
 <!-- EVENT dmzx_mchat_body_before -->
+<a id="mChat"></a>
 <div class="forabg">
-	<div class="inner"><a name="mChat"></a>
+	<div class="inner">
 		<ul class="topiclist">
 			<li class="header">
 				<dl class="icon">
 					<dt><!-- IF MCHAT_ARCHIVE_PAGE -->{L_MCHAT_ARCHIVE_PAGE}<!-- ELSEIF S_MCHAT_CUSTOM_PAGE --><a href="{MCHAT_FILE_NAME}" title="{L_MCHAT_TITLE}">{L_MCHAT_TITLE}</a><!-- ELSE -->{L_MCHAT_TITLE}<!-- ENDIF --></dt>
+					<dd style="border:none">&nbsp;</dd>
 				</dl>
 			</li>
 		</ul>
@@ -60,10 +62,6 @@
 				editInfo		: '{LA_MCHAT_EDITINFO}',
 				noAccess		: '{LA_NO_AUTH_OPERATION}',
 				flood			: '{LA_MCHAT_FLOOD}',
-				<!-- IF MCHAT_FOUNDER -->
-				cleanConfirm	: '{LA_MCHAT_DELALLMESS}',
-				cleanDone		: '{LA_MCHAT_CLEANED}',
-				<!-- ENDIF -->
 				delConfirm		: '{LA_MCHAT_DELCONFIRM}',
 				clearConfirm	: '{LA_MCHAT_RESET_QUESTION}',
 				sessOut			: '{LA_MCHAT_SESSION_OUT}',
@@ -71,7 +69,7 @@
 				refreshYes		: '{MCHAT_REFRESH_YES}',
 				refreshNo		: '{LA_MCHAT_REFRESH_NO}',
 				mssgLngthLong	: '{MCHAT_MESS_LONG}',
-				likes			: '{LA_MCHAT_LIKES}',
+				likes			: '{LA_MCHAT_LIKES}'
 			};
 			// ]]>
 			</script>
@@ -96,7 +94,7 @@
 				<!-- IF not .mchatrow --><div id="mchat-no-messages">{L_MCHAT_NOMESSAGE}</div><!-- ENDIF -->
 			</div>
 
-			<!-- IF MCHAT_STATIC_MESS -->
+			<!-- IF MCHAT_STATIC_MESS and not MCHAT_ARCHIVE_PAGE -->
 				<div id="mchat-static"><strong>{L_MCHAT_ANNOUNCEMENT}{L_COLON}</strong> <span>{MCHAT_STATIC_MESS}</span></div>
 			<!-- ENDIF -->
 
@@ -118,7 +116,7 @@
 							<br />
 							<input id="mchat-add" type="button" class="button2" data-mchat-action="add" value="{L_MCHAT_ADD}" />
 							<!-- IF MCHAT_USER_TIMEOUT or MCHAT_PAUSE_ON_INPUT -->
-								<input id="mchat-clear" type="button" class="button2" data-mchat-action="clear" value="{L_MCHAT_CLEAR_INPUT}" />
+								<input id="mchat-clear" type="button" class="button2" data-mchat-action="clear" value="{L_RESET}" />
 							<!-- ENDIF -->
 							<!-- IF MCHAT_ALLOW_SMILES and .smiley -->
 								<input type="button" class="button2" data-mchat-toggle="smilies" value="{L_MCHAT_SMILES}" />
@@ -131,12 +129,9 @@
 						<!-- IF MCHAT_READ_ARCHIVE_BUTTON -->
 							<input type="button" class="button2" onclick="window.location.href = '{MCHAT_ARCHIVE_URL}';" value="{L_MCHAT_ARCHIVE}" />
 						<!-- ENDIF -->
-						<!-- IF MCHAT_FOUNDER -->
-							<input id="mchat-clean" type="button" class="button2" data-mchat-action="clean" value="{L_MCHAT_CLEAN}" />
-						<!-- ENDIF -->
 						<!-- IF MCHAT_ALLOW_USE -->
 							<!-- IF MCHAT_RULES -->
-								<input type="button" class="button2" onclick="popup('{U_MCHAT_RULES}', 450, 275); return false;" value="{L_MCHAT_HELP}" />
+								<input type="button" class="button2" onclick="popup('{U_MCHAT_RULES}', 450, 275); return false;" value="{L_MCHAT_RULES}" />
 							<!-- ENDIF -->
 							<!-- EVENT dmzx_mchat_buttons_after -->
 							<!-- IF MCHAT_ALLOW_BBCODES -->
@@ -153,10 +148,10 @@
 						<!-- ENDIF -->
 						<!-- EVENT dmzx_mchat_body_smiley_after -->
 						<div id="mchat-status">
-							<img src="{EXT_URL}styles/prosilver/theme/images/load.gif" alt="{L_MCHAT_LOAD}" title="{L_MCHAT_LOAD}" id="mchat-refresh-load" />
+							<img src="{EXT_URL}styles/prosilver/theme/images/load.gif" alt="{L_LOADING}" title="{L_LOADING}" id="mchat-refresh-load" />
 							<img src="{EXT_URL}styles/prosilver/theme/images/ok.gif" alt="{L_MCHAT_OK}" title="{L_MCHAT_OK}" id="mchat-refresh-ok" />
-							<img src="{EXT_URL}styles/prosilver/theme/images/error.gif" alt="{L_MCHAT_ERROR}" title="{L_MCHAT_ERROR}" id="mchat-refresh-error" />
 							<img src="{EXT_URL}styles/prosilver/theme/images/paused.gif" alt="{L_MCHAT_PAUSE}" title="{L_MCHAT_PAUSE}" id="mchat-refresh-paused" />
+							<img src="{EXT_URL}styles/prosilver/theme/images/error.gif" alt="{L_ERROR}" title="{L_ERROR}" id="mchat-refresh-error" />
 							<span id="mchat-refresh-text">{MCHAT_REFRESH_YES}</span>
 							<!-- IF MCHAT_USER_TIMEOUT --> &bull; <span id="mchat-session">{L_MCHAT_SESSION_ENDS} {MCHAT_USER_TIMEOUT_TIME}</span><!-- ENDIF --> &bull; <label for="mchat-user-sound">{L_MCHAT_USESOUND} <input type="checkbox" id="mchat-user-sound"<!-- IF S_MCHAT_SOUND_YES --> checked="checked"<!-- ENDIF --> /></label>
 							{L_MCHAT_COPYRIGHT}
diff --git a/styles/prosilver/template/mchat_messages.html b/styles/prosilver/template/mchat_messages.html
index ab510cb..b8dcf62 100644
--- a/styles/prosilver/template/mchat_messages.html
+++ b/styles/prosilver/template/mchat_messages.html
@@ -3,7 +3,7 @@
 	<!-- IF S_MCHAT_AVATARS -->
 	<div class="mchat-avatar">
 		<!-- IF mchatrow.U_VIEWPROFILE --><a href="{mchatrow.U_VIEWPROFILE}" title="{L_READ_PROFILE}"><!-- ENDIF -->
-			<!-- IF mchatrow.MCHAT_USER_AVATAR -->{mchatrow.MCHAT_USER_AVATAR}<!-- ELSE --><img src="{STYLE_PATH}/theme/images/no_avatar.gif" width="40px;" height="40px;" alt="" /><!-- ENDIF -->
+			<!-- IF mchatrow.MCHAT_USER_AVATAR -->{mchatrow.MCHAT_USER_AVATAR}<!-- ELSE --><img src="{STYLE_PATH}/theme/images/no_avatar.gif" class="mchat-avatar" alt="{L_READ_PROFILE}" /><!-- ENDIF -->
 		<!-- IF mchatrow.U_VIEWPROFILE --></a><!-- ENDIF -->
 	</div>
 	<!-- ENDIF -->
@@ -13,12 +13,12 @@
 	</div>
 	<div class="mchat-message-icons">
 		<!-- IF MCHAT_ALLOW_PM and mchatrow.MCHAT_PM and mchatrow.U_VIEWPROFILE --><a href="{mchatrow.MCHAT_PM}" title="{L_MCHAT_SEND_PM}"><img src="{EXT_URL}styles/prosilver/theme/images/message.gif" alt="{L_MCHAT_SEND_PM}" title="{L_MCHAT_SEND_PM}" /></a><!-- ENDIF -->
-		<!-- IF MCHAT_ALLOW_LIKE and not MCHAT_ARCHIVE_PAGE and not mchatrow.MCHAT_IS_POSTER --><img src="{EXT_URL}styles/prosilver/theme/images/like.png" alt="{L_REPLY_WITH_LIKE}" title="{L_REPLY_WITH_LIKE}" data-mchat-action="like" /></a><!-- ENDIF -->
+		<!-- IF MCHAT_ALLOW_LIKE and not MCHAT_ARCHIVE_PAGE and not mchatrow.MCHAT_IS_POSTER --><img src="{EXT_URL}styles/prosilver/theme/images/like.png" alt="{L_MCHAT_LIKE}" title="{L_MCHAT_LIKE}" data-mchat-action="like" /></a><!-- ENDIF -->
 		<!-- IF MCHAT_ALLOW_QUOTE and not MCHAT_ARCHIVE_PAGE and not mchatrow.MCHAT_IS_POSTER --><img src="{EXT_URL}styles/prosilver/theme/images/quota.png" alt="{L_REPLY_WITH_QUOTE}" title="{L_REPLY_WITH_QUOTE}" data-mchat-action="quote" /><!-- ENDIF -->
-		<!-- IF MCHAT_ALLOW_IP --><a href="{mchatrow.MCHAT_U_IP}" onclick="popup(this.href, 750, 500); return false;"><img src="{EXT_URL}styles/prosilver/theme/images/ip.gif" alt="{L_MCHAT_IP} {mchatrow.MCHAT_USER_IP}" title="{L_MCHAT_IP} {mchatrow.MCHAT_USER_IP}" /></a><!-- ENDIF -->
+		<!-- IF MCHAT_ALLOW_IP --><a href="{mchatrow.MCHAT_U_IP}" onclick="popup(this.href, 750, 500); return false;"><img src="{EXT_URL}styles/prosilver/theme/images/ip.gif" alt="{mchatrow.MCHAT_WHOIS_USER}" title="{mchatrow.MCHAT_WHOIS_USER}" /></a><!-- ENDIF -->
 		<!-- IF mchatrow.MCHAT_ALLOW_BAN --><a href="{mchatrow.MCHAT_U_BAN}"><img src="{EXT_URL}styles/prosilver/theme/images/ban.gif" alt="{L_MCHAT_PERMISSIONS}" title="{L_MCHAT_PERMISSIONS}" /></a><!-- ENDIF -->
 		<!-- IF mchatrow.MCHAT_ALLOW_EDIT --><img src="{EXT_URL}styles/prosilver/theme/images/edit.gif" alt="{L_MCHAT_EDIT}" title="{L_MCHAT_EDIT}" data-mchat-action="edit" /><!-- ENDIF -->
-		<!-- IF mchatrow.MCHAT_ALLOW_DEL --><img src="{EXT_URL}styles/prosilver/theme/images/del.gif" alt="{L_MCHAT_DELITE}" title="{L_MCHAT_DELITE}" data-mchat-action="del" /><!-- ENDIF -->
+		<!-- IF mchatrow.MCHAT_ALLOW_DEL --><img src="{EXT_URL}styles/prosilver/theme/images/del.gif" alt="{L_DELETE}" title="{L_DELETE}" data-mchat-action="del" /><!-- ENDIF -->
 	</div>
 	<br />
 	<div class="mchat-text">{mchatrow.MCHAT_MESSAGE}</div>
diff --git a/styles/prosilver/template/mchat_portal_body.html b/styles/prosilver/template/mchat_portal_body.html
index 62e447b..fc8107c 100644
--- a/styles/prosilver/template/mchat_portal_body.html
+++ b/styles/prosilver/template/mchat_portal_body.html
@@ -1,10 +1,7 @@
 <!-- INCLUDEJS jquery.titlealert.min.js -->
 <!-- INCLUDEJS js.cookie-2.0.4.min.js -->
 <!-- INCLUDEJS mchat.js -->
-
-
 <!-- EVENT dmzx_mchat_body_before -->
-
 		<div id="mchat-body" class="postbody">
 			<script type="text/javascript">
 			// <![CDATA[
@@ -35,10 +32,6 @@
 				editInfo		: '{LA_MCHAT_EDITINFO}',
 				noAccess		: '{LA_NO_AUTH_OPERATION}',
 				flood			: '{LA_MCHAT_FLOOD}',
-				<!-- IF MCHAT_FOUNDER -->
-				cleanConfirm	: '{LA_MCHAT_DELALLMESS}',
-				cleanDone		: '{LA_MCHAT_CLEANED}',
-				<!-- ENDIF -->
 				delConfirm		: '{LA_MCHAT_DELCONFIRM}',
 				clearConfirm	: '{LA_MCHAT_RESET_QUESTION}',
 				sessOut			: '{LA_MCHAT_SESSION_OUT}',
@@ -46,7 +39,7 @@
 				refreshYes		: '{MCHAT_REFRESH_YES}',
 				refreshNo		: '{LA_MCHAT_REFRESH_NO}',
 				mssgLngthLong	: '{MCHAT_MESS_LONG}',
-				likes			: '{LA_MCHAT_LIKES}',
+				likes			: '{LA_MCHAT_LIKES}'
 			};
 			// ]]>
 			</script>
@@ -71,7 +64,7 @@
 				<!-- IF not .mchatrow --><div id="mchat-no-messages">{L_MCHAT_NOMESSAGE}</div><!-- ENDIF -->
 			</div>
 
-			<!-- IF MCHAT_STATIC_MESS -->
+			<!-- IF MCHAT_STATIC_MESS and not MCHAT_ARCHIVE_PAGE -->
 				<div id="mchat-static"><strong>{L_MCHAT_ANNOUNCEMENT}{L_COLON}</strong> <span>{MCHAT_STATIC_MESS}</span></div>
 			<!-- ENDIF -->
 
@@ -93,7 +86,7 @@
 							<br />
 							<input id="mchat-add" type="button" class="button2" data-mchat-action="add" value="{L_MCHAT_ADD}" />
 							<!-- IF MCHAT_USER_TIMEOUT or MCHAT_PAUSE_ON_INPUT -->
-								<input id="mchat-clear" type="button" class="button2" data-mchat-action="clear" value="{L_MCHAT_CLEAR_INPUT}" />
+								<input id="mchat-clear" type="button" class="button2" data-mchat-action="clear" value="{L_RESET}" />
 							<!-- ENDIF -->
 							<!-- IF MCHAT_ALLOW_SMILES and .smiley -->
 								<input type="button" class="button2" data-mchat-toggle="smilies" value="{L_MCHAT_SMILES}" />
@@ -106,12 +99,9 @@
 						<!-- IF MCHAT_READ_ARCHIVE_BUTTON -->
 							<input type="button" class="button2" onclick="window.location.href = '{MCHAT_ARCHIVE_URL}';" value="{L_MCHAT_ARCHIVE}" />
 						<!-- ENDIF -->
-						<!-- IF MCHAT_FOUNDER -->
-							<input id="mchat-clean" type="button" class="button2" data-mchat-action="clean" value="{L_MCHAT_CLEAN}" />
-						<!-- ENDIF -->
 						<!-- IF MCHAT_ALLOW_USE -->
 							<!-- IF MCHAT_RULES -->
-								<input type="button" class="button2" onclick="popup('{U_MCHAT_RULES}', 450, 275); return false;" value="{L_MCHAT_HELP}" />
+								<input type="button" class="button2" onclick="popup('{U_MCHAT_RULES}', 450, 275); return false;" value="{L_MCHAT_RULES}" />
 							<!-- ENDIF -->
 							<!-- EVENT dmzx_mchat_buttons_after -->
 							<!-- IF MCHAT_ALLOW_BBCODES -->
@@ -128,10 +118,10 @@
 						<!-- ENDIF -->
 						<!-- EVENT dmzx_mchat_body_smiley_after -->
 						<div id="mchat-status">
-							<img src="{EXT_URL}styles/prosilver/theme/images/load.gif" alt="{L_MCHAT_LOAD}" title="{L_MCHAT_LOAD}" id="mchat-refresh-load" />
+							<img src="{EXT_URL}styles/prosilver/theme/images/load.gif" alt="{L_LOADING}" title="{L_LOADING}" id="mchat-refresh-load" />
 							<img src="{EXT_URL}styles/prosilver/theme/images/ok.gif" alt="{L_MCHAT_OK}" title="{L_MCHAT_OK}" id="mchat-refresh-ok" />
-							<img src="{EXT_URL}styles/prosilver/theme/images/error.gif" alt="{L_MCHAT_ERROR}" title="{L_MCHAT_ERROR}" id="mchat-refresh-error" />
 							<img src="{EXT_URL}styles/prosilver/theme/images/paused.gif" alt="{L_MCHAT_PAUSE}" title="{L_MCHAT_PAUSE}" id="mchat-refresh-paused" />
+							<img src="{EXT_URL}styles/prosilver/theme/images/error.gif" alt="{L_ERROR}" title="{L_ERROR}" id="mchat-refresh-error" />
 							<span id="mchat-refresh-text">{MCHAT_REFRESH_YES}</span>
 							<!-- IF MCHAT_USER_TIMEOUT --> &bull; <span id="mchat-session">{L_MCHAT_SESSION_ENDS} {MCHAT_USER_TIMEOUT_TIME}</span><!-- ENDIF --> &bull; <label for="mchat-user-sound">{L_MCHAT_USESOUND} <input type="checkbox" id="mchat-user-sound"<!-- IF S_MCHAT_SOUND_YES --> checked="checked"<!-- ENDIF --> /></label>
 							{L_MCHAT_COPYRIGHT}
@@ -139,31 +129,4 @@
 					</div>
 				<!-- ENDIF -->
 			</form>
-		</div>
-
-<!-- IF MCHAT_ARCHIVE_PAGE and (.pagination or MCHAT_TOTAL_MESSAGES) -->
-<div class="action-bar bottom">
-	<div class="pagination">
-		{MCHAT_TOTAL_MESSAGES}
-		<!-- IF .pagination -->
-			<!-- INCLUDE pagination.html -->
-		<!-- ELSE -->
-			&bull; {PAGE_NUMBER}
-		<!-- ENDIF -->
-	</div>
-</div>
-<!-- ENDIF -->
-
-<!-- IF MCHAT_CUSTOM_PAGE and not MCHAT_ARCHIVE_PAGE and MCHAT_WHOIS_REFRESH -->
-	<h3>{L_WHO_IS_CHATTING}</h3>
-	<!-- INCLUDE mchat_whois.html -->
-	<div class="mchat-refresh">
-		<span id="mchat-refresh">{MCHAT_WHOIS_REFRESH_EXPLAIN}</span>
-		<span id="mchat-refresh-pending" class="hidden">{L_MCHAT_REFRESHING}</span>
-		<!-- IF LEGEND --><br /><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF -->
-	</div>
-<!-- ELSEIF MCHAT_ARCHIVE_PAGE and LEGEND -->
-	<div class="mchat-refresh">
-		<em>{L_LEGEND}{L_COLON} {LEGEND}</em>
-	</div>
-<!-- ENDIF -->
\ No newline at end of file
+		</div>
\ No newline at end of file
diff --git a/styles/prosilver/template/mchat_rules.html b/styles/prosilver/template/mchat_rules.html
index 71c0c44..f30bcea 100644
--- a/styles/prosilver/template/mchat_rules.html
+++ b/styles/prosilver/template/mchat_rules.html
@@ -1,10 +1,10 @@
 <!-- INCLUDE simple_header.html -->
 
-<h2>{L_MCHAT_HELP}</h2>
+<h2>{L_MCHAT_RULES}</h2>
 <div class="rules">
-	<div class="inner"><span class="corners-top"><span></span></span>
+	<div class="inner">
 		{MCHAT_RULES}
-	<span class="corners-bottom"><span></span></span></div>
+	</div>
 </div>
 <a	href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>