From 856980038d9ee99c21cc20a3d87dc8973d87d979 Mon Sep 17 00:00:00 2001 From: Denis Shakhov Date: Mon, 26 Apr 2010 01:23:15 +0000 Subject: [PATCH] fix developer --- .../developer/actions/ActionBlog/comment.tpl | 156 ------------------ .../developer/actions/ActionBlog/invited.tpl | 31 ++-- .../skin/developer/css/Autocompleter.css | 2 +- templates/skin/developer/css/style.css | 3 +- templates/skin/developer/images/spinner.gif | Bin 0 -> 1569 bytes templates/skin/developer/menu.blog.tpl | 6 +- 6 files changed, 21 insertions(+), 177 deletions(-) delete mode 100644 templates/skin/developer/actions/ActionBlog/comment.tpl create mode 100644 templates/skin/developer/images/spinner.gif diff --git a/templates/skin/developer/actions/ActionBlog/comment.tpl b/templates/skin/developer/actions/ActionBlog/comment.tpl deleted file mode 100644 index ae8b0d3d..00000000 --- a/templates/skin/developer/actions/ActionBlog/comment.tpl +++ /dev/null @@ -1,156 +0,0 @@ - - -
- - {if $oUserCurrent} -
-
- -
- {/if} - - -
-

{$aLang.comment_title} ({$oTopic->getCountComment()})

- - RSS - {$aLang.comment_collapse} / - {$aLang.comment_expand} -
- - - {literal} - - {/literal} - - - {assign var="nesting" value="-1"} - {foreach from=$aCommentsNew item=aComment name=rublist} - {assign var="cmtlevel" value=$aComment.level} - {if $cmtlevel>$BLOG_COMMENT_MAX_TREE_LEVEL} - {assign var="cmtlevel" value=$BLOG_COMMENT_MAX_TREE_LEVEL} - {/if} - {if $nesting < $cmtlevel} - {elseif $nesting > $cmtlevel} - {section name=closelist1 loop=`$nesting-$cmtlevel+1`}
{/section} - {elseif not $smarty.foreach.rublist.first} - - {/if} - - -
- {if !$aComment.obj->getDelete() or ($oUserCurrent and $oUserCurrent->isAdministrator())} - + - - - - - - -
- {if $aComment.obj->getRating()>0}+{/if}{$aComment.obj->getRating()} - - -
- - -
- {if $oUserCurrent and $aComment.obj->getUserId()!=$oUserCurrent->getId() and $dDateTopicRead<=$aComment.obj->getDate()} - {literal} - - {/literal} - {/if} -
- {if $aComment.obj->isBad()} - - {$aLang.comment_bad_open} - {else} - {$aComment.obj->getText()} - {/if} -
- {if $oUserCurrent and !$aComment.obj->getDelete() and !$oTopic->getForbidComment()} - ({$aLang.comment_answer}) - {/if} -
-
- -
- - {else} - {$aLang.comment_was_delete} - {/if} - - -
- - - {assign var="nesting" value=$cmtlevel} - {if $smarty.foreach.rublist.last} - {section name=closelist2 loop=`$nesting+1`}
{/section} - {/if} - {/foreach} - - -
- - {if $oTopic->getForbidComment()} - {$aLang.topic_comment_notallow} - {else} - {if $oUserCurrent} -

{$aLang.topic_comment_add}

