public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding android app to email. Also finalizing cleanup.

Browse source
This commit is contained in:
Samuel Clay 2011-09-21 21:51:25 -07:00
parent ed7d2bd88f
commit 8a6ff025d5
6 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
media/css/reader.css
View file

@ -3586,8 +3586,9 @@ background: transparent;
}
.NB-module-mobile .NB-module-mobile-freeforpremium {
font-size: 11px;
color: #606060;
font-size: 12px;
color: #3D3D3D;
font-weight: bold;
}
/* ================ */

BIN
media/img/reader/android_icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

6
media/js/newsblur/reader.js
View file

@ -104,7 +104,7 @@
this.load_recommended_feeds();
this.setup_dashboard_graphs();
this.setup_howitworks_hovers();
this.load_email_optout();
this.load_url_next_param();
};
NEWSBLUR.Reader.prototype = {
@ -309,10 +309,12 @@
}
},
load_email_optout: function() {
load_url_next_param: function() {
var next = $.getQueryString('next');
if (next == 'optout') {
this.open_account_modal({'animate_email': true});
} else if (next == 'goodies') {
this.open_goodies_modal();
}
},

7
templates/mail/email_base.txt
View file

@ -14,7 +14,12 @@ Stay up to date and in touch with me, yr. developer, in a few different ways:
* Read the NewsBlur Blog: http://blog.newsblur.com
* Get support on NewsBlur's Get Satisfaction: http://getsatisfaction.com/newsblur
* Download the free NewsBlur iPhone app: [Coming soon -- it's in review on the App Store]
There's plenty of ways to use NewsBlur beyond the website:
* Download the iPhone App -- Coming soon, it's in review on the App Store.
* Download the Android App on the Android Market: https://market.android.com/details?id=bitwrit.Blar
* Download browser extensions for Safari, Firefox, and Chrome: http://www.newsblur.com{{ user.profile.autologin_url }}?next=goodies
-----------------------------------------------------------------------------

25
templates/mail/email_base.xhtml
View file

@ -20,7 +20,7 @@
{% block body %}{% endblock %}
<p style="line-height:20px;">- Samuel Clay, <a href="http://twitter.com/samuelclay">@samuelclay</a></p>
<p style="line-height:20px;">- Samuel Clay, <a href="http://twitter.com/samuelclay" style="text-decoration:none">@samuelclay</a></p>
</td>
</tr>
<tr>
@ -31,17 +31,24 @@
<p style="line-height:20px;">Stay up to date and in touch with me, yr. developer, in a few different ways:</p>
<p style="line-height: 20px;">
<ul style="list-style: none;">
<li style="line-height:22px;"><a href="http://twitter.com/samuelclay" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/reader/twitter_icon_2.png" style="width:16px;height:16px;vertical-align:top;"> Follow @samuelclay on Twitter</a>.</li>
<li style="line-height:22px;"><a href="http://twitter.com/newsblur" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/reader/twitter.png" style="width:16px;height:16px;vertical-align:top;"> Follow @newsblur on Twitter</a>.</li>
<li style="line-height:22px;"><a href="http://github.com/samuelclay" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/reader/github_icon.png" style="width:16px;height:16px;vertical-align:top;"> Follow the constantly evolving source code on GitHub</a>.</li>
<li style="line-height:22px;"><a href="http://twitter.com/samuelclay" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/reader/twitter_icon_2.png" style="width:16px;height:16px;vertical-align:top;padding-top:3px;"> Follow @samuelclay on Twitter</a>.</li>
<li style="line-height:22px;"><a href="http://twitter.com/newsblur" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/reader/twitter.png" style="width:16px;height:16px;vertical-align:top;padding-top:3px;"> Follow @newsblur on Twitter</a>.</li>
<li style="line-height:22px;"><a href="http://github.com/samuelclay" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/reader/github_icon.png" style="width:16px;height:16px;vertical-align:top;padding-top:3px;"> Follow the constantly evolving source code on GitHub</a>.</li>
</ul>
</p>
<p style="line-height: 20px;">{% block resources_header %}There are a few resources you can use if you end up loving NewsBlur:{% endblock resources_header %}</p>
<p style="line-height: 20px;">{% block resources_header %}There are a couple resources you can use if you end up loving NewsBlur:{% endblock resources_header %}</p>
<p style="line-height: 20px;">
<ul style="list-style: none;">
<li style="line-height:22px;"><a href="http://blog.newsblur.com" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/favicon.png" style="width:16px;height:16px;vertical-align:top;"> Read the NewsBlur Blog</a>.</li>
<li style="line-height:22px;"><a href="http://getsatisfaction.com/newsblur" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/reader/getsatisfaction.png" style="width:16px;height:16px;vertical-align:top;"> Get support on NewsBlur's Get Satisfaction</a>.</li>
<li style="line-height:22px;"><img src="http://nb.local.host:8000/media/img/reader/iphone_icon.png" style="width:16px;height:16px;vertical-align:top;"> [Coming soon -- it's in review on the App Store]</li>
<li style="line-height:22px;"><a href="http://blog.newsblur.com" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/favicon.png" style="width:16px;height:16px;vertical-align:top;padding-top:3px;"> Read the NewsBlur Blog</a>.</li>
<li style="line-height:22px;"><a href="http://getsatisfaction.com/newsblur" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/reader/getsatisfaction.png" style="width:16px;height:16px;vertical-align:top;padding-top:3px;"> Get support on NewsBlur's Get Satisfaction</a>.</li>
</ul>
</p>
<p style="line-height: 20px;">There's plenty of ways to use NewsBlur beyond the website:</p>
<p style="line-height: 20px;">
<ul style="list-style: none;">
<li style="line-height:22px;"><img src="http://www.newsblur.com/media/img/reader/iphone_icon.png" style="width:16px;height:16px;vertical-align:top;padding-top:3px;"> <i>iPhone App -- Coming soon, it's in review on the App Store.</i></li>
<li style="line-height:22px;"><a href="https://market.android.com/details?id=bitwrit.Blar" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/reader/android_icon.png" style="width:16px;height:16px;vertical-align:top;padding-top:3px;"> Download the Android App on the Android Market</a>.</li>
<li style="line-height:22px;"><a href="http://www.newsblur.com{{ user.profile.autologin_url }}?next=goodies" style="text-decoration:none"><img src="http://www.newsblur.com/media/img/icons/silk/package_green.png" style="width:16px;height:16px;vertical-align:top;padding-top:3px;"> Download browser extensions for Safari, Firefox, and Chrome</a>.</li>
</ul>
</p>
</td>
@ -55,7 +62,7 @@
<tr>
<td>
<p style="font-size:12px;">
Don't want to be notified about anything NewsBlur related? <a href="http://www.newsblur.com{{ user.profile.autologin_url }}?next=optout" style="color:#1C4D84; text-decoration:none;">Opt-out of emails from NewsBlur</a>.
Don't want to be notified about anything NewsBlur related? <a href="http://www.newsblur.com{{ user.profile.autologin_url }}?next=optout" style="text-decoration:none;">Opt-out of emails from NewsBlur</a>.
</p>
</td>
</tr>

2
templates/reader/feeds.xhtml
View file

@ -377,7 +377,7 @@ $(document).ready(function() {
<div class="NB-module-item-title">
<span class="NB-raquo">&raquo;</span>
<!-- <a href="#" class="NB-splash-link">Download NewsBlur on the App Store</a> -->
<span class="NB-module-mobile-freeforpremium">In review since Thursday, September 8th. Coming very soon.</span>
<span class="NB-module-mobile-freeforpremium">In review -- Coming very soon.</span>
</div>
</div>
<div class="NB-module-item NB-last {% if user_profile.hide_mobile %}NB-hidden{% endif %}">