Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Update templates to Jinja. #47

Merged
merged 1 commit into from

2 participants

Giorgos Logiotatidis here temporarily.
Giorgos Logiotatidis

Fix bug 728805

remo/base/templates/main.html
@@ -1,4 +1,5 @@
-{% extends "base.html" %} {% load markup %} {% block content %}
+{% extends "base.html" %}
+{% block content %}

add a line break in here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Giorgos Logiotatidis glogiotatidis merged commit b510a85 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 2, 2012
  1. Giorgos Logiotatidis

    Update templates to Jinja.

    glogiotatidis authored
    Fix bug 728805
This page is out of date. Refresh to see the latest.
7 remo/base/helpers.py
View
@@ -0,0 +1,7 @@
+from django.contrib.markup.templatetags import markup
+from jingo import register
+
+
+@register.filter
+def restructuredtext(text):
+ return markup.restructuredtext(text)
33 remo/base/templates/base.html
View
@@ -63,17 +63,17 @@
<div class="ten columns phone-three pull-one-phone pull-two" id="login-box">
<ul>
<li class="account anonymous nomenu logout">
- {% if not user.is_authenticated %}
+ {% if not user.is_authenticated() %}
<a id="browserid" href="#">Sign In</a>
- <form method="POST" action="{% url browserid_verify %}">
- {% csrf_token %} {{ browserid_form.as_p }}
- <input type="hidden" name="next" value="{{ request.get_full_path }}" />
+ <form method="POST" action="{{ url('browserid_verify') }}">
+ {{ csrf() }} {{ browserid_form.as_p() }}
+ <input type="hidden" name="next" value="{{ request.get_full_path() }}" />
</form>
{% else %}
- <a href="{% url profiles_view_my_profile %}">
- {{ user.get_full_name|default:user.userprofile.display_name}}
+ <a href="{{ url('profiles_view_my_profile') }}">
+ {{ user.get_full_name()|default('user.userprofile.display_name') }}
</a>
- [<a href="{% url logout %}">Sign out</a>]
+ [<a href="{{ url('logout') }}">Sign out</a>]
{% endif %}
</li>
</ul>
@@ -86,7 +86,7 @@
<!-- Logo and Wordmark -->
<div class="four columns" id="logo-box">
<div class="row hide-on-phones">
- <a href="{% url main %}">
+ <a href="{{ url('main') }}">
<img src="{{ MEDIA_URL }}img/remo/remo_logo_medium.png"
alt="Mozilla Reps logo">
<h3>mozilla reps</h3>
@@ -101,10 +101,10 @@
<div class="eight columns hide-on-phones" id="navigation-box">
<ul class="nav-bar">
<li>
- <a href="{% url main %}" class="main">Main</a>
+ <a href="{{ url('main') }}" class="main">Main</a>
</li>
<li>
- <a href="{% url profiles_list_profiles %}" class="main">People</a>
+ <a href="{{ url('profiles_list_profiles') }}" class="main">People</a>
</li>
<li>
<a href="https://wiki.mozilla.org/ReMo/Events" class="main">Events</a>
@@ -128,10 +128,10 @@
<div class="eight columns show-on-phones" id="navigation-box-mobile">
<ul class="nav-bar">
<li>
- <a href="{% url main %}" class="main">Main</a>
+ <a href="{{ url('main') }}" class="main">Main</a>
</li>
<li>
- <a href="{% url profiles_list_profiles %}" class="main">People</a>
+ <a href="{{ url('profiles_list_profiles') }}" class="main">People</a>
</li>
<li>
<a href="https://wiki.mozilla.org/ReMo/Events" class="main">Events</a>
@@ -196,7 +196,7 @@
<p class="lead">So, you wanna join us?</p>
<h2>Cool!</h2>
<p>
- The Mozilla Reps program is open to all Mozillians who are 18 years
+ The Mozilla Reps program is open to all Mozillians who are 18 years
of age and above. Before you become a Mozilla Rep, you must
complete a short but rigorous application process in order to
demonstrate your interest in and motivation for joining the
@@ -222,9 +222,10 @@
<li>
<h4>Step 1</h4>
<p>Fill out and submit the
- <a href="https://bugzilla.mozilla.org/form.reps.mentorship">Mozilla
-Reps application form</a>
- . A Mozilla Rep mentor will be in touch within 24 hours.</p>
+ <a href="https://bugzilla.mozilla.org/form.reps.mentorship">
+ Mozilla Reps application form
+ </a>.
+ A Mozilla Rep mentor will be in touch within 24 hours.</p>
</li>
<li>
<h4>Step 2</h4>
10 remo/base/templates/main.html
View
@@ -1,4 +1,6 @@
-{% extends "base.html" %} {% load markup %} {% block content %}
+{% extends "base.html" %}
+
+{% block content %}
<!-- Sidereel Orbit featured images -->
<div class="row show-on-desktop">
@@ -64,16 +66,16 @@
</div>
<div class="eight columns">
<h5>
- <a href="{% url profiles_view_profile featuredrep.user.userprofile.display_name %}">
+ <a href="{{ url('profiles_view_profile', featuredrep.user.userprofile.display_name) }}">
{{ featuredrep.user.first_name }}
</a>
<br>
- <a href="{% url profiles_view_profile featuredrep.user.userprofile.display_name %}">
+ <a href="{{ url('profiles_view_profile', featuredrep.user.userprofile.display_name) }}">
{{ featuredrep.user.last_name }}
</a>
</h5>
<br>
- {{ featuredrep.user.userprofile.city }}, {{ featuredrep.user.userprofile.country}}
+ {{ featuredrep.user.userprofile.city }}, {{ featuredrep.user.userprofile.country }}
</div>
{% else %}
<div class="twelve columns">
10 remo/featuredrep/templates/featuredrep_alter.html
View
@@ -15,17 +15,17 @@
Please specify the rep and add descriptive text.
</p>
<form class="custom" method="post" action="{{ post_to }}">
- {% csrf_token %}
+ {{ csrf() }}
<select id="id_user" name="user">
- {% if not form.user.value %}
+ {% if not form.user.value() %}
<option selected="selected" value="">
---------
</option>
{% endif %}
{% for rep in reps %}
<option value="{{ rep.id }}"
- {% if rep.id == form.user.value %}selected="selected"{% endif %}>
- {{ rep.get_full_name }} :{{ rep.userprofile.display_name }}
+ {% if rep.id == form.user.value() %}selected="selected"{% endif %}>
+ {{ rep.get_full_name() }} :{{ rep.userprofile.display_name }}
</option>
{% endfor %}
</select>
@@ -33,7 +33,7 @@
{{ form.user.errors }}
</small>
<textarea class="flat big" placeholder="Enter featured text using markup"
- name="text">{{ form.text.value }}</textarea>
+ name="text">{{ form.text.value() }}</textarea>
<small class="error">
{{ form.text.errors }}
</small>
15 remo/featuredrep/templates/featuredrep_list.html
View
@@ -1,5 +1,4 @@
{% extends "base.html" %}
-{% load markup %}
{% block pagetitle %}Mozilla Reps - Featured Reps {% endblock%}
@@ -15,7 +14,7 @@
<!-- Adding new rep -->
<div class="row">
<div class="twelve columns align-right">
- <a href="{% url featuredrep_add_featured %}"
+ <a href="{{ url('featuredrep_add_featured') }}"
class="featured-button small white button nice radius">Add new</a>
</div>
</div>
@@ -42,8 +41,8 @@
{% for feature in featured %}
<tr>
<td>
- <a href="{% url profiles_view_profile feature.user.userprofile.display_name %}">
- {{ feature.user.get_full_name }}
+ <a href="{{ url('profiles_view_profile', feature.user.userprofile.display_name) }}">
+ {{ feature.user.get_full_name() }}
</a>
</td>
<td>
@@ -53,17 +52,17 @@
{{ feature.created_on }}
</td>
<td>
- <a href="{% url featuredrep_edit_featured feature.id %}"
+ <a href="{{ url('featuredrep_edit_featured', feature.id) }}"
class="featured-edit pictogram-button">e</a>
<form id="deleteform-{{ feature.id }}" method="post"
- action="{% url featuredrep_delete_featured feature.id %}">
- {% csrf_token %}
+ action="{{ url('featuredrep_delete_featured', feature.id) }}">
+ {{ csrf() }}
<a href="#" data-reveal-id="delete-feature"
class="featured-delete pictogram-button">X</a>
</form>
</td>
</tr>
- {% empty %}
+ {% else %}
<tr>
<td>
No entries yet!
1  remo/profiles/people_urls.py
View
@@ -1,4 +1,3 @@
-from django.core.urlresolvers import reverse
from django.conf.urls.defaults import *
# We use /people/[query] to automatically load the people list view
2  remo/profiles/templates/plainlogin.html
View
@@ -10,7 +10,7 @@
{% if form.errors %}
<p>Your username and password didn't match. Please try again.</p>
{% endif %}
- <form method="post" action="{% url plainlogin %}">
+ <form method="post" action="{{ url('plainlogin') }}">
{% csrf_token %}
<table>
<tr>
62 remo/profiles/templates/profiles_edit.html
View
@@ -16,8 +16,8 @@
</div>
</div>
<form class="custom" method="post"
- action="{% url profiles_edit pageuser.userprofile.display_name %}">
- {% csrf_token %}
+ action="{{ url('profiles_edit', pageuser.userprofile.display_name) }}">
+ {{ csrf() }}
<!-- Two column block -->
<div class="row">
<div class="six columns">
@@ -27,7 +27,7 @@
</div>
<div class="eleven columns">
<input type="text" placeholder="Username" name="display_name"
- value="{{ profileform.display_name.value }}"
+ value="{{ profileform.display_name.value() }}"
class="input-text big">
{% if profileform.display_name.errors %}
<small class="error">
@@ -35,7 +35,7 @@
</small>
{% endif %}
<input type="text" placeholder="Last name" name="last_name"
- value="{{ userform.last_name.value }}"
+ value="{{ userform.last_name.value() }}"
class="input-text big">
{% if userform.last_name.errors %}
<small class="error">
@@ -43,7 +43,7 @@
</small>
{% endif %}
<input type="text" placeholder="First name" name="first_name"
- value="{{ userform.first_name.value }}"
+ value="{{ userform.first_name.value() }}"
class="input-text big">
{% if userform.first_name.errors %}
<small class="error">
@@ -51,7 +51,7 @@
</small>
{% endif %}
<input type="text" placeholder="Name in local language"
- name="local_name" value="{{ profileform.local_name.value }}"
+ name="local_name" value="{{ profileform.local_name.value() }}"
class="input-text big">
{% if profileform.local_name.errors %}
<small class="error">
@@ -96,14 +96,14 @@
</div>
<div class="eleven columns">
<input type="text" placeholder="Personal email"
- value="{{ profileform.private_email.value }}"
+ value="{{ profileform.private_email.value() }}"
name="private_email" class="input-text big">
{% if profileform.private_email.errors %}
<small class="error">
{{ profileform.private_email.errors }}
</small>
{% endif %}
- <input type="text" placeholder="Bugzilla email" value="{{ userform.email.value }}"
+ <input type="text" placeholder="Bugzilla email" value="{{ userform.email.value() }}"
name="email" class="input-text big">
{% if userform.email.errors %}
<small class="error">
@@ -111,7 +111,7 @@
</small>
{% endif %}
<input type="text" placeholder="Mozillians.org profile"
- value="{{ profileform.mozillians_profile_url.value }}"
+ value="{{ profileform.mozillians_profile_url.value() }}"
name="mozillians_profile_url" class="input-text big">
{% if profileform.mozillians_profile_url.errors %}
<small class="error">
@@ -119,7 +119,7 @@
</small>
{% endif %}
<input type="text" placeholder="Wiki profile"
- value="{{ profileform.wiki_profile_url.value }}"
+ value="{{ profileform.wiki_profile_url.value() }}"
name="wiki_profile_url" class="input-text big">
{% if profileform.wiki_profile_url.errors %}
<small class="error">
@@ -127,15 +127,15 @@
</small>
{% endif %}
<select name="mentor">
- {% if not profileform.mentor.value %}
+ {% if not profileform.mentor.value() %}
<option selected="selected" value="">
Choose mentor
</option>
{% endif %}
{% for mentor in mentors %}
- <option value="{{ mentor.id }}" {% if mentor.id == profileform.mentor.value %}
+ <option value="{{ mentor.id }}" {% if mentor.id == profileform.mentor.value() %}
selected="selected" {% endif %}>
- {{ mentor.get_full_name }}
+ {{ mentor.get_full_name() }}
</option>
{% endfor %}
</select>
@@ -148,14 +148,14 @@
p
</div>
<div class="eleven columns">
- <input type="text" placeholder="City" value="{{ profileform.city.value }}"
+ <input type="text" placeholder="City" value="{{ profileform.city.value() }}"
name="city" class="input-text big">
{% if profileform.city.errors %}
<small class="error">
{{ profileform.city.errors }}
</small>
{% endif %}
- <input type="text" placeholder="State or Region" value="{{ profileform.region.value }}"
+ <input type="text" placeholder="State or Region" value="{{ profileform.region.value() }}"
name="region" class="input-text big">
{% if profileform.region.errors %}
<small class="error">
@@ -163,12 +163,12 @@
</small>
{% endif %}
<select name="country">
- {% if not profileform.country.value %}
+ {% if not profileform.country.value() %}
<option selected="selected">Country</option>
{% endif%}
{% for country in countries %}
<option value="{{ country }}"
- {% if profileform.country.value == country %}selected="selected"{% endif %}>
+ {% if profileform.country.value() == country %}selected="selected"{% endif %}>
{{ country }}
</option>
{% endfor %}
@@ -178,9 +178,9 @@
{{ profileform.country.errors }}
</small>
{% endif %}
- <input type="hidden" placeholder="Latitude" value="{{ profileform.lat.value }}"
+ <input type="hidden" placeholder="Latitude" value="{{ profileform.lat.value() }}"
name="lat" class="input-text point-lat">
- <input type="hidden" placeholder="Longitude" value="{{ profileform.lon.value }}"
+ <input type="hidden" placeholder="Longitude" value="{{ profileform.lon.value() }}"
name="lon" class="input-text point-long">
{% if profileform.lat.errors or profileform.lon.errors %}
<small class="error">
@@ -203,7 +203,7 @@
</div>
<div class="eleven columns">
<input type="text" placeholder="Twitter handle"
- value="{{ profileform.twitter_account.value }}"
+ value="{{ profileform.twitter_account.value() }}"
name="twitter_account" class="input-text big">
{% if profileform.twitter_account.errors %}
<small class="error">
@@ -211,7 +211,7 @@
</small>
{% endif %}
<input type="text" placeholder="Facebook profile"
- value="{{ profileform.facebook_url.value }}"
+ value="{{ profileform.facebook_url.value() }}"
name="facebook_url" class="input-text big">
{% if profileform.facebook_url.errors %}
<small class="error">
@@ -219,7 +219,7 @@
</small>
{% endif %}
<input type="text" placeholder="Diaspora profile"
- value="{{ profileform.diaspora_url.value }}"
+ value="{{ profileform.diaspora_url.value() }}"
name="diaspora_url" class="input-text big">
{% if profileform.diaspora_url.errors %}
<small class="error">
@@ -227,7 +227,7 @@
</small>
{% endif %}
<input type="text" placeholder="LinkedIn profile"
- value="{{ profileform.linkedin_url.value }}"
+ value="{{ profileform.linkedin_url.value() }}"
name="linkedin_url" class="input-text big">
{% if profileform.linkedin_url.errors %}
<small class="error">
@@ -244,7 +244,7 @@
</div>
<div class="eleven columns">
<input type="text" placeholder="Jabber ID"
- value="{{ profileform.jabber_id.value }}"
+ value="{{ profileform.jabber_id.value() }}"
name="jabber_id" class="input-text big">
{% if profileform.jabber_id.errors %}
<small class="error">
@@ -252,7 +252,7 @@
</small>
{% endif %}
<input type="text" placeholder="IRC nickname"
- value="{{ profileform.irc_name.value }}"
+ value="{{ profileform.irc_name.value() }}"
name="irc_name" class="input-text big">
{% if profileform.irc_name.errors %}
<small class="error">
@@ -260,7 +260,7 @@
</small>
{% endif %}
<textarea class="flat" placeholder="Please list the channels you use in IRC"
- name="irc_channels">{{ profileform.irc_channels.value }}</textarea>
+ name="irc_channels">{{ profileform.irc_channels.value() }}</textarea>
{% if profileform.irc_channels.errors %}
<small class="error">
{{ profileform.irc_channels.errors }}
@@ -278,7 +278,7 @@
</div>
<div class="eleven columns">
<input type="text" placeholder="Personal site URL"
- value="{{ profileform.personal_website_url.value }}"
+ value="{{ profileform.personal_website_url.value() }}"
name="personal_website_url" class="input-text big">
{% if profileform.personal_website_url.errors %}
<small class="error">
@@ -286,7 +286,7 @@
</small>
{% endif %}
<input type="text" placeholder="Feed for Reps Planet"
- value="{{ profileform.personal_blog_feed.value }}"
+ value="{{ profileform.personal_blog_feed.value() }}"
name="personal_blog_feed" class="input-text big">
{% if profileform.personal_blog_feed.errors %}
<small class="error">
@@ -304,7 +304,7 @@
<div class="eleven columns">
<br>
<textarea class="flat" placeholder="Bio - Write us a bit about yourself"
- name="bio">{{ profileform.bio.value }}</textarea>
+ name="bio">{{ profileform.bio.value() }}</textarea>
{% if profileform.bio.errors %}
<small class="error">
{{ profileform.bio.errors }}
@@ -409,8 +409,8 @@
By pressing the following button you will permanently and irreversibly delete the
profile of this Rep.
</p>
- <form method="post" action="{% url profiles_delete pageuser.userprofile.display_name %}">
- {% csrf_token %}
+ <form method="post" action="{{ url('profiles_delete', pageuser.userprofile.display_name) }}">
+ {{ csrf() }}
<button class="large red button nice radius close-reveal-modal">
Delete profile
</button>
4 remo/profiles/templates/profiles_invite.html
View
@@ -14,8 +14,8 @@
<div class="row">
<div class="twelve columns">
<p>Please enter the Bugzilla mail of the newly accepted rep and press add.</p>
- <form action="{% url profiles_invite %}" method="post" class="custom">
- {% csrf_token %}
+ <form action="{{ url('profiles_invite') }}" method="post" class="custom">
+ {{ csrf() }}
<input type="text" name="email" placeholder="Bugzilla mail" class="input-text">
{% if form.email.errors %}
<small class="error">
18 remo/profiles/templates/profiles_people.html
View
@@ -38,13 +38,13 @@
<ul class="block-grid mobile three-up" id="searchlist">
{% for person in people %}
<li id="li-person-{{ person.id }}">
- <a href="{% url profiles_view_profile person.userprofile.display_name %}">
+ <a href="{{ url('profiles_view_profile', person.userprofile.display_name) }}">
<div class="panel grid-profile">
<div class="row">
<div class="three phone-one columns grid-profile-image">
- <img src="{{ person.userprofile.get_avatar_url }}"
+ <img src="{{ person.userprofile.get_avatar_url() }}"
class="profiles-people-avatar"
- alt="{{ person.get_full_name }} avatar">
+ alt="{{ person.get_full_name() }} avatar">
</div>
<div class="nine phone-three columns grid-profile-text">
<h6>{{ person.first_name }}</h6>
@@ -88,25 +88,25 @@
{% for person in people %}
<tr>
<td>
- <a href="{% url profiles_view_profile person.userprofile.display_name %}">
- {{ person.get_full_name }}
+ <a href="{{ url('profiles_view_profile', person.userprofile.display_name) }}">
+ {{ person.get_full_name() }}
</a>
</td>
<td>
{{ person.userprofile.display_name }}
</td>
<td>
- <a href="{% url profiles_list_profiles %}{{ person.userprofile.city }}">
+x <a href="{{ url('profiles_list_profiles') }}{{ person.userprofile.city }}">
{{ person.userprofile.city }}
</a>
</td>
<td>
- <a href="{% url profiles_list_profiles %}{{ person.userprofile.country }}">
+ <a href="{{ url('profiles_list_profiles') }}{{ person.userprofile.country }}">
{{ person.userprofile.country }}
</a>
</td>
<td>
- {{ person.userprofile.mozillians_profile_url|urlizetrunc:50}}
+ {{ person.userprofile.mozillians_profile_url|urlize(50)}}
</td>
<td>
{{ person.userprofile.private_email }}
@@ -118,7 +118,7 @@
<span>{{ person.userprofile.irc_name }}</span>
<span>{{ person.userprofile.twitter_account }}</span>
<span>{{ person.userprofile.jabber_id }}</span>
- <span>{{ person.userprofile.get_gender_display }}</span>
+ <span>{{ person.userprofile.get_gender_display() }}</span>
</td>
</tr>
{% endfor %}
34 remo/profiles/templates/profiles_view.html
View
@@ -1,5 +1,4 @@
{% extends "base.html" %}
-{% load markup %}
{% block pagetitle %}
Mozilla Reps - Profile of {{ user_profile.display_name }}
@@ -87,15 +86,15 @@ <h5 class="grayed">
Location
</span>
&nbsp;
- <a href="{% url profiles_list_profiles %}{{ user_profile.city }}">
+ <a href="{{ url('profiles_list_profiles') }}{{ user_profile.city }}">
{{ user_profile.city }}
</a>
-
- <a href="{% url profiles_list_profiles %}{{ user_profile.region }}">
+ <a href="{{ url('profiles_list_profiles') }}{{ user_profile.region }}">
{{ user_profile.region }}
</a>
-
- <a href="{% url profiles_list_profiles %}{{ user_profile.country }}">
+ <a href="{{ url('profiles_list_profiles') }}{{ user_profile.country }}">
{{ user_profile.country }}
</a>
</p>
@@ -104,7 +103,7 @@ <h5 class="grayed">
<span class="white radius label">
Gender
</span>
- &nbsp;{{ user_profile.get_gender_display }}
+ &nbsp;{{ user_profile.get_gender_display() }}
</p>
{% endif %}
</div>
@@ -130,13 +129,13 @@ <h5 class="grayed">
<span class="white radius label">
Mozillians Profile
</span>
- &nbsp;{{ user_profile.mozillians_profile_url|urlizetrunc:50 }}
+ &nbsp;{{ user_profile.mozillians_profile_url|urlize(50) }}
</p>
<p class="profile-item">
<span class="white radius label">
Wiki Profile
</span>
- &nbsp;{{ user_profile.wiki_profile_url|urlizetrunc:50 }}
+ &nbsp;{{ user_profile.wiki_profile_url|urlize(50) }}
</p>
{% if mentor %}
<p class="profile-item">
@@ -144,15 +143,16 @@ <h5 class="grayed">
Mentor
</span>
&nbsp;
- <a href="{% url profiles_view_profile mentor.userprofile.display_name %}">
- {{ mentor.get_full_name }}
+ <a href="{{ url('profiles_view_profile', mentor.userprofile.display_name) }}">
+ {{ mentor.get_full_name() }}
</a>
</p>
{% endif %}
</div>
</div>
<div class="row">
- {% if user_profile.twitter_account or user_profile.facebook_url or user_profile.diaspora_url or user_profile.linkedin_url %}
+ {% if user_profile.twitter_account or user_profile.facebook_url or
+ user_profile.diaspora_url or user_profile.linkedin_url %}
<div class="one columns pictogram">
T
</div>
@@ -173,7 +173,7 @@ <h5 class="grayed">
<span class="white radius label">
Facebook profile
</span>
- &nbsp;{{ user_profile.facebook_url|urlizetrunc:50 }}
+ &nbsp;{{ user_profile.facebook_url|urlize(50) }}
</p>
{% endif %}
{% if user_profile.diaspora_url %}
@@ -181,7 +181,7 @@ <h5 class="grayed">
<span class="white radius label">
Diaspora profile
</span>
- &nbsp;{{ user_profile.diaspora_url|urlizetrunc:50 }}
+ &nbsp;{{ user_profile.diaspora_url|urlize(50) }}
</p>
{% endif %}
{% if user_profile.linkedin_url %}
@@ -189,7 +189,7 @@ <h5 class="grayed">
<span class="white radius label">
LinkedIn profile
</span>
- &nbsp;{{ user_profile.linkedin_url|urlizetrunc:50 }}
+ &nbsp;{{ user_profile.linkedin_url|urlize(50) }}
</p>
{% endif %}
</div>
@@ -235,7 +235,7 @@ <h5 class="grayed">
<span class="white radius label">
Personal Site
</span>
- &nbsp;{{ user_profile.personal_website_url|urlizetrunc:50 }}
+ &nbsp;{{ user_profile.personal_website_url|urlize(50) }}
</p>
{% endif %}
{% if user_profile.personal_blog_feed %}
@@ -243,7 +243,7 @@ <h5 class="grayed">
<span class="white radius label">
Feed for Reps Planet
</span>
- &nbsp;{{ user_profile.personal_blog_feed|urlizetrunc:50 }}
+ &nbsp;{{ user_profile.personal_blog_feed|urlize(50) }}
</p>
{% endif %}
</div>
@@ -260,7 +260,7 @@ <h5 class="grayed">
Added by
</span>
&nbsp;
- <a href="{% url profiles_view_profile added_by.userprofile.display_name %}">
+ <a href="{{ url('profiles_view_profile', added_by.userprofile.display_name) }}">
{{ added_by.userprofile.display_name }}
</a>
</p>
@@ -272,7 +272,7 @@ <h5 class="grayed">
{% if user == pageuser or perms.profiles.can_edit_profiles %}
<div class="row">
<div id="save-profile" class="twelve columns align-right">
- <a href="{% url profiles_edit user_profile.display_name %}"
+ <a href="{{ url('profiles_edit', user_profile.display_name) }}"
class="small white button nice radius">Edit profile</a>
</div>
</div>
3  remo/settings/base.py
View
@@ -73,9 +73,6 @@
# Required for BrowserID. Very important security feature
SITE_URL = 'http://reps.mozilla.org'
-# Remove jinja template engine. To be revisited
-TEMPLATE_LOADERS = filter(lambda x: x != 'jingo.Loader', TEMPLATE_LOADERS)
-
# Remove LocaleURLMiddleware since we are not localing our website
MIDDLEWARE_CLASSES = filter(
lambda x: x != 'funfactory.middleware.LocaleURLMiddleware',
Something went wrong with that request. Please try again.