public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stripping www from blurblogs.

Browse source
This commit is contained in:
Samuel Clay 2013-05-21 06:34:49 -07:00
parent 144470feb4
commit fbb908174a
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
templates/import/signup.xhtml
View file

@ -26,7 +26,6 @@
{{ signup_form.password }} {{ signup_form.password }}
</div> </div>
<div class=""> <div class="">
<div class="NB-signup-optional">Optional</div>
{{ signup_form.email.label_tag }} {{ signup_form.email.label_tag }}
{{ signup_form.email }} {{ signup_form.email }}
</div> </div>

4
templates/social/social_page.xhtml
View file

@ -103,13 +103,13 @@
Blurblogs Blurblogs
</div> </div>
</a> </a>
<a class="NB-header-tab NB-following-tab {% if current_tab == "global" %}NB-active{% endif %}" href="//popular.global.{% current_domain %}"> <a class="NB-header-tab NB-following-tab {% if current_tab == "global" %}NB-active{% endif %}" href="//popular.global.{% current_domain strip_www=True %}">
<div class="NB-tab-inner"> <div class="NB-tab-inner">
<span class="NB-icon"></span> <span class="NB-icon"></span>
Global Global
</div> </div>
</a> </a>
<a class="NB-header-tab NB-trending-tab {% if current_tab == "popular" %}NB-active{% endif %}" href="//popular.{% current_domain %}"> <a class="NB-header-tab NB-trending-tab {% if current_tab == "popular" %}NB-active{% endif %}" href="//popular.{% current_domain strip_www=True %}">
<div class="NB-tab-inner"> <div class="NB-tab-inner">
<span class="NB-icon"></span> <span class="NB-icon"></span>
Popular Popular

4
utils/templatetags/utils_tags.py
View file

@ -11,11 +11,13 @@ from utils.user_functions import get_user
register = template.Library() register = template.Library()
@register.simple_tag @register.simple_tag
def current_domain(dev=False): def current_domain(dev=False, strip_www=False):
current_site = Site.objects.get_current() current_site = Site.objects.get_current()
domain = current_site and current_site.domain domain = current_site and current_site.domain
if dev and settings.SERVER_NAME in ["dev"] and domain: if dev and settings.SERVER_NAME in ["dev"] and domain:
domain = domain.replace("www", "dev") domain = domain.replace("www", "dev")
if strip_www:
domain = domain.replace("www.", "")
return domain return domain
@register.simple_tag(takes_context=True) @register.simple_tag(takes_context=True)