mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-07-01 05:55:02 +03:00
Фикс багов
This commit is contained in:
parent
2f93c9275d
commit
f44d444e9b
|
@ -461,6 +461,15 @@ $config['block']['userfeedUsers'] = array(
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
$config['block']['rule_blog_info'] = array(
|
||||||
|
'action' => array(
|
||||||
|
'blog' => array('{topic}')
|
||||||
|
),
|
||||||
|
'blocks' => array(
|
||||||
|
'right' => array('blocks/block.blog.tpl'=>array('priority'=>300))
|
||||||
|
),
|
||||||
|
'clear' => false,
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -26,6 +26,7 @@ ls.blog = (function ($) {
|
||||||
;
|
;
|
||||||
|
|
||||||
obj.empty().text(text);
|
obj.empty().text(text);
|
||||||
|
obj.toggleClass('active');
|
||||||
|
|
||||||
$('#blog_user_count_'+idBlog).text(result.iCountUser);
|
$('#blog_user_count_'+idBlog).text(result.iCountUser);
|
||||||
ls.hook.run('ls_blog_toggle_join_after',[idBlog,result],obj);
|
ls.hook.run('ls_blog_toggle_join_after',[idBlog,result],obj);
|
||||||
|
|
23
templates/skin/developer/blocks/block.blog.tpl
Normal file
23
templates/skin/developer/blocks/block.blog.tpl
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
{if $oTopic}
|
||||||
|
{assign var="oBlog" value=$oTopic->getBlog()}
|
||||||
|
{if $oBlog->getType()!='personal'}
|
||||||
|
<section class="block block-type-blog">
|
||||||
|
<header class="block-header">
|
||||||
|
<h3><a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()|escape:'html'}</a></h3>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="block-content">
|
||||||
|
<span id="blog_user_count_{$oBlog->getId()}">{$oBlog->getCountUser()}</span> {$oBlog->getCountUser()|declension:$aLang.reader_declension:'russian'}<br />
|
||||||
|
{$oBlog->getCountTopic()} {$oBlog->getCountTopic()|declension:$aLang.topic_declension:'russian'}
|
||||||
|
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
|
||||||
|
{if $oUserCurrent and $oUserCurrent->getId()!=$oBlog->getOwnerId()}
|
||||||
|
<button class="button button-primary {if $oBlog->getUserIsJoin()}active{/if}" id="blog-join" data-only-text="1" onclick="ls.blog.toggleJoin(this,{$oBlog->getId()}); return false;">{if $oBlog->getUserIsJoin()}{$aLang.blog_leave}{else}{$aLang.blog_join}{/if}</button>
|
||||||
|
{/if}
|
||||||
|
<a href="{router page='rss'}blog/{$oBlog->getUrl()}/" class="rss">RSS</a>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
{/if}
|
||||||
|
{/if}
|
|
@ -62,7 +62,7 @@
|
||||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#43bb34', endColorstr='#3aa62c',GradientType=0 );
|
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#43bb34', endColorstr='#3aa62c',GradientType=0 );
|
||||||
}
|
}
|
||||||
.button.button-primary:hover { background: #3AA62C; }
|
.button.button-primary:hover { background: #3AA62C; }
|
||||||
|
.button.button-primary.active { background: #D23E3E; }
|
||||||
|
|
||||||
/* Button Icon (Without text) */
|
/* Button Icon (Without text) */
|
||||||
.button.button-icon { padding: 7px 10px; }
|
.button.button-icon { padding: 7px 10px; }
|
|
@ -76,7 +76,7 @@
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<td class="cell-readers" id="blog_user_count_{$oBlog->getId()}">{$oBlog->getCountUser()}</td>
|
<td class="cell-readers" id="blog_user_count_{$oBlog->getId()}">{$oBlog->getCountUser()}</td>
|
||||||
<td class="cell-rating align-center">{$oBlog->getRating()}</td>
|
<td class="cell-rating align-center {if $oBlog->getRating() < 0}negative{/if}">{$oBlog->getRating()}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{/foreach}
|
{/foreach}
|
||||||
{else}
|
{else}
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
.table a.desc { color: #000; border-color: #000; }
|
.table a.desc { color: #000; border-color: #000; }
|
||||||
.table a.asc:after { content: " ↑"; }
|
.table a.asc:after { content: " ↑"; }
|
||||||
.table a.desc:after { content: " ↓"; }
|
.table a.desc:after { content: " ↓"; }
|
||||||
|
.table .cell-rating.negative { color: #f00 !important; }
|
||||||
|
|
||||||
.table .cell-tab { padding: 0; }
|
.table .cell-tab { padding: 0; }
|
||||||
.table .cell-tab .cell-tab-inner { position: relative; top: 1px; display: inline-block; border: 1px solid transparent; border-radius: 3px 3px 0 0; border-bottom: none; }
|
.table .cell-tab .cell-tab-inner { position: relative; top: 1px; display: inline-block; border: 1px solid transparent; border-radius: 3px 3px 0 0; border-bottom: none; }
|
||||||
|
|
|
@ -35,16 +35,6 @@ $config['head']['default']['css'] = array(
|
||||||
"___path.static.skin___/themes/___view.theme___/style.css",
|
"___path.static.skin___/themes/___view.theme___/style.css",
|
||||||
);
|
);
|
||||||
|
|
||||||
$config['block']['rule_blog_info'] = array(
|
|
||||||
'action' => array(
|
|
||||||
'blog' => array('{topic}')
|
|
||||||
),
|
|
||||||
'blocks' => array(
|
|
||||||
'right' => array('blocks/block.blog.tpl'=>array('priority'=>300))
|
|
||||||
),
|
|
||||||
'clear' => false,
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
return $config;
|
return $config;
|
||||||
?>
|
?>
|
|
@ -45,7 +45,7 @@
|
||||||
{/if}
|
{/if}
|
||||||
</td>
|
</td>
|
||||||
<td class="cell-skill">{$oUserList->getSkill()}</td>
|
<td class="cell-skill">{$oUserList->getSkill()}</td>
|
||||||
<td class="cell-rating"><strong>{$oUserList->getRating()}</strong></td>
|
<td class="cell-rating {if $oUserList->getRating() < 0}negative{/if}"><strong>{$oUserList->getRating()}</strong></td>
|
||||||
</tr>
|
</tr>
|
||||||
{/foreach}
|
{/foreach}
|
||||||
{else}
|
{else}
|
||||||
|
|
Loading…
Reference in a new issue