ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-05-21 18:28:17 +03:00
Code Issues Releases Wiki Activity

Доработка компонентов

Browse source
This commit is contained in:
Denis Shakhov 2014-12-05 18:49:29 +07:00
parent e55e0700ea
commit 9d751951ad
101 changed files with 787 additions and 766 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,7 @@ class ActionAdmin extends Action
*/
$aPluginsAll = func_list_plugins(true);
if (in_array('admin', $aPluginsAll)) {
$this->Viewer_Assign('bAvailableAdminPlugin', true);
$this->Viewer_Assign('availableAdminPlugin', true);
}
}
@ -107,7 +107,7 @@ class ActionAdmin extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign("aPlugins", $aPlugins);
$this->Viewer_Assign("plugins", $aPlugins);
$this->Viewer_AddHtmlTitle($this->Lang_Get('admin.plugins.title'));
/**
* Устанавливаем шаблон вывода

64
application/classes/actions/ActionBlog.class.php
View file

@ -239,7 +239,7 @@ class ActionBlog extends Action
* Прогружаем категории блогов
*/
$aCategories = $this->Blog_GetCategoriesTree();
$this->Viewer_Assign('aBlogCategories', $aCategories);
$this->Viewer_Assign('blogCategories', $aCategories);
/**
* Создаем объект блога
*/
@ -339,14 +339,14 @@ class ActionBlog extends Action
* Прогружаем категории блогов
*/
$aCategories = $this->Blog_GetCategoriesTree();
$this->Viewer_Assign('aBlogCategories', $aCategories);
$this->Viewer_Assign('blogCategories', $aCategories);
/**
* Устанавливаем title страницы
*/
$this->Viewer_AddHtmlTitle($oBlog->getTitle());
$this->Viewer_AddHtmlTitle($this->Lang_Get('common.edit'));
$this->Viewer_Assign('oBlogEdit', $oBlog);
$this->Viewer_Assign('blogEdit', $oBlog);
/**
* Устанавливаем шалон для вывода
*/
@ -516,15 +516,15 @@ class ActionBlog extends Action
*/
$aPaging = $this->Viewer_MakePaging($aResult['count'], $iPage, Config::Get('module.blog.users_per_page'),
Config::Get('pagination.pages.count'), Router::GetPath('blog') . "admin/{$oBlog->getId()}");
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('paging', $aPaging);
/**
* Устанавливаем title страницы
*/
$this->Viewer_AddHtmlTitle($oBlog->getTitle());
$this->Viewer_AddHtmlTitle($this->Lang_Get('blog.admin.title'));
$this->Viewer_Assign('oBlogEdit', $oBlog);
$this->Viewer_Assign('aBlogUsers', $aBlogUsers);
$this->Viewer_Assign('blogEdit', $oBlog);
$this->Viewer_Assign('blogUsers', $aBlogUsers);
/**
* Устанавливаем шалон для вывода
*/
@ -536,7 +536,7 @@ class ActionBlog extends Action
if ($oBlog->getType() == 'close') {
$aBlogUsersInvited = $this->Blog_GetBlogUsersByBlogId($oBlog->getId(), ModuleBlog::BLOG_USER_ROLE_INVITE,
null);
$this->Viewer_Assign('aBlogUsersInvited', $aBlogUsersInvited['collection']);
$this->Viewer_Assign('blogUsersInvited', $aBlogUsersInvited['collection']);
$this->Viewer_AddBlock('right', 'components/blog/blocks/block.blog-invite.tpl');
}
}
@ -702,11 +702,11 @@ class ActionBlog extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_Assign('paging', $aPaging);
if (in_array($sShowType, array('discussed', 'top'))) {
$this->Viewer_Assign('sPeriodSelectCurrent', $sPeriod);
$this->Viewer_Assign('sPeriodSelectRoot', Router::GetPath('blog') . $sShowType . '/');
$this->Viewer_Assign('periodSelectCurrent', $sPeriod);
$this->Viewer_Assign('periodSelectRoot', Router::GetPath('blog') . $sShowType . '/');
}
/**
* Устанавливаем шаблон вывода
@ -787,7 +787,7 @@ class ActionBlog extends Action
$aPaging['aPagesLeft'] = array_reverse($aPaging['aPagesLeft']);
$aPaging['aPagesRight'] = array_reverse($aPaging['aPagesRight']);
}
$this->Viewer_Assign('aPagingCmt', $aPaging);
$this->Viewer_Assign('pagingComments', $aPaging);
}
/**
* Отмечаем дату прочтения топика
@ -815,9 +815,9 @@ class ActionBlog extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('oTopic', $oTopic);
$this->Viewer_Assign('aComments', $aComments);
$this->Viewer_Assign('iMaxIdComment', $iMaxIdComment);
$this->Viewer_Assign('topic', $oTopic);
$this->Viewer_Assign('comments', $aComments);
$this->Viewer_Assign('lastCommentId', $iMaxIdComment);
/**
* Устанавливаем title страницы
*/
@ -862,7 +862,7 @@ class ActionBlog extends Action
$aPaging = $this->Viewer_MakePaging($aBlogUsersResult['count'], $iPage,
Config::Get('module.blog.users_per_page'), Config::Get('pagination.pages.count'),
$oBlog->getUrlFull() . 'users');
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('paging', $aPaging);
/**
* Вызов хуков
*/
@ -870,9 +870,9 @@ class ActionBlog extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aBlogUsers', $aBlogUsers);
$this->Viewer_Assign('iCountBlogUsers', $aBlogUsersResult['count']);
$this->Viewer_Assign('oBlog', $oBlog);
$this->Viewer_Assign('blogUsers', $aBlogUsers);
$this->Viewer_Assign('countBlogUsers', $aBlogUsersResult['count']);
$this->Viewer_Assign('blog', $oBlog);
/**
* Устанавливаем title страницы
*/
@ -965,11 +965,11 @@ class ActionBlog extends Action
*/
$this->iCountTopicsSubNew = $this->Topic_GetCountTopicsByBlogNew($oBlog);
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('topics', $aTopics);
if (in_array($sShowType, array('discussed', 'top'))) {
$this->Viewer_Assign('sPeriodSelectCurrent', $sPeriod);
$this->Viewer_Assign('sPeriodSelectRoot', $oBlog->getUrlFull() . $sShowType . '/');
$this->Viewer_Assign('periodSelectCurrent', $sPeriod);
$this->Viewer_Assign('periodSelectRoot', $oBlog->getUrlFull() . $sShowType . '/');
}
}
/**
@ -996,7 +996,7 @@ class ActionBlog extends Action
$aBlogs = $this->Blog_GetBlogs();
unset($aBlogs[$oBlog->getId()]);
$this->Viewer_Assign('aBlogs', $aBlogs);
$this->Viewer_Assign('blogs', $aBlogs);
}
/**
* Вызов хуков
@ -1005,14 +1005,14 @@ class ActionBlog extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aBlogUsers', $aBlogUsers);
$this->Viewer_Assign('aBlogModerators', $aBlogModerators);
$this->Viewer_Assign('aBlogAdministrators', $aBlogAdministrators);
$this->Viewer_Assign('iCountBlogUsers', $aBlogUsersResult['count']);
$this->Viewer_Assign('iCountBlogModerators', $aBlogModeratorsResult['count']);
$this->Viewer_Assign('iCountBlogAdministrators', $aBlogAdministratorsResult['count'] + 1);
$this->Viewer_Assign('oBlog', $oBlog);
$this->Viewer_Assign('bPrivateBlog', $bPrivateBlog);
$this->Viewer_Assign('blogUsers', $aBlogUsers);
$this->Viewer_Assign('blogModerators', $aBlogModerators);
$this->Viewer_Assign('blogAdministrators', $aBlogAdministrators);
$this->Viewer_Assign('countBlogUsers', $aBlogUsersResult['count']);
$this->Viewer_Assign('countBlogModerators', $aBlogModeratorsResult['count']);
$this->Viewer_Assign('countBlogAdministrators', $aBlogAdministratorsResult['count'] + 1);
$this->Viewer_Assign('blog', $oBlog);
$this->Viewer_Assign('isPrivateBlog', $bPrivateBlog);
/**
* Устанавливаем title страницы
*/

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

@ -181,8 +181,8 @@ class ActionBlogs extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign("aBlogs", $aBlogs);
$this->Viewer_Assign('iSearchCount', $aResult['count']);
$this->Viewer_Assign("blogs", $aBlogs);
$this->Viewer_Assign("searchCount", $aResult['count']);
/**
* Устанавливаем шаблон вывода
*/

14
application/classes/actions/ActionContent.class.php
View file

@ -127,8 +127,8 @@ class ActionContent extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_AddHtmlTitle($this->Lang_Get('topic.nav.' . $this->sCurrentEvent));
}
@ -189,11 +189,11 @@ class ActionContent extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aBlogsAllow', $this->Blog_GetBlogsAllowByUser($this->oUserCurrent));
$this->Viewer_Assign('oTopicType', $oTopicType);
$this->Viewer_Assign('blogsAllow', $this->Blog_GetBlogsAllowByUser($this->oUserCurrent));
$this->Viewer_Assign('topicType', $oTopicType);
$this->Viewer_AddHtmlTitle($this->Lang_Get('topic.add.title.edit'));
$this->Viewer_Assign('oTopicEdit', $oTopic);
$this->Viewer_Assign('topicEdit', $oTopic);
$this->SetTemplateAction('add');
}
@ -224,8 +224,8 @@ class ActionContent extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('oTopicType', $oTopicType);
$this->Viewer_Assign('aBlogsAllow', $this->Blog_GetBlogsAllowByUser($this->oUserCurrent));
$this->Viewer_Assign('topicType', $oTopicType);
$this->Viewer_Assign('blogsAllow', $this->Blog_GetBlogsAllowByUser($this->oUserCurrent));
$this->Viewer_Assign('blogId', $iBlogId);
$this->Viewer_AddHtmlTitle($this->Lang_Get('topic.add.title.add'));
$this->SetTemplateAction('add');

28
application/classes/actions/ActionIndex.class.php
View file

@ -153,10 +153,10 @@ class ActionIndex extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('sPeriodSelectCurrent', $sPeriod);
$this->Viewer_Assign('sPeriodSelectRoot', Router::GetPath('index') . 'top/');
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('periodSelectCurrent', $sPeriod);
$this->Viewer_Assign('periodSelectRoot', Router::GetPath('index') . 'top/');
/**
* Устанавливаем шаблон вывода
*/
@ -214,10 +214,10 @@ class ActionIndex extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('sPeriodSelectCurrent', $sPeriod);
$this->Viewer_Assign('sPeriodSelectRoot', Router::GetPath('index') . 'discussed/');
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('periodSelectCurrent', $sPeriod);
$this->Viewer_Assign('periodSelectRoot', Router::GetPath('index') . 'discussed/');
/**
* Устанавливаем шаблон вывода
*/
@ -257,8 +257,8 @@ class ActionIndex extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_Assign('paging', $aPaging);
/**
* Устанавливаем шаблон вывода
*/
@ -298,8 +298,8 @@ class ActionIndex extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_Assign('paging', $aPaging);
/**
* Устанавливаем шаблон вывода
*/
@ -344,8 +344,8 @@ class ActionIndex extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_Assign('paging', $aPaging);
/**
* Устанавливаем шаблон вывода
*/

10
application/classes/actions/ActionPeople.class.php
View file

