From 59417e7b1ab8f51830cb3730fe221c55519c0853 Mon Sep 17 00:00:00 2001 From: kirsan Date: Wed, 20 Jul 2011 10:26:44 +0000 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=20=D1=82=D0=BE=D0=BF=D0=B8=D0=BA=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=B2=20develper-jquery?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/skin/developer-jquery/topic.tpl | 2 +- .../skin/developer-jquery/topic_link.tpl | 131 +++++++------ .../skin/developer-jquery/topic_photoset.tpl | 157 +++++++-------- .../skin/developer-jquery/topic_question.tpl | 183 +++++++++--------- .../skin/developer-jquery/topic_topic.tpl | 131 ++++++------- 5 files changed, 291 insertions(+), 313 deletions(-) diff --git a/templates/skin/developer-jquery/topic.tpl b/templates/skin/developer-jquery/topic.tpl index 38923fd1..ad0f960b 100644 --- a/templates/skin/developer-jquery/topic.tpl +++ b/templates/skin/developer-jquery/topic.tpl @@ -1,2 +1,2 @@ {assign var="sTopicTemplateName" value="topic_`$oTopic->getType()`.tpl"} -{include file=$sTopicTemplateName} \ No newline at end of file +{include file=$sTopicTemplateName} \ No newline at end of file diff --git a/templates/skin/developer-jquery/topic_link.tpl b/templates/skin/developer-jquery/topic_link.tpl index 8e892473..ba1c04d9 100644 --- a/templates/skin/developer-jquery/topic_link.tpl +++ b/templates/skin/developer-jquery/topic_link.tpl @@ -1,80 +1,79 @@ {assign var="oBlog" value=$oTopic->getBlog()} {assign var="oUser" value=$oTopic->getUser()} -{assign var="oVote" value=$oTopic->getVote()} - +{assign var="oVote" value=$oTopic->getVote()}
-

- {$oBlog->getTitle()|escape:'html'} → - {if $oTopic->getPublish()==0} - {$aLang.topic_unpublish} - {/if} - {$aLang.topic_link} - {$oTopic->getTitle()|escape:'html'} -

- - - - +

+ {$oBlog->getTitle()|escape:'html'} → + {if $oTopic->getPublish()==0} + {$aLang.topic_unpublish} + {/if} + {$aLang.topic_link} + {$oTopic->getTitle()|escape:'html'} +

+ + + + -
- {if $bTopicList} - {$oTopic->getTextShort()} - {if $oTopic->getTextShort()!=$oTopic->getText()} - - {if $oTopic->getCutText()} - {$oTopic->getCutText()} - {else} - {$aLang.topic_read_more} - {/if} - - {/if} - {else} - {$oTopic->getText()} - {/if} -
+
+ {if $bTopicList} + {$oTopic->getTextShort()} + {if $oTopic->getTextShort()!=$oTopic->getText()} + + {if $oTopic->getCutText()} + {$oTopic->getCutText()} + {else} + {$aLang.topic_read_more} + {/if} + + {/if} + {else} + {$oTopic->getText()} + {/if} +
- + - - {if $tSingle} - {hook run='topic_show_end' topic=$oTopic} - {/if} + + {if $tSingle} + {hook run='topic_show_end' topic=$oTopic} + {/if}
\ No newline at end of file diff --git a/templates/skin/developer-jquery/topic_photoset.tpl b/templates/skin/developer-jquery/topic_photoset.tpl index be7b87dc..6e57b61d 100644 --- a/templates/skin/developer-jquery/topic_photoset.tpl +++ b/templates/skin/developer-jquery/topic_photoset.tpl @@ -1,6 +1,6 @@ -{assign var="oBlog" value=$oTopic->getBlog()} +{assign var="oBlog" value=$oTopic->getBlog()} {assign var="oUser" value=$oTopic->getUser()} -{assign var="oVote" value=$oTopic->getVote()} +{assign var="oVote" value=$oTopic->getVote()} -
-
- - -

- {if $oTopic->getPublish()==0} - {$aLang.topic_unpublish} - {/if} - {if $bTopicList} - {$oTopic->getTitle()|escape:'html'} - {else} - {$oTopic->getTitle()|escape:'html'} - {/if} -

- - - - - {assign var=iPhotosCount value=$oTopic->getPhotosCount()} +
+

+ {$oBlog->getTitle()|escape:'html'} → + {if $oTopic->getPublish()==0} + {$aLang.topic_unpublish} + {/if} + {$oTopic->getTitle()|escape:'html'} +

