ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-16 23:00:51 +03:00
Code Issues Releases Wiki Activity

Доработка личных сообщений

Browse source
This commit is contained in:
Denis Shakhov 2014-04-03 17:48:18 +07:00
parent 6d2d5526d9
commit 4dcb3ef59d
5 changed files with 113 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
application/classes/actions/ActionTalk.class.php
View file

@ -123,7 +123,7 @@ class ActionTalk extends Action {
/**
* Обработка удаления сообщений
*/
if (getRequest('submit_talk_del')) {
if (getRequestStr('form_action') == 'remove') {
$this->Security_ValidateSendForm();
$aTalksIdDel=getRequest('talk_select');
@ -134,7 +134,7 @@ class ActionTalk extends Action {
/**
* Обработка отметки о прочтении
*/
if (getRequest('submit_talk_read')) {
if (getRequestStr('form_action') == 'mark_as_read') {
$this->Security_ValidateSendForm();
$aTalksIdDel=getRequest('talk_select');

37
application/frontend/common/js/talk.js
View file

@ -26,33 +26,28 @@ ls.talk = (function ($) {
* @param {Object} options Опции
*/
this.init = function(options) {
var _this = this;
this.options = $.extend({}, defaults, options);
this.elements = {
form: $('#talk-form'),
form_action: $('#talk-form-action')
}
$('.js-talk-form-action').on('click', function (e) {
_this.formAction( $(this).data('action') );
});
};
/**
* Удаление списка писем
* Установка экшена формы
*/
this.removeTalks = function() {
if ($('.form_talks_checkbox:checked').length == 0) {
return false;
}
$('#form_talks_list_submit_del').val(1);
$('#form_talks_list_submit_read').val(0);
$('#form_talks_list').submit();
return false;
};
this.formAction = function(sName) {
if ( ! this.elements.form.find('input[type=checkbox]:checked').length ) return;
/**
* Пометка о прочтении писем
*/
this.makeReadTalks = function() {
if ($('.form_talks_checkbox:checked').length == 0) {
return false;
}
$('#form_talks_list_submit_read').val(1);
$('#form_talks_list_submit_del').val(0);
$('#form_talks_list').submit();
return false;
this.elements.form_action.val(sName);
this.elements.form.submit();
};
return this;

1
application/frontend/skin/developer/actionbar.item.tpl
View file

@ -2,6 +2,7 @@
{block 'actionbar_item'}
<{if $aActionbarItem['url']}a{else}button{/if} {if $aActionbarItem['url']}href="{$aActionbarItem['url']}"{/if}
class="button actionbar-item-link {$aActionbarItem['classes']} {block 'actionbar_item_classes'}{/block}"
{if ! $aActionbarItem['url']}type="button"{/if}
{$aActionbarItem['attributes']} {block 'actionbar_item_attributes'}{/block}>
{block 'actionbar_item_icon'}

172
application/frontend/skin/developer/actions/ActionTalk/message_list.tpl
View file

@ -3,105 +3,111 @@
*}
{if $aTalks}
{* Экшнбар *}
{include 'actionbar.item.select.tpl' sName='asdfsdf' sItemSelector='.js-message-list-item' assign=sMessagesSelect aItems=[
[ 'text' => 'Прочитанные', 'filter' => ":not('.message-unread')" ],
[ 'text' => 'Не прочитанные', 'filter' => ".message-unread" ]
]}
<form action="{router page='talk'}" method="post" id="talk-form">
{* Скрытые поля *}
{include 'forms/fields/form.field.hidden.security_key.tpl'}
{include 'forms/fields/form.field.hidden.tpl' sFieldName='form_action' sFieldId='talk-form-action'}
{include 'actionbar.tpl' aActionbarItems=[
[ 'html' => $sMessagesSelect ],
[ 'icon' => 'icon-ok', 'classes' => 'js-temp', 'text' => $aLang.talk_inbox_make_read ],
[ 'icon' => 'icon-remove', 'classes' => 'js-temp', 'text' => $aLang.common.remove ]
]}
{* Экшнбар *}
{include 'actionbar.item.select.tpl' sName='asdfsdf' sItemSelector='.js-message-list-item' assign=sMessagesSelect aItems=[
[ 'text' => 'Прочитанные', 'filter' => ":not('.message-unread')" ],
[ 'text' => 'Не прочитанные', 'filter' => ".message-unread" ]
]}
{* Список сообщений *}
<table class="table table-talk message-list">
<tbody>
{foreach $aTalks as $oTalk}
{* Создатель диалога *}
{$oAuthor = $oTalk->getTalkUser()}
{include 'actionbar.tpl' aActionbarItems=[
[ 'html' => $sMessagesSelect ],
[ 'icon' => 'icon-ok', 'classes' => 'js-talk-form-action', 'attributes' => 'data-action="mark_as_read"', 'text' => $aLang.talk_inbox_make_read ],
[ 'icon' => 'icon-remove', 'classes' => 'js-talk-form-action', 'attributes' => 'data-action="remove"', 'text' => $aLang.common.remove ]
]}
{* Все участники диалога *}
{$aUsers = $oTalk->getTalkUsers()}
{* Список сообщений *}
<table class="table table-talk message-list">
<tbody>
{foreach $aTalks as $oTalk}
{* Создатель диалога *}
{$oAuthor = $oTalk->getTalkUser()}
{* Кол-во участников диалога *}
{$iUsersCount = count($aUsers)}
{* Все участники диалога *}
{$aUsers = $oTalk->getTalkUsers()}
<tr class="message-list-item {if $oAuthor->getCommentCountNew() or ! $oAuthor->getDateLast()}message-unread{/if} js-message-list-item" data-id="{$oTalk->getId()}">
{* Выделение *}
<td class="cell-checkbox">
<input type="checkbox" name="talk_select[{$oTalk->getId()}]" data-id="{$oTalk->getId()}" />
</td>
{* Кол-во участников диалога *}
{$iUsersCount = count($aUsers)}
{* Избранное *}
<td class="cell-favourite">
{include 'favourite.tpl' sFavouriteType='talk' oFavouriteObject=$oTalk}
</td>
<tr class="message-list-item {if $oAuthor->getCommentCountNew() or ! $oAuthor->getDateLast()}message-unread{/if} js-message-list-item" data-id="{$oTalk->getId()}">
{* Выделение *}
<td class="cell-checkbox">
<input type="checkbox" name="talk_select[{$oTalk->getId()}]" data-id="{$oTalk->getId()}" />
</td>
{* Основная информация о диалоге *}
<td width=200>
<div class="message-list-info">
{* Участники диалога *}
{if $iUsersCount > 2}
<a href="{router page='talk'}read/{$oTalk->getId()}/" class="message-list-info-avatar">
<img src="{cfg name="path.skin.web"}/assets/images/avatars/avatar_male_64x64.png" />
</a>
{* Избранное *}
<td class="cell-favourite">
{include 'favourite.tpl' sFavouriteType='talk' oFavouriteObject=$oTalk}
</td>
{$iUsersCount} участника
{else}
{* Если участников двое, то отображаем только собеседника *}
{foreach $aUsers as $oUser}
{$oUser = $oUser->getUser()}
{* Основная информация о диалоге *}
<td class="cell-info">
<div class="message-list-info">
{* Участники диалога *}
{if $iUsersCount > 2}
<a href="{router page='talk'}read/{$oTalk->getId()}/" class="message-list-info-avatar">
<img src="{cfg name="path.skin.web"}/assets/images/avatars/avatar_male_64x64.png" />
</a>
{if $oUser->getUserId() != $oUserCurrent->getId()}
<a href="{$oUser->getUserWebPath()}" class="message-list-info-avatar">
<img src="{$oUser->getProfileAvatarPath(64)}" alt="{$oUser->getLogin()}" />
</a>
{$iUsersCount} участника
{else}
{* Если участников двое, то отображаем только собеседника *}
{foreach $aUsers as $oUser}
{$oUser = $oUser->getUser()}
<a href="{$oUser->getUserWebPath()}">{$oUser->getDisplayName()}</a>
{/if}
{/foreach}
{/if}
{if $oUser->getUserId() != $oUserCurrent->getId()}
<a href="{$oUser->getUserWebPath()}" class="message-list-info-avatar">
<img src="{$oUser->getProfileAvatarPath(64)}" alt="{$oUser->getLogin()}" />
</a>
{* Дата *}
<time class="message-list-info-date" datetime="{date_format date=$oTalk->getDate() format='c'}" title="{date_format date=$oTalk->getDate() format='j F Y, H:i'}">
{date_format date=$oTalk->getDate() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
</time>
</div>
</td>
<a href="{$oUser->getUserWebPath()}" class="word-wrap">{$oUser->getDisplayName()}</a>
{/if}
{/foreach}
{/if}
{* Заголовок и текст последнего сообщения *}
<td>
<div class="message-list-item-extra">
{* Заголовок *}
<h2 class="message-list-item-title">
<a href="{router page='talk'}read/{$oTalk->getId()}/">
{$oTalk->getTitle()|escape:'html'}
</a>
</h2>
{* Текст последнего сообщения *}
<div class="message-list-item-text">
{$oTalk->getText()|strip_tags|truncate:120:"..."|escape}
{* Дата *}
<time class="message-list-info-date" datetime="{date_format date=$oTalk->getDate() format='c'}" title="{date_format date=$oTalk->getDate() format='j F Y, H:i'}">
{date_format date=$oTalk->getDate() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
</time>
</div>
</td>
{* Кол-во сообщений *}
{if $oTalk->getCountComment()}
<div class="message-list-item-count">
{$oTalk->getCountComment()}
{* Заголовок и текст последнего сообщения *}
<td>
<div class="message-list-item-extra">
{* Заголовок *}
<h2 class="message-list-item-title">
<a href="{router page='talk'}read/{$oTalk->getId()}/">
{$oTalk->getTitle()|escape:'html'}
</a>
</h2>
{if $oAuthor->getCommentCountNew()}
<strong>+{$oAuthor->getCommentCountNew()}</strong>
{/if}
{* Текст последнего сообщения *}
<div class="message-list-item-text">
{(($oTalk->getCommentLast()) ? $oTalk->getCommentLast()->getText() : $oTalk->getText())|strip_tags|truncate:120:"..."|escape}
</div>
{/if}
</div>
</td>
</tr>
{/foreach}
</tbody>
</table>
{* Кол-во сообщений *}
{if $oTalk->getCountComment()}
<div class="message-list-item-count">
{$oTalk->getCountComment()}
{if $oAuthor->getCommentCountNew()}
<strong>+{$oAuthor->getCommentCountNew()}</strong>
{/if}
</div>
{/if}
</div>
</td>
</tr>
{/foreach}
</tbody>
</table>
</form>
{else}
{include file='alert.tpl' mAlerts=$aLang.messages.alerts.empty sAlertStyle='empty'}
{/if}

7
application/frontend/skin/developer/assets/css/messages.css
View file

@ -22,14 +22,17 @@
/**
* Message list
*/
.table.message-list td { vertical-align: top; }
.table.message-list td { vertical-align: top; }
.table.message-list .cell-checkbox,
.table.message-list .cell-favourite { width: 14px; }
.table.message-list .cell-info { width: 150px; }
.table .message-list-item:first-child td { border-top: 1px solid #f1f1f1; }
.message-list-item { background: #fff; }
.message-list-item.message-unread { background: #f7f7f7; }
.message-list-item.selected { background: #FFC; }
.message-list-info { position: relative; padding-left: 75px; min-height: 64px; }
.message-list-info { width: 150px; position: relative; padding-left: 75px; min-height: 64px; }
.message-list-info-avatar { position: absolute; top: 0; left: 0; }
.message-list-info-date { display: block; font-size: 11px; color: #aaa; }