@ -196,10 +196,10 @@ class ActionPeople extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aUsers', $aResult['collection']);
$this->Viewer_Assign('iSearchCount', $aResult['count']);
$this->Viewer_Assign('aPrefixUser', $aPrefixUser);
$this->Viewer_Assign('aCountriesUsed', $aCountriesUsed);
$this->Viewer_Assign('users', $aResult['collection']);
$this->Viewer_Assign('searchCount', $aResult['count']);
$this->Viewer_Assign('prefixUser', $aPrefixUser);
$this->Viewer_Assign('countriesUsed', $aCountriesUsed);
/**
* Устанавливаем шаблон вывода
*/
@ -219,7 +219,7 @@ class ActionPeople extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aStat', $aStat);
$this->Viewer_Assign('usersStat', $aStat);
}
/**

6
application/classes/actions/ActionPersonalBlog.class.php
View file

@ -142,10 +142,10 @@ class ActionPersonalBlog extends Action
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('paging', $aPaging);
if (in_array($sShowType, array('discussed', 'top'))) {
$this->Viewer_Assign('sPeriodSelectCurrent', $sPeriod);
$this->Viewer_Assign('sPeriodSelectRoot', Router::GetPath('personal_blog') . $sShowType . '/');
$this->Viewer_Assign('periodSelectCurrent', $sPeriod);
$this->Viewer_Assign('periodSelectRoot', Router::GetPath('personal_blog') . $sShowType . '/');
}
/**
* Устанавливаем шаблон вывода

59
application/classes/actions/ActionProfile.class.php
View file

@ -241,8 +241,8 @@ class ActionProfile extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('aFriends', $aFriends);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('friends', $aFriends);
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.friends.title') . ' ' . $this->oUserProfile->getLogin());
$this->SetTemplateAction('friends');
@ -283,8 +283,8 @@ class ActionProfile extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.publications.title') . ' ' . $this->oUserProfile->getLogin());
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.publications.nav.topics'));
$this->Viewer_SetHtmlRssAlternate(Router::GetPath('rss') . 'personal_blog/' . $this->oUserProfile->getLogin() . '/',
@ -322,8 +322,8 @@ class ActionProfile extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('aComments', $aComments);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('comments', $aComments);
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.publications.title') . ' ' . $this->oUserProfile->getLogin());
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.publications.nav.comments'));
/**
@ -368,8 +368,8 @@ class ActionProfile extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.profile.title') . ' ' . $this->oUserProfile->getLogin());
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.favourites.title'));
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.favourites.nav.topics'));
@ -421,9 +421,9 @@ class ActionProfile extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('sFavouriteTag', htmlspecialchars($sTag));
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_Assign('favouriteTag', htmlspecialchars($sTag));
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.profile.title') . ' ' . $this->oUserProfile->getLogin());
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.favourites.title'));
/**
@ -460,8 +460,8 @@ class ActionProfile extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('aComments', $aComments);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('comments', $aComments);
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.profile.title') . ' ' . $this->oUserProfile->getLogin());
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.favourites.title'));
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.favourites.nav.comments'));
@ -494,12 +494,12 @@ class ActionProfile extends Action
* Получаем список тех кого пригласил юзер
*/
$aUsersInvite = $this->User_GetUsersInvite($this->oUserProfile->getId());
$this->Viewer_Assign('aUsersInvite', $aUsersInvite);
$this->Viewer_Assign('usersInvited', $aUsersInvite);
/**
* Получаем того юзера, кто пригласил текущего
*/
$oUserInviteFrom = $this->User_GetUserInviteFrom($this->oUserProfile->getId());
$this->Viewer_Assign('oUserInviteFrom', $oUserInviteFrom);
$this->Viewer_Assign('invitedByUser', $oUserInviteFrom);
}
/**
* Получаем список юзеров блога
@ -520,11 +520,11 @@ class ActionProfile extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aBlogUsers', $aBlogUsers);
$this->Viewer_Assign('aBlogModerators', $aBlogModerators);
$this->Viewer_Assign('aBlogAdministrators', $aBlogAdministrators);
$this->Viewer_Assign('aBlogsOwner', $aBlogsOwner);
$this->Viewer_Assign('aUsersFriend', $aUsersFriend['collection']);
$this->Viewer_Assign('blogsJoined', $aBlogUsers);
$this->Viewer_Assign('blogsModerate', $aBlogModerators);
$this->Viewer_Assign('blogsAdminister', $aBlogAdministrators);
$this->Viewer_Assign('blogsCreated', $aBlogsOwner);
$this->Viewer_Assign('userFriends', $aUsersFriend['collection']);
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.profile.title') . ' ' . $this->oUserProfile->getLogin());
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.profile.title')); // TODO: i18n
/**
@ -541,21 +541,6 @@ class ActionProfile extends Action
if (!$this->CheckUserProfile()) {
return parent::EventNotFound();
}
/**
* Получаем записи стены
*/
$aWall = $this->Wall_GetWall(array('wall_user_id' => $this->oUserProfile->getId(), 'pid' => null),
array('id' => 'desc'), 1, Config::Get('module.wall.per_page'));
$aPosts = $aWall['collection'];
$this->Viewer_Assign('aWall', $aPosts);
$this->Viewer_Assign('iCountWall', $aWall['count']);
if (count($aPosts)) {
$oPostLast = end($aPosts);
$this->Viewer_Assign('iWallLastId', $oPostLast->getId());
}
/**
* Устанавливаем шаблон вывода
*/
@ -655,8 +640,8 @@ class ActionProfile extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('aUsersList', $aNotes);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('notesUsers', $aNotes);
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.publications.title') . ' ' . $this->oUserProfile->getLogin());
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.publications.nav.notes'));
/**

20
application/classes/actions/ActionSearch.class.php
View file

@ -109,11 +109,11 @@ class ActionSearch extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aResultItems', $aResultItems);
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('sSearchType', $sSearchType);
$this->Viewer_Assign('sQuery', $sQuery);
$this->Viewer_Assign('aTypeCounts', array($sSearchType => $aResult['count']));
$this->Viewer_Assign('resultItems', $aResultItems);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('searchType', $sSearchType);
$this->Viewer_Assign('query', $sQuery);
$this->Viewer_Assign('typeCounts', array($sSearchType => $aResult['count']));
}
/**
@ -163,10 +163,10 @@ class ActionSearch extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aResultItems', $aResultItems);
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('sSearchType', $sSearchType);
$this->Viewer_Assign('sQuery', $sQuery);
$this->Viewer_Assign('aTypeCounts', array($sSearchType => $aResult['count']));
$this->Viewer_Assign('resultItems', $aResultItems);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('searchType', $sSearchType);
$this->Viewer_Assign('query', $sQuery);
$this->Viewer_Assign('typeCounts', array($sSearchType => $aResult['count']));
}
}

6
application/classes/actions/ActionTag.class.php
View file

@ -87,9 +87,9 @@ class ActionTag extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('sTag', $sTag);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_Assign('tag', $sTag);
$this->Viewer_AddHtmlTitle($this->Lang_Get('tag_title'));
$this->Viewer_AddHtmlTitle($sTag);
$this->Viewer_SetHtmlRssAlternate(Router::GetPath('rss') . 'tag/' . $sTag . '/', $sTag);

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

@ -332,7 +332,7 @@ class ActionTalk extends Action
{
$this->sMenuSubItemSelect = 'blacklist';
$aUsersBlacklist = $this->Talk_GetBlacklistByUserId($this->oUserCurrent->getId());
$this->Viewer_Assign('aUsersBlacklist', $aUsersBlacklist);
$this->Viewer_Assign('talkBlacklistUsers', $aUsersBlacklist);
}
/**
@ -363,8 +363,8 @@ class ActionTalk extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('aTalks', $aTalks);
$this->Viewer_Assign('paging', $aPaging);
$this->Viewer_Assign('talks', $aTalks);
$this->Viewer_AddHtmlTitle($this->Lang_Get('talk.nav.favourites'));
}
@ -458,9 +458,9 @@ class ActionTalk extends Action
$this->Talk_UpdateTalkUser($oTalkUser);
$this->Viewer_AddHtmlTitle($oTalk->getTitle());
$this->Viewer_Assign('oTalk', $oTalk);
$this->Viewer_Assign('aComments', $aComments);
$this->Viewer_Assign('iMaxIdComment', $iMaxIdComment);
$this->Viewer_Assign('talk', $oTalk);
$this->Viewer_Assign('comments', $aComments);
$this->Viewer_Assign('lastCommentId', $iMaxIdComment);
/**
* Подсчитываем нужно ли отображать комментарии.
* Комментарии не отображаются, если у вестки только один читатель

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

@ -86,8 +86,8 @@ class ActionUserfeed extends Action
/**
* Загружаем переменные в шаблон
*/
$this->Viewer_Assign('aTopics', $aTopics);
$this->Viewer_Assign('aPaging', $aPaging);
$this->Viewer_Assign('topics', $aTopics);
$this->Viewer_Assign('paging', $aPaging);
$this->SetTemplateAction('list');
}

2
application/config/config.php
View file