-
-
- {if !$BLOG_USE_TINYMCE} -
- - - - -   - - - -
- {/if} -
- -   - - - -
-
- {else} - {$aLang.comment_unregistered}
- {/if} - {/if} - \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionBlog/invited.tpl b/templates/skin/developer/actions/ActionBlog/invited.tpl index cb72f965..1d6d9177 100644 --- a/templates/skin/developer/actions/ActionBlog/invited.tpl +++ b/templates/skin/developer/actions/ActionBlog/invited.tpl @@ -27,8 +27,7 @@ function addBlogInvite(idBlog) { sUsers=$('blog_admin_user_add').get('value'); - if(sUsers.length<2) { - msgErrorBox.alert('Error','Пользователь не указан'); + if(!sUsers) { return false; } $('blog_admin_user_add').set('value',''); @@ -59,19 +58,19 @@ } function reBlogInvite(idUser,idBlog) { JsHttpRequest.query( - 'POST '+aRouter['blog']+'ajaxrebloginvite/', - { idUser: idUser, idBlog: idBlog, security_ls_key: LIVESTREET_SECURITY_KEY }, - function(result, errors) { - if (!result) { - msgErrorBox.alert('Error','Please try again later'); - } - if (result.bStateError) { - msgErrorBox.alert(result.sMsgTitle,result.sMsg); - } else { - msgNoticeBox.alert(result.sMsgTitle, result.sMsg); - } - }, - true + 'POST '+aRouter['blog']+'ajaxrebloginvite/', + { idUser: idUser, idBlog: idBlog, security_ls_key: LIVESTREET_SECURITY_KEY }, + function(result, errors) { + if (!result) { + msgErrorBox.alert('Error','Please try again later'); + } + if (result.bStateError) { + msgErrorBox.alert(result.sMsgTitle,result.sMsg); + } else { + msgNoticeBox.alert(result.sMsgTitle, result.sMsg); + } + }, + true ); return false; } @@ -93,7 +92,7 @@ {foreach from=$aBlogUsersInvited item=oBlogUser} {assign var='oUser' value=$oBlogUser->getUser()} -
  • {$oUser->getLogin()} — {$aLang.blog_user_invite_readd}
    • +
  • {$oUser->getLogin()} — {$aLang.blog_user_invite_readd}
    • {/foreach} {/if} diff --git a/templates/skin/developer/css/Autocompleter.css b/templates/skin/developer/css/Autocompleter.css index d1be8f7e..df45af08 100644 --- a/templates/skin/developer/css/Autocompleter.css +++ b/templates/skin/developer/css/Autocompleter.css @@ -49,7 +49,7 @@ ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried input.autocompleter-loading { - background-image: url(../img/spinner.gif); + background-image: url(../images/spinner.gif); background-repeat: no-repeat; background-position: right 50%; } \ No newline at end of file diff --git a/templates/skin/developer/css/style.css b/templates/skin/developer/css/style.css index 33b33a29..06d69555 100644 --- a/templates/skin/developer/css/style.css +++ b/templates/skin/developer/css/style.css @@ -385,8 +385,9 @@ span.form-note { display: block; color: #aaa; font-size: 11px; line-height: 14px /* Block - Blogs */ .block.blogs .list { border-top: 1px solid #eee; padding-top: 3px; margin-top: 10px; } .block.blogs .list li { overflow: hidden; border-bottom: 1px solid #eee; padding-bottom: 5px; margin-bottom: 5px; } -.block.blogs .list li a { padding-right: 50px; color: #777; text-decoration: none; } +.block.blogs .list li a { color: #777; text-decoration: none; } .block.blogs .list li .total { float: right; font-weight: bold; padding-right: 13px; } +.block.blogs .list li a.local { text-decoration: none; border-bottom: 1px dotted #777; } .block.blogs .list li a.close { padding-right: 18px; background: url(../images/key.gif) no-repeat right; } .block.blogs .user-list a { padding: 0 !important; color: #284ea2 !important; } .block.blogs .user-list a.delete { font-size: 11px; color: #f00 !important; } diff --git a/templates/skin/developer/images/spinner.gif b/templates/skin/developer/images/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..88fac73dca427cd918e7fe9fda891fa7517a0c72 GIT binary patch literal 1569 zcmY+EeK6a19LIl&gya{AB*=qCog($p8XB6Knwp!NTUuILTU)PQz1r5+*52N3GMT!%x_Wwg zdV6~Z1_lNP2Zx4+hKGkoMn*dAeCMNFOxidLAIW;vkJv}`$GxOlVgU62_ zKY8-x>C>lkb8`y|3yX`3OG``3%gZY(E32!kYiny}v-#!Am+R~6ymi9X@OZ5|=$3Ac*%IgT+Ds5+OGdk_-B4F{dAcdAsVTz+%sNqp=LM4kzb?{0I z;Bz=G_C%7MC{enBL1!z)8|7O>CCWe^*>Uq0Hiat%awm$Q!Y#nx%ULG0cP#MSC7}pi znBEk3;4eG{f*4FWj|O%l84+(L?P{oSw#38uvnG)ZZ+hDkFoWN&DomB1{ zjl0?f$RtSX%!3ZVRRQYWApJ;=oN@V{ch5`Pp%I(?a3*b!(AJ-(x=?je>q56RP z`&&@0ahx7+72}@1-1+BKffxy;hb*QAAxO|FHP9nNxoauxL_2-NktKHRL3+tnwy?RjN$+Zicb zGBLx;8e@gaVDK}69D|}nX@oXnI|!S}2JYnGOe3(s;UE-Jn;n9SGu=fL!)KMH3elT) zq@5g&on39$(Z3#Ol<^%)PSXVo@E&q6`cSTrjO&%y`>vBZRF7tVaM(pbqh&-VhzUFx zAqs1hWVaY)*e%^*0kMXxkk*L*^>%P&;+jFh5-IyB8C89Gd22-x+jxV%#Di|LEwkjyu(vg~l-y8JRso0YmVQ5EkVH9_bWdmriPn;Xz0HU?r-}Ym*JU~Gu z#H!z-Sig~NtEtil^EbXk5q|z4muDm>JIP0rwG7WD3S+9GBJ~;heG|L%tnJOt3;ODZ z-=AxhB~Tm|@--{&wt!9Dq!z~jdjgQsj;d1ui)`r{g#3l@`Y+o|m4+ohb8%lK3Tosj z`cr?TkjIV;SJxUp<&q1u2@0f zfjG4{K?pdGK(syql%&93%2zra#Xu0BrOCKFA;`ks$&+{$aLang.blog_menu_collective} {if $iCountTopicsCollectiveNew>0}+{$iCountTopicsCollectiveNew}{/if} {if $sMenuItemSelect=='blog'} {/if}