1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-05-14 14:58:19 +03:00

Фикс багов, доработка шаблона Synio

This commit is contained in:
Denis Shakhov 2012-07-31 21:37:40 +07:00
parent 789bdb2bb6
commit b7086c7608
21 changed files with 55 additions and 34 deletions

View file

@ -241,6 +241,7 @@ return array(
'topic_create_blog_error_nojoin' => "You're not a member of this blog!",
'topic_create_blog_error_noacl' => "You don't have enough power to post to this blog",
'topic_create_blog_error_noallow' => "You can't write to this blog",
'topic_create_blog_notice' => 'You need to join blog to post to it.',
'topic_create_title' => 'Title',
'topic_create_title_notice' => 'Title should be meaningful to reflect the meaning of the topic.',
'topic_create_title_error' => "Topic's title should consist of 2 upto 200 chars",

View file

@ -241,6 +241,7 @@ return array(
'topic_create_blog_error_nojoin' => 'Вы не состоите в этом блоге!',
'topic_create_blog_error_noacl' => 'Вы еще недостаточно окрепли, чтобы постить в этот блог',
'topic_create_blog_error_noallow' => 'Вы не можете писать в этот блог',
'topic_create_blog_notice' => 'Для того чтобы написать в определенный блог, вы должны, для начала, вступить в него.',
'topic_create_title' => 'Заголовок',
'topic_create_title_notice' => 'Заголовок должен быть наполнен смыслом, чтобы можно было понять, о чем будет топик.',
'topic_create_title_error' => 'Название топика должно быть от 2 до 200 символов',
@ -1152,6 +1153,7 @@ return array(
'date_hours_back' => '%%hours%% час назад; %%hours%% часа назад; %%hours%% часов назад',
'date_hours_back_less' => 'Менее часа назад',
'today' => 'Сегодня',
'more' => 'еще',
'timezone_list'=> array(
'-12' => '[UTC 12] Меридиан смены дат (запад)',

View file

@ -22,7 +22,8 @@
{foreach from=$aBlogsAllow item=oBlog}
<option value="{$oBlog->getId()}" {if $_aRequest.blog_id==$oBlog->getId()}selected{/if}>{$oBlog->getTitle()|escape:'html'}</option>
{/foreach}
</select></p>
</select>
<small class="note">{$aLang.topic_create_blog_notice}</small></p>
<script type="text/javascript">

View file

@ -55,7 +55,8 @@
{foreach from=$aBlogsAllow item=oBlog}
<option value="{$oBlog->getId()}" {if $_aRequest.blog_id==$oBlog->getId()}selected{/if}>{$oBlog->getTitle()|escape:'html'}</option>
{/foreach}
</select></p>
</select>
<small class="note">{$aLang.topic_create_blog_notice}</small></p>
<script type="text/javascript">

View file

@ -21,7 +21,8 @@
{foreach from=$aBlogsAllow item=oBlog}
<option value="{$oBlog->getId()}" {if $_aRequest.blog_id==$oBlog->getId()}selected{/if}>{$oBlog->getTitle()|escape:'html'}</option>
{/foreach}
</select></p>
</select>
<small class="note">{$aLang.topic_create_blog_notice}</small></p>
<script type="text/javascript">
jQuery(document).ready(function($){

View file

@ -25,7 +25,8 @@
{foreach from=$aBlogsAllow item=oBlog}
<option value="{$oBlog->getId()}" {if $_aRequest.blog_id==$oBlog->getId()}selected{/if}>{$oBlog->getTitle()|escape:'html'}</option>
{/foreach}
</select></p>
</select>
<small class="note">{$aLang.topic_create_blog_notice}</small></p>
<script type="text/javascript">

View file

@ -152,7 +152,7 @@
.icon-contact { width: 16px; height: 16px; background: url(../images/icons-contact.png) no-repeat; }
.icon-contact-default { background-position: 0 0; }
.icon-contact-email { background-position: -20px 0; }
.icon-contact-mail { background-position: -20px 0; }
.icon-contact-icq { background-position: -40px 0; }
.icon-contact-jabber { background-position: -60px 0; }
.icon-contact-phone { background-position: -80px 0; }

View file

@ -5,7 +5,7 @@
<article class="topic topic-type-{$oTopic->getType()} js-topic">
<header class="topic-header">
<h1 class="topic-title">
<h1 class="topic-title word-wrap">
{if $oTopic->getPublish() == 0}
<i class="icon-tag" title="{$aLang.topic_unpublish}"></i>
{/if}

View file

@ -23,7 +23,8 @@
{foreach from=$aBlogsAllow item=oBlog}
<option value="{$oBlog->getId()}" {if $_aRequest.blog_id==$oBlog->getId()}selected{/if}>{$oBlog->getTitle()|escape:'html'}</option>
{/foreach}
</select></p>
</select>
<small class="note">{$aLang.topic_create_blog_notice}</small></p>
<script type="text/javascript">

View file

@ -55,7 +55,8 @@
{foreach from=$aBlogsAllow item=oBlog}
<option value="{$oBlog->getId()}" {if $_aRequest.blog_id==$oBlog->getId()}selected{/if}>{$oBlog->getTitle()|escape:'html'}</option>
{/foreach}
</select></p>
</select>
<small class="note">{$aLang.topic_create_blog_notice}</small></p>
<script type="text/javascript">

View file

@ -22,7 +22,8 @@
{foreach from=$aBlogsAllow item=oBlog}
<option value="{$oBlog->getId()}" {if $_aRequest.blog_id==$oBlog->getId()}selected{/if}>{$oBlog->getTitle()|escape:'html'}</option>
{/foreach}
</select></p>
</select>
<small class="note">{$aLang.topic_create_blog_notice}</small></p>
<script type="text/javascript">
jQuery(document).ready(function($){

View file

@ -25,7 +25,8 @@
{foreach from=$aBlogsAllow item=oBlog}
<option value="{$oBlog->getId()}" {if $_aRequest.blog_id==$oBlog->getId()}selected{/if}>{$oBlog->getTitle()|escape:'html'}</option>
{/foreach}
</select></p>
</select>
<small class="note">{$aLang.topic_create_blog_notice}</small></p>
<script type="text/javascript">

View file

@ -354,4 +354,8 @@
.page-header-menu { overflow: hidden; zoom: 1; margin-bottom: 10px; }
.page-header-menu .page-header { float: left; margin-right: 20px; margin-bottom: 10px; }
.page-header-menu .nav.nav-pills { margin-top: 5px; float: left; }
.page-header-menu .nav.nav-pills { margin-top: 5px; float: left; }
.blog-list-info { width: 19px; height: 19px; display: inline-block; background: url(../images/icons-synio.png) 0 -107px no-repeat; cursor: pointer; }
.blog-list-info:hover,
.blog-list-info.active { background-position: -19px -107px; }

View file

@ -156,7 +156,7 @@
.icon-contact { width: 16px; height: 16px; background: url(../images/icons-contact.png) no-repeat; }
.icon-contact-default { background-position: 0 0; }
.icon-contact-email { background-position: -20px 0; }
.icon-contact-mail { background-position: -20px 0; }
.icon-contact-icq { background-position: -40px 0; }
.icon-contact-jabber { background-position: -60px 0; }
.icon-contact-phone { background-position: -80px 0; }

View file

@ -27,9 +27,7 @@
/* Table Blogs */
.table.table-blogs .cell-info { width: 19px; padding-right: 0; padding-left: 0; }
.table.table-blogs tbody .cell-info { vertical-align: top; }
.table.table-blogs .cell-info .blog-list-info { width: 19px; height: 19px; display: block; background: url(../images/icons-synio.png) 0 -107px no-repeat; cursor: pointer; }
.table.table-blogs .cell-info .blog-list-info:hover,
.table.table-blogs .cell-info .blog-list-info.active { background-position: -19px -107px; }
.table.table-blogs tbody .cell-info .blog-list-info { display: block; }
.table.table-blogs .cell-name { padding-left: 3px; }
.table.table-blogs .cell-name .avatar { float: left; margin-right: 10px; clear: right; }
.table.table-blogs .cell-name p { overflow: hidden; margin-bottom: 5px; }

View file

@ -40,6 +40,6 @@
.text object,
.text img { max-width: 100%; vertical-align: top; }
.text .ls-user { }
.text .ls-user { color: #3F8AD7; }
.text .ls-user:visited { color: #3F8AD7; }
.text .ls-user:hover { color: #f00; }

View file

@ -13,8 +13,9 @@
.topic .topic-header .topic-title i { position: relative; top: 9px; cursor: help; margin-right: 5px; }
.topic .topic-header .topic-info { margin-bottom: 25px; color: #777; }
.topic .topic-header .topic-info time { margin-right: 15px; }
.topic .topic-header .topic-info .topic-blog { margin-right: 15px; font-family: 'PT Sans', sans-serif; font-size: 18px; color: #000; text-decoration: underline; }
.topic .topic-header .topic-info .topic-blog { font-family: 'PT Sans', sans-serif; font-size: 18px; color: #000; text-decoration: underline; }
.topic .topic-header .topic-info .topic-blog:hover { color: #666; }
.topic .topic-header .topic-info .blog-list-info { position: relative; top: 5px; }
.topic .topic-header .topic-actions { background: #fcfce9; border-radius: 5px; padding: 10px 15px; font-size: 11px; overflow: hidden; }
.topic .topic-header .topic-actions li { float: left; margin-right: 18px; }
.topic .topic-header .topic-actions li.draft a { color: #27964c; }
@ -70,9 +71,9 @@
.topic .topic-footer .topic-info li.topic-info-favourite:hover i { background-position: 0 -51px; }
/* Share */
.topic .topic-share { display: none; border: 3px solid #edf8fd; padding: 3px; border-radius: 5px; margin-bottom: 10px; position: relative; }
.topic .topic-share .close { content: ''; position: absolute; top: -9px; right: -9px; width: 19px; height: 22px; background: url(../images/icons-synio.png) -479px -26px no-repeat; cursor: pointer; opacity: .8; }
.topic .topic-share .close:hover { opacity: 1; }
.topic .topic-share { display: none; border: 3px solid #edf8fd; padding: 3px 35px 3px 3px; border-radius: 10px; margin-bottom: 10px; position: relative; }
.topic .topic-share .close { content: ''; position: absolute; top: 7px; right: 7px; width: 19px; height: 22px; background: url(../images/icons-synio.png) -479px -26px no-repeat; cursor: pointer; opacity: .8; }
.topic .topic-share .close:hover { opacity: 1; }
.topic .topic-share .arrow { position: absolute; border: none; width: 15px; height: 11px; background: url(../images/icons-synio.png) no-repeat; background-position: -53px -107px; bottom: -11px; }
/* Poll */

View file

@ -11,7 +11,7 @@
{hook run='main_menu_item'}
<li class="nav-main-more"><a href="#" id="dropdown-mainmenu-trigger" onclick="return false">еще</a></li>
<li class="nav-main-more"><a href="#" id="dropdown-mainmenu-trigger" onclick="return false">{$aLang.more}</a></li>
</ul>
<ul class="dropdown-nav-main dropdown-menu" id="dropdown-mainmenu-menu"></ul>

View file

@ -119,7 +119,7 @@ jQuery(document).ready(function($){
$('.js-infobox-vote-topic').poshytip({
content: function() {
var id = $(this).attr('id').replace('vote_total_topic_','vote-info-topic-');
var id = $(this).attr('id').replace('vote_area_topic_','vote-info-topic-');
return $('#'+id).html();
},
className: 'infobox-topic',

View file

@ -79,6 +79,11 @@
{/if}
</li>
{/if}
{if $oVote || ($oUserCurrent && $oTopic->getUserId() == $oUserCurrent->getId()) || strtotime($oTopic->getDateAdd()) < $smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}
{assign var="bVoteInfoShow" value=true}
{/if}
<li class="topic-info-vote">
<div id="vote_area_topic_{$oTopic->getId()}" class="vote-topic
@ -116,18 +121,17 @@
{if strtotime($oTopic->getDateAdd()) > $smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}
vote-not-expired
{/if}">
{if $oVote || ($oUserCurrent && $oTopic->getUserId() == $oUserCurrent->getId()) || strtotime($oTopic->getDateAdd()) < $smarty.now-$oConfig->GetValue('acl.vote.topic.limit_time')}
{assign var="bVoteInfoShow" value=true}
{/if}
{/if}
{if $bVoteInfoShow}js-infobox-vote-topic{/if}">
<div class="vote-item vote-down" onclick="return ls.vote.vote({$oTopic->getId()},this,-1,'topic');"><span><i></i></span></div>
<div class="vote-item vote-count" title="{$aLang.topic_vote_count}: {$oTopic->getCountVote()}">
<span id="vote_total_topic_{$oTopic->getId()}" {if $bVoteInfoShow}class="js-infobox-vote-topic"{/if}>
{if $bVoteInfoShow}
{if $oTopic->getRating() > 0}+{/if}{$oTopic->getRating()}
{else}
<i onclick="return ls.vote.vote({$oTopic->getId()},this,0,'topic');"></i>
{/if}
<span id="vote_total_topic_{$oTopic->getId()}">
{if $bVoteInfoShow}
{if $oTopic->getRating() > 0}+{/if}{$oTopic->getRating()}
{else}
<i onclick="return ls.vote.vote({$oTopic->getId()},this,0,'topic');"></i>
{/if}
</span>
</div>
<div class="vote-item vote-up" onclick="return ls.vote.vote({$oTopic->getId()},this,1,'topic');"><span><i></i></span></div>

View file

@ -5,7 +5,7 @@
<article class="topic topic-type-{$oTopic->getType()} js-topic">
<header class="topic-header">
<h1 class="topic-title">
<h1 class="topic-title word-wrap">
{if $bTopicList}
<a href="{$oTopic->getUrl()}">{$oTopic->getTitle()|escape:'html'}</a>
{else}
@ -23,7 +23,10 @@
<div class="topic-info">
<a href="{$oBlog->getUrlFull()}" class="topic-blog">{$oBlog->getTitle()|escape:'html'}</a>
<a href="{$oBlog->getUrlFull()}" class="topic-blog">{$oBlog->getTitle()|escape:'html'}</a>
{if $oBlog->getType() != 'personal'}
<a href="#" class="blog-list-info" onclick="return ls.infobox.showInfoBlog(this,{$oBlog->getId()});"></a>
{/if}
</div>
{if $oUserCurrent and ($oUserCurrent->getId()==$oTopic->getUserId() or $oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getUserIsModerator() or $oBlog->getOwnerId()==$oUserCurrent->getId())}