@ -632,7 +632,7 @@ $config['head']['default']['css'] = array(
"___path.skin.web___/components/info-list/css/info-list.css",
"___path.skin.web___/components/uploader/css/uploader.css",
"___path.skin.web___/components/activity/css/activity.css",
"___path.skin.web___/components/activity/css/block.activity-recent.css",
"___path.skin.web___/components/activity/css/blocks.css",
"___path.skin.web___/components/block/css/block.css",
"___path.skin.web___/components/item/css/item.css",
"___path.skin.web___/components/tags/css/tags-blocks.css",

14
application/frontend/skin/developer/actions/ActionAdmin/index.tpl
View file

@ -1,3 +1,9 @@
{**
* Админка
*
* @param boolean $availableAdminPlugin
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
@ -9,5 +15,11 @@
{/block}
{block 'layout_content'}
{include 'components/admin/manage.tpl'}
{include 'components/nav/nav.tpl'
name = 'admin'
mods = 'stacked pills'
items = [
[ 'name' => 'user', 'url' => "{router page='admin/plugins'}?plugin=admin&action=activate&security_ls_key={$LIVESTREET_SECURITY_KEY}", 'text' => {lang 'admin.install_plugin_admin'}, is_enabled=$availableAdminPlugin ],
[ 'name' => 'plugins', 'url' => "{router page='admin'}plugins/", 'text' => {lang 'admin.items.plugins'} ]
]}
{/block}

16
application/frontend/skin/developer/actions/ActionAdmin/plugins.tpl
View file

@ -1,15 +1,21 @@
{**
* Плагины
*
* @param array $plugins Список плагинов
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{/block}
{block 'layout_page_title'}
<a href="{router page='admin'}">{lang name='admin.title'}</a>
<span>&raquo;</span>
{lang name='admin.items.plugins'}
<a href="{router page='admin'}">{lang name='admin.title'}</a>
<span>&raquo;</span>
{lang name='admin.items.plugins'}
{/block}
{block 'layout_content'}
{include 'components/admin/plugins.tpl' plugins=$aPlugins}
{include 'components/admin/plugins.tpl' plugins=$plugins}
{/block}

26
application/frontend/skin/developer/actions/ActionBlog/add.tpl
View file

@ -1,26 +1,30 @@
{**
* Создание блога
* TODO: Вынести 'rangelength' > в конфиг
*
* @param array $blogCategories Список категорий блогов
* @param object $blogEdit Блог, передается в случае если блог редактируется
*
* TODO: Вынести 'rangelength' в конфиг
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{if $sEvent == 'edit'}
{$sNav = 'blog.edit'}
{/if}
{if $sEvent == 'edit'}
{$sNav = 'blog.edit'}
{/if}
{/block}
{block 'layout_page_title'}
{if $sEvent == 'add'}
{$aLang.blog.add.title}
{else}
{$aLang.blog.admin.title}: <a href="{$oBlogEdit->getUrlFull()}">{$oBlogEdit->getTitle()|escape}</a>
{/if}
{if $sEvent == 'add'}
{$aLang.blog.add.title}
{else}
{$aLang.blog.admin.title}: <a href="{$blogEdit->getUrlFull()}">{$blogEdit->getTitle()|escape}</a>
{/if}
{/block}
{block 'layout_content'}
{include 'components/blog/add.tpl' blog=$oBlogEdit}
{include 'components/blog/add.tpl' blog=$blogEdit}
{/block}

18
application/frontend/skin/developer/actions/ActionBlog/admin.tpl
View file

@ -1,24 +1,26 @@
{**
* Управление пользователями блога
*
* @param object oBlogEdit Блог
* @param array aBlogUsers Список пользователей
* @param object $blogEdit Блог
* @param array $blogUsers Список пользователей блога
* @param array $blogUsersInvited Список приглашенных пользователей, передается в случае если блог закрытый
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{if $oBlogEdit->getType() != 'close'}
{$bNoSidebar = true}
{/if}
{* Показываем сайдбар только для закрытых блогов *}
{if $blogEdit->getType() != 'close'}
{$bNoSidebar = true}
{/if}
{$sNav = 'blog.edit'}
{$sNav = 'blog.edit'}
{/block}
{block 'layout_page_title'}
{$aLang.blog.admin.title}: <a href="{$oBlogEdit->getUrlFull()}">{$oBlogEdit->getTitle()|escape}</a>
{$aLang.blog.admin.title}: <a href="{$blogEdit->getUrlFull()}">{$blogEdit->getTitle()|escape}</a>
{/block}
{block 'layout_content'}
{include 'components/blog/admin.tpl' users=$aBlogUsers pagination=$aPaging}
{include 'components/blog/admin.tpl' users=$blogUsers pagination=$paging}
{/block}

50
application/frontend/skin/developer/actions/ActionBlog/blog.tpl
View file

@ -1,39 +1,41 @@
{**
* Блог
*
* @param object $oBlog Блог
* @param array $aBlogUsers Читатели блога
* @param array $aBlogModerators Модераторы блога
* @param array $aBlogAdministrators Администраторы блога
* @param integer $iCountBlogUsers Кол-во читателей
* @param integer $iCountBlogModerators Кол-во модераторов
* @param integer $iCountBlogAdministrators Кол-во администраторов
* @param boolean $bPrivateBlog Закрытый блог или нет
*
* TODO: Fix alerts
* @param object $blog Блог
* @param boolean $isPrivateBlog Закрытый блог или нет
* @param array $topics Список топиков
* @param array $paging Пагинация
* @param string $periodSelectCurrent
* @param string $periodSelectRoot
* @param array $blogUsers Читатели блога
* @param array $blogModerators Модераторы блога
* @param array $blogAdministrators Администраторы блога
* @param integer $countBlogUsers Кол-во читателей
* @param integer $countBlogModerators Кол-во модераторов
* @param integer $countBlogAdministrators Кол-во администраторов
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$sNav = 'topics.sub'}
{$sNav = 'topics.sub'}
{/block}
{block 'layout_content_header'}
{include 'components/blog/blog.tpl' blog=$oBlog blogs=$aBlogs}
{include 'components/blog/blog.tpl' blog=$blog}
{$smarty.block.parent}
{$smarty.block.parent}
{* Сообщение для забаненного пользователя *}
{* TODO: Вывод сообщения о бане *}
{if false}
{include 'components/alert/alert.tpl' text=$aLang.blog.alerts.banned mods='error'}
{/if}
{* Сообщение для забаненного пользователя *}
{* TODO: Вывод сообщения о бане *}
{if false}
{include 'components/alert/alert.tpl' text=$aLang.blog.alerts.banned mods='error'}
{/if}
{* Список топиков *}
{if $bPrivateBlog}
{include 'components/alert/alert.tpl' text=$aLang.blog.alerts.private mods='error'}
{else}
{include 'components/topic/topic-list.tpl' topics=$aTopics paging=$aPaging}
{/if}
{* Список топиков *}
{if $isPrivateBlog}
{include 'components/alert/alert.tpl' text=$aLang.blog.alerts.private mods='error'}
{else}
{include 'components/topic/topic-list.tpl' topics=$topics paging=$paging}
{/if}
{/block}

9
application/frontend/skin/developer/actions/ActionBlog/index.tpl
View file

@ -1,13 +1,18 @@
{**
* Список топиков
*
* @param array $topics
* @param array $paging
* @param string $periodSelectCurrent
* @param string $periodSelectRoot
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$sNav = 'topics'}
{$sNav = 'topics'}
{/block}
{block 'layout_content'}
{include 'components/topic/topic-list.tpl' topics=$aTopics paging=$aPaging}
{include 'components/topic/topic-list.tpl' topics=$topics paging=$paging}
{/block}

25
application/frontend/skin/developer/actions/ActionBlog/topic.tpl
View file

@ -1,5 +1,10 @@
{**
* Топик
*
* @param object $topic
* @param array $comments
* @param integer $lastCommentId
* @param array $pagingComments
*}
{extends 'layouts/layout.base.tpl'}
@ -10,25 +15,25 @@
{block 'layout_content'}
{* Топик *}
{include 'components/topic/topic.tpl' topic=$oTopic}
{include 'components/topic/topic.tpl' topic=$topic}
{* Комментарии *}
{include 'components/comment/comments.tpl'
comments = $aComments
count = $oTopic->getCountComment()
comments = $comments
count = $topic->getCountComment()
classes = 'js-comments-topic'
attributes = [ 'id' => 'comments' ]
targetId = $oTopic->getId()
targetId = $topic->getId()
targetType = 'topic'
authorId = $oTopic->getUserId()
authorId = $topic->getUserId()
authorText = $aLang.topic.author
dateReadLast = $oTopic->getDateRead()
forbidAdd = $oTopic->getForbidComment()
dateReadLast = $topic->getDateRead()
forbidAdd = $topic->getForbidComment()
forbidText = $aLang.topic.comments.notices.not_allowed
useSubscribe = true
isSubscribed = $oTopic->getSubscribeNewComment() && $oTopic->getSubscribeNewComment()->getStatus()
lastCommentId = $iMaxIdComment
pagination = $aPagingCmt
isSubscribed = $topic->getSubscribeNewComment() && $topic->getSubscribeNewComment()->getStatus()
lastCommentId = $lastCommentId
pagination = $pagingComments
useVote = true
useFavourite = true}
{/block}

13
application/frontend/skin/developer/actions/ActionBlog/users.tpl
View file

@ -1,18 +1,23 @@
{**
* Список пользователей которые подключены к блогу
*
* @param object $blog
* @param array $blogUsers
* @param integer $countBlogUsers
* @param array $paging
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{/block}
{block 'layout_page_title'}
{$aLang.blog.users.readers_all} ({$iCountBlogUsers}):
<a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape}</a>
{$aLang.blog.users.readers_all} ({$countBlogUsers}):
<a href="{$blog->getUrlFull()}">{$blog->getTitle()|escape}</a>
{/block}
{block 'layout_content'}
{include 'components/user/user-list.tpl' users=$aBlogUsers pagination=$aPaging}
{include 'components/user/user-list.tpl' users=$blogUsers pagination=$paging}
{/block}

6
application/frontend/skin/developer/actions/ActionBlogs/index.tpl
View file

@ -1,5 +1,9 @@
{**
* Список блогов
*
* @param array $blogs
* @param integer $searchCount
* @param array $paging
*}
{extends 'layouts/layout.base.tpl'}
@ -25,6 +29,6 @@
]}
<div class="js-search-ajax-blog">
{include 'components/blog/blog-list.tpl' blogs=$aBlogs useMore=true pagination=$aPaging}
{include 'components/blog/blog-list.tpl' blogs=$blogs useMore=true}
</div>
{/block}

25
application/frontend/skin/developer/actions/ActionContent/add.tpl
View file

@ -1,25 +1,28 @@
{**
* Создание топика
* Создание/редактирование топика
*
* @styles css/topic.css
* @parama object $topicEdit
* @parama string $topicType
* @parama array $blogsAllow
* @parama integer $blogId
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{if $sEvent == 'add'}
{$sNav = 'create'}
{/if}
{if $sEvent == 'add'}
{$sNav = 'create'}
{/if}
{/block}
{block 'layout_page_title'}
{if $sEvent == 'add'}
{$aLang.topic.add.title.add}
{else}
{$aLang.topic.add.title.edit}
{/if}
{if $sEvent == 'add'}
{$aLang.topic.add.title.add}
{else}
{$aLang.topic.add.title.edit}
{/if}
{/block}
{block 'layout_content'}
{include 'components/topic/topic-add.tpl' topic=$oTopicEdit type=$oTopicType blogs=$aBlogsAllow blogId=$blogId}
{include 'components/topic/topic-add.tpl' topic=$topicEdit type=$topicType blogs=$blogsAllow blogId=$blogId}
{/block}

9
application/frontend/skin/developer/actions/ActionContent/drafts.tpl
View file

@ -1,18 +1,21 @@
{**
* Черновики
*
* @parama array $topics
* @parama array $paging
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$sNav = 'create'}
{$sNav = 'create'}
{/block}
{block 'layout_page_title'}
{$aLang.topic.add.title.add}
{$aLang.topic.add.title.add}
{/block}
{block 'layout_content'}
{include 'components/topic/topic-list.tpl' topics=$aTopics paging=$aPaging}
{include 'components/topic/topic-list.tpl' topics=$topics paging=$paging}
{/block}

22
application/frontend/skin/developer/actions/ActionError/index.tpl
View file

@ -5,22 +5,20 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSystemMessages = true}
{$bNoSidebar = true}
{$bNoSystemMessages = true}
{/block}
{block 'layout_body_test'}{/block}
{block 'layout_page_title'}
{if $aMsgError[0].title}
{$aLang.error}: <span>{$aMsgError[0].title}</span>
{/if}
{if $aMsgError[0].title}
{$aLang.error}: <span>{$aMsgError[0].title}</span>
{/if}
{/block}
{block 'layout_content'}
<p>{$aMsgError[0].msg}</p>
<p>
<a href="javascript:history.go(-1);">{$aLang.site_history_back}</a>,
<a href="{router page='/'}">{$aLang.site_go_main}</a>
</p>
<p>{$aMsgError[0].msg}</p>
<p>
<a href="javascript:history.go(-1);">{$aLang.site_history_back}</a>,
<a href="{router page='/'}">{$aLang.site_go_main}</a>
</p>
{/block}

7
application/frontend/skin/developer/actions/ActionIndex/index.tpl
View file

@ -1,13 +1,16 @@
{**
* Главная
*
* @parama array $topics
* @parama array $paging
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$sNav = 'topics'}
{$sNav = 'topics'}
{/block}
{block 'layout_content'}
{include 'components/topic/topic-list.tpl' topics=$aTopics paging=$aPaging}
{include 'components/topic/topic-list.tpl' topics=$topics paging=$paging}
{/block}

6
application/frontend/skin/developer/actions/ActionLogin/index.tpl
View file

@ -5,13 +5,13 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{/block}
{block 'layout_page_title'}
{$aLang.auth.login.title}
{$aLang.auth.login.title}
{/block}
{block 'layout_content'}
{include 'components/auth/auth.login.tpl' showExtra=true}
{include 'components/auth/auth.login.tpl' showExtra=true}
{/block}

6
application/frontend/skin/developer/actions/ActionLogin/reset.tpl
View file

@ -5,13 +5,13 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{/block}
{block 'layout_page_title'}
{$aLang.auth.reset.title}
{$aLang.auth.reset.title}
{/block}
{block 'layout_content'}
{include 'components/auth/auth.reset.tpl'}
{include 'components/auth/auth.reset.tpl'}
{/block}

6
application/frontend/skin/developer/actions/ActionLogin/reset_confirm.tpl
View file

@ -6,13 +6,13 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{/block}
{block 'layout_page_title'}
{$aLang.auth.reset.title}
{$aLang.auth.reset.title}
{/block}
{block 'layout_content'}
{$aLang.auth.reset.notices.success_send_password}
{$aLang.auth.reset.notices.success_send_password}
{/block}

8
application/frontend/skin/developer/actions/ActionPeople/index.tpl
View file

@ -1,5 +1,11 @@
{**
* Список всех пользователей
*
* @param array $users
* @param integer $searchCount
* @param array $countriesUsed
* @param array $paging
* @param array $usersStat
*}
{extends 'layouts/layout.base.tpl'}
@ -21,6 +27,6 @@
]}
<div class="js-search-ajax-users">
{include 'components/user/user-list.tpl' users=$aUsers useMore=true}
{include 'components/user/user-list.tpl' users=$users useMore=true}
</div>
{/block}

9
application/frontend/skin/developer/actions/ActionPersonalBlog/index.tpl
View file

@ -1,13 +1,18 @@
{**
* Список топиков из персональных блогов
*
* @param array $topics
* @param array $paging
* @param string $periodSelectCurrent
* @param string $periodSelectRoot
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$sNav = 'topics'}
{$sNav = 'topics'}
{/block}
{block 'layout_content'}
{include 'components/topic/topic-list.tpl' topics=$aTopics paging=$aPaging}
{include 'components/topic/topic-list.tpl' topics=$topics paging=$paging}
{/block}

15
application/frontend/skin/developer/actions/ActionProfile/activity.tpl
View file

@ -1,17 +1,20 @@
{**
* Активность пользователя
*
* @param array $activityEvents
* @param integer $activityEventsAllCount
*}
{extends 'layouts/layout.user.tpl'}
{block 'layout_user_page_title'}
{lang name='activity.title'}
{lang name='activity.title'}
{/block}
{block 'layout_content' append}
{include 'components/activity/activity.tpl'
events = $activityEvents
count = $activityEventsAllCount
targetId = $oUserProfile->getId()
classes = 'js-activity--user'}
{include 'components/activity/activity.tpl'
events = $activityEvents
count = $activityEventsAllCount
targetId = $oUserProfile->getId()
classes = 'js-activity--user'}
{/block}

9
application/frontend/skin/developer/actions/ActionProfile/created.comments.tpl
View file

@ -1,14 +1,17 @@
{**
* Список комментариев созданных пользователем
*
* @param array $comments
* @param array $paging
*}
{extends 'layouts/layout.user.tpl'}
{block 'layout_user_page_title'}
{lang name='user.publications.title'}
{lang name='user.publications.title'}
{/block}
{block 'layout_content' append}
{include 'navs/nav.user.created.tpl'}
{include 'components/comment/comment-list.tpl' comments=$aComments}
{include 'navs/nav.user.created.tpl'}
{include 'components/comment/comment-list.tpl' comments=$comments paging=$paging}
{/block}

5
application/frontend/skin/developer/actions/ActionProfile/created.notes.tpl
View file

@ -1,5 +1,8 @@
{**
* Список заметок созданных пользователем
*
* @param array $notesUsers
* @param array $paging
*}
{extends 'layouts/layout.user.tpl'}
@ -10,5 +13,5 @@
{block 'layout_content' append}
{include 'navs/nav.user.created.tpl'}
{include 'components/user/user-list.tpl' users=$aUsersList pagination=$aPaging}
{include 'components/user/user-list.tpl' users=$notesUsers pagination=$paging}
{/block}

9
application/frontend/skin/developer/actions/ActionProfile/created.topics.tpl
View file

@ -1,14 +1,17 @@
{**
* Список топиков созданных пользователем
*
* @param array $topics
* @param array $paging
*}
{extends 'layouts/layout.user.tpl'}
{block 'layout_user_page_title'}
{lang name='user.publications.title'}
{lang name='user.publications.title'}
{/block}
{block 'layout_content' append}
{include 'navs/nav.user.created.tpl'}
{include 'components/topic/topic-list.tpl' topics=$aTopics paging=$aPaging}
{include 'navs/nav.user.created.tpl'}
{include 'components/topic/topic-list.tpl' topics=$topics paging=$paging}
{/block}

9
application/frontend/skin/developer/actions/ActionProfile/favourite.comments.tpl
View file

@ -1,14 +1,17 @@
{**
* Избранные комментарии пользователя
*
* @param array $comments
* @param array $paging
*}
{extends 'layouts/layout.user.tpl'}
{block 'layout_user_page_title'}
{lang name='user.favourites.title'}
{lang name='user.favourites.title'}
{/block}
{block 'layout_content' append}
{include 'navs/nav.user.favourite.tpl'}
{include 'components/comment/comment-list.tpl' comments=$aComments}
{include 'navs/nav.user.favourite.tpl'}
{include 'components/comment/comment-list.tpl' comments=$comments paging=$paging}
{/block}

17
application/frontend/skin/developer/actions/ActionProfile/favourite.topics.tpl
View file

@ -1,20 +1,23 @@
{**
* Избранные топики пользователя
*
* @param array $topics
* @param array $paging
*}
{extends 'layouts/layout.user.tpl'}
{block 'layout_user_page_title'}
{lang name='user.favourites.title'}
{lang name='user.favourites.title'}
{/block}
{block 'layout_content' append}
{include 'navs/nav.user.favourite.tpl'}
{include 'navs/nav.user.favourite.tpl'}
{* Блок с тегами избранного *}
{if $oUserCurrent && $oUserCurrent->getId() == $oUserProfile->getId()}
{insert name="block" block=tagsFavouriteTopic params={$aBlockParams.user=$oUserProfile}}
{/if}
{* Блок с тегами избранного *}
{if $oUserCurrent && $oUserCurrent->getId() == $oUserProfile->getId()}
{insert name='block' block='tagsFavouriteTopic' params={$aBlockParams.user=$oUserProfile}}
{/if}
{include 'components/topic/topic-list.tpl' topics=$aTopics paging=$aPaging}
{include 'components/topic/topic-list.tpl' topics=$topics paging=$paging}
{/block}

7
application/frontend/skin/developer/actions/ActionProfile/friends.tpl
View file

@ -1,13 +1,16 @@
{**
* Список друзей
*
* @param array $friends
* @param array $paging
*}
{extends 'layouts/layout.user.tpl'}
{block 'layout_user_page_title'}
{lang name='user.friends.title'}
{lang name='user.friends.title'}
{/block}
{block 'layout_content' append}
{include 'components/user/user-list.tpl' users=$aFriends pagination=$aPaging}
{include 'components/user/user-list.tpl' users=$friends pagination=$paging}
{/block}

24
application/frontend/skin/developer/actions/ActionProfile/info.tpl
View file

@ -1,15 +1,25 @@
{**
* Профиль пользователя с информацией о нем
*
* @param array usersInvited
* @param object invitedByUser
* @param array blogsJoined
* @param array blogsModerate
* @param array blogsAdminister
* @param array blogsCreated
* @param array usersFriend
*}
{extends 'layouts/layout.user.tpl'}
{block 'layout_options'}
{$oSession = $oUserProfile->getSession()}
{$oGeoTarget = $oUserProfile->getGeoTarget()}
{/block}
{block 'layout_content' append}
{*include 'navs/nav.user.info.tpl'*}
{include 'components/user/info.tpl'}
{include 'components/user/info.tpl'
user = $oUserProfile
friends = $userFriends
usersInvited = $usersInvited
invitedByUser = $invitedByUser
blogsJoined = $blogsJoined
blogsAdminister = $blogsAdminister
blogsModerate = $blogsModerate
blogsCreated = $blogsCreated}
{/block}

10
application/frontend/skin/developer/actions/ActionProfile/wall.tpl
View file

@ -5,12 +5,12 @@
{extends 'layouts/layout.user.tpl'}
{block 'layout_user_page_title'}
{lang name='wall.title'}
{lang name='wall.title'}
{/block}
{block 'layout_content' append}
{insert name='block' block='wall' params=[
'classes' => 'js-wall-default',
'user_id' => $oUserProfile->getId()
]}
{insert name='block' block='wall' params=[
'classes' => 'js-wall-default',
'user_id' => $oUserProfile->getId()
]}
{/block}

6
application/frontend/skin/developer/actions/ActionRegistration/activate.tpl
View file

@ -5,13 +5,13 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{/block}
{block 'layout_page_title'}
{$aLang.auth.registration.notices.success_activate}
{$aLang.auth.registration.notices.success_activate}
{/block}
{block 'layout_content'}
<a href="{router page='/'}">{$aLang.site_go_main}</a>
<a href="{router page='/'}">{$aLang.site_go_main}</a>
{/block}

8
application/frontend/skin/developer/actions/ActionRegistration/confirm.tpl
View file

@ -5,15 +5,15 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{/block}
{block 'layout_page_title'}
{$aLang.auth.registration.confirm.title}
{$aLang.auth.registration.confirm.title}
{/block}
{block 'layout_content'}
{$aLang.auth.registration.confirm.text}<br /><br />
{$aLang.auth.registration.confirm.text}<br /><br />
<a href="{router page='/'}">{$aLang.site_go_main}</a>
<a href="{router page='/'}">{$aLang.site_go_main}</a>
{/block}

6
application/frontend/skin/developer/actions/ActionRegistration/index.tpl
View file

@ -5,13 +5,13 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{/block}
{block 'layout_page_title'}
{$aLang.auth.registration.title}
{$aLang.auth.registration.title}
{/block}
{block 'layout_content'}
{include 'components/auth/auth.registration.tpl'}
{include 'components/auth/auth.registration.tpl'}
{/block}

6
application/frontend/skin/developer/actions/ActionRegistration/invite.tpl
View file

@ -5,13 +5,13 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{/block}
{block 'layout_page_title'}
{$aLang.auth.invite.title}
{$aLang.auth.invite.title}
{/block}
{block 'layout_content'}
{include 'components/auth/auth.invite.tpl'}
{include 'components/auth/auth.invite.tpl'}
{/block}

6
application/frontend/skin/developer/actions/ActionRegistration/reactivation.tpl
View file

@ -5,13 +5,13 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{/block}
{block 'layout_page_title'}
{$aLang.auth.reactivation.title}
{$aLang.auth.reactivation.title}
{/block}
{block 'layout_content'}
{include 'components/auth/auth.reactivation.tpl'}
{include 'components/auth/auth.reactivation.tpl'}
{/block}

50
application/frontend/skin/developer/actions/ActionRss/index.tpl
View file

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
<title>{$aChannel.title}</title>
<link>{$aChannel.link}</link>
<atom:link href="{$PATH_WEB_CURRENT}/" rel="self" type="application/rss+xml" />
<description><![CDATA[{$aChannel.description}]]></description>
<language>{$aChannel.language}</language>
<managingEditor>{$aChannel.managingEditor} ({Router::GetPath('/')})</managingEditor>
<webMaster>{$aChannel.managingEditor} ({Router::GetPath('/')})</webMaster>
<copyright>{Router::GetPath('/')}</copyright>
<generator>{$aChannel.generator}</generator>
{foreach $items as $oItem}
<item>
<title>{$oItem.title|escape:'html'}</title>
<guid isPermaLink="true">{$oItem.guid}</guid>
<link>{$oItem.link}</link>
<dc:creator>{$oItem.author}</dc:creator>
<description><![CDATA[{$oItem.description}]]></description>
<pubDate>{date_format date=$oItem.pubDate format="r"}</pubDate>
<category>{$oItem.category|replace:',':'</category>
<category>'}</category>
</item>
{/foreach}
</channel>
</rss>
<channel>
<title>{$aChannel.title}</title>
<link>{$aChannel.link}</link>
<atom:link href="{$PATH_WEB_CURRENT}/" rel="self" type="application/rss+xml" />
<description><![CDATA[{$aChannel.description}]]></description>
<language>{$aChannel.language}</language>
<managingEditor>{$aChannel.managingEditor} ({Router::GetPath('/')})</managingEditor>
<webMaster>{$aChannel.managingEditor} ({Router::GetPath('/')})</webMaster>
<copyright>{Router::GetPath('/')}</copyright>
<generator>{$aChannel.generator}</generator>
{foreach $items as $item}
<item>
<title>{$item.title|escape:'html'}</title>
<guid isPermaLink="true">{$item.guid}</guid>
<link>{$item.link}</link>
<dc:creator>{$item.author}</dc:creator>
<description><![CDATA[{$item.description}]]></description>
<pubDate>{date_format date=$item.pubDate format="r"}</pubDate>
<category>{$item.category|replace:',':'</category>
<category>'}</category>
</item>
{/foreach}
</channel>
</rss>

36
application/frontend/skin/developer/actions/ActionSearch/index.tpl
View file

@ -1,30 +1,36 @@
{**
* Страница с формой поиска
*
* @param array resultItems
* @param array paging
* @param array searchType
* @param array query
* @param array typeCounts
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSidebar = true}
{/block}
{block 'layout_page_title'}
{$aLang.search.search}
{$aLang.search.search}
{/block}
{block 'layout_content'}
{include 'components/search/search-form.main.tpl'}
{include 'navs/nav.search.tpl'}
{include 'components/search/search-form.main.tpl' searchType=$searchType}
{include 'navs/nav.search.tpl'}
{if $aResultItems}
{if $sSearchType == 'topics'}
{include 'components/topic/topic-list.tpl' topics=$aResultItems paging=$aPaging}
{elseif $sSearchType == 'comments'}
{include 'comments/comment_list.tpl' aComments=$aResultItems}
{else}
{hook run='search_result' type=$sSearchType}
{/if}
{elseif $_aRequest.q}
{include 'components/alert/alert.tpl' text=$aLang.search.alerts.empty mods='empty'}
{/if}
{if $resultItems}
{if $searchType == 'topics'}
{include 'components/topic/topic-list.tpl' topics=$resultItems paging=$paging}
{elseif $searchType == 'comments'}
{include 'components/comment/comment-list.tpl' comments=$resultItems}
{else}
{hook run='search_result' type=$searchType}
{/if}
{elseif $_aRequest.q}
{include 'components/alert/alert.tpl' text=$aLang.search.alerts.empty mods='empty'}
{/if}
{/block}

34
application/frontend/skin/developer/actions/ActionSearch/opensearch.tpl
View file

@ -1,18 +1,18 @@
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
<ShortName>{cfg name='view.name'}</ShortName>
<Description>{$sHtmlTitle}</Description>
<Contact>{Config::Get('sys.mail.from_email')}</Contact>
<Url type="text/html" template="{router page='search/topics'}?q={literal}{searchTerms}{/literal}" />
<LongName>{$sHtmlDescription}</LongName>
<Image height="64" width="64" type="image/png">{cfg name='path.skin.assets.web'}/images/favicons/opensearch.png</Image>
<Image height="16" width="16" type="image/vnd.microsoft.icon">{cfg name='path.skin.assets.web'}/images/favicons/favicon.ico</Image>
<Developer>{cfg name='view.name'} ({Router::GetPath('/')})</Developer>
<Attribution>
© «{cfg name='view.name'}»
</Attribution>
<SyndicationRight>open</SyndicationRight>
<AdultContent>false</AdultContent>
<Language>ru-ru</Language>
<OutputEncoding>UTF-8</OutputEncoding>
<InputEncoding>UTF-8</InputEncoding>
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
<ShortName>{cfg name='view.name'}</ShortName>
<Description>{$sHtmlTitle}</Description>
<Contact>{Config::Get('sys.mail.from_email')}</Contact>
<Url type="text/html" template="{router page='search/topics'}?q={literal}{searchTerms}{/literal}" />
<LongName>{$sHtmlDescription}</LongName>
<Image height="64" width="64" type="image/png">{cfg name='path.skin.assets.web'}/images/favicons/opensearch.png</Image>
<Image height="16" width="16" type="image/vnd.microsoft.icon">{cfg name='path.skin.assets.web'}/images/favicons/favicon.ico</Image>
<Developer>{cfg name='view.name'} ({Router::GetPath('/')})</Developer>
<Attribution>
© «{cfg name='view.name'}»
</Attribution>
<SyndicationRight>open</SyndicationRight>
<AdultContent>false</AdultContent>
<Language>ru-ru</Language>
<OutputEncoding>UTF-8</OutputEncoding>
<InputEncoding>UTF-8</InputEncoding>
</OpenSearchDescription>

6
application/frontend/skin/developer/actions/ActionSettings/account.change_email_confirm.tpl
View file

@ -5,10 +5,10 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$bNoSystemMessages = true}
{$bNoSidebar = true}
{$bNoSystemMessages = true}
{/block}
{block 'layout_content'}
{$sText}
{$sText}
{/block}

2
application/frontend/skin/developer/actions/ActionSettings/account.tpl
View file

@ -5,5 +5,5 @@
{extends 'layouts/layout.user.settings.tpl'}
{block 'layout_content' append}
{include 'components/user/settings/account.tpl' user=$oUserCurrent}
{include 'components/user/settings/account.tpl' user=$oUserCurrent}
{/block}

2
application/frontend/skin/developer/actions/ActionSettings/invite.tpl
View file

@ -5,5 +5,5 @@
{extends 'layouts/layout.user.settings.tpl'}
{block 'layout_content' append}
{include 'components/user/settings/invite.tpl' user=$oUserCurrent}
{include 'components/user/settings/invite.tpl' user=$oUserCurrent}
{/block}

2
application/frontend/skin/developer/actions/ActionSettings/profile.tpl
View file

@ -1,7 +1,5 @@
{**
* Основные настройки профиля
*
* @scripts <framework>/js/livestreet/userfield.js
*}
{extends 'layouts/layout.user.settings.tpl'}

2
application/frontend/skin/developer/actions/ActionSettings/tuning.tpl
View file

@ -5,5 +5,5 @@
{extends 'layouts/layout.user.settings.tpl'}
{block 'layout_content' append}
{include 'components/user/settings/tuning.tpl' user=$oUserCurrent}
{include 'components/user/settings/tuning.tpl' user=$oUserCurrent}
{/block}

11
application/frontend/skin/developer/actions/ActionStream/all.tpl
View file

@ -1,18 +1,21 @@
{**
* Вся активность
*
* @param array $activityEvents
* @param integer $activityEventsAllCount
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$bNoSidebar = true}
{$sNav = 'activity'}
{$bNoSidebar = true}
{$sNav = 'activity'}
{/block}
{block 'layout_page_title'}
{$aLang.activity.title}
{$aLang.activity.title}
{/block}
{block 'layout_content'}
{include 'components/activity/activity.tpl' events=$activityEvents count=$activityEventsAllCount classes='js-activity--all'}
{include 'components/activity/activity.tpl' events=$activityEvents count=$activityEventsAllCount classes='js-activity--all'}
{/block}

9
application/frontend/skin/developer/actions/ActionStream/personal.tpl
View file

@ -1,17 +1,20 @@
{**
* Настраиваемая, персональная страница активности
*
* @param array $activityEvents
* @param integer $activityEventsAllCount
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$sNav = 'activity'}
{$sNav = 'activity'}
{/block}
{block 'layout_page_title'}
{$aLang.activity.title}
{$aLang.activity.title}
{/block}
{block 'layout_content'}
{include 'components/activity/activity.tpl' events=$activityEvents count=$activityEventsAllCount classes='js-activity--personal'}
{include 'components/activity/activity.tpl' events=$activityEvents count=$activityEventsAllCount classes='js-activity--personal'}
{/block}

10
application/frontend/skin/developer/actions/ActionTag/index.tpl
View file

@ -1,14 +1,18 @@
{**
* Поиск по тегам
*
* @param array $topics
* @param array $paging
* @param string $tag
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_page_title'}
{lang 'tags.search.title'}
{lang 'tags.search.title'}
{/block}
{block 'layout_content'}
{include 'components/tags/search-form.tags.tpl'}
{include 'components/topic/topic-list.tpl' topics=$aTopics paging=$aPaging}
{include 'components/tags/search-form.tags.tpl'}
{include 'components/topic/topic-list.tpl' topics=$topics paging=$paging}
{/block}

2
application/frontend/skin/developer/actions/ActionTalk/add.tpl
View file

@ -5,5 +5,5 @@
{extends 'layouts/layout.user.messages.tpl'}
{block 'layout_content'}
{include 'components/talk/add.tpl'}
{include 'components/talk/add.tpl'}
{/block}

4
application/frontend/skin/developer/actions/ActionTalk/blacklist.tpl
View file

@ -1,9 +1,11 @@
{**
* Черный список
*
* @param array $talkBlacklistUsers
*}
{extends 'layouts/layout.user.messages.tpl'}
{block 'layout_content'}
{include 'components/talk/blacklist.tpl' users=$aUsersBlacklist}
{include 'components/talk/blacklist.tpl' users=$talkBlacklistUsers}
{/block}

5
application/frontend/skin/developer/actions/ActionTalk/favourites.tpl
View file

@ -1,9 +1,12 @@
{**
* Список избранных сообщений
*
* @param array $talks
* @param array $paging
*}
{extends 'layouts/layout.user.messages.tpl'}
{block 'layout_content'}
{include 'components/talk/talk-list.tpl' talks=$aTalks}
{include 'components/talk/talk-list.tpl' talks=$talks paging=$paging}
{/block}

9
application/frontend/skin/developer/actions/ActionTalk/inbox.tpl
View file

@ -1,14 +1,17 @@
{**
* Список сообщений
*
* @param array $talks
* @param array $paging
*}
{extends 'layouts/layout.user.messages.tpl'}
{block 'layout_options' append}
{$bNoSystemMessages = false}
{$bNoSystemMessages = false}
{/block}
{block 'layout_content'}
{include 'components/talk/talk-search-form.tpl'}
{include 'components/talk/talk-list.tpl' talks=$aTalks selectable=true}
{include 'components/talk/talk-search-form.tpl'}
{include 'components/talk/talk-list.tpl' talks=$talks paging=$paging selectable=true}
{/block}

6
application/frontend/skin/developer/actions/ActionTalk/talk.tpl
View file

@ -1,9 +1,13 @@
{**
* Диалог
*
* @param object $talk
* @param array $comments
* @param integer $lastCommentId
*}
{extends 'layouts/layout.user.messages.tpl'}
{block 'layout_content'}
{include 'components/talk/talk.tpl' talk=$oTalk comments=$aComments}
{include 'components/talk/talk.tpl' talk=$talk comments=$comments lastCommentId=$lastCommentId}
{/block}

7
application/frontend/skin/developer/actions/ActionUserfeed/list.tpl
View file

@ -1,13 +1,16 @@
{**
* Лента пользователя
*
* @param array $topics
* @param array $paging
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_options'}
{$sNav = 'topics'}
{$sNav = 'topics'}
{/block}
{block 'layout_content'}
{include 'components/topic/topic-list.tpl' topics=$aTopics paging=$aPaging}
{include 'components/topic/topic-list.tpl' topics=$topics paging=$paging}
{/block}

16
application/frontend/skin/developer/blocks.tpl
View file

@ -5,13 +5,13 @@
{get_blocks assign='aBlocksLoad'}
{if isset($aBlocksLoad.$group)}
{foreach $aBlocksLoad.$group as $aBlock}
{if $aBlock.type == 'block'}
{insert name="block" block=$aBlock.name params=$aBlock.params}
{/if}
{foreach $aBlocksLoad.$group as $aBlock}
{if $aBlock.type == 'block'}
{insert name="block" block=$aBlock.name params=$aBlock.params}
{/if}
{if $aBlock.type == 'template'}
{include $aBlock.name params=$aBlock.params}
{/if}
{/foreach}
{if $aBlock.type == 'template'}
{include $aBlock.name params=$aBlock.params}
{/if}
{/foreach}
{/if}

6
application/frontend/skin/developer/components/accordion/accordion.tpl
View file

@ -4,14 +4,14 @@
* @param array $items
* @param string $mods
* @param string $classes
* @param string $attributes
* @param array $attributes
*}
{$component = 'accordion'}
<div class="{$component} {cmods name=$component mods=$smarty.local.mods} {$smarty.local.classes}" {cattr list=$smarty.local.attributes}>
{foreach $smarty.local.items as $item}
<h3>{$item[ 'title' ]}</h3>
<div>{$item[ 'content' ]}</div>
<h3 class="{$component}-title">{$item[ 'title' ]}</h3>
<div class="{$component}-content">{$item[ 'content' ]}</div>
{/foreach}
</div>

2
application/frontend/skin/developer/components/accordion/css/accordion.css
View file

@ -7,5 +7,5 @@
*/
.accordion {
margin-bottom: 15px;
margin-bottom: 15px;
}

2
application/frontend/skin/developer/components/actionbar/actionbar-item.tpl
View file

@ -6,7 +6,7 @@
* @param string $url
* @param string $show
* @param string $classes
* @param string $attributes
* @param array $attributes
*}
{$component = 'actionbar-item'}

2
application/frontend/skin/developer/components/actionbar/actionbar.tpl
View file

@ -4,7 +4,7 @@
* @param array $items Массив с кнопками
* @param string $mods
* @param string $classes
* @param string $attributes
* @param array $attributes
*}
{$component = 'actionbar'}

30
application/frontend/skin/developer/components/activity/blocks/block.activity-recent.tpl
View file

@ -1,38 +1,36 @@
{**
* Прямой эфир
*
* @styles css/blocks.css
* Последняя активность
*}
{extends 'components/block/block.tpl'}
{block 'block_title'}
<a href="{router page='stream'}">{lang 'activity.block_recent.title'}</a>
<a href="{router page='stream'}">{lang 'activity.block_recent.title'}</a>
{/block}
{block 'block_options' append}
{$mods = "{$mods} stream nopadding"}
{$classes = "{$classes} js-block-default"}
{$mods = "{$mods} stream nopadding"}
{$classes = "{$classes} js-block-default"}
{/block}
{* Кнопка обновления *}
{block 'block_header_end'}
<div class="block-update js-block-update-tabs"></div>
<div class="block-update js-block-update-tabs"></div>
{/block}
{* Навигация *}
{block 'block_content'}
{**
* TODO: Выпадающее меню
* Показывается если в меню что выше пунктов больше установленного значения (по умолчанию - 2)
*}
{include 'components/tabs/tabs.tpl' classes='js-tabs-block js-activity-block-recent-tabs' tabs=[
[ 'text' => {lang 'activity.block_recent.comments'}, 'url' => "{router page='ajax'}stream/comment", 'content' => $smarty.local.content ],
[ 'text' => {lang 'activity.block_recent.topics'}, 'url' => "{router page='ajax'}stream/topic" ]
]}
{**
* TODO: Выпадающее меню
* Показывается если в меню что выше пунктов больше установленного значения (по умолчанию - 2)
*}
{include 'components/tabs/tabs.tpl' classes='js-tabs-block js-activity-block-recent-tabs' tabs=[
[ 'text' => {lang 'activity.block_recent.comments'}, 'url' => "{router page='ajax'}stream/comment", 'content' => $smarty.local.content ],
[ 'text' => {lang 'activity.block_recent.topics'}, 'url' => "{router page='ajax'}stream/topic" ]
]}
{/block}
{* Подвал *}
{block 'block_footer'}
<a href="{router page='rss'}allcomments/">{lang 'activity.block_recent.feed'}</a>
<a href="{router page='rss'}allcomments/">{lang 'activity.block_recent.feed'}</a>
{/block}

8
application/frontend/skin/developer/components/activity/blocks/block.activity-settings.tpl
View file

@ -1,19 +1,17 @@
{**
* Блок настройки ленты активности
*
* @styles css/blocks.css
*}
{extends 'components/block/block.tpl'}
{block 'block_title'}
{$aLang.activity.settings.title}
{$aLang.activity.settings.title}
{/block}
{block 'block_options' append}
{$mods = "{$mods} activity-settings"}
{$mods = "{$mods} activity-settings"}
{/block}
{block 'block_content'}
{include 'components/activity/settings.tpl' typesActive=$typesActive types=$types}
{include 'components/activity/settings.tpl' typesActive=$typesActive types=$types}
{/block}

6
application/frontend/skin/developer/components/activity/blocks/block.activity-users.tpl
View file

@ -1,12 +1,12 @@
{**
* Выбор пользователей для чтения в ленте активности
*
* @styles css/blocks.css
*}
{extends 'components/block/block.tpl'}
{block 'block_title'}{$aLang.activity.users.title}{/block}
{block 'block_title'}
{$aLang.activity.users.title}
{/block}
{block 'block_options' append}
{$mods = "{$mods} activity-users"}

44
application/frontend/skin/developer/components/activity/blocks/recent-comments.tpl
View file

@ -1,32 +1,32 @@
{**
* Прямой эфир
* Последняя активность
* Топики отсортированные по времени последнего комментария
*}
<div class="block-content">
<ul class="block-item-list">
{foreach $smarty.local.comments as $comment}
{$user = $comment->getUser()}
{$topic = $comment->getTarget()}
{$blog = $topic->getBlog()}
<ul class="block-item-list">
{foreach $smarty.local.comments as $comment}
{$user = $comment->getUser()}
{$topic = $comment->getTarget()}
{$blog = $topic->getBlog()}
<li class="js-title-comment" title="{$comment->getText()|strip_tags|trim|truncate:100:'...'|escape}">
<a href="{$user->getUserWebPath()}"><img src="{$user->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<li class="js-title-comment" title="{$comment->getText()|strip_tags|trim|truncate:100:'...'|escape}">
<a href="{$user->getUserWebPath()}"><img src="{$user->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<a href="{$user->getUserWebPath()}" class="author">{$user->getDisplayName()}</a> &rarr;
<a href="{$blog->getUrlFull()}" class="blog-name">{$blog->getTitle()|escape}</a> &rarr;
<a href="{if Config::Get('module.comment.nested_per_page')}{router page='comments'}{else}{$topic->getUrl()}#comment{/if}{$comment->getId()}">
{$topic->getTitle()|escape}
</a>
<a href="{$user->getUserWebPath()}" class="author">{$user->getDisplayName()}</a> &rarr;
<a href="{$blog->getUrlFull()}" class="blog-name">{$blog->getTitle()|escape}</a> &rarr;
<a href="{if Config::Get('module.comment.nested_per_page')}{router page='comments'}{else}{$topic->getUrl()}#comment{/if}{$comment->getId()}">
{$topic->getTitle()|escape}
</a>
<p>
<time datetime="{date_format date=$comment->getDate() format='c'}">
{date_format date=$comment->getDate() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
</time> |
<p>
<time datetime="{date_format date=$comment->getDate() format='c'}">
{date_format date=$comment->getDate() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
</time> |
{lang name='comments.comments_declension' count=$topic->getCountComment() plural=true}
</p>
</li>
{/foreach}
</ul>
{lang name='comments.comments_declension' count=$topic->getCountComment() plural=true}
</p>
</li>
{/foreach}
</ul>
</div>

38
application/frontend/skin/developer/components/activity/blocks/recent-topics.tpl
View file

@ -1,29 +1,29 @@
{**
* Прямой эфир
* Последняя активность
* Последние топики
*}
<div class="block-content">
<ul class="block-item-list">
{foreach $smarty.local.topics as $topic}
{$user = $topic->getUser()}
{$blog = $topic->getBlog()}
<ul class="block-item-list">
{foreach $smarty.local.topics as $topic}
{$user = $topic->getUser()}
{$blog = $topic->getBlog()}
<li class="js-title-topic" title="{$topic->getText()|strip_tags|trim|truncate:150:'...'|escape}">
<a href="{$user->getUserWebPath()}"><img src="{$user->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<li class="js-title-topic" title="{$topic->getText()|strip_tags|trim|truncate:150:'...'|escape}">
<a href="{$user->getUserWebPath()}"><img src="{$user->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<a href="{$user->getUserWebPath()}" class="author">{$user->getDisplayName()}</a> &rarr;
<a href="{$blog->getUrlFull()}" class="blog-name">{$blog->getTitle()|escape}</a> &rarr;
<a href="{$topic->getUrl()}">{$topic->getTitle()|escape}</a>
<a href="{$user->getUserWebPath()}" class="author">{$user->getDisplayName()}</a> &rarr;
<a href="{$blog->getUrlFull()}" class="blog-name">{$blog->getTitle()|escape}</a> &rarr;
<a href="{$topic->getUrl()}">{$topic->getTitle()|escape}</a>
<p>
<time datetime="{date_format date=$topic->getDate() format='c'}">
{date_format date=$topic->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
</time> |
<p>
<time datetime="{date_format date=$topic->getDate() format='c'}">
{date_format date=$topic->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
</time> |
{lang name='comments.comments_declension' count=$topic->getCountComment() plural=true}
</p>
</li>
{/foreach}
</ul>
{lang name='comments.comments_declension' count=$topic->getCountComment() plural=true}
</p>
</li>
{/foreach}
</ul>
</div>

0
application/frontend/skin/developer/components/activity/css/block.activity-recent.css → application/frontend/skin/developer/components/activity/css/blocks.css
View file

28
application/frontend/skin/developer/components/activity/event-list.tpl
View file

@ -10,21 +10,21 @@
{$dateNow = {date_format date=$smarty.now format="Y-m-d" notz=1}}
{foreach $smarty.local.events as $event}
{$dateAdded = {date_format date=$event->getDateAdded() format="Y-m-d" notz=1}}
{$dateAdded = {date_format date=$event->getDateAdded() format="Y-m-d" notz=1}}
{* Дата группы событий *}
{if $dateAdded != $dateLast}
{$dateLast = $dateAdded}
{* Дата группы событий *}
{if $dateAdded != $dateLast}
{$dateLast = $dateAdded}
<li class="activity-date">
{if $dateNow == $dateLast}
{$aLang.date.today}
{else}
{date_format date=$event->getDateAdded() format="j F Y"}
{/if}
</li>
{/if}
<li class="activity-date">
{if $dateNow == $dateLast}
{$aLang.date.today}
{else}
{date_format date=$event->getDateAdded() format="j F Y"}
{/if}
</li>
{/if}
{* Событие *}
{include './event.tpl' event=$event}
{* Событие *}
{include './event.tpl' event=$event}
{/foreach}

114
application/frontend/skin/developer/components/activity/event.tpl
View file

@ -18,71 +18,71 @@
* @param $text Текст
*}
{function activity_event_text text=''}
{if trim($text)}
<div class="{$component}-text text">{$text}</div>
{/if}
{if trim($text)}
<div class="{$component}-text text">{$text}</div>
{/if}
{/function}
{* Событие *}
<li class="{$component} {$component}--{$type} js-{$component}">
{* Аватар *}
<a href="{$user->getUserWebPath()}">
<img src="{$user->getProfileAvatarPath(48)}" alt="{$user->getDisplayName()}" class="activity-event-avatar" />
</a>
{* Аватар *}
<a href="{$user->getUserWebPath()}">
<img src="{$user->getProfileAvatarPath(48)}" alt="{$user->getDisplayName()}" class="activity-event-avatar" />
</a>
{* Дата *}
<time datetime="{date_format date=$event->getDateAdded() format='c' notz=1}"
class="{$component}-date"
title="{date_format date=$event->getDateAdded()}">
{date_format date=$event->getDateAdded() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
</time>
{* Дата *}
<time datetime="{date_format date=$event->getDateAdded() format='c' notz=1}"
class="{$component}-date"
title="{date_format date=$event->getDateAdded()}">
{date_format date=$event->getDateAdded() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}
</time>
{* Логин *}
<a href="{$user->getUserWebPath()}" class="{$component}-username">
{$user->getDisplayName()}
</a>
{* Логин *}
<a href="{$user->getUserWebPath()}" class="{$component}-username">
{$user->getDisplayName()}
</a>
{* Текст события *}
{if $type == 'add_topic'}
{* Добавлен топик *}
{lang "activity.events.{$type}_{$gender}" topic="<a href=\"{$target->getUrl()}\">{$target->getTitle()|escape}</a>"}
{elseif $type == 'add_comment'}
{* Добавлен комментарий *}
{lang "activity.events.{$type}_{$gender}" topic="<a href=\"{$target->getTarget()->getUrl()}#comment{$target->getId()}\">{$target->getTarget()->getTitle()|escape}</a>"}
{* Текст события *}
{if $type == 'add_topic'}
{* Добавлен топик *}
{lang "activity.events.{$type}_{$gender}" topic="<a href=\"{$target->getUrl()}\">{$target->getTitle()|escape}</a>"}
{elseif $type == 'add_comment'}
{* Добавлен комментарий *}
{lang "activity.events.{$type}_{$gender}" topic="<a href=\"{$target->getTarget()->getUrl()}#comment{$target->getId()}\">{$target->getTarget()->getTitle()|escape}</a>"}
{activity_event_text text=$target->getText()}
{elseif $type == 'add_blog'}
{* Создан блог *}
{lang "activity.events.{$type}_{$gender}" blog="<a href=\"{$target->getUrlFull()}\">{$target->getTitle()|escape}</a>"}
{elseif $type == 'vote_blog'}
{* Проголосовали за блог *}
{lang "activity.events.{$type}_{$gender}" blog="<a href=\"{$target->getUrlFull()}\">{$target->getTitle()|escape}</a>"}
{elseif $type == 'vote_topic'}
{* Проголосовали за топик *}
{lang "activity.events.{$type}_{$gender}" topic="<a href=\"{$target->getUrl()}\">{$target->getTitle()|escape}</a>"}
{elseif $type == 'vote_comment_topic'}
{* Проголосовали за комментарий *}
{lang "activity.events.{$type}_{$gender}" topic="<a href=\"{$target->getTarget()->getUrl()}#comment{$target->getId()}\">{$target->getTarget()->getTitle()|escape}</a>"}
{elseif $type == 'vote_user'}
{* Проголосовали за пользователя *}
{lang "activity.events.{$type}_{$gender}" user="<a href=\"{$target->getUserWebPath()}\">{$target->getDisplayName()}</a>"}
{elseif $type == 'join_blog'}
{* Вступили в блог *}
{lang "activity.events.{$type}_{$gender}" blog="<a href=\"{$target->getUrlFull()}\">{$target->getTitle()|escape}</a>"}
{elseif $type == 'add_friend'}
{* Добавили в друзья *}
{lang "activity.events.{$type}_{$gender}" user="<a href=\"{$target->getUserWebPath()}\">{$target->getDisplayName()}</a>"}
{elseif $type == 'add_wall'}
{* Написали на стене *}
{if $target->getWallUser()->getId() == $user->getId()}
{lang "activity.events.{$type}_self_{$gender}" url=$target->getUrlWall()}
{else}
{lang "activity.events.{$type}_{$gender}" url=$target->getUrlWall() user=$target->getWallUser()->getDisplayName()}
{/if}
{activity_event_text text=$target->getText()}
{elseif $type == 'add_blog'}
{* Создан блог *}
{lang "activity.events.{$type}_{$gender}" blog="<a href=\"{$target->getUrlFull()}\">{$target->getTitle()|escape}</a>"}
{elseif $type == 'vote_blog'}
{* Проголосовали за блог *}
{lang "activity.events.{$type}_{$gender}" blog="<a href=\"{$target->getUrlFull()}\">{$target->getTitle()|escape}</a>"}
{elseif $type == 'vote_topic'}
{* Проголосовали за топик *}
{lang "activity.events.{$type}_{$gender}" topic="<a href=\"{$target->getUrl()}\">{$target->getTitle()|escape}</a>"}
{elseif $type == 'vote_comment_topic'}
{* Проголосовали за комментарий *}
{lang "activity.events.{$type}_{$gender}" topic="<a href=\"{$target->getTarget()->getUrl()}#comment{$target->getId()}\">{$target->getTarget()->getTitle()|escape}</a>"}
{elseif $type == 'vote_user'}
{* Проголосовали за пользователя *}
{lang "activity.events.{$type}_{$gender}" user="<a href=\"{$target->getUserWebPath()}\">{$target->getDisplayName()}</a>"}
{elseif $type == 'join_blog'}
{* Вступили в блог *}
{lang "activity.events.{$type}_{$gender}" blog="<a href=\"{$target->getUrlFull()}\">{$target->getTitle()|escape}</a>"}
{elseif $type == 'add_friend'}
{* Добавили в друзья *}
{lang "activity.events.{$type}_{$gender}" user="<a href=\"{$target->getUserWebPath()}\">{$target->getDisplayName()}</a>"}
{elseif $type == 'add_wall'}
{* Написали на стене *}
{if $target->getWallUser()->getId() == $user->getId()}
{lang "activity.events.{$type}_self_{$gender}" url=$target->getUrlWall()}
{else}
{lang "activity.events.{$type}_{$gender}" url=$target->getUrlWall() user=$target->getWallUser()->getDisplayName()}
{/if}
{activity_event_text text=$target->getText()}
{else}
{hook run="activity_event_`$type`" event=$event}
{/if}
{activity_event_text text=$target->getText()}
{else}
{hook run="activity_event_`$type`" event=$event}
{/if}
</li>

2
application/frontend/skin/developer/components/activity/settings.tpl
View file

@ -1,5 +1,5 @@
{**
* Список пользователей на которых подписан текущий пользователь
* Настройки активности
*
* @param array $types
* @param array $typesActive

19
application/frontend/skin/developer/components/admin/manage.tpl
View file

@ -1,19 +0,0 @@
{**
* Админка
*}
<ul>
{if $bAvailableAdminPlugin}
<li>
<a href="{router page='admin/plugins'}?plugin=admin&action=activate&security_ls_key={$LIVESTREET_SECURITY_KEY}">
<strong>{lang 'admin.install_plugin_admin'}</strong>
</a>
</li>
{/if}
<li><a href="{router page="admin"}plugins/">{lang 'admin.items.plugins'}</a></li>
{hook run='admin_action_item'}
</ul>
{hook run='admin_action'}

9
application/frontend/skin/developer/components/admin/toolbar.admin.tpl
View file

@ -1,18 +1,15 @@
{**
* Тулбар
* Кнопка перехода в админку
*
* @styles css/toolbar.css
* @scripts js/livestreet/toolbar.js
*}
{extends 'components/toolbar/toolbar.item.tpl'}
{block 'toolbar_item_options' append}
{$_mods = 'admin'}
{$_bShow = $oUserCurrent && $oUserCurrent->isAdministrator()}
{$_mods = 'admin'}
{$_bShow = $oUserCurrent && $oUserCurrent->isAdministrator()}
{/block}
{block 'toolbar_item'}
{toolbar_item_icon url="{router page='admin'}" title="{lang name='admin.title'}" icon="icon-cog"}
{toolbar_item_icon url="{router page='admin'}" title="{lang name='admin.title'}" icon="icon-cog"}
{/block}

2
application/frontend/skin/developer/components/blog/blocks/block.blog-actions.tpl
View file

@ -12,8 +12,6 @@
{/block}
{block 'block_content'}
{$blog = $oBlog}
<ul class="profile-actions" id="profile_actions">
{* Список экшенов *}
{$actions = []}

10
application/frontend/skin/developer/components/blog/blocks/block.blog-admins.tpl
View file

@ -14,15 +14,15 @@
{block 'block_content'}
{* Создатель *}
{include 'components/user/user-list-small.tpl' users=[ $oBlog->getOwner() ] title=$aLang.blog.owner}
{include 'components/user/user-list-small.tpl' users=[ $blog->getOwner() ] title=$aLang.blog.owner}
{* Администраторы *}
{if count($aBlogAdministrators)}
{include 'components/user/user-list-small.tpl' users=$aBlogAdministrators title="{$aLang.blog.administrators} ({count($aBlogAdministrators)})"}
{if count($blogAdministrators)}
{include 'components/user/user-list-small.tpl' users=$blogAdministrators title="{$aLang.blog.administrators} ({count($blogAdministrators)})"}
{/if}
{* Модераторы *}
{if count($aBlogModerators)}
{include 'components/user/user-list-small.tpl' users=$aBlogModerators title="{$aLang.blog.moderators} ({count($aBlogModerators)})"}
{if count($blogModerators)}
{include 'components/user/user-list-small.tpl' users=$blogModerators title="{$aLang.blog.moderators} ({count($blogModerators)})"}
{/if}
{/block}

4
application/frontend/skin/developer/components/blog/blocks/block.blog-invite.tpl
View file

@ -15,7 +15,7 @@
{block 'block_content'}
{include 'components/blog/invite/invite.tpl'
users = $aBlogUsersInvited
users = $blogUsersInvited
classes = 'js-user-list-add-blog-invite'
attributes = [ 'data-param-i-target-id' => $oBlogEdit->getId() ]}
attributes = [ 'data-param-i-target-id' => $blogEdit->getId() ]}
{/block}

12
application/frontend/skin/developer/components/blog/blocks/block.blog-photo.tpl
View file

@ -14,10 +14,10 @@
{include 'components/photo/photo.tpl'
classes = 'js-blog-avatar'
useAvatar = false
hasPhoto = $oBlog->getAvatar()
editable = $oBlog->isAllowEdit()
targetId = $oBlog->getId()
url = $oBlog->getUrlFull()
photoPath = $oBlog->getAvatarPath(500)
photoAltText = $oBlog->getTitle()|escape}
hasPhoto = $blog->getAvatar()
editable = $blog->isAllowEdit()
targetId = $blog->getId()
url = $blog->getUrlFull()
photoPath = $blog->getAvatarPath(500)
photoAltText = $blog->getTitle()|escape}
{/block}

10
application/frontend/skin/developer/components/blog/blocks/block.blog-users.tpl
View file

@ -5,11 +5,11 @@
{extends 'components/block/block.tpl'}
{block 'block_title'}
{$iUsersCount = count($aBlogUsers)}
{$usersCount = count($blogUsers)}
<a href="{$oBlog->getUrlFull()}users/">
{if $iUsersCount}
{$iUsersCount} {$iUsersCount|declension:$aLang.blog.readers_declension:'russian'}
<a href="{$blog->getUrlFull()}users/">
{if $usersCount}
{$usersCount} {$usersCount|declension:$aLang.blog.readers_declension:'russian'}
{else}
{$aLang.blog.users.empty}
{/if}
@ -21,5 +21,5 @@
{/block}
{block 'block_content'}
{include 'components/user/user-list-avatar.tpl' aUsersList=$aBlogUsers}
{include 'components/user/user-list-avatar.tpl' aUsersList=$blogUsers}
{/block}

14
application/frontend/skin/developer/components/blog/blocks/blogs-top.tpl
View file

@ -6,20 +6,20 @@
*}
<ul class="block-item-list">
{foreach $aBlogs as $oBlog}
{foreach $aBlogs as $blog}
<li>
<a href="{$oBlog->getUrlFull()}">
<img src="{$oBlog->getAvatarPath(48)}" alt="{$oBlog->getTitle()|escape}" class="avatar" />
<a href="{$blog->getUrlFull()}">
<img src="{$blog->getAvatarPath(48)}" alt="{$blog->getTitle()|escape}" class="avatar" />
</a>
{if $oBlog->getType() == 'close'}
{if $blog->getType() == 'close'}
<i title="{lang 'blog.blocks.blogs.item.private'}" class="icon icon-lock"></i>
{/if}
<a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape}</a>
<a href="{$blog->getUrlFull()}">{$blog->getTitle()|escape}</a>
<p>{lang 'blog.users.readers_total'}: <strong>{$oBlog->getCountUser()}</strong></p>
<p>{lang 'blog.topics_total'}: <strong>{$oBlog->getCountTopic()}</strong></p>
<p>{lang 'blog.users.readers_total'}: <strong>{$blog->getCountUser()}</strong></p>
<p>{lang 'blog.topics_total'}: <strong>{$blog->getCountTopic()}</strong></p>
</li>
{/foreach}
</ul>

73
application/frontend/skin/developer/components/blog/js/blog.js
View file

@ -19,20 +19,10 @@ ls.blog = (function ($) {
* @private
*/
var _defaults = {
// Роутеры
routers: {
categories: aRouter['ajax'] + 'blogs/get-by-category/'
},
// Селекторы
selectors: {
addBlogSelectType: '.js-blog-add-type',
blog_add_type_note: '#blog_type_note',
nav: {
categories: '.js-blog-nav-categories',
blogs: '.js-blog-nav-blogs',
submit: '.js-blog-nav-submit'
}
}
};
@ -47,11 +37,6 @@ ls.blog = (function ($) {
this.options = $.extend({}, _defaults, options);
this.elements = {
nav: {
categories: $(this.options.selectors.nav.categories),
blogs: $(this.options.selectors.nav.blogs),
submit: $(this.options.selectors.nav.submit)
},
blog_add_type_note: $(this.options.selectors.blog_add_type_note),
};
@ -59,20 +44,6 @@ ls.blog = (function ($) {
$(this.options.selectors.addBlogSelectType).on('change', function (e) {
_this.loadInfoType($(this).val());
});
/**
* Блок навигации по категориям и блогам
*/
// Подгрузка блогов из выбранной категории
this.elements.nav.categories.on('change', function (e) {
_this.loadBlogsByCategory($(this).val());
});
// Переход на страницу выбранного блога
this.elements.nav.submit.on('click', function (e) {
_this.navigatorGoSelectBlog();
});
};
/**
@ -82,49 +53,5 @@ ls.blog = (function ($) {
this.elements.blog_add_type_note.text(ls.lang.get('blog.add.fields.type.note_' + type));
};
/**
* Подгружает блоги из категории
*
* @param {String} id ID категории
*/
this.loadBlogsByCategory = function(iId) {
var url = this.options.routers.categories,
params = { id: iId };
this.elements.nav.blogs.empty().prop('disabled', true),
this.elements.nav.submit.prop('disabled', true).addClass(ls.options.classes.states.loading);
ls.hook.marker('loadBlogsByCategoryBefore');
if (iId !== '0') {
ls.ajax.load(url, params, function(result) {
if (result.bStateError) {
this.elements.nav.blogs.append('<option>' + result.sMsg + '</option>');
} else {
$($.map(result.aBlogs, function(value, index) {
return '<option value="' + value.id + '" data-url="' + value.url_full + '">' + value.title + '</option>';
}).join('')).appendTo(this.elements.nav.blogs);
this.elements.nav.blogs.prop('disabled', false);
this.elements.nav.submit.prop('disabled', false).removeClass(ls.options.classes.states.loading);
ls.hook.run('ls_blog_load_blogs_by_category_after', [iId, result]);
}
this.elements.nav.submit.removeClass(ls.options.classes.states.loading);
}.bind(this));
} else {
this.elements.nav.submit.removeClass(ls.options.classes.states.loading);
this.elements.nav.blogs.html('<option>' + ls.lang.get('blog.blocks.navigator.blog') + '</option>');
}
};
/**
* Переход на страницу выбранного блога
*/
this.navigatorGoSelectBlog = function() {
window.location.href = this.elements.nav.blogs.find('option:selected').data('url') || '';
};
return this;
}).call(ls.blog || {},jQuery);

7
application/frontend/skin/developer/components/nav/css/nav.css
View file

@ -68,9 +68,10 @@
.nav--pills > li > a + a { margin-left: 1px; }
/* Stacked */
.nav.nav--pills.nav--stacked { margin-bottom: 15px; }
.nav.nav--pills.nav--stacked > li { float: none; margin-bottom: 3px; margin-right: 0; }
.nav.nav--pills.nav--stacked > li > a { float: none; display: block; padding: 7px 45px 7px 12px; }
.nav.nav--pills.nav--stacked { margin-bottom: 15px; }
.nav.nav--pills.nav--stacked:last-child { margin-bottom: 0; }
.nav.nav--pills.nav--stacked > li { float: none; margin-bottom: 3px; margin-right: 0; }
.nav.nav--pills.nav--stacked > li > a { float: none; display: block; padding: 7px 45px 7px 12px; }
/* Dropdown support */
.nav.nav--pills .dropdown-toggle:after { border-top-color: #333; }

2
application/frontend/skin/developer/components/pagination/pagination.tpl
View file

@ -6,8 +6,6 @@
* @param string $mods Список классов-модификаторов
* @param string $attributes Атрибуты
*
* @styles assets/css/components/pagination.css
*
* TODO: Сделать универсальные ссылки
*}

2
application/frontend/skin/developer/components/search/search-form.main.tpl
View file

@ -4,4 +4,4 @@
* @styles css/forms.css
*}
{include 'components/search-form/search-form.tpl' name='main' action="{router page='search'}{$sSearchType|default:'topics'}" mods=$smarty.local.mods}
{include 'components/search-form/search-form.tpl' name='main' action="{router page='search'}{$smarty.local.searchType|default:'topics'}" mods=$smarty.local.mods}

12
application/frontend/skin/developer/components/sort/sort.timespan.tpl
View file

@ -2,17 +2,17 @@
* Выпадающее меню выбора временного периода (за 24 часа, за месяц и т.д.)
*}
{if $sPeriodSelectCurrent}
{if $periodSelectCurrent}
{include 'components/dropdown/dropdown.tpl'
classes = 'js-dropdown-default'
name = 'sort_by_date'
text = 'Loading...'
attributes = [ 'data-dropdown-selectable' => 'true' ]
activeItem = $sPeriodSelectCurrent
activeItem = $periodSelectCurrent
menu = [
[ 'name' => '1', 'url' => "{$sPeriodSelectRoot}?period=1", 'text' => {lang name='blog.menu.top_period_1'} ],
[ 'name' => '7', 'url' => "{$sPeriodSelectRoot}?period=7", 'text' => {lang name='blog.menu.top_period_7'} ],
[ 'name' => '30', 'url' => "{$sPeriodSelectRoot}?period=30", 'text' => {lang name='blog.menu.top_period_30'} ],
[ 'name' => 'all', 'url' => "{$sPeriodSelectRoot}?period=all", 'text' => {lang name='blog.menu.top_period_all'} ]
[ 'name' => '1', 'url' => "{$periodSelectRoot}?period=1", 'text' => {lang name='blog.menu.top_period_1'} ],
[ 'name' => '7', 'url' => "{$periodSelectRoot}?period=7", 'text' => {lang name='blog.menu.top_period_7'} ],
[ 'name' => '30', 'url' => "{$periodSelectRoot}?period=30", 'text' => {lang name='blog.menu.top_period_30'} ],
[ 'name' => 'all', 'url' => "{$periodSelectRoot}?period=all", 'text' => {lang name='blog.menu.top_period_all'} ]
]}
{/if}

4
application/frontend/skin/developer/components/tags/search-form.tags.tpl
View file

@ -1,7 +1,5 @@
{**
* Форма поиска по тегам
*
* @styles css/forms.css
*}
{include 'components/search-form/search-form.tpl'
@ -11,4 +9,4 @@
classes = 'js-tag-search-form'
inputClasses = 'autocomplete-tags js-tag-search'
inputName = 'tag'
value = $sTag|escape}
value = $tag|escape}

3
application/frontend/skin/developer/components/talk/talk-list.tpl
View file

@ -3,6 +3,7 @@
*
* @param array $talks
* @param boolean $selectable
* @param boolean $paging
*}
{if $smarty.local.talks}
@ -123,4 +124,4 @@
{include 'components/alert/alert.tpl' text=$aLang.talk.notices.empty mods='empty'}
{/if}
{include 'components/pagination/pagination.tpl' paging=$aPaging}
{include 'components/pagination/pagination.tpl' paging=$smarty.local.paging}

19
application/frontend/skin/developer/components/talk/talk.tpl
View file

@ -3,6 +3,7 @@
*
* @param object $talk
* @param array $comments
* @param array $lastCommentId
*}
{$talk = $smarty.local.talk}
@ -22,13 +23,13 @@
{* Вывод комментариев к сообщению *}
{include 'components/comment/comments.tpl'
comments = $smarty.local.comments
classes = 'js-comments-talk'
attributes = [ 'id' => 'comments' ]
targetId = $talk->getId()
targetType = 'talk'
count = $talk->getCountComment()
dateReadLast = $talk->getTalkUser()->getDateLast()
lastCommentId = $iMaxIdComment
forbidText = $aLang.talk.notices.deleted}
comments = $smarty.local.comments
classes = 'js-comments-talk'
attributes = [ 'id' => 'comments' ]
targetId = $talk->getId()
targetType = 'talk'
count = $talk->getCountComment()
dateReadLast = $talk->getTalkUser()->getDateLast()
lastCommentId = $smarty.local.lastCommentId
forbidText = $aLang.talk.notices.deleted}
{/if}

