Browse Source

- Remove the old post syntax in Movim

- Fix smileys in titles in Syndication
- Remove the "get subscription" button in Node
pull/16/head
Jaussoin Timothée 12 years ago
parent
commit
d993ee71ff
  1. 5
      app/widgets/Node/_node_content.tpl
  2. 11
      app/widgets/Syndication/Syndication.php
  3. 32
      app/widgets/WidgetCommon/_post.tpl

5
app/widgets/Node/_node_content.tpl

@ -30,12 +30,13 @@
onclick="{$refresh}
this.className='button icon color alone orange loading'; this.onclick=null;"
class="button color blue icon alone refresh"></a>
<!--
<a
class="button color icon yes"
onclick="{$getsubscription}"
>{$c->t('Get Subscription')}</a>
-->
<a
class="button color icon user"
style="float: right; display: none;"

11
app/widgets/Syndication/Syndication.php

@ -63,13 +63,16 @@ class Syndication extends WidgetBase
function prepareTitle($title) {
if($title == null)
return trim(substr(strip_tags($title), 0, 40)).'...';
return '...';
else
return $this->prepareContent($title);
return $this->prepareContent($title, true);
}
function prepareContent($content) {
return cleanHTMLTags(prepareString($content));
function prepareContent($content, $title = false) {
if($title)
return cleanHTMLTags($content);
else
return trim(cleanHTMLTags(prepareString($content)));
}
function generateUUID($content) {

32
app/widgets/WidgetCommon/_post.tpl

@ -1,36 +1,4 @@
<span id="{$idhash}"></span>
<!--<div class="post {$class}" id="{$id}">
<div class="{$access}" title="{$flagtitle}"></div>
<a href="{$friend}">
{$avatar}
</a>
<div id="{$id}bubble" class="postbubble">
<div class="header">
<span class="title">{$title}</span>
{$contact}
<span class="date">
{$date}
</span>
</div>
<div class="content
{if="$spoiler != false"}
spoiler
{/if}
" onclick="{$spoiler}">
{$content}
</div>
{$tags}
{$enc}
{$comments}
{$place}
{$recycle}
{$group}
{$toolbox}
</div>
</div>
-->
<article class="block" id="{$id}">
<div class="{$access}" title="{$flagtitle}"></div>
<header>

Loading…
Cancel
Save