+ + + +
    + {if $oUserCurrent and ($oUserCurrent->getId()==$oTopic->getUserId() or $oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getUserIsModerator() or $oBlog->getOwnerId()==$oUserCurrent->getId())} +
  • {$aLang.topic_edit}
    • + {/if} + {if $oUserCurrent and ($oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getOwnerId()==$oUserCurrent->getId())} +
  • {$aLang.topic_delete}
    • + {/if} +
+ + {assign var=iPhotosCount value=$oTopic->getPhotosCount()}
{assign var=oMainPhoto value=$oTopic->getMainPhoto()} @@ -50,33 +44,25 @@ image
- - -
- {if $bTopicList} - {$oTopic->getTextShort()} - - - -

{$aLang.topic_photoset_show_all|ls_lang:"COUNT%%`$iPhotosCount`"} → - - - - {if $oTopic->getTextShort()!=$oTopic->getText()} -

( - {if $oTopic->getCutText()} - {$oTopic->getCutText()} - {else} - {$aLang.topic_read_more} - {/if} - ) - {/if} - {else} - {$oTopic->getText()} - {/if} -
- - + +
+ {if $bTopicList} + {$oTopic->getTextShort()} + {if $oTopic->getTextShort()!=$oTopic->getText()} + + {if $oTopic->getCutText()} + {$oTopic->getCutText()} + {else} + {$aLang.topic_read_more} + {/if} + + {/if} + {else} + {$oTopic->getText()} + {/if} +
+ + {if !$bTopicList}

{$iPhotosCount} {$aLang.topic_photoset_count_images}

@@ -98,33 +84,36 @@
{/if} - - -
    - {foreach from=$oTopic->getTagsArray() item=sTag name=tags_list} -
  • {$sTag|escape:'html'}{if !$smarty.foreach.tags_list.last}, {/if}
    • - {/foreach} -
- - - - - {hook run='topic_show_end' topic=$oTopic} +
    + {foreach from=$oTopic->getTagsArray() item=sTag name=tags_list} +
  • {$sTag|escape:'html'}{if !$smarty.foreach.tags_list.last}, {/if}
    • + {/foreach} +
+ + + + + {if $tSingle} + {hook run='topic_show_end' topic=$oTopic} + {/if}
\ No newline at end of file diff --git a/templates/skin/developer-jquery/topic_question.tpl b/templates/skin/developer-jquery/topic_question.tpl index d2fa0725..6f36b62d 100644 --- a/templates/skin/developer-jquery/topic_question.tpl +++ b/templates/skin/developer-jquery/topic_question.tpl @@ -1,112 +1,107 @@ {assign var="oBlog" value=$oTopic->getBlog()} {assign var="oUser" value=$oTopic->getUser()} -{assign var="oVote" value=$oTopic->getVote()} - +{assign var="oVote" value=$oTopic->getVote()}
-

- {$oBlog->getTitle()|escape:'html'} → - {if $oTopic->getPublish()==0} - {$aLang.topic_unpublish} - {/if} - {if $bTopicList} - {$oTopic->getTitle()|escape:'html'} - {else} - {$oTopic->getTitle()|escape:'html'} - {/if} -

- - - -
    - {if $oUserCurrent and ($oUserCurrent->getId()==$oTopic->getUserId() or $oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getUserIsModerator() or $oBlog->getOwnerId()==$oUserCurrent->getId())} -
  • {$aLang.topic_edit}
    • - {/if} - {if $oUserCurrent and ($oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getOwnerId()==$oUserCurrent->getId())} -
  • {$aLang.topic_delete}
    • - {/if} -
+

+ {$oBlog->getTitle()|escape:'html'} → + {if $oTopic->getPublish()==0} + {$aLang.topic_unpublish} + {/if} + {$oTopic->getTitle()|escape:'html'} +

+ + + +
    + {if $oUserCurrent and ($oUserCurrent->getId()==$oTopic->getUserId() or $oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getUserIsModerator() or $oBlog->getOwnerId()==$oUserCurrent->getId())} +
  • {$aLang.topic_edit}
    • + {/if} + {if $oUserCurrent and ($oUserCurrent->isAdministrator() or $oBlog->getUserIsAdministrator() or $oBlog->getOwnerId()==$oUserCurrent->getId())} +
  • {$aLang.topic_delete}
    • + {/if} +
-
-
- {if !$oTopic->getUserQuestionIsVote()} -
    - {foreach from=$oTopic->getQuestionAnswers() key=key item=aAnswer} -
    • - {/foreach} -
+
+
+ {if !$oTopic->getUserQuestionIsVote()} +
    + {foreach from=$oTopic->getQuestionAnswers() key=key item=aAnswer} +
    • + {/foreach} +
