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

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

View File

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

View File

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

View File

@ -2,6 +2,7 @@
<form action="chat" method="post" >
{{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>
{{$acl}}
<div class="clear"></div>