8
application/frontend/skin/developer/components/user/blocks/block.user-photo.tpl
View file

@ -10,13 +10,15 @@
{/block}
{block 'block_content'}
{$session = $user->getSession()}
{* Статус онлайн\оффлайн *}
{if $oSession}
{if $oUserProfile->isOnline() && $smarty.now - strtotime($oSession->getDateLast()) < 60*5}
{if $session}
{if $oUserProfile->isOnline() && $smarty.now - strtotime($session->getDateLast()) < 60*5}
<div class="user-status user-status--online">{$aLang.user.status.online}</div>
{else}
<div class="user-status user-status--offline">
{$date = {date_format date=$oSession->getDateLast() hours_back="12" minutes_back="60" day_back="8" now="60*5" day="day H:i" format="j F в G:i"}|lower}
{$date = {date_format date=$session->getDateLast() hours_back="12" minutes_back="60" day_back="8" now="60*5" day="day H:i" format="j F в G:i"}|lower}
{if $oUserProfile->getProfileSex() != 'woman'}
{lang 'user.status.was_online_male' date=$date}

2
application/frontend/skin/developer/components/user/blocks/block.users-search.tpl
View file

@ -32,7 +32,7 @@
{include 'components/field/field.geo.tpl'
classes = 'js-field-geo-default'
targetType = 'user'
countries = $aCountriesUsed
countries = $countriesUsed
name = 'geo'
label = {lang name='user.settings.profile.fields.place.label'} }
{/block}

