mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-05 16:58:59 +00:00
Merge branch 'social' into redis
* social: Adding mongod, redis-server, and nginx to Mac OS X's launchd. Restyling the demo account dashboard. Thanks to @mgeraci for the inspiration.
This commit is contained in:
Samuel Clay
commit
cb7bced0bf
9 changed files with 205 additions and 159 deletions
14
config/com.nginx.nginx.plist
Normal file
14
config/com.nginx.nginx.plist
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>com.nginx.nginx</string>
|
||||
<key>RunAtLoad</key>
|
||||
<true/>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>/usr/local/bin/nginx</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>com.redis</string>
|
||||
<string>com.redis.redis-server</string>
|
||||
<key>RunAtLoad</key>
|
||||
<true/>
|
||||
<key>ProgramArguments</key>
|
||||
|
|
@ -3332,7 +3332,7 @@ form.opml_import_form input {
|
|||
bottom: 0;
|
||||
right: 0;
|
||||
overflow-y: auto;
|
||||
margin: 56px 0;
|
||||
margin: 32px 0;
|
||||
}
|
||||
|
||||
.NB-splash-info {
|
||||
|
|
@ -3362,8 +3362,12 @@ form.opml_import_form input {
|
|||
bottom: inherit;
|
||||
border-bottom: 1px solid #C9CDE0;
|
||||
}
|
||||
.NB-body-main .NB-splash-info.NB-splash-top {
|
||||
height: 30px;
|
||||
}
|
||||
.NB-splash-info.NB-splash-bottom {
|
||||
border-top: 1px solid #E9ECF6;
|
||||
height: 30px;
|
||||
}
|
||||
.NB-splash-info .NB-splash-title {
|
||||
position: absolute;
|
||||
|
|
@ -3377,69 +3381,58 @@ form.opml_import_form input {
|
|||
.NB-splash-info.NB-splash-top .NB-splash-title {
|
||||
top: 0px;
|
||||
bottom: inherit;
|
||||
right: 166px;
|
||||
right: 24px;
|
||||
width: 312px;
|
||||
height: 55px;
|
||||
}
|
||||
.NB-body-main .NB-splash-info.NB-splash-top .NB-splash-title {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.NB-splash-info .NB-splash-links {
|
||||
position: absolute;
|
||||
right: 0px;
|
||||
width: 80px;
|
||||
text-align: right;
|
||||
bottom: 0;
|
||||
float: right;
|
||||
display: block;
|
||||
line-height: 16px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
text-shadow: 1px 1px 0 #F0F0F0;
|
||||
list-style: none;
|
||||
white-space: nowrap;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.NB-splash-bottom .NB-splash-links-2 {
|
||||
right: 82px;
|
||||
}
|
||||
.NB-splash-info.NB-splash-top .NB-splash-links {
|
||||
top: 0;
|
||||
width: 164px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.NB-splash-info .NB-splash-links .NB-splash-link {
|
||||
display: block;
|
||||
line-height: 12px;
|
||||
margin: 1px 0;
|
||||
padding: 0;
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
float: left;
|
||||
}
|
||||
.NB-splash-info .NB-splash-links .NB-splash-link.NB-first {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
|
||||
.NB-splash-info .NB-splash-links .NB-splash-link a {
|
||||
background-color: #F3F6F9;
|
||||
margin: 0;
|
||||
padding: 2px 4px;
|
||||
padding: 9px 12px 9px 20px;
|
||||
display: block;
|
||||
-webkit-transition: all .12s ease-out;
|
||||
-moz-transition: all .12s ease-out;
|
||||
-o-transition: all .12s ease-out;
|
||||
-ms-transition: all .12s ease-out;
|
||||
}
|
||||
.NB-splash-info .NB-splash-links .NB-splash-link.NB-splash-link-logo a {
|
||||
padding-top: 0;
|
||||
margin-top: -1px;
|
||||
}
|
||||
|
||||
.NB-splash-info .NB-splash-links .NB-splash-link a:hover {
|
||||
background-color: #E9ECF6;
|
||||
}
|
||||
.NB-splash-info .NB-splash-links .NB-splash-link-github a:hover {
|
||||
background: #E9ECF6 url('/media/embed/reader/github_icon.png') no-repeat 0 0;
|
||||
background: transparent url('/media/embed/reader/octocat.png') no-repeat 0 7px;
|
||||
}
|
||||
.NB-splash-info .NB-splash-links .NB-splash-link-getsatisfaction a:hover {
|
||||
background: #E9ECF6 url('/media/embed/reader/getsatisfaction.png') no-repeat 0 0;
|
||||
background: transparent url('/media/embed/reader/getsatisfaction.png') no-repeat 0 7px;
|
||||
}
|
||||
.NB-splash-info .NB-splash-links .NB-splash-link-blog a:hover {
|
||||
background: #E9ECF6 url('/media/embed/reader/ofbrooklyn_icon.png') no-repeat 0 0;
|
||||
background: transparent url('/media/embed/reader/ofbrooklyn_icon.png') no-repeat 0 7px;
|
||||
}
|
||||
|
||||
.NB-splash-info .NB-splash-links .NB-splash-link-twitter a:hover {
|
||||
background: #E9ECF6 url('/media/embed/reader/twitter_icon.png') no-repeat 0 0;
|
||||
background: transparent url('/media/embed/reader/twitter_bird.png') no-repeat 0 7px;
|
||||
}
|
||||
|
||||
.NB-splash-info .NB-splash-links a {
|
||||
|
|
@ -3463,6 +3456,33 @@ form.opml_import_form input {
|
|||
color: #A85B40;
|
||||
}
|
||||
|
||||
.NB-module-logo, .NB-module-login {
|
||||
height: 264px;
|
||||
}
|
||||
.NB-module-logo {
|
||||
text-align: center;
|
||||
line-height: 32px;
|
||||
font-size: 20px;
|
||||
}
|
||||
.NB-module-logo .NB-module-logo-image {
|
||||
margin: 12px 0 0;
|
||||
}
|
||||
.NB-module-logo .NB-module-logo-tagline {
|
||||
margin: 36px 0 42px;
|
||||
}
|
||||
.NB-module-logo .NB-module-logo-tagline b {
|
||||
padding: 2px 8px;
|
||||
background-color: #F0F0F0;
|
||||
font-weight: normal;
|
||||
border-radius: 4px;
|
||||
color: #191F37;
|
||||
text-shadow: 0 1px 0 #FFF;
|
||||
}
|
||||
.NB-module-logo .NB-module-logo-elsewhere {
|
||||
font-size: 16px;
|
||||
color: #797979;
|
||||
}
|
||||
|
||||
/* ============== */
|
||||
/* = Classifier = */
|
||||
/* ============== */
|
||||
|
|
|
|||
BIN
media/img/reader/octocat.png
Normal file
BIN
media/img/reader/octocat.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 698 B |
BIN
media/img/reader/twitter_bird.png
Normal file
BIN
media/img/reader/twitter_bird.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
|
|
@ -884,7 +884,11 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
|
|||
NEWSBLUR.Preferences[preference] = value;
|
||||
var preferences = {};
|
||||
preferences[preference] = value;
|
||||
this.make_request('/profile/set_preference', preferences, callback, null);
|
||||
if (NEWSBLUR.Globals.is_authenticated) {
|
||||
this.make_request('/profile/set_preference', preferences, callback, null);
|
||||
} else {
|
||||
if (callback) callback();
|
||||
}
|
||||
},
|
||||
|
||||
save_preferences: function(preferences, callback) {
|
||||
|
|
|
|||
|
|
@ -101,24 +101,19 @@
|
|||
|
||||
<div class="NB-splash-info NB-splash-top">
|
||||
<a href="{% url index %}"><img class="NB-splash-title" src="{{ MEDIA_URL }}/img/logo_newsblur_blur.png" /></a>
|
||||
<ul class="NB-splash-links">
|
||||
<li class="NB-splash-link NB-first NB-splash-link-twitter"><a href="http://twitter.com/samuelclay">@samuelclay</a></li>
|
||||
<li class="NB-splash-link NB-first NB-splash-link-twitter"><a href="http://twitter.com/newsblur">@newsblur</a></li>
|
||||
<li class="NB-splash-link NB-splash-link-blog"><a href="http://blog.newsblur.com">The Blog</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="NB-splash-info NB-splash-bottom">
|
||||
<a href="{% url index %}"><img class="NB-splash-title" src="{{ MEDIA_URL }}/img/logo_newsblur.png" /></a>
|
||||
<ul class="NB-splash-links">
|
||||
<li class="NB-splash-link"><a href="{% url faq %}">FAQ</a></li>
|
||||
<li class="NB-splash-link NB-splash-link-logo"><a href="{% url index %}"><img src="{{ MEDIA_URL }}/img/logo_newsblur_blur.png" style="height: 32px; width: 183px;" /></a></li>
|
||||
<li class="NB-splash-link"><a href="{% url about %}">About</a></li>
|
||||
<li class="NB-splash-link NB-first NB-splash-link-github"><a href="http://github.com/samuelclay">GitHub</a></li>
|
||||
</ul>
|
||||
<ul class="NB-splash-links NB-splash-links-2">
|
||||
<li class="NB-splash-link"><a href="{% url faq %}">FAQ</a></li>
|
||||
<li class="NB-splash-link"><a href="{% url api %}">API</a></li>
|
||||
<li class="NB-splash-link"><a href="{% url press %}">Press</a></li>
|
||||
<li class="NB-splash-link NB-splash-link-github"><a href="http://github.com/samuelclay">GitHub</a></li>
|
||||
<li class="NB-splash-link NB-splash-link-getsatisfaction"><a href="https://getsatisfaction.com/newsblur">Feedback</a></li>
|
||||
<li class="NB-splash-link NB-splash-link-blog"><a href="http://blog.newsblur.com">The Blog</a></li>
|
||||
<li class="NB-splash-link NB-first NB-splash-link-twitter"><a href="http://twitter.com/newsblur">@newsblur</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{% extends 'base.html' %}
|
||||
|
||||
{% load typogrify_tags recommendations_tags utils_tags statistics_tags %}
|
||||
{% load recommendations_tags utils_tags statistics_tags %}
|
||||
|
||||
{% block extra_head_js %}
|
||||
<script>
|
||||
|
|
@ -24,11 +24,12 @@
|
|||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block bodyclass %}NB-body-main{% endblock %}
|
||||
{% block content %}
|
||||
|
||||
|
||||
<h1 class="NB-splash-heading">NewsBlur</h1>
|
||||
<h2 class="NB-splash-heading">- A visual feed reader with intelligence.</h2>
|
||||
<h2 class="NB-splash-heading">- The best stories from your friends and favorite blogs, all in one place.</h2>
|
||||
|
||||
<div id="NB-splash" style="left: {% firstof user_profile.feed_pane_size 240 %}px">
|
||||
|
||||
|
|
@ -37,19 +38,131 @@
|
|||
{% if user.is_authenticated %}
|
||||
{% render_interactions_module %}
|
||||
{% render_activities_module %}
|
||||
{% endif %}
|
||||
|
||||
{% if recommended_feeds %}
|
||||
{% render_recommended_feed recommended_feeds %}
|
||||
{% endif %}
|
||||
|
||||
{% if not user.is_authenticated %}
|
||||
{% if user.is_staff and unmoderated_feeds %}
|
||||
{% render_recommended_feed unmoderated_feeds 1 %}
|
||||
{% endif %}
|
||||
|
||||
{% endif %}{% if not user.is_authenticated %}
|
||||
|
||||
<div class="NB-module NB-module-logo">
|
||||
<img src="{{ MEDIA_URL }}img/logo_newsblur.png" class="NB-module-logo-image" />
|
||||
<div class="NB-module-logo-tagline">
|
||||
Focus on the best stories from<br><b>your friends</b> and <b>favorite blogs</b>
|
||||
</div>
|
||||
<div class="NB-module-logo-elsewhere">
|
||||
FOR WEB, <a href="/iphone" class="NB-splash-link">iOS</a>, AND <a href="https://market.android.com/details?id=bitwrit.Blar" class="NB-splash-link">ANDROID</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% render_features_module %}
|
||||
|
||||
<div class="NB-module NB-module-howitworks" style="display: none">
|
||||
<h5 class="NB-module-header">
|
||||
<div class="NB-module-header-right">
|
||||
<a href="#" class="NB-module-direction NB-module-next-page"></a>
|
||||
<a href="#" class="NB-module-direction NB-module-previous-page NB-disabled"></a>
|
||||
</div>
|
||||
<div class="NB-module-header-left">
|
||||
How It Works
|
||||
</div>
|
||||
</h5>
|
||||
|
||||
<div class="NB-howitworks-page-indicators">
|
||||
<a href="#" class="NB-module-page-indicator NB-active"></a>
|
||||
<a href="#" class="NB-module-page-indicator"></a>
|
||||
<a href="#" class="NB-module-page-indicator"></a>
|
||||
<a href="#" class="NB-module-page-indicator"></a>
|
||||
<a href="#" class="NB-module-page-indicator"></a>
|
||||
<a href="#" class="NB-module-page-indicator"></a>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page NB-active">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_original.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
Read the original site.
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_intelligence_like.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
Easily train NewsBlur to highlight stories you like.
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_intelligence_dislike.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
NewsBlur will filter out stories which you don't like.
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_import.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
Quickly import your sites from Google Reader.
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_iphone.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
Use the free iPhone app.
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_github.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
Open source, regularly improved, attention to detail.
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if recommended_feeds %}
|
||||
{% render_recommended_feed recommended_feeds %}
|
||||
{% endif %}
|
||||
|
||||
{% if user.is_staff and unmoderated_feeds %}
|
||||
{% render_recommended_feed unmoderated_feeds 1 %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
||||
|
|
@ -58,7 +171,7 @@
|
|||
<div class="NB-account">
|
||||
|
||||
{% if not user.is_authenticated %}
|
||||
<div class="NB-module">
|
||||
<div class="NB-module NB-module-login">
|
||||
<h5>
|
||||
<div class="NB-module-header-login">Login</div>
|
||||
<div class="NB-module-header-signup">Signup</div>
|
||||
|
|
@ -123,110 +236,10 @@
|
|||
{% endif %}
|
||||
|
||||
<div class="NB-signup-orline {% if signup_form.errors %}NB-signup-orline-reduced{% endif %}">— <span class="NB-signup-orline-or">or</span> —</div>
|
||||
<a href="{% url google-reader-authorize %}" class="NB-splash-link NB-signup-google">Import from<br /><img src="{{ MEDIA_URL }}img/reader/google-reader-logo.png" width="112" height="24" /></a>
|
||||
<a href="{% url google-reader-authorize %}" class="NB-splash-link NB-signup-google">Import from <img src="{{ MEDIA_URL }}img/reader/google-reader-logo.png" width="112" height="24" /></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="NB-module NB-module-howitworks">
|
||||
<h5 class="NB-module-header">
|
||||
<div class="NB-module-header-right">
|
||||
<a href="#" class="NB-module-direction NB-module-next-page"></a>
|
||||
<a href="#" class="NB-module-direction NB-module-previous-page NB-disabled"></a>
|
||||
</div>
|
||||
<div class="NB-module-header-left">
|
||||
How It Works
|
||||
</div>
|
||||
</h5>
|
||||
|
||||
<div class="NB-howitworks-page-indicators">
|
||||
<a href="#" class="NB-module-page-indicator NB-active"></a>
|
||||
<a href="#" class="NB-module-page-indicator"></a>
|
||||
<a href="#" class="NB-module-page-indicator"></a>
|
||||
<a href="#" class="NB-module-page-indicator"></a>
|
||||
<a href="#" class="NB-module-page-indicator"></a>
|
||||
<a href="#" class="NB-module-page-indicator"></a>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page NB-active">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_original.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
{% filter typogrify %}Read the<br />original site.{% endfilter %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_intelligence_like.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
{% filter typogrify %}Easily train NewsBlur to highlight stories you like.{% endfilter %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_intelligence_dislike.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
{% filter typogrify %}NewsBlur will filter out stories which you don't like.{% endfilter %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_import.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
{% filter typogrify %}Quickly import<br>your feeds from<br>Google Reader.{% endfilter %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_iphone.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
{% filter typogrify %}Use the free iPhone app.{% endfilter %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="NB-howitworks-page">
|
||||
<div class="NB-howitworks-page-image">
|
||||
<img src="{{ MEDIA_URL }}img/reader/howitworks_github.png" />
|
||||
</div>
|
||||
<table class="NB-howitworks-page-description">
|
||||
<tr>
|
||||
<td>
|
||||
{% filter typogrify %}Open source,<br>regularly improved,<br>attention to detail.{% endfilter %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% else %}
|
||||
|
||||
<div class="NB-module NB-module-account">
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue