Alexander Yakovlev 3 years ago
parent
commit
88098cd0d6
6 changed files with 33 additions and 11 deletions
  1. +6
    -1
      README.md
  2. +1
    -1
      application/config/config.php
  3. +15
    -0
      application/config/jevix.php
  4. +2
    -1
      application/frontend/skin/synio/components/comment/css/comment.css
  5. +8
    -7
      application/frontend/skin/synio/components/vote/vote.tpl
  6. +1
    -1
      framework

+ 6
- 1
README.md View File

@@ -1,6 +1,6 @@
Исходный код ifhub.ru

На основе [LiveStreet CMS](http://livestreetcms.ru) 2.0.0.dev
На основе [LiveStreet CMS](http://livestreetcms.ru) 2.0.1.dev

### Лицензия

@@ -8,3 +8,8 @@ LiveStreet - open-source проект под лицензией [GPL-2.0](http:/



Readme
-------------

* [English README](https://github.com/livestreet/livestreet/blob/master/Readme.EN.txt)
* [Russian README](https://github.com/livestreet/livestreet/blob/master/Readme.RU.txt)

+ 1
- 1
application/config/config.php View File

@@ -21,7 +21,7 @@
* Ничего не изменяйте в этом файле!
* Все изменения нужно вносить в файл config/config.local.php
*/
define('LS_VERSION', '2.0.0');
define('LS_VERSION', '2.0.1');

/**
* Основные настройки путей


+ 15
- 0
application/config/jevix.php View File

@@ -86,6 +86,21 @@ return array(
array('title' => '#text')
),
),
// Теги с обязательными параметрами
'cfgSetTagParamDefault' => array(
array(
'a',
'target',
'_blank',
true
),
array(
'a',
'rel',
'noreferrer noopener',
true
),
),
'cfgSetTagCallbackFull' => array(
array(
'ls',


+ 2
- 1
application/frontend/skin/synio/components/comment/css/comment.css View File

@@ -42,7 +42,8 @@
filter: alpha(opacity=100);
}

.ls-comment.ls-comment--deleted { background: #efd5d5; }
.ls-comment--deleted .ls-comment-content { background: #efd5d5; }
.ls-comment--deleted .ls-comment-content:after { border-top-color: #efd5d5; }
.ls-user-role-not-admin .ls-comment.ls-comment--deleted {
padding: 10px 15px;
min-height: 0;


+ 8
- 7
application/frontend/skin/synio/components/vote/vote.tpl View File

@@ -12,16 +12,17 @@
{component_define_params params=[ 'showRating', 'target', 'isLocked', 'useAbstain', 'mods', 'classes', 'attributes' ]}

{* Параметры для тестирования *}
{component_define_params params=[ 'isVoted', 'targetId', 'rating', 'direction' ]}
{component_define_params params=[ 'targetId', 'rating']}

{* Установка дефолтных значений *}
{$showRating = $showRating|default:true}

{* Рейтинг *}
{$rating = $rating|default:$target->getRating()}
{$_direction = $direction|default:$target->getDirection()}
{$_id = $targetId|default:$target->getId()}
{$_isVoted = $isVoted|default:$target->getVote()}
{$_vote = $target->getVote()}
{$_direction = ($_vote) ? $_vote->getDirection() : 0}


{* Получаем модификаторы *}
{if $showRating}
@@ -34,7 +35,7 @@
{/if}
{/if}

{if $_isVoted}
{if $_vote}
{$mods = "$mods voted"}

{if $_direction > 0}
@@ -76,15 +77,15 @@
</div>

{* Нравится *}
<div class="{$component}-item {$component}-item-up js-vote-item" {if ! $_isVoted}title="{$aLang.$component.up}"{/if} data-vote-value="1"></div>
<div class="{$component}-item {$component}-item-up js-vote-item" {if ! $_vote}title="{$aLang.$component.up}"{/if} data-vote-value="1"></div>

{* Воздержаться *}
{if $useAbstain}
<div class="{$component}-item {$component}-item-abstain js-vote-item" {if ! $_isVoted}title="{$aLang.$component.abstain}"{/if} data-vote-value="0"></div>
<div class="{$component}-item {$component}-item-abstain js-vote-item" {if ! $_vote}title="{$aLang.$component.abstain}"{/if} data-vote-value="0"></div>
{/if}

{* Не нравится *}
<div class="{$component}-item {$component}-item-down js-vote-item" {if ! $_isVoted}title="{$aLang.$component.down}"{/if} data-vote-value="-1"></div>
<div class="{$component}-item {$component}-item-down js-vote-item" {if ! $_vote}title="{$aLang.$component.down}"{/if} data-vote-value="-1"></div>
{/block}
</div>
</div>

+ 1
- 1
framework

@@ -1 +1 @@
Subproject commit fe79575fa28c116d7392c8028df0c1404f2b246d
Subproject commit 4c8a63b376ce5f3daaecc88584f6aa6ce589b080

Loading…
Cancel
Save