mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-09-18 21:50:56 +00:00
New about page!
This commit is contained in:
Samuel Clay
parent
b7733c71e9
commit
926432d684
9 changed files with 80 additions and 30 deletions
|
|
@ -167,7 +167,10 @@ class UserSubscription(models.Model):
|
|||
r.delete(unread_ranked_stories_keys)
|
||||
|
||||
for feed_id in feed_ids:
|
||||
us = cls.objects.get(user=user_id, feed=feed_id)
|
||||
try:
|
||||
us = cls.objects.get(user=user_id, feed=feed_id)
|
||||
except cls.DoesNotExist:
|
||||
continue
|
||||
story_guids = us.get_stories(offset=0, limit=200,
|
||||
order=order, read_filter=read_filter,
|
||||
withscores=True)
|
||||
|
|
|
|||
|
|
@ -173,6 +173,7 @@ def exception_retry(request):
|
|||
feed_id = get_argument_or_404(request, 'feed_id')
|
||||
reset_fetch = json.decode(request.POST['reset_fetch'])
|
||||
feed = Feed.get_by_id(feed_id)
|
||||
original_feed = feed
|
||||
|
||||
if not feed:
|
||||
raise Http404
|
||||
|
|
@ -190,7 +191,11 @@ def exception_retry(request):
|
|||
feed.save()
|
||||
|
||||
feed = feed.update(force=True, compute_scores=False, verbose=True)
|
||||
usersub = UserSubscription.objects.get(user=user, feed=feed)
|
||||
try:
|
||||
usersub = UserSubscription.objects.get(user=user, feed=feed)
|
||||
except UserSubscription.DoesNotExist:
|
||||
usersub = UserSubscription.objects.get(user=user, feed=original_feed)
|
||||
usersub.switch_feed(feed, original_feed)
|
||||
usersub.calculate_feed_scores(silent=False)
|
||||
|
||||
feeds = {feed.pk: usersub.canonical(full=True), feed_id: usersub.canonical(full=True)}
|
||||
|
|
|
|||
|
|
@ -7414,11 +7414,10 @@ form.opml_import_form input {
|
|||
font-size: 13px;
|
||||
}
|
||||
|
||||
.NB-static-about ul li
|
||||
.NB-static-about ul li,
|
||||
.NB-static-faq ul li {
|
||||
margin: 0 0 12px;
|
||||
padding-left: 20px;
|
||||
list-style: none;
|
||||
line-height: 20px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.NB-static-about ul li.last,
|
||||
|
|
@ -7427,19 +7426,30 @@ form.opml_import_form input {
|
|||
}
|
||||
|
||||
.NB-static-about ul.NB-about-what li {
|
||||
background: transparent url('/media/embed/icons/silk/bullet_blue.png') no-repeat 0 0;
|
||||
list-style-image: url('/media/embed/icons/silk/bullet_blue.png');
|
||||
}
|
||||
.NB-static-about ul.NB-about-server li {
|
||||
background: transparent url('/media/embed/icons/silk/bullet_yellow.png') no-repeat 0 0;
|
||||
list-style-image: url('/media/embed/icons/silk/bullet_yellow.png');
|
||||
}
|
||||
.NB-static-about ul.NB-about-client li {
|
||||
background: transparent url('/media/embed/icons/silk/bullet_red.png') no-repeat 0 0;
|
||||
list-style-image: url('/media/embed/icons/silk/bullet_red.png');
|
||||
}
|
||||
.NB-static-about ul.NB-about-who li {
|
||||
background: transparent url('/media/embed/icons/silk/bullet_green.png') no-repeat 0 0;
|
||||
.NB-static-about .NB-about-who {
|
||||
overflow: hidden;
|
||||
}
|
||||
.NB-static-about ul.NB-about-why li {
|
||||
background: transparent url('/media/embed/icons/silk/bullet_orange.png') no-repeat 0 0;
|
||||
.NB-static-about .NB-about-who li {
|
||||
float: left;
|
||||
margin: 0 24px 0 0;
|
||||
text-align: center;
|
||||
list-style: none;
|
||||
}
|
||||
.NB-static-about .NB-about-who img {
|
||||
border: 1px solid #505050;
|
||||
margin: 12px 0;
|
||||
width: 170px;
|
||||
}
|
||||
.NB-static-about .NB-about-why li {
|
||||
list-style-image: url('/media/embed/icons/silk/bullet_orange.png');
|
||||
}
|
||||
|
||||
.NB-static-faq .NB-link-about-faq {
|
||||
|
|
|
|||
BIN
media/img/static/Roy Yang.jpg
Normal file
BIN
media/img/static/Roy Yang.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 93 KiB |
BIN
media/img/static/Samuel Clay.jpg
Normal file
BIN
media/img/static/Samuel Clay.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 114 KiB |
BIN
media/img/static/Shiloh.jpg
Normal file
BIN
media/img/static/Shiloh.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 40 KiB |
|
|
@ -38,7 +38,7 @@ NEWSBLUR.ReaderGoodies.prototype = {
|
|||
href: '#'
|
||||
}, 'Add to Chrome'),
|
||||
$.make('div', { className: 'NB-goodies-chrome' }),
|
||||
$.make('div', { className: 'NB-goodies-title' }, 'Google Chome: NewsBlur Chrome Web App')
|
||||
$.make('div', { className: 'NB-goodies-title' }, 'Google Chrome: NewsBlur Chrome Web App')
|
||||
]),
|
||||
$.make('div', { className: 'NB-goodies-group NB-modal-submit' }, [
|
||||
$.make('a', {
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ NEWSBLUR.Views.SocialPageStory = Backbone.View.extend({
|
|||
|
||||
this.$mark = this.$el.closest('.NB-mark');
|
||||
this.attach_tooltips();
|
||||
this.truncate_story_height();
|
||||
},
|
||||
|
||||
attach_tooltips: function() {
|
||||
|
|
@ -62,6 +63,10 @@ NEWSBLUR.Views.SocialPageStory = Backbone.View.extend({
|
|||
});
|
||||
},
|
||||
|
||||
truncate_story_height: function() {
|
||||
|
||||
},
|
||||
|
||||
story_url: function() {
|
||||
var guid = this.story_guid.substr(0, 6);
|
||||
var url = window.location.protocol + '//' + window.location.host + '/story/' + guid;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{% extends 'base.html' %}
|
||||
|
||||
{% block bodyclass %}NB-static{% endblock %}
|
||||
{% block bodyclass %}NB-static NB-static-about{% endblock %}
|
||||
|
||||
{% block title %}About NewsBlur{% endblock %}
|
||||
|
||||
|
|
@ -14,14 +14,52 @@
|
|||
About NewsBlur
|
||||
</div>
|
||||
|
||||
<div class="NB-module">
|
||||
<h5 class="NB-module-title"><span class="NB-module-title-prefix">What:</span>The story behind NewsBlur</h5>
|
||||
<div class="NB-module-content">
|
||||
<ul class="NB-about-what">
|
||||
<li>NewsBlur is a social news reader built for people who want to enjoy reading the news. NewsBlur is a great place to read the best stories from your friends and favorite blogs.</li>
|
||||
<li>In New York City during the Summer of 2009, Samuel Clay wanted a better way to read the news. So he built the first version of NewsBlur almost entirely underground on the A train.</li>
|
||||
<li>In mid-2010, NewsBlur launched to the public and to favorable reviews. In October 2010 premium accounts launched, paying NewsBlur's increasing server costs since the first week.</li>
|
||||
<li>After entering Y Combinator during the Summer of 2012, Blurblogs are launched as a new way to share and talk about the news between friends. Samuel, Roy, and Shiloh celebrate with champagne and biscuits.
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="NB-module">
|
||||
<h5 class="NB-module-title"><span class="NB-module-title-prefix">Who:</span>A Labor of Love</h5>
|
||||
<div class="NB-module-content">
|
||||
<ul class="NB-about-who">
|
||||
<li>Hand-crafted by: <a href="http://www.samuelclay.com">Samuel Clay</a></li>
|
||||
<li>Talk to him on Twitter: <a href="http://twitter.com/samuelclay">@samuelclay</a></li>
|
||||
<li>E-mail: <a href="mailto:samuel@newsblur.com">samuel@newsblur.com</a></li>
|
||||
<li class="last">Created in: <a href="http://www.newyorkfieldguide.com">New York City</a> (mostly on the A train)</li>
|
||||
<li>
|
||||
<img src="{{ MEDIA_URL }}img/static/Samuel Clay.jpg">
|
||||
<div class="NB-about-who-name">Samuel Clay</div>
|
||||
<div class="NB-acount-who-twitter"><a href="http://twitter.com/samuelclay">@samuelclay</a></div>
|
||||
<div class="NB-about-who-website"><a href="http://www.samuelclay.com">www.samuelclay.com</a></div>
|
||||
<div class="NB-about-who-email"><a href="mailto:samuel@newsblur.com">samuel@newsblur.com</a></div>
|
||||
</li>
|
||||
<li>
|
||||
<img src="{{ MEDIA_URL }}img/static/Roy Yang.jpg">
|
||||
<div class="NB-about-who-name">Roy Yang</div>
|
||||
<div class="NB-acount-who-twitter"><a href="http://twitter.com/roycyang">@roycyang</a></div>
|
||||
<div class="NB-about-who-email"><a href="mailto:roy@newsblur.com">roy@newsblur.com</a></div>
|
||||
</li>
|
||||
<li>
|
||||
<img src="{{ MEDIA_URL }}img/static/Shiloh.jpg">
|
||||
<div class="NB-about-who-name">Shiloh</div>
|
||||
<div class="NB-acount-who-twitter"><a href="http://twitter.com/newsblur">@newsblur</a></div>
|
||||
<div class="NB-about-who-email"><a href="mailto:shiloh@newsblur.com">shiloh@newsblur.com</a></div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="NB-module">
|
||||
<h5 class="NB-module-title"><span class="NB-module-title-prefix">Why:</span>What makes NewsBlur better</h5>
|
||||
<div class="NB-module-content">
|
||||
<ul class="NB-about-why">
|
||||
<li><b>News reading</b>: With first-class iOS, Android, and web apps, NewsBlur is an easy and organized way to read the news wherever you are. </li>
|
||||
<li><b>Training</b>: By using NewsBlur's training filters, you can hide stories you don't want to see while highlighting the stories you want to focus on.</li>
|
||||
<li><b>Social</b>: Sharing and talking about the news is not only fun, but allows you to break out of your filter bubble and embrace the serendipity of your friend's tastes.</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -49,15 +87,4 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="NB-module">
|
||||
<h5 class="NB-module-title"><span class="NB-module-title-prefix">Why:</span>What's the point of another RSS feed reader?</h5>
|
||||
<div class="NB-module-content">
|
||||
<ul class="NB-about-why">
|
||||
<li>To prove that I could do it.</li>
|
||||
<li>I wanted something better.</li>
|
||||
<li>Where there's a will, there's an empty git repository.</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock content %}
|
||||
Loading…
Add table
Reference in a new issue