ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-17 07:10:48 +03:00
Code Issues Releases Wiki Activity

Мелкие доработки и исправления

Browse source
This commit is contained in:
Denis Shakhov 2016-08-30 11:28:40 +07:00
parent 5ecc9bfd85
commit d6dd63b29e
12 changed files with 26 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/classes/actions/ActionAjax.class.php
View file

@ -1797,7 +1797,7 @@ class ActionAjax extends Action
if ($bReturnExtended) {
$aItems[] = array(
'value' => $oUser->getId(),
'text' => $oUser->getLogin(),
'label' => $oUser->getLogin(),
);
} else {
$aItems[] = $oUser->getLogin();

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

@ -52,7 +52,7 @@
{/if}
{/if}
{component 'nav' items=$actions mods='stacked' classes='profile-actions'}
{component 'nav' hook='blog_actions' items=$actions mods='stacked' classes='profile-actions'}
{/capture}
{component 'block'

4
application/frontend/components/comment/comments.tpl
View file

@ -28,7 +28,7 @@
*}
{$component = 'ls-comments'}
{component_define_params params=[ 'addCommentText', 'authorid', 'authorText', 'commentParams', 'comments', 'count', 'dateReadLast', 'forbidAdd',
{component_define_params params=[ 'addCommentText', 'authorId', 'authorText', 'commentParams', 'comments', 'count', 'dateReadLast', 'forbidAdd',
'forbidText', 'isSubscribed', 'lastCommentId', 'maxLevel', 'pagination', 'targetId', 'targetType', 'title', 'titleNoComments',
'useSubscribe', 'mods', 'classes', 'attributes' ]}
@ -109,7 +109,7 @@
comments = $comments
forbidAdd = $forbidAdd
maxLevel = $maxLevel
authorid = $authorid
authorId = $authorId
authorText = $authorText
dateReadLast = $dateReadLast
commentParams = $commentParams}

30
application/frontend/components/search-form/tests/visual/search_form.tpl
View file

@ -1,30 +0,0 @@
{**
* Тестирование форм поиска
*}
{extends 'layouts/layout.base.tpl'}
{block 'layout_page_title'}
Component <span>search-form</span>
{/block}
{block 'layout_content'}
{function test_heading}
<br><h3>{$sText}</h3>
{/function}
{test_heading sText='Default'}
{component 'search-form'
name = 'text'
note = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Velit, libero.'}
{test_heading sText='Light'}
{component 'search-form'
name = 'text'
mods = 'light'
note = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Velit, libero.'}
{/block}

17
application/frontend/components/topic/topic-add.tpl
View file

@ -7,20 +7,12 @@
* @param array $blogId
*}
{component_define_params params=[ 'topic', 'type', 'skipBlogs', 'blogs' ]}
{component_define_params params=[ 'topic', 'type', 'skipBlogs', 'blogs', 'classes' ]}
{block 'add_topic_options'}{/block}
{hook run="add_topic_begin"}
{block 'add_topic_header_after'}{/block}
<form action="" method="POST" enctype="multipart/form-data" id="topic-add-form" class="js-form-validate" data-content-action="{( $topic ) ? 'edit' : 'add'}">
<form action="" method="POST" enctype="multipart/form-data" id="topic-add-form" class="{$classes} js-form-validate" data-content-action="{( $topic ) ? 'edit' : 'add'}">
{hook run="form_add_topic_begin"}
{block 'add_topic_form_begin'}{/block}
{* Выбор блога *}
{if ! $skipBlogs}
{$blogsSelect = []}
@ -199,7 +191,4 @@
{* Блок с превью текста *}
{component 'topic' template='preview'}
{block 'add_topic_end'}{/block}
{hook run="add_topic_end"}
{component 'topic' template='preview'}

1
application/frontend/components/user/actions.tpl
View file

@ -8,6 +8,7 @@
{component 'nav'
hook = 'user_actions'
hookParams = [ user => $user ]
mods = 'stacked'
classes = 'profile-actions'
items = [

4
application/frontend/components/user/modals/modal.user-list.tpl
View file

@ -13,9 +13,9 @@
{component 'actionbar' template='item.select'
classes = 'js-user-list-modal-actionbar'
target = '.js-user-list-select .js-user-list-small-item'
assign = users}
assign = usersHtml}
{component 'actionbar' items=[[ 'buttons' => [ 'html' => $users ] ]]}
{component 'actionbar' items=[[ 'buttons' => [ 'html' => $usersHtml ] ]]}
{/if}
{* Список *}

2
application/frontend/components/user/nav.user.tpl
View file

@ -2,7 +2,7 @@
* Навигация на странице пользователя
*}
{component 'nav' name='user' activeItem=$sMenuProfileItemSelect mods='stacked' classes='user-nav' hookParams=[ 'oUserProfile' => $oUserProfile ] items=[
{component 'nav' hook='user_profile' activeItem=$sMenuProfileItemSelect mods='stacked' classes='user-nav' hookParams=[ 'oUserProfile' => $oUserProfile ] items=[
[ 'name' => 'whois', 'text' => {lang name='user.profile.nav.info'}, 'url' => "{$oUserProfile->getUserWebPath()}" ],
[ 'name' => 'wall', 'text' => {lang name='user.profile.nav.wall'}, 'url' => "{$oUserProfile->getUserWebPath()}wall/", 'count' => $iCountWallUser ],
[ 'name' => 'created', 'text' => {lang name='user.profile.nav.publications'}, 'url' => "{$oUserProfile->getUserWebPath()}created/topics/", 'count' => $iCountCreated ],

1
application/frontend/components/user/user-list-small.tpl
View file

@ -37,7 +37,6 @@
{if ! $exclude || ! in_array( $user->getId(), $exclude )}
{block 'user_list_small_item'}
{*include $itemTemplate|default:'./user-list-small-item.tpl' showRemove=! $excludeRemove || ! in_array( $user->getId(), $aUserListSmallExcludeRemove )*}
{component 'user' template='list-small-item' user=$user selectable=$selectable}
{/block}
{/if}

4
application/frontend/components/userbar/userbar.tpl
View file

@ -41,7 +41,7 @@
]
]
],
[ 'text' => $aLang.common.create, menu => [ items => $createMenu ] ],
[ 'text' => $aLang.common.create, menu => [ hook => 'create', items => $createMenu ] ],
[ 'text' => $aLang.talk.title, 'url' => "{router page='talk'}", 'title' => $aLang.talk.new_messages, 'is_enabled' => $iUserCurrentCountTalkNew, 'count' => $iUserCurrentCountTalkNew ],
[ 'text' => $aLang.auth.logout, 'url' => "{router page='auth'}logout/?security_ls_key={$LIVESTREET_SECURITY_KEY}" ]
]}
@ -52,7 +52,7 @@
]}
{/if}
{component 'nav' name='userbar' activeItem=$sMenuHeadItemSelect mods='userbar' items=$items}
{component 'nav' hook='userbar_nav' hookParams=[ user => $oUserCurrent ] activeItem=$sMenuHeadItemSelect mods='userbar' items=$items}
</nav>
{component 'search' template='main' mods='light'}

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

