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-10-16 17:56:42 +07:00
parent fa87cf779c
commit d374327a4b
10 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -222,7 +222,7 @@ class ActionSettings extends Action
$oViewer->Assign('width', (int)getRequest('width'), true);
$oViewer->Assign('height', (int)getRequest('height'), true);
$this->Viewer_AssignAjax('sText', $oViewer->Fetch("component@user.modal.crop-photo"));
$this->Viewer_AssignAjax('sText', $oViewer->Fetch("component@photo.modal-photo"));
}
/**
@ -241,7 +241,7 @@ class ActionSettings extends Action
$oViewer->Assign('height', (int)getRequest('height'), true);
$oViewer->Assign('usePreview', true, true);
$this->Viewer_AssignAjax('sText', $oViewer->Fetch("component@user.modal.crop-avatar"));
$this->Viewer_AssignAjax('sText', $oViewer->Fetch("component@photo.modal-avatar"));
}
/**

8
application/frontend/components/auth/auth.login.tpl
View file

@ -30,10 +30,10 @@
{* Каптча *}
{if Config::Get('general.login.captcha')}
{component 'field' template='captcha'
type = Config::Get('sys.captcha.type')
name = 'captcha'
captchaName = 'user_auth'
label = $aLang.auth.labels.captcha}
captchaType = Config::Get('sys.captcha.type')
captchaName = 'user_auth'
name = 'captcha'
label = $aLang.auth.labels.captcha}
{/if}
{* Запомнить *}

4
application/frontend/components/auth/auth.registration.tpl
View file

@ -40,9 +40,9 @@
{* Каптча *}
{if Config::Get('module.user.captcha_use_registration')}
{component 'field' template='captcha'
type = Config::Get('sys.captcha.type')
name = 'captcha'
captchaType = Config::Get('sys.captcha.type')
captchaName = 'user_signup'
name = 'captcha'
label = $aLang.auth.labels.captcha}
{/if}

4
application/frontend/components/photo/component.json
View file

@ -5,7 +5,9 @@
"crop": "*"
},
"templates": {
"photo": "photo.tpl"
"photo": "photo.tpl",
"modal-photo": "modal-photo.tpl",
"modal-avatar": "modal-avatar.tpl"
},
"scripts": {
"photo": "js/photo.js"

6
application/frontend/components/photo/modal-avatar.tpl Normal file
View file

@ -0,0 +1,6 @@
{extends 'component@crop.crop'}
{block 'crop_modal_options' append}
{$title = {lang 'user.photo.crop_avatar.title'}}
{$desc = {lang 'user.photo.crop_avatar.desc'}}
{/block}

6
application/frontend/components/photo/modal-photo.tpl Normal file
View file

@ -0,0 +1,6 @@
{extends 'component@crop.crop'}
{block 'crop_modal_options' append}
{$title = {lang 'user.photo.crop_photo.title'}}
{$desc = {lang 'user.photo.crop_photo.desc'}}
{/block}

2
application/frontend/components/report/modal.report.tpl
View file

@ -25,7 +25,7 @@
{* Каптча *}
{if Config::Get('module.user.complaint_captcha')}
{component 'field' template='captcha'
type = Config::Get('sys.captcha.type')
captchaType = Config::Get('sys.captcha.type')
captchaName ='complaint_user'
name ='captcha'}
{/if}

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

@ -10,6 +10,7 @@
* @param string $itemTemplate
*}
{$component = 'user-list-small'}
{component_define_params params=[ 'exclude', 'hideableEmptyAlert', 'selectable', 'show', 'title', 'users', 'mods', 'classes', 'attributes' ]}
{* Заголовок *}
@ -25,9 +26,13 @@
visible = ! $users}
{/if}
{if $selectable}
{$mods = "$mods selectable"}
{/if}
{* Список пользователей *}
{if $users || ! $show|default:true}
<ul class="user-list-small js-user-list-small {$classes}" {if ! $show|default:true}style="display: none"{/if}>
<ul class="{$component} js-user-list-small {$classes} {cmods name=$component mods=$mods}" {cattr list=$attributes} {if ! $show|default:true}style="display: none"{/if}>
{foreach $users as $user}
{$userContainer = $user}

2
application/frontend/skin/developer/assets/js/init.js
View file

@ -391,7 +391,7 @@ jQuery(document).ready(function($){
cancel_photo: aRouter.settings + 'ajax-crop-cancel-photo'
},
changeavatar: function ( event, _this, avatars ) {
$( '.js-user-profile-avatar, .js-wall-entry[data-user-id=' + _this.option( 'params.user_id' ) + '] .comment-avatar img' ).attr( 'src', avatars[ '64crop' ] + '?' + Math.random() );
$( '.js-user-profile-avatar, .js-wall-entry[data-user-id=' + _this.option( 'params.target_id' ) + '] .ls-comment-avatar img' ).attr( 'src', avatars[ '64crop' ] + '?' + Math.random() );
$( '.nav-item--userbar-username img' ).attr( 'src', avatars[ '24crop' ] + '?' + Math.random() );
}
});

2
framework

@ -1 +1 @@
Subproject commit cc1438697bd1f6726743fd19ada083806a34702e
Subproject commit 2cd69cf3365b92d95dc65d2750727eaa2c8679b0