public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:samuelclay/NewsBlur into social

Browse source 
* 'master' of github.com:samuelclay/NewsBlur:
  Truncating feed title in trainer dialog.
  Adding French review to press page.

Conflicts:
	media/js/newsblur/reader/reader_classifier.js
This commit is contained in:
Samuel Clay 2012-05-02 12:08:08 -07:00
commit c19e068262
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
media/js/newsblur/reader/reader_classifier.js
View file

@ -584,8 +584,8 @@ var classifier_prototype = {
},
make_publisher: function(publisher) {
console.log(["publisher", publisher]);
var $publisher = this.make_classifier(publisher.feed_title, publisher.id, 'feed', publisher.story_count, publisher);
var $publisher = this.make_classifier(_.string.truncate(publisher.feed_title, 50),
publisher.id, 'feed', publisher.story_count, publisher);
return $publisher;
},

8
templates/static/press.xhtml
View file

@ -84,6 +84,14 @@
<span class="NB-press-author">Robin Good</span>,
<span class="NB-press-date">April 21, 2012</span>
</li>
<li>
<a href="http://linuxfr.org/news/newsblur-la-fusion-du-contenu-et-du-contexte">NewsBlur, la fusion du contenu et du contexte</a>
<span class="NB-press-publisher">
<img src="http://linuxfr.org/favicon.ico">
LinuxFr.org</span>,
<span class="NB-press-author">Aissen</span>,
<span class="NB-press-date">May 2, 2012</span>
</li>
<li>
<a href="http://www.girlsync.fr/2012/04/25/newsblur-mon-alternative-a-google-reader/">NewsBlur, mon alternative à Google Reader</a>
<span class="NB-press-publisher">