diff --git a/application/classes/actions/ActionProfile.class.php b/application/classes/actions/ActionProfile.class.php index 33ab86fa..7b240b08 100644 --- a/application/classes/actions/ActionProfile.class.php +++ b/application/classes/actions/ActionProfile.class.php @@ -576,7 +576,7 @@ class ActionProfile extends Action * Создаем заметку и проводим валидацию */ $oNote = Engine::GetEntity('ModuleUser_EntityNote'); - $oNote->setTargetUserId(getRequestStr('iUserId')); + $oNote->setTargetUserId(getRequestStr('user_id')); $oNote->setUserId($this->oUserCurrent->getId()); $oNote->setText(getRequestStr('text')); @@ -608,7 +608,7 @@ class ActionProfile extends Action return $this->EventErrorDebug(); } - if (!($oUserTarget = $this->User_GetUserById(getRequestStr('iUserId')))) { + if (!($oUserTarget = $this->User_GetUserById(getRequestStr('user_id')))) { return $this->EventErrorDebug(); } if (!($oNote = $this->User_GetUserNote($oUserTarget->getId(), $this->oUserCurrent->getId()))) { diff --git a/application/frontend/components/feed/blogs.tpl b/application/frontend/components/feed/blogs.tpl index 0f097924..5c5838a7 100644 --- a/application/frontend/components/feed/blogs.tpl +++ b/application/frontend/components/feed/blogs.tpl @@ -6,7 +6,7 @@ *} {if $oUserCurrent} -
+
{$blogsSubscribed = $smarty.local.blogsSubscribed}

diff --git a/application/frontend/components/note/css/note.css b/application/frontend/components/note/css/note.css index ff737889..b7000ee6 100644 --- a/application/frontend/components/note/css/note.css +++ b/application/frontend/components/note/css/note.css @@ -2,51 +2,51 @@ * Заметка */ -.user-note { +.ls-note { background: #F1F7AF; padding: 20px 20px 18px; margin-bottom: 15px; border-radius: 5px; box-shadow: 0 1px 0 #DBE28B; } -.user-note:last-child { +.ls-note:last-child { margin-bottom: 0; } /* Действия */ -.user-note-actions { +.ls-note-actions { margin: 10px 0 0 0; } -.user-note-actions li { +.ls-note-actions li { float: left; margin-right: 15px; } -.user-note-actions li a { +.ls-note-actions li a { text-decoration: none; color: #B7BD79; -webkit-transition: color .2s; transition: color .2s; } -.user-note-actions li a:hover { +.ls-note-actions li a:hover { color: #A3A86B; } -.user-note-actions li a:focus { +.ls-note-actions li a:focus { outline: dotted 1px; } -.user-note-actions--add { +.ls-note-actions--add { margin: 0; } -.user-note-actions--add li { +.ls-note-actions--add li { margin: 0; float: none; text-align: center; } /* Форма добавления/редактирования */ -.user-note-form .ls-field { +.ls-note-form .ls-field { margin-bottom: 15px; } -.user-note-form-text { +.ls-note-form-text { height: 5em; } \ No newline at end of file diff --git a/application/frontend/components/note/js/note.js b/application/frontend/components/note/js/note.js index 6df2d4c4..480fae8a 100644 --- a/application/frontend/components/note/js/note.js +++ b/application/frontend/components/note/js/note.js @@ -24,16 +24,16 @@ // Селекторы selectors: { - body: '.js-user-note-body', - text: '.js-user-note-text', - add: '.js-user-note-add', - actions: '.js-user-note-actions', - actions_edit: '.js-user-note-actions-edit', - actions_remove: '.js-user-note-actions-remove', + body: '.js-note-body', + text: '.js-note-text', + add: '.js-note-add', + actions: '.js-note-actions', + actions_edit: '.js-note-actions-edit', + actions_remove: '.js-note-actions-remove', - form: '.js-user-note-form', - form_text: '.js-user-note-form-text', - form_cancel: '.js-user-note-form-cancel' + form: '.js-note-form', + form_text: '.js-note-form-text', + form_cancel: '.js-note-form-cancel' }, params: {} diff --git a/application/frontend/components/note/note.tpl b/application/frontend/components/note/note.tpl index 23d56f70..ee472e66 100644 --- a/application/frontend/components/note/note.tpl +++ b/application/frontend/components/note/note.tpl @@ -7,17 +7,17 @@ *} {* Название компонента *} -{$component = 'user-note'} +{$component = 'ls-note'} {* Установка дефолтных значений *} {$note = $smarty.local.note} {$isEditable = $smarty.local.isEditable|default:true} -

+
{* Заметка *} -
+
{* Текст *} -

+

{if $note} {$note->getText()} {/if} @@ -25,13 +25,13 @@ {* Действия *} {if $isEditable} -

    -
  • {$aLang.common.edit}
    • -
  • {$aLang.common.remove}
    • + {* Добавить *} -
      + {/if} @@ -39,11 +39,11 @@ {* Форма редактирования *} {if $isEditable} - {/if}
\ No newline at end of file diff --git a/application/frontend/components/photo/css/photo.css b/application/frontend/components/photo/css/photo.css index aa9aa1b2..e5b8e4d9 100644 --- a/application/frontend/components/photo/css/photo.css +++ b/application/frontend/components/photo/css/photo.css @@ -8,7 +8,7 @@ * @author Denis Shakhov */ -.photo { +.ls-photo { position: relative; min-width: 100%; min-height: 50px; @@ -16,13 +16,13 @@ } /* Изображение */ -.photo-image { +.ls-photo-image { vertical-align: top; max-width: 100%; } /* Действия */ -.photo-actions { +.ls-photo-actions { position: absolute; bottom: 0; left: 0; @@ -33,7 +33,7 @@ -webkit-transition: opacity .3s; transition: opacity .3s; } -.photo-actions li { +.ls-photo-actions li { padding: 7px 15px; color: #bbb; font-size: 13px; @@ -41,21 +41,21 @@ -webkit-transition: color .2s; transition: color .2s; } -.photo-actions li:hover { +.ls-photo-actions li:hover { color: #eee; } -.photo:hover .photo-actions { +.ls-photo:hover .ls-photo-actions { opacity: 1; } /* @modifier nophoto */ -.photo--nophoto .photo-image { +.ls-photo--nophoto .ls-photo-image { width: 100%; } -.photo--nophoto .photo-actions { +.ls-photo--nophoto .ls-photo-actions { opacity: 1; } -.photo--nophoto .photo-actions-crop-avatar, -.photo--nophoto .photo-actions-remove { +.ls-photo--nophoto .ls-photo-actions-crop-avatar, +.ls-photo--nophoto .ls-photo-actions-remove { display: none; } \ No newline at end of file diff --git a/application/frontend/components/photo/photo.tpl b/application/frontend/components/photo/photo.tpl index 8f1f2982..eecbb3f3 100644 --- a/application/frontend/components/photo/photo.tpl +++ b/application/frontend/components/photo/photo.tpl @@ -12,7 +12,7 @@ * TODO: Вынести текстовки в photo *} -{$component = 'photo'} +{$component = 'ls-photo'} {$hasPhoto = $smarty.local.hasPhoto} {$useAvatar = $smarty.local.useAvatar|default:true} diff --git a/application/frontend/components/poll/css/poll.css b/application/frontend/components/poll/css/poll.css index ed9bc1fc..f2e8d8a7 100644 --- a/application/frontend/components/poll/css/poll.css +++ b/application/frontend/components/poll/css/poll.css @@ -8,15 +8,15 @@ * @author Denis Shakhov */ -.poll { margin-bottom: 15px; background: #fafafa; padding: 15px; } +.ls-poll { margin-bottom: 15px; background: #fafafa; padding: 15px; } -.poll-title { font-size: 20px; margin-bottom: 20px; } +.ls-poll-title { font-size: 20px; margin-bottom: 20px; } -.poll-answer-list { margin-bottom: 20px; margin-left: 0; list-style-type: none; } +.ls-poll-answer-list { margin-bottom: 20px; margin-left: 0; list-style-type: none; } -.poll-answer-list-item { margin-bottom: 10px; } -.poll-answer-list-item:last-child { margin-bottom: 0; } -.poll-answer-list-item label { display: inline; } +.ls-poll-answer-list-item { margin-bottom: 10px; } +.ls-poll-answer-list-item:last-child { margin-bottom: 0; } +.ls-poll-answer-list-item label { display: inline; } /** @@ -24,18 +24,18 @@ * * @template polls/poll.result.tpl */ -.poll-result { margin-bottom: 10px; padding: 15px 15px 0; background: #fff; border: 1px solid #eee; } -.poll-result-item { margin-bottom: 20px; overflow: hidden; zoom: 1; } -.poll-result-item-count { float: left; width: 50px; text-align: right; padding-right: 15px; } -.poll-result-item-count strong { display: block; } -.poll-result-item-count span { color: #aaa; } -.poll-result-item-chart { padding-left: 65px; } -.poll-result-item-bar { height: 10px; margin-top: 5px; background: #ccc; overflow: hidden; border-radius: 2px; } +.ls-poll-result { margin-bottom: 10px; padding: 15px 15px 0; background: #fff; border: 1px solid #eee; } +.ls-poll-result-item { margin-bottom: 20px; overflow: hidden; zoom: 1; } +.ls-poll-result-item-count { float: left; width: 50px; text-align: right; padding-right: 15px; } +.ls-poll-result-item-count strong { display: block; } +.ls-poll-result-item-count span { color: #aaa; } +.ls-poll-result-item-chart { padding-left: 65px; } +.ls-poll-result-item-bar { height: 10px; margin-top: 5px; background: #ccc; overflow: hidden; border-radius: 2px; } -.poll-result-item--most .poll-result-item-bar { background: #AC90DF; } -.poll-result-item--voted .poll-result-item-count strong { background: yellow; } +.ls-poll-result-item--most .ls-poll-result-item-bar { background: #AC90DF; } +.ls-poll-result-item--voted .ls-poll-result-item-count strong { background: yellow; } -.poll-result-total { color: #aaa; margin-left: 10px; } +.ls-poll-result-total { color: #aaa; margin-left: 10px; } /** @@ -43,11 +43,11 @@ * * @template polls/poll.form.tpl */ -.poll-manage .fieldset-body { padding-bottom: 0; } -.poll-manage-add { margin-bottom: 15px; } -.poll-manage-list { overflow: hidden; } -.poll-manage-item { padding: 10px 70px 10px 15px; background: #fff; margin-bottom: 1px; position: relative; } -.poll-manage-item:last-child { margin-bottom: 15px; } +.ls-poll-manage .fieldset-body { padding-bottom: 0; } +.ls-poll-manage-add { margin-bottom: 15px; } +.ls-poll-manage-list { overflow: hidden; } +.ls-poll-manage-item { padding: 10px 70px 10px 15px; background: #fff; margin-bottom: 1px; position: relative; } +.ls-poll-manage-item:last-child { margin-bottom: 15px; } /** @@ -55,7 +55,7 @@ * * @template polls/poll.form.tpl */ -.poll-form-answer-item { margin-bottom: 10px; padding-right: 25px; position: relative; } -.poll-form-answer-item .ls-field, -.poll-form-answer-item:last-child { margin-bottom: 0; } -.poll-form-answer-item-remove { position: absolute; top: 7px; right: 0; cursor: pointer; } +.ls-poll-form-answer-item { margin-bottom: 10px; padding-right: 25px; position: relative; } +.ls-poll-form-answer-item .ls-field, +.ls-poll-form-answer-item:last-child { margin-bottom: 0; } +.ls-poll-form-answer-item-remove { position: absolute; top: 7px; right: 0; cursor: pointer; } diff --git a/application/frontend/components/poll/poll.form.item.tpl b/application/frontend/components/poll/poll.form.item.tpl index c3a0c865..e40bfe12 100644 --- a/application/frontend/components/poll/poll.form.item.tpl +++ b/application/frontend/components/poll/poll.form.item.tpl @@ -5,7 +5,7 @@ * @scripts /js/poll.js *} -
  • @@ -26,7 +26,7 @@ {if $bPollIsAllowRemove|default:true} {component 'icon' icon='remove' - classes='poll-form-answer-item-remove js-poll-form-answer-item-remove' + classes='ls-poll-form-answer-item-remove js-poll-form-answer-item-remove' attributes=[ title => {lang 'blog.private'}, style => "{if ! $smarty.local.showRemove|default:true}display: none{/if}" diff --git a/application/frontend/components/poll/poll.form.tpl b/application/frontend/components/poll/poll.form.tpl index 7394869d..485e3052 100644 --- a/application/frontend/components/poll/poll.form.tpl +++ b/application/frontend/components/poll/poll.form.tpl @@ -62,7 +62,7 @@
    -
      +
        {if $oPoll} {$aAnswers = $oPoll->getAnswers()} diff --git a/application/frontend/components/poll/poll.manage.item.tpl b/application/frontend/components/poll/poll.manage.item.tpl index f7b3d8b9..0467a4f2 100644 --- a/application/frontend/components/poll/poll.manage.item.tpl +++ b/application/frontend/components/poll/poll.manage.item.tpl @@ -7,7 +7,7 @@ * @scripts /js/poll.js *} -
      • +
      • {* Заголовок *} {$oPoll->getTitle()} diff --git a/application/frontend/components/poll/poll.manage.list.tpl b/application/frontend/components/poll/poll.manage.list.tpl index 21c894bb..c25017d9 100644 --- a/application/frontend/components/poll/poll.manage.list.tpl +++ b/application/frontend/components/poll/poll.manage.list.tpl @@ -5,7 +5,7 @@ * @scripts /js/poll.js *} -
          +
            {if $aPollItems} {foreach $aPollItems as $oPoll} {include './poll.manage.item.tpl' oPoll=$oPoll} diff --git a/application/frontend/components/poll/poll.manage.tpl b/application/frontend/components/poll/poll.manage.tpl index 5246f3f7..ef4f59f2 100644 --- a/application/frontend/components/poll/poll.manage.tpl +++ b/application/frontend/components/poll/poll.manage.tpl @@ -8,14 +8,14 @@ * @scripts /js/poll.js *} -
            +

            {$aLang.poll.polls}

            {* Кнопка добавить *} - {component 'button' text=$aLang.common.add type='button' classes='poll-manage-add js-poll-manage-add'} + {component 'button' text=$aLang.common.add type='button' classes='ls-poll-manage-add js-poll-manage-add'} {* Список добавленных опросов *} {insert name="block" block="pollFormItems" params=[ diff --git a/application/frontend/components/poll/poll.result.tpl b/application/frontend/components/poll/poll.result.tpl index d4650460..57fdb97d 100644 --- a/application/frontend/components/poll/poll.result.tpl +++ b/application/frontend/components/poll/poll.result.tpl @@ -5,7 +5,7 @@ *} {* Список ответов *} -
              +
                {$answers = $oPoll->getAnswers()} {$count = count($answers)} {$answersCurrent=$oPoll->getVoteCurrent()->getAnswers()} @@ -15,7 +15,7 @@ {$percent = $oPoll->getAnswerPercent($answer)} {* Ответ *} -
              • getCountVoteAnswerMax() == $votes}poll-result-item--most{/if} {if in_array( $answer->getId(), $answersCurrent )}poll-result-item--voted{/if} js-poll-result-item" @@ -23,15 +23,15 @@ data-position = "{$count - $answer@index - 1}"> {* Кол-во и процент проголосовавших *} -
                +
                {$percent}% ({$votes})
                {* Визуальное отображения процента проголосовавших *} -
                -
                {$answer->getTitle()}
                -
                +
                +
                {$answer->getTitle()}
                +
                • {/foreach} @@ -45,7 +45,7 @@ attributes = [ 'title' => $aLang.poll.result.sort ]} {* Статистика голосования *} - + {$aLang.poll.result.voted_total}: {$oPoll->getCountVote()} | {$aLang.poll.result.abstained_total}: {$oPoll->getCountAbstain()} \ No newline at end of file diff --git a/application/frontend/components/poll/poll.tpl b/application/frontend/components/poll/poll.tpl index 18377a22..aeb5c511 100644 --- a/application/frontend/components/poll/poll.tpl +++ b/application/frontend/components/poll/poll.tpl @@ -4,8 +4,8 @@ * @param ModulePoll_EntityPoll $poll Опрос *} -
                -

                {$poll->getTitle()}

                +
                +

                {$poll->getTitle()}

                {if ! $poll->getVoteCurrent()} {include './poll.vote.tpl' poll=$poll} diff --git a/application/frontend/components/poll/poll.vote.tpl b/application/frontend/components/poll/poll.vote.tpl index 939ecb32..c2a11624 100644 --- a/application/frontend/components/poll/poll.vote.tpl +++ b/application/frontend/components/poll/poll.vote.tpl @@ -11,9 +11,9 @@ {* Форма *}
                {* Список ответов *} -
                  +
                    {foreach $poll->getAnswers() as $answer} -
                  • +
                  • {component 'field' template=$type name = 'answers[]' value = $answer->getId() diff --git a/application/frontend/components/property/css/property.css b/application/frontend/components/property/css/property.css index 7e3ff3b2..8ef374cb 100644 --- a/application/frontend/components/property/css/property.css +++ b/application/frontend/components/property/css/property.css @@ -2,11 +2,11 @@ * Media */ -.property-list { +.ls-property-list { margin-bottom: 30px; } -.property { +.ls-property { padding: 15px 15px; border-bottom: 1px solid #eee; } \ No newline at end of file diff --git a/application/frontend/components/property/output/list.tpl b/application/frontend/components/property/output/list.tpl index a0712d9b..b6a1006b 100644 --- a/application/frontend/components/property/output/list.tpl +++ b/application/frontend/components/property/output/list.tpl @@ -1,5 +1,5 @@ {if $smarty.local.properties} -
                    +
                    {foreach $smarty.local.properties as $property} {include './item.tpl' property=$property} {/foreach} diff --git a/application/frontend/components/property/output/property.default.tpl b/application/frontend/components/property/output/property.default.tpl index 90ad1a89..147417c8 100644 --- a/application/frontend/components/property/output/property.default.tpl +++ b/application/frontend/components/property/output/property.default.tpl @@ -1,9 +1,9 @@ -
                    -
                    +
                    +
                    {$property->getTitle()}
                    - + {$property->getValue()->getValueForDisplay()}
                    \ No newline at end of file diff --git a/application/frontend/components/property/output/property.file.tpl b/application/frontend/components/property/output/property.file.tpl index 52cd086c..530481b6 100644 --- a/application/frontend/components/property/output/property.file.tpl +++ b/application/frontend/components/property/output/property.file.tpl @@ -1,8 +1,8 @@ {$value = $property->getValue()} {$valueType = $value->getValueTypeObject()} -
                    -
                    +
                    +
                    {$property->getTitle()}
                    diff --git a/application/frontend/components/property/output/property.image.tpl b/application/frontend/components/property/output/property.image.tpl index 0287300e..1ddf7eb9 100644 --- a/application/frontend/components/property/output/property.image.tpl +++ b/application/frontend/components/property/output/property.image.tpl @@ -1,7 +1,7 @@ {$valueType = $property->getValue()->getValueTypeObject()} -
                    -
                    +
                    +
                    {$property->getTitle()}
                    diff --git a/application/frontend/components/search-form/css/search-form.css b/application/frontend/components/search-form/css/search-form.css index a6919133..181d92b4 100644 --- a/application/frontend/components/search-form/css/search-form.css +++ b/application/frontend/components/search-form/css/search-form.css @@ -3,11 +3,20 @@ * * @template forms/form.search.base.tpl */ -.search-form { padding: 15px; margin-bottom: 20px; background: #f7f7f7; position: relative; } -.search-form .ls-field { margin-bottom: 0;} -.search-form-input[type="text"] { padding-right: 30px; } +.ls-search-form { + padding: 15px; + margin-bottom: 20px; + background: #f7f7f7; + position: relative; +} +.ls-search-form .ls-field { + margin-bottom: 0; +} +.ls-search-form-input[type="text"] { + padding-right: 30px; +} -.ls-button--icon.search-form-submit { +.ls-button--icon.ls-search-form-submit { border: none; background: none; position: absolute; @@ -19,10 +28,20 @@ opacity: .7; filter: alpha(opacity=70); } -.search-form-submit:hover { opacity: 1; filter: alpha(opacity=100); background-color: transparent; } +.ls-search-form-submit:hover { + opacity: 1; + filter: alpha(opacity=100); + background-color: transparent; +} /** * Light */ -.search-form--light { background: none; padding: 0; } -.search-form--light .search-form-submit { top: 6px; right: 7px; } \ No newline at end of file +.ls-search-form--light { + background: none; + padding: 0; +} +.ls-search-form--light .ls-search-form-submit { + top: 6px; + right: 7px; +} \ No newline at end of file diff --git a/application/frontend/components/search-form/search-form.tpl b/application/frontend/components/search-form/search-form.tpl index 7f1a00e1..584866c2 100644 --- a/application/frontend/components/search-form/search-form.tpl +++ b/application/frontend/components/search-form/search-form.tpl @@ -7,7 +7,7 @@ *} {* Название компонента *} -{$component = 'search-form'} +{$component = 'ls-search-form'} {block 'search_form'} diff --git a/application/frontend/components/sort/css/sort.css b/application/frontend/components/sort/css/sort.css index 9d5a2bc0..0419ada4 100644 --- a/application/frontend/components/sort/css/sort.css +++ b/application/frontend/components/sort/css/sort.css @@ -8,17 +8,17 @@ * @author Denis Shakhov */ -.sort { +.ls-sort { margin-bottom: 15px; } -.sort--inline { +.ls-sort--inline { display: inline; margin-right: 10px; } -.sort li.active[data-order=asc] a:after { +.ls-sort li.active[data-order=asc] a:after { content: "↑"; } -.sort li.active[data-order=desc] a:after { +.ls-sort li.active[data-order=desc] a:after { content: "↓"; } \ No newline at end of file diff --git a/application/frontend/components/sort/sort.ajax.tpl b/application/frontend/components/sort/sort.ajax.tpl index 94a5a3d8..abb2cc8b 100644 --- a/application/frontend/components/sort/sort.ajax.tpl +++ b/application/frontend/components/sort/sort.ajax.tpl @@ -6,10 +6,10 @@ * @param boolean $showLabel *} -{$component = 'sort'} +{$component = 'ls-sort'} {$items = $smarty.local.items} -{$classes = "{$smarty.local.classes} sort"} +{$classes = "{$smarty.local.classes} {$component}"} {foreach $items as $item} {$items[ $item@key ][ 'attributes' ] = array_merge( $items[ $item@key ][ 'attributes' ]|default:[], [ diff --git a/application/frontend/components/sort/sort.tpl b/application/frontend/components/sort/sort.tpl index b844dbb0..71a9a851 100644 --- a/application/frontend/components/sort/sort.tpl +++ b/application/frontend/components/sort/sort.tpl @@ -2,9 +2,9 @@ * *} -
                    +
                    {if $bSortShowLabel|default:true} -
                    {if $sSortLabel}{$sSortLabel}{else}{$aLang.sort.label}{/if}
                    +
                    {if $sSortLabel}{$sSortLabel}{else}{$aLang.sort.label}{/if}
                    {/if}
                    ...
                    diff --git a/application/frontend/components/userbar/css/userbar.css b/application/frontend/components/userbar/css/userbar.css index b8429a42..e0fef3fc 100644 --- a/application/frontend/components/userbar/css/userbar.css +++ b/application/frontend/components/userbar/css/userbar.css @@ -6,21 +6,21 @@ * @author Denis Shakhov */ -.userbar { +.ls-userbar { background: #fff; } -.userbar-inner { +.ls-userbar-inner { margin: 0 auto; padding: 0 50px; } /* Меню */ -.userbar-nav { +.ls-userbar-nav { float: left; } /* Форма поиска */ -.userbar .search-form { +.ls-userbar .ls-search-form { float: right; width: 200px; position: relative; @@ -29,7 +29,7 @@ } /* Лого */ -.userbar-logo { +.ls-userbar-logo { float: left; font-size: 28px; line-height: 54px; @@ -95,7 +95,7 @@ * Responsive styles */ @media (max-width: 360px) { - .userbar-inner { + .ls-userbar-inner { padding: 0; } } \ No newline at end of file diff --git a/application/frontend/components/userbar/userbar.tpl b/application/frontend/components/userbar/userbar.tpl index d4effe71..08ef85f3 100644 --- a/application/frontend/components/userbar/userbar.tpl +++ b/application/frontend/components/userbar/userbar.tpl @@ -2,15 +2,15 @@ * Юзербар *} -
                    -
                    +
                    +
                    {if ! Config::Get( 'view.layout_show_banner' )} -

                    +

                    {Config::Get('view.name')}

                    {/if} -