- - - - {else} -
    - {foreach from=$oTopic->getQuestionAnswers() key=key item=aAnswer} + + + + {else} +
      + {foreach from=$oTopic->getQuestionAnswers() key=key item=aAnswer}
    • getQuestionAnswerMax()==$aAnswer.count}class="most"{/if}> -
      -
      - {$oTopic->getQuestionAnswerPercent($key)}%
      - ({$aAnswer.count}) -
      -
      {$aAnswer.text|escape:'html'}
      -
      +
      +
      + {$oTopic->getQuestionAnswerPercent($key)}%
      + ({$aAnswer.count}) +
      +
      {$aAnswer.text|escape:'html'}
      +
      • - {/foreach} -
    + {/foreach} +
-

{$aLang.topic_question_vote_result}: {$oTopic->getQuestionCountVote()} | {$aLang.topic_question_abstain_result}: {$oTopic->getQuestionCountVoteAbstain()}

- {/if} -
+

{$aLang.topic_question_vote_result}: {$oTopic->getQuestionCountVote()} | {$aLang.topic_question_abstain_result}: {$oTopic->getQuestionCountVoteAbstain()}

+ {/if} +
- {if $bTopicList} - {$oTopic->getTextShort()} - {if $oTopic->getTextShort()!=$oTopic->getText()} - - {if $oTopic->getCutText()} - {$oTopic->getCutText()} - {else} - {$aLang.topic_read_more} - {/if} - - {/if} - {else} - {$oTopic->getText()} - {/if} -
+ {if $bTopicList} + {$oTopic->getTextShort()} + {if $oTopic->getTextShort()!=$oTopic->getText()} + + {if $oTopic->getCutText()} + {$oTopic->getCutText()} + {else} + {$aLang.topic_read_more} + {/if} + + {/if} + {else} + {$oTopic->getText()} + {/if} +
-
    - {foreach from=$oTopic->getTagsArray() item=sTag name=tags_list} -
  • {$sTag|escape:'html'}{if !$smarty.foreach.tags_list.last}, {/if}
    • - {/foreach} -
+
    + {foreach from=$oTopic->getTagsArray() item=sTag name=tags_list} +
  • {$sTag|escape:'html'}{if !$smarty.foreach.tags_list.last}, {/if}
    • + {/foreach} +
- - {if $tSingle} - {hook run='topic_show_end' topic=$oTopic} - {/if} -
+ + {if $tSingle} + {hook run='topic_show_end' topic=$oTopic} + {/if} +
\ No newline at end of file diff --git a/templates/skin/developer-jquery/topic_topic.tpl b/templates/skin/developer-jquery/topic_topic.tpl index 9a501a44..b3b2e20e 100644 --- a/templates/skin/developer-jquery/topic_topic.tpl +++ b/templates/skin/developer-jquery/topic_topic.tpl @@ -1,82 +1,77 @@ {assign var="oBlog" value=$oTopic->getBlog()} {assign var="oUser" value=$oTopic->getUser()} -{assign var="oVote" value=$oTopic->getVote()} - +{assign var="oVote" value=$oTopic->getVote()}
-

- {$oBlog->getTitle()|escape:'html'} → - {if $oTopic->getPublish()==0} - {$aLang.topic_unpublish} - {/if} - {if $bTopicList} - {$oTopic->getTitle()|escape:'html'} - {else} - {$oTopic->getTitle()|escape:'html'} - {/if} -

- - - - +

+ {$oBlog->getTitle()|escape:'html'} → + {if $oTopic->getPublish()==0} + {$aLang.topic_unpublish} + {/if} + {$oTopic->getTitle()|escape:'html'} +

+ + + + -
- {if $bTopicList} - {$oTopic->getTextShort()} - {if $oTopic->getTextShort()!=$oTopic->getText()} - - {if $oTopic->getCutText()} - {$oTopic->getCutText()} - {else} - {$aLang.topic_read_more} - {/if} - - {/if} - {else} - {$oTopic->getText()} - {/if} -
+
+ {if $bTopicList} + {$oTopic->getTextShort()} + {if $oTopic->getTextShort()!=$oTopic->getText()} + + {if $oTopic->getCutText()} + {$oTopic->getCutText()} + {else} + {$aLang.topic_read_more} + {/if} + + {/if} + {else} + {$oTopic->getText()} + {/if} +
- + - - {if $tSingle} - {hook run='topic_show_end' topic=$oTopic} - {/if} + + {if $tSingle} + {hook run='topic_show_end' topic=$oTopic} + {/if}
\ No newline at end of file