4
application/frontend/skin/developer/components/user/blocks/block.users-statistics.tpl
View file

@ -1,7 +1,5 @@
{**
* Статистика по пользователям
*
* @styles css/blocks.css
*}
{extends 'components/block/block.tpl'}
@ -15,5 +13,5 @@
{/block}
{block 'block_content'}
{include 'components/user/stat.tpl' stat=$aStat}
{include 'components/user/stat.tpl' stat=$usersStat}
{/block}

105
application/frontend/skin/developer/components/user/info.tpl
View file

@ -1,54 +1,70 @@
{hook run='user_info_begin' user=$oUserProfile}
{**
* Информация о пользователе
*
* @param object $user
* @param array usersInvited
* @param object invitedByUser
* @param array blogsJoined
* @param array blogsModerate
* @param array blogsAdminister
* @param array blogsCreated
* @param array usersFriend
*}
{$user = $smarty.local.user}
{$session = $user->getSession()}
{$geoTarget = $user->getGeoTarget()}
{hook run='user_info_begin' user=$user}
{**
* О себе
*}
{if $oUserProfile->getProfileAbout()}
{if $user->getProfileAbout()}
<div class="profile-info-about">
<h3 class="h5">{$aLang.user.profile.about.title}</h3>
<div class="text">
{$oUserProfile->getProfileAbout()}
{$user->getProfileAbout()}
</div>
</div>
{/if}
{hook run='user_info_about_after' user=$oUserProfile}
{hook run='user_info_about_after' user=$user}
{**
* Личное
*}
{$items = []}
{$userfields = $oUserProfile->getUserFieldValues(true, array(''))}
{$userfields = $user->getUserFieldValues(true, array(''))}
{* Пол *}
{if $oUserProfile->getProfileSex() != 'other'}
{if $user->getProfileSex() != 'other'}
{$items[] = [
'label' => {lang name='user.profile.personal.gender'},
'content' => "{if $oUserProfile->getProfileSex() == 'man'}{lang name='user.profile.personal.gender_male'}{else}{lang name='user.profile.personal.gender_female'}{/if}"
'content' => "{if $user->getProfileSex() == 'man'}{lang name='user.profile.personal.gender_male'}{else}{lang name='user.profile.personal.gender_female'}{/if}"
]}
{/if}
{* День рождения *}
{if $oUserProfile->getProfileBirthday()}
{if $user->getProfileBirthday()}
{$items[] = [
'label' => {lang name='user.profile.personal.birthday'},
'content' => {date_format date=$oUserProfile->getProfileBirthday() format="j F Y" notz=true}
'content' => {date_format date=$user->getProfileBirthday() format="j F Y" notz=true}
]}
{/if}
{* Местоположение *}
{if $oGeoTarget}
{if $geoTarget}
{capture 'info_private_geo'}
<span itemprop="address" itemscope itemtype="http://data-vocabulary.org/Address">
{if $oGeoTarget->getCountryId()}
<a href="{router page='people'}country/{$oGeoTarget->getCountryId()}/" itemprop="country-name">{$oUserProfile->getProfileCountry()|escape}</a>{if $oGeoTarget->getCityId()},{/if}
{if $geoTarget->getCountryId()}
<a href="{router page='people'}country/{$geoTarget->getCountryId()}/" itemprop="country-name">{$user->getProfileCountry()|escape}</a>{if $geoTarget->getCityId()},{/if}
{/if}
{if $oGeoTarget->getCityId()}
<a href="{router page='people'}city/{$oGeoTarget->getCityId()}/" itemprop="locality">{$oUserProfile->getProfileCity()|escape}</a>
{if $geoTarget->getCityId()}
<a href="{router page='people'}city/{$geoTarget->getCityId()}/" itemprop="locality">{$user->getProfileCity()|escape}</a>
{/if}
</span>
{/capture}
@ -66,7 +82,7 @@
* Контакты
*}
{$items = []}
{$userfields = $oUserProfile->getUserFieldValues(true, array('contact'))}
{$userfields = $user->getUserFieldValues(true, array('contact'))}
{foreach $userfields as $field}
{$items[] = [
@ -82,7 +98,7 @@
* Соц. сети
*}
{$items = []}
{$userfields = $oUserProfile->getUserFieldValues(true, array('social'))}
{$userfields = $user->getUserFieldValues(true, array('social'))}
{foreach $userfields as $field}
{$items[] = [
@ -102,19 +118,19 @@
{if Config::Get('general.reg.invite')}
{* Кто пригласил пользователя *}
{if $oUserInviteFrom}
{if $smarty.local.invitedByUser}
{$items[] = [
'label' => {lang name='user.profile.activity.invited_by'},
'content' => "<a href=\"{$oUserInviteFrom->getUserWebPath()}\">{$oUserInviteFrom->getDisplayName()}</a>"
'content' => "<a href=\"{$invitedByUser->getUserWebPath()}\">{$invitedByUser->getDisplayName()}</a>"
]}
{/if}
{* Приглашенные пользователем *}
{if $aUsersInvite}
{$users = ''}
{if $smarty.local.usersInvited}
{$users = []}
{foreach $aUsersInvite as $user}
{$users = $users|cat:"<a href=\"{$user->getUserWebPath()}\">{$user->getDisplayName()}</a>&nbsp;"}
{foreach $smarty.local.usersInvited as $userInvited}
{$users = $users|cat:"<a href=\"{$userInvited->getUserWebPath()}\">{$userInvited->getDisplayName()}</a>&nbsp;"}
{/foreach}
{$items[] = [
@ -125,10 +141,10 @@
{/if}
{* Блоги созданные пользователем *}
{if $aBlogsOwner}
{if $smarty.local.blogsCreated}
{$blogs = ''}
{foreach $aBlogsOwner as $blog}
{foreach $smarty.local.blogsCreated as $blog}
{$blogs = $blogs|cat:"<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>{if ! $blog@last}, {/if}"}
{/foreach}
@ -139,12 +155,12 @@
{/if}
{* Блоги администрируемые пользователем *}
{if $aBlogAdministrators}
{if $smarty.local.blogsAdminister}
{$blogs = ''}
{foreach $aBlogAdministrators as $user}
{$blog = $user->getBlog()}
{$blogs = $blogs|cat:"<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>{if ! $user@last}, {/if}"}
{foreach $smarty.local.blogsAdminister as $blogUser}
{$blog = $blogUser->getBlog()}
{$blogs = $blogs|cat:"<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>{if ! $blogUser@last}, {/if}"}
{/foreach}
{$items[] = [
@ -154,12 +170,12 @@
{/if}
{* Блоги модерируемые пользователем *}
{if $aBlogModerators}
{if $smarty.local.blogsModerate}
{$blogs = ''}
{foreach $aBlogModerators as $user}
{$blog = $user->getBlog()}
{$blogs = $blogs|cat:"<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>{if ! $user@last}, {/if}"}
{foreach $smarty.local.blogsModerate as $blogUser}
{$blog = $blogUser->getBlog()}
{$blogs = $blogs|cat:"<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>{if ! $blogUser@last}, {/if}"}
{/foreach}
{$items[] = [
@ -169,12 +185,12 @@
{/if}
{* Блоги в которые вступил пользователь *}
{if $aBlogUsers}
{if $smarty.local.blogsJoined}
{$blogs = ''}
{foreach $aBlogUsers as $user}
{$blog = $user->getBlog()}
{$blogs = $blogs|cat:"<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>{if ! $user@last}, {/if}"}
{foreach $smarty.local.blogsJoined as $blogUser}
{$blog = $blogUser->getBlog()}
{$blogs = $blogs|cat:"<a href=\"{$blog->getUrlFull()}\">{$blog->getTitle()|escape}</a>{if ! $blogUser@last}, {/if}"}
{/foreach}
{$items[] = [
@ -186,14 +202,14 @@
{* Дата регистрации *}
{$items[] = [
'label' => {lang name='user.date_registration'},
'content' => {date_format date=$oUserProfile->getDateRegister()}
'content' => {date_format date=$user->getDateRegister()}
]}
{* Дата последнего визита *}
{if $oSession}
{if $session}
{$items[] = [
'label' => {lang name='user.date_last_session'},
'content' => {date_format date=$oSession->getDateLast()}
'content' => {date_format date=$session->getDateLast()}
]}
{/if}
@ -202,28 +218,27 @@
{**
* Друзья
*}
{if $aUsersFriend}
{if $smarty.local.friends}
{capture 'user_info_friends'}
{include 'components/user/user-list-avatar.tpl' aUsersList=$aUsersFriend}
{include 'components/user/user-list-avatar.tpl' aUsersList=$smarty.local.friends}
{/capture}
{include 'components/user/info-group.tpl'
title = "<a href=\"{$oUserProfile->getUserWebPath()}friends/\">{$aLang.user.friends.title}</a> ({$iCountFriendsUser})"
title = "<a href=\"{$user->getUserWebPath()}friends/\">{$aLang.user.friends.title}</a> ({$iCountFriendsUser})"
html = $smarty.capture.user_info_friends}
{/if}
{**
* Стена
*}
{capture 'user_info_wall'}
{insert name='block' block='wall' params=[
'classes' => 'js-wall-default',
'user_id' => $oUserProfile->getId()
'user_id' => $user->getId()
]}
{/capture}
{include 'components/user/info-group.tpl' name='wall' title={lang name='wall.title'} html=$smarty.capture.user_info_wall}
{hook run='user_info_end' user=$oUserProfile}
{hook run='user_info_end' user=$user}

2
application/frontend/skin/developer/components/user/js/user-follow.js
View file

@ -62,7 +62,7 @@
* Отписаться
*/
unfollow: function() {
ls.ajax.load( this.option( 'urls.follow' ), { iUserId: [ this.element.data('id') ] }, this.onUnfollow.bind(this) );
ls.ajax.load( this.option( 'urls.unfollow' ), { iUserId: this.element.data('id') }, this.onUnfollow.bind(this) );
},
/**

12
application/frontend/skin/developer/components/user/stat.tpl
View file

@ -3,15 +3,15 @@
<div class="user-stat">
{* Кол-во пользователей *}
{include 'components/info-list/info-list.tpl' list=[
[ 'label' => "{lang name='user.stats.all'}:", 'content' => $aStat.count_all ],
[ 'label' => "{lang name='user.stats.active'}:", 'content' => $aStat.count_active ],
[ 'label' => "{lang name='user.stats.not_active'}:", 'content' => $aStat.count_inactive ]
[ 'label' => "{lang name='user.stats.all'}:", 'content' => $stat.count_all ],
[ 'label' => "{lang name='user.stats.active'}:", 'content' => $stat.count_active ],
[ 'label' => "{lang name='user.stats.not_active'}:", 'content' => $stat.count_inactive ]
]}
{* Пол *}
{include 'components/info-list/info-list.tpl' list=[
[ 'label' => "{lang name='user.stats.men'}:", 'content' => $aStat.count_sex_man ],
[ 'label' => "{lang name='user.stats.women'}:", 'content' => $aStat.count_sex_woman ],
[ 'label' => "{lang name='user.stats.none'}:", 'content' => $aStat.count_sex_other ]
[ 'label' => "{lang name='user.stats.men'}:", 'content' => $stat.count_sex_man ],
[ 'label' => "{lang name='user.stats.women'}:", 'content' => $stat.count_sex_woman ],
[ 'label' => "{lang name='user.stats.none'}:", 'content' => $stat.count_sex_other ]
]}
</div>

4
application/frontend/skin/developer/navs/nav.blog.edit.tpl
View file

@ -7,6 +7,6 @@
activeItem = $sMenuItemSelect
mods = 'pills'
items = [
[ 'name' => 'profile', 'url' => "{router page='blog'}edit/{$oBlogEdit->getId()}/", 'text' => $aLang.blog.admin.nav.profile ],
[ 'name' => 'admin', 'url' => "{router page='blog'}admin/{$oBlogEdit->getId()}/", 'text' => $aLang.blog.admin.nav.users ]
[ 'name' => 'profile', 'url' => "{router page='blog'}edit/{$blogEdit->getId()}/", 'text' => $aLang.blog.admin.nav.profile ],
[ 'name' => 'admin', 'url' => "{router page='blog'}admin/{$blogEdit->getId()}/", 'text' => $aLang.blog.admin.nav.users ]
]}

6
application/frontend/skin/developer/navs/nav.search.tpl
View file

@ -4,9 +4,9 @@
{include 'components/nav/nav.tpl'
name = 'search'
activeItem = $sSearchType
activeItem = $searchType
mods = 'pills'
items = [
[ 'name' => 'topics', 'url' => "{router page='search/topics'}?q={$_aRequest.q}", 'text' => $aLang.search.result.topics, 'count' => $aTypeCounts.topics ],
[ 'name' => 'comments', 'url' => "{router page='search/comments'}?q={$_aRequest.q}", 'text' => $aLang.search.result.comments, 'count' => $aTypeCounts.comments ]
[ 'name' => 'topics', 'url' => "{router page='search/topics'}?q={$_aRequest.q}", 'text' => $aLang.search.result.topics, 'count' => $typeCounts.topics ],
[ 'name' => 'comments', 'url' => "{router page='search/comments'}?q={$_aRequest.q}", 'text' => $aLang.search.result.comments, 'count' => $typeCounts.comments ]
]}

Some files were not shown because too many files have changed in this diff Show more