dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Vincent Augagneur
2013-10-30 10:52:04 +01:00
parent 0020412aea 190c14ed9d
commit ad68105467
80 changed files with 695 additions and 1786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/admin-dashboard.js
+7 -8
View File
@@ -208,16 +208,15 @@ function getBlogRss()
},
dataType: 'json',
success : function(jsonData){
if (!jsonData.has_errors)
{
for (var article in jsonData.rss)
{
article_html = '<article><strong>'+jsonData.rss[article].title+'</strong><br>'+jsonData.rss[article].short_desc+'<br/><a href="'+jsonData.rss[article].link+'">'+read_more+'</a></article><br>';
$('.dash_news h4').after(article_html);
if (!jsonData.has_errors) {
for (var article in jsonData.rss) {
article_html = '<article><h4><a href="'+jsonData.rss[article].link+'">'+jsonData.rss[article].title+'</a></h4><p>'+jsonData.rss[article].short_desc+' <a href="'+jsonData.rss[article].link+'">'+read_more+'</a><p></article><hr/>';
$('.dash_news .dash_news_content').append(article_html);
}
}
else
else {
$('.dash_news').hide();
}
},
error : function(data){
//@TODO display errors
@@ -305,4 +304,4 @@ function preactivationLinkClick(module)
//@TODO display errors
}
});
}
}