allow html inside app descriptions
This commit is contained in:
parent
7027742bd6
commit
b5234a4f34
|
@ -437,6 +437,9 @@ class OC_App{
|
|||
foreach($child->children() as $type){
|
||||
$data['types'][]=$type->getName();
|
||||
}
|
||||
}elseif($child->getName()=='description'){
|
||||
$xml=(string)$child->asXML();
|
||||
$data[$child->getName()]=substr($xml,13,-14);//script <description> tags
|
||||
}else{
|
||||
$data[$child->getName()]=(string)$child;
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
|
|||
} else {
|
||||
page.find('span.version').text('');
|
||||
}
|
||||
page.find('p.description').text(app.description);
|
||||
page.find('p.description').html(app.description);
|
||||
page.find('img.preview').attr('src', app.preview);
|
||||
page.find('small.externalapp').attr('style', 'visibility:visible');
|
||||
page.find('span.author').text(app.author);
|
||||
|
@ -100,7 +100,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
|
|||
|
||||
$(document).ready(function(){
|
||||
$('#leftcontent li').each(function(index,li){
|
||||
var app = $.parseJSON($(this).children('span').text());
|
||||
var app = OC.get('appData_'+$(li).data('id'));
|
||||
$(li).data('app',app);
|
||||
$(this).find('span.hidden').remove();
|
||||
});
|
||||
|
|
|
@ -14,9 +14,9 @@
|
|||
<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>"
|
||||
data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
|
||||
<a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a>
|
||||
<span class="hidden">
|
||||
<?php OC_JSON::encodedPrint($app,false) ?>
|
||||
</span>
|
||||
<script type="application/javascript">
|
||||
appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app,false) ?>;
|
||||
</script>
|
||||
<?php if(!$app['internal']) echo '<small class="externalapp list">3rd party</small>' ?>
|
||||
</li>
|
||||
<?php endforeach;?>
|
||||
|
|
Loading…
Reference in New Issue