mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-05 16:58:59 +00:00
1338c69edb
* master: Using user's username on signup if no password. Using user's username on signup if no password. Fixing passwords if left blank. Patching Django 1.5 to handle underscores in subdomains. Allowed hosts Allowed hosts If not active subs, turn off real-time. If not active subs, turn off real-time. Skipping real-time fetch for non-premium active feeds. Upgrading django 1.5 manage.py. Upgrade to django 1.5 script. Also handling story lookups with objectids. Updated Django to always use the latest 1.5 version. Updated django-redis-session to latest version. Moving HAProxy's config to secrets so I can set a password. Allowing_hosts for django 1.5. Upgrading django from 1.3 to 1.5. Keep Raven from making settings puke. Added django-redis-sessions to requirements. Added a check for testing the email address provided during registration and throwing an error if the email address is already associated with an existing account. Adding revsys fab command. Froze requirements to make installation a bit easier. Conflicts: templates/reader/dashboard.xhtml templates/social/social_page.xhtml
34 lines
No EOL
1.6 KiB
HTML
34 lines
No EOL
1.6 KiB
HTML
{% load utils_tags %}
|
|
|
|
<div class="NB-module NB-module-account">
|
|
<h5 class="NB-module-header">
|
|
<div class="NB-module-account-settings NB-javascript"></div>
|
|
Welcome, <span class="NB-module-account-username">{{ user.username }}</span>
|
|
</h5>
|
|
|
|
<div class="NB-module-item">
|
|
<h3 class="NB-module-content-header">
|
|
<div class="NB-module-content-subtitle NB-module-content-account-realtime-subtitle"></div>
|
|
<div class="NB-module-content-account-realtime" title=""></div>
|
|
{% if user_profile.is_premium %}
|
|
Premium Account
|
|
{% else %}
|
|
Free Account
|
|
{% endif %}
|
|
</h3>
|
|
<div class="NB-module-stats-counts">
|
|
<div class="NB-module-stats-count">
|
|
<div class="NB-module-stats-count-number NB-module-stats-count-number-sites">{{ feed_count|commify }}</div>
|
|
<div class="NB-module-stats-count-description">{{ feed_count|pluralize:"Site,Sites" }}</div>
|
|
</div>
|
|
<div class="NB-module-stats-count">
|
|
<div class="NB-module-stats-count-number">{{ social_profile.shared_stories_count|commify }}</div>
|
|
<div class="NB-module-stats-count-description">Shared stor{{ social_profile.shared_stories_count|pluralize:"y,ies" }}</div>
|
|
</div>
|
|
<div class="NB-module-stats-count">
|
|
<div class="NB-module-stats-count-number">{{ social_profile.follower_count|commify }}</div>
|
|
<div class="NB-module-stats-count-description">Follower{{ social_profile.follower_count|pluralize }}</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div> |