@ -12,7 +12,7 @@
{block 'layout_content'}
{component 'nav'
name = 'admin'
hook = '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 ],

18
application/frontend/skin/developer/layouts/layout.base.tpl
View file

@ -56,6 +56,8 @@
{/block}
{block 'layout_body'}
{hook run='layout_body_begin'}
{**
* Юзербар
*}
@ -90,9 +92,9 @@
{**
* Основной контэйнер
*}
<div id="container" class="ls-grid-row layout-container {hook run='container_class'} {if $layoutShowSidebar}layout-has-sidebar{else}layout-no-sidebar{/if}">
<div id="container" class="ls-grid-row layout-container {hook run='layout_container_class' action=$sAction} {if $layoutShowSidebar}layout-has-sidebar{else}layout-no-sidebar{/if}">
{* Вспомогательный контейнер-обертка *}
<div class="ls-grid-row layout-wrapper" class="{hook run='wrapper_class'}">
<div class="ls-grid-row layout-wrapper" class="{hook run='layout_wrapper_class' action=$sAction}">
{**
* Контент
*}
@ -100,7 +102,7 @@
role="main"
{if $sMenuItemSelect == 'profile'}itemscope itemtype="http://data-vocabulary.org/Person"{/if}>
{hook run='content_begin'}
{hook run='layout_content_header_begin' action=$sAction}
{* Основной заголовок страницы *}
{block 'layout_page_title' hide}
@ -147,9 +149,11 @@
{/if}
{/block}
{hook run='layout_content_begin' action=$sAction}
{block 'layout_content'}{/block}
{hook run='content_end'}
{hook run='layout_content_end' action=$sAction}
</div>
{**
@ -167,9 +171,9 @@
{* Подвал *}
<footer class="ls-grid-row layout-footer">
{block 'layout_footer'}
{hook run='footer_begin'}
{hook run='layout_footer_begin'}
{hook run='copyright'}
{hook run='footer_end'}
{hook run='layout_footer_end'}
{/block}
</footer>
</div> {* /container *}
@ -192,4 +196,6 @@
{* Подключение тулбара *}
{component 'toolbar' classes='js-toolbar-default' items={show_blocks group='toolbar'}}
{hook run='layout_body_end'}
{/block}