use profession/location instead of discipline/city/country

thraxil · Feb 27, 2016 · c3735c1 · c3735c1
1 parent b925ac4
commit c3735c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/spokehub/templates/we/index.html b/spokehub/templates/we/index.html
@@ -29,8 +29,8 @@ <h3><a href="ask">Ask a question!</a></h3>
           {% for conversation in conversation_list %}
               <div class="grid-item">
 					        <h3><a href="{{conversation.get_absolute_url}}">{{conversation.body|markdown}}</a></h3>
-					        <p><a href="{% url 'userena_profile_detail' conversation.author.username %}">{{conversation.author.username}}</a>, {{conversation.author.profile.discipline}}</p>
-					        <p>{{conversation.author.profile.city}}, {{conversation.author.profile.country}}, {{conversation.added}}</p>
+					        <p><a href="{% url 'userena_profile_detail' conversation.author.username %}">{{conversation.author.username}}</a>, {{conversation.author.profile.profession}}</p>
+					        <p>{{conversation.author.profile.location}}, {{conversation.added}}</p>
 				      </div>
           {% endfor %}
 			</div>

diff --git a/spokehub/templates/we/question.html b/spokehub/templates/we/question.html
@@ -31,8 +31,8 @@ <h2><b>WE</b> ask questions with visual answers</h2>
 			<div class="conversation">
 				<div class="grid-item">
 					<h3>{{conversation.body|markdown}}</h3>
-					<p><a href="{% url 'userena_profile_detail' conversation.author.username %}">{{conversation.author.username}}</a>, {{conversation.author.profile.discipline1}}</p>
-					<p>{{conversation.author.profile.city}}, {{conversation.author.profile.country}}, {{conversation.added}}</p>
+					<p><a href="{% url 'userena_profile_detail' conversation.author.username %}">{{conversation.author.username}}</a>, {{conversation.author.profile.profession}}</p>
+					<p>{{conversation.author.profile.location}}, {{conversation.added}}</p>
 				</div>
 
             	{% if not request.user.is_anonymous %}
@@ -60,8 +60,8 @@ <h3 class="responses-heading">{{conversation.reply_set.count}} RESPONSE{{convers
 
         		{% for reply in conversation.reply_set.all %}
 				    <div class="grid-item">
-					    <p><a href="{% url 'userena_profile_detail' reply.author.username %}">{{reply.author.username}}</a>, {{reply.author.profile.discipline1}}</p>
-					    <p>{{reply.author.profile.city}}, {{reply.author.profile.country}}, {{reply.added}}</p>
+					    <p><a href="{% url 'userena_profile_detail' reply.author.username %}">{{reply.author.username}}</a>, {{reply.author.profile.profession}}</p>
+					    <p>{{reply.author.profile.location}}, {{reply.added}}</p>
 
                 		{% if reply.image %}
 					        <div class="media-center"><img src="{% thumbnail reply.image 400x400 %}"></div>