harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bring back chat expiration setting and adjust chat size for our now smaller content region

Browse Source
This commit is contained in:
redmatrix 2015-10-17 14:54:27 -07:00
parent 4b984f9819
commit 1d2797dc1f
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/chat.php
View File

@ -59,6 +59,9 @@ function chat_post(&$a) {
$arr = $acl->get(); $arr = $acl->get();
$arr['name'] = $room; $arr['name'] = $room;
$arr['expire'] = intval($_POST['chat_expire']);
if(intval($arr['expire']) < 0)
$arr['expire'] = 0;
chatroom_create($channel,$arr); chatroom_create($channel,$arr);
@ -204,6 +207,7 @@ function chat_content(&$a) {
$o = replace_macros(get_markup_template('chatroom_new.tpl'),array( $o = replace_macros(get_markup_template('chatroom_new.tpl'),array(
'$header' => t('New Chatroom'), '$header' => t('New Chatroom'),
'$name' => array('room_name',t('Chatroom Name'),'', ''), '$name' => array('room_name',t('Chatroom Name'),'', ''),
'$chat_expire' => array('chat_expire',t('Expiration of chats (minutes)'),120,''),
'$permissions' => t('Permissions'), '$permissions' => t('Permissions'),
'$acl' => populate_acl($channel_acl,false), '$acl' => populate_acl($channel_acl,false),
'$submit' => t('Submit') '$submit' => t('Submit')

2
view/css/mod_chat.css
View File

@ -6,7 +6,7 @@
#chatTopBar { #chatTopBar {
float: left; float: left;
height: 400px; height: 400px;
width: 650px; width: 400px;
overflow-y: auto; overflow-y: auto;
} }

1
view/tpl/chatroom_new.tpl
View File

@ -2,6 +2,7 @@
<form action="chat" method="post" > <form action="chat" method="post" >
{{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$name}}
{{include file="field_input.tpl" field=$chat_expire}}
<button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button> <button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button>
{{$acl}} {{$acl}}
<div class="clear"></div> <div class="clear"></div>