Skip to content

Commit

Permalink
Merge branch 'master' into db_user_objects
Browse files Browse the repository at this point in the history
  • Loading branch information
AdrianMarceau committed Nov 11, 2017
2 parents bbaca5d + 9949e68 commit e69b07b
Showing 1 changed file with 6 additions and 27 deletions.
33 changes: 6 additions & 27 deletions pages/community_chat.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,34 +37,13 @@
<div class="subbody">
<div class="float float_right"><div class="sprite sprite_80x80 sprite_80x80_0<?= mt_rand(0, 2) ?>" style="background-image: url(images/robots/<?= MMRPG_SETTINGS_CURRENT_FIELDMECHA ?>/sprite_left_80x80.png);">Met</div></div>
<p class="text"><?= $this_category_info['category_description'] ?></p>
<p class="text" style="margin-bottom: 6px;">(!) Please log in to the chat using the same username and password that you created for your prototype account</p>
<p class="text" style="margin-bottom: 6px;">(!) You will need a Discord account to use the chat, <a href="https://discordapp.com/register?redirect_to=%2Fchannels%342807345782325249%342807977906143237" target="_blank">please create one</a> if you do not have one already</p>
<p class="text" style="margin-bottom: 6px;">(!) Please see <a href="community/general/1107/official-chat-help-and-guidelines/">this thread</a> for a more thorough overview of the rules for the chat room<br />
<p class="text" style="margin-bottom: 6px;">(!) Please <a href="chat/" target="_blank">click here</a> if you would like to view the chat larger in a new window</p>
<?/*If you need to use the legacy chat (for serious discussion and meetings) <a href="community/chat/&legacy=true">please click here</a>.*/?>
<p class="text type_block type_water" style="width: auto; padding: 6px; clear: both;">
<strong>MMRPG Discord Invite</strong> : <a href="https://discord.gg/hv5Ht2d" target="_blank">https://discord.gg/hv5Ht2d</a>
</p>
<p class="text type_block type_water" style="width: auto; padding: 6px; clear: both;">
<strong>MMRPG Discord Chat</strong> : <a href="https://discordapp.com/channels/342807345782325249/342807977906143237" target="_blank">https://discordapp.com/channels/342807345782325249/342807977906143237</a>
</p>
<?/* if(!empty($temp_viewing_userids)):?>
<div style="clear:both;margin:0;height:0;">&nbsp;</div>
<p class="event text" style="min-height: 1px; text-align: right; font-size: 10px; line-height: 13px; margin-top: 10px; padding-bottom: 5px;">
<span><strong style="display: block; text-decoration: underline; margin-bottom: 6px;">Online Players</strong></span>
<?= mmrpg_website_print_online($this_leaderboard_online_players, $temp_viewing_userids) ?>
</p>
<? endif; */?>
</div
<div class="subbody" style="background-color: #f0f3ff;">
<iframe style="border-color: #f0f3ff; width: 99% !important; height: 600px !important;" src="http://rpg.megamanpoweredup.net/chat/" width="100%" height="600"></iframe>
</div>
<?/*
<? if(!empty($_GET['legacy'])): ?>
<div class="subbody" style="background-color: #f0f3ff;">
<iframe style="border-color: #f0f3ff; width: 100% !important; height: 600px !important;" src="http://webchat.freenode.net?nick=<?= $user_chat_name ?>&channels=mmrpg&uio=Mj10cnVlJjk9dHJ1ZSYxMT0yMjY59" width="100%" height="600"></iframe>
</div>
<? else: ?>
<div class="subbody" style="">
<embed wmode="transparent" src="http://www.xatech.com/web_gear/chat/chat.swf" quality="high" width="100%" height="480" name="chat" FlashVars="id=210661526" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://xat.com/update_flash.php" />
<p class="text" style="margin: 0px 10px 12px; text-align: right;"><a class="link_inline" target="_blank" href="http://xat.com/web_gear/?cb">Chatbox by Xat</a> &nbsp;<span class="pipe">|</span>&nbsp; <a class="link_inline" target="_blank" href="http://xat.com/web_gear/chat/go_large.php?id=210661526">Open Chat in New Window</a></small><br>
</div>
<? endif; ?>
*/?>

<?
?>

0 comments on commit e69b07b

Please sign in to comment.