diff --git a/README.md b/README.md index 17875b15..b1aa378f 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/application/config/config.php b/application/config/config.php index 5f068cda..cb6ae4b5 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -21,7 +21,7 @@ * Ничего не изменяйте в этом файле! * Все изменения нужно вносить в файл config/config.local.php */ -define('LS_VERSION', '2.0.0'); +define('LS_VERSION', '2.0.1'); /** * Основные настройки путей diff --git a/application/config/jevix.php b/application/config/jevix.php index 4f83f2f1..6d0a7426 100644 --- a/application/config/jevix.php +++ b/application/config/jevix.php @@ -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', diff --git a/application/frontend/skin/synio/components/comment/css/comment.css b/application/frontend/skin/synio/components/comment/css/comment.css index e85f59bd..b9a0992b 100644 --- a/application/frontend/skin/synio/components/comment/css/comment.css +++ b/application/frontend/skin/synio/components/comment/css/comment.css @@ -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; diff --git a/application/frontend/skin/synio/components/vote/vote.tpl b/application/frontend/skin/synio/components/vote/vote.tpl index f18e2819..909b9cf0 100644 --- a/application/frontend/skin/synio/components/vote/vote.tpl +++ b/application/frontend/skin/synio/components/vote/vote.tpl @@ -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 @@ {* Нравится *} -
+
{* Воздержаться *} {if $useAbstain} -
+
{/if} {* Не нравится *} -
+
{/block} \ No newline at end of file diff --git a/framework b/framework index fe79575f..4c8a63b3 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit fe79575fa28c116d7392c8028df0c1404f2b246d +Subproject commit 4c8a63b376ce5f3daaecc88584f6aa6ce589b080