Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Исправление мелких багов

  • Loading branch information...
commit 3eac0f511df0e3c7bb61dfc8560bf0b5f7b9ee8f 1 parent d75eead
@deniart deniart authored
View
6 templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl
@@ -15,9 +15,11 @@
{$oWall->getText()}
</div>
- {if $oUserCurrent and !$aReplyWall}
+ {if ($oUserCurrent and !$aReplyWall) or $oWall->isAllowDelete()}
<ul class="comment-actions">
- <li><a href="#" class="link-dotted" onclick="return ls.wall.toggleReply({$oWall->getId()});">Ответить</a></li>
+ {if $oUserCurrent and !$aReplyWall}
+ <li><a href="#" class="link-dotted" onclick="return ls.wall.toggleReply({$oWall->getId()});">Ответить</a></li>
+ {/if}
{if $oWall->isAllowDelete()}
<li><a href="#" onclick="return ls.wall.remove({$oWall->getId()});" class="link-dotted">Удалить</a></li>
View
2  templates/skin/developer-jquery/comment_list.tpl
@@ -20,7 +20,7 @@
<ul class="comment-info clearfix">
<li class="comment-author"><a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a></li>
<li class="comment-date">
- <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}#comment{/if}{$oComment->getId()}" class="link-dotted" title="Ññûëêà íà êîììåíòàðèé">
+ <a href="{if $oConfig->GetValue('module.comment.nested_per_page')}{router page='comments'}{else}#comment{/if}{$oComment->getId()}" class="link-dotted" title="Ссылка на комментарий">
<time datetime="{date_format date=$oComment->getDate() format='c'}">{date_format date=$oComment->getDate() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</time>
</a>
</li>
View
2  templates/skin/developer-jquery/css/blocks.css
@@ -23,7 +23,7 @@
/* Block Type - Profile */
.block.block-type-profile { background: none; border: none; padding: 0; }
-.block.block-type-profile .profile-photo-wrapper { position: relative; }
+.block.block-type-profile .profile-photo-wrapper { position: relative; min-height: 50px; }
.block.block-type-profile .profile-photo { vertical-align: top; }
.block.block-type-profile .status { position: absolute; top: 5px; left: 5px; padding: 0 5px; border-radius: 2px; font-size: 11px; }
.block.block-type-profile .status.status-online { background: #B7BC1C; color: #fff; }
View
6 templates/skin/developer-jquery/css/common.css
@@ -3,14 +3,14 @@
---------------------------------------------------------------*/
.vote { }
-.vote .vote-count { display: inline-block; font-weight: bold; color: #aaa; }
+.vote .vote-count { display: inline-block; font-weight: bold; color: #aaa; font-size: 14px; }
.vote .vote-count a { text-decoration: none; color: #999; outline: none; }
.vote.vote-count-positive .vote-count { color: #390; }
.vote.vote-count-negative .vote-count { color: #f00; }
.vote .vote-up,
-.vote .vote-down { display: inline-block; cursor: pointer; vertical-align: text-top; width: 14px; height: 14px; background: url(../images/icons.png) no-repeat; opacity: .5; }
+.vote .vote-down { display: inline-block; cursor: pointer; vertical-align: text-top; width: 14px; height: 14px; background: url(../images/icons.png) no-repeat; opacity: .3; }
.vote .vote-up { background-position: -408px -96px; }
.vote .vote-down { background-position: -433px -96px; }
.vote .vote-up:hover { opacity: .8; }
@@ -94,7 +94,7 @@
.user-list li .author { font-weight: bold; color: #333; }
.user-list-avatar { overflow: hidden; zoom: 1; }
-.user-list-avatar li { width: 64px; overflow: hidden; float: left; margin-right: 15px; text-align: center; font-size: 11px; margin-bottom: 10px; }
+.user-list-avatar li { width: 64px; overflow: hidden; float: left; margin-right: 20px; margin-bottom: 15px; text-align: center; font-size: 11px; }
.user-list-avatar li img { margin-bottom: 2px; display: block; }
View
4 templates/skin/developer-jquery/css/reset.css
@@ -196,9 +196,7 @@ samp {
*/
pre {
- white-space: pre;
- white-space: pre-wrap;
- word-wrap: break-word;
+
}
/*
View
6 templates/skin/developer-jquery/css/text.css
@@ -12,14 +12,14 @@
.text p { margin-bottom: 1em; }
.text abbr[title] { border-bottom: 1px dotted; }
.text b, .text strong { font-weight: bold; }
-.text blockquote { margin: 0; background: #eee; color: #555; padding: 15px 20px; }
+.text blockquote { margin: 0; background: #fafafa; color: #555; padding: 15px 20px; clear: both; border-left: 5px solid #eee; }
.text dfn { font-style: italic; }
.text hr { display: block; height: 1px; border: 0; border-top: 1px solid #ccc; margin: 1em 0; padding: 0; }
.text ins { background: #ff9; color: #000; text-decoration: none; }
.text mark { background: #ff0; color: #000; font-style: italic; font-weight: bold; }
-.text pre { margin: 0; padding: 10px 15px; border: 1px solid #ddd; background: #eee; font-size: 12px; line-height:18px; }
-.text q { quotes: none; }
+.text pre { margin: 0; padding: 10px 15px; border: none; background: #fafafa; font-size: 12px; line-height: 18px; overflow: auto; width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; clear: both; }
+.text q { quotes: none; clear: both; }
.text q:before, q:after { content: ""; content: none; }
.text small { font-size: 85%; }
View
4 templates/skin/developer-jquery/css/topic.css
@@ -25,8 +25,8 @@
.topic .topic-footer .topic-tags li.topic-tags-user a { color: #3CA023; }
/* Info */
-.topic .topic-footer .topic-info { overflow: hidden; background: #eee; border-radius: 3px; }
-.topic .topic-footer .topic-info li { float: left; padding: 8px 15px;border-right: 1px solid #fff; }
+.topic .topic-footer .topic-info { overflow: hidden; background: #f7f7f7; border-radius: 3px; }
+.topic .topic-footer .topic-info li { float: left; padding: 8px 15px; border-right: 1px solid #fff; }
.topic .topic-footer .topic-info li a { text-decoration: none; }
.topic .topic-footer .topic-info li.topic-info-author a { font-weight: bold; color: #333; }
View
2  templates/skin/developer-jquery/topic_preview_topic.tpl
@@ -47,6 +47,6 @@
</article>
-<button name="submit_topic_publish" class="button button-primary" onclick="jQuery('#submit_topic_publish').trigger('click');">{$aLang.topic_create_submit_publish}</button>
+<button name="submit_topic_publish" class="button button-primary fl-r" onclick="jQuery('#submit_topic_publish').trigger('click');">{$aLang.topic_create_submit_publish}</button>
<button name="submit_preview" onclick="jQuery('#text_preview').html('').hide(); return false;" class="button">{$aLang.topic_create_submit_preview_close}</button>
<button name="submit_topic_save" class="button" onclick="jQuery('#submit_topic_save').trigger('click');">{$aLang.topic_create_submit_save}</button>
Please sign in to comment.
Something went wrong with that request. Please try again.