Merge branch 'master' of https://github.com/cofounders/freyalove

added dropdown search for who field for #121 and #118. pending functionality and polishing the design.

freyalove/urls.py

@@ -18,10 +18,10 @@
     url(r'^users/friends/leaderboard/summary/$', 'freyalove.api.views.currentuser.leaderboard'),
 
     # OTHER USERS
-    url(r'^users/(?P<fb_username>[-\w]+)/profile/$', 'freyalove.api.views.otherusers.profile'),
-    url(r'^users/(?P<fb_username>[-\w]+)/profile/summary/$', 'freyalove.api.views.otherusers.profile_summary'),
-    url(r'^users/(?P<fb_username>[-\w]+)/friends/$', 'freyalove.api.views.otherusers.friends'),
-    url(r'^users/friends/(?P<fb_username>[-\w]+)/mutual/$', 'freyalove.api.views.otherusers.mutual_friends'),
+    url(r'^users/(?P<fb_username>[-\w.]+)/profile/$', 'freyalove.api.views.otherusers.profile'),
+    url(r'^users/(?P<fb_username>[-\w.]+)/profile/summary/$', 'freyalove.api.views.otherusers.profile_summary'),
+    url(r'^users/(?P<fb_username>[-\w.]+)/friends/$', 'freyalove.api.views.otherusers.friends'),
+    url(r'^users/friends/(?P<fb_username>[-\w.]+)/mutual/$', 'freyalove.api.views.otherusers.mutual_friends'),
 
     # ACTIVITIES
     url(r'^activities/sexytimes/upcoming/$', 'freyalove.api.views.activities.fetch_sexytimes'), 
@@ -47,9 +47,9 @@
     url(r'^matchmaker/(?P<userid_list>[-\w+]+)/questions/answered/$', 'freyalove.api.views.matchmaking.answered'),
 
     # QUESTIONNAIRE
-    url(r'^users/(?P<fb_username>[-\w]+)/questionnaire/categories/$', 'freyalove.api.views.questionnaire.categories'),
-    url(r'^users/(?P<fb_username>[-\w]+)/questionnaire/questions/random/(?P<status>[-\w]+)/$','freyalove.api.views.questionnaire.random_questions'),
-    url(r'^users/(?P<fb_username>[-\w]+)/questionnaire/(?P<category>[-\w]+)/(?P<status>[-\w]+)/$','freyalove.api.views.questionnaire.filter_questions'),
+    url(r'^users/(?P<fb_username>[-\w.]+)/questionnaire/categories/$', 'freyalove.api.views.questionnaire.categories'),
+    url(r'^users/(?P<fb_username>[-\w.]+)/questionnaire/questions/random/(?P<status>[-\w]+)/$','freyalove.api.views.questionnaire.random_questions'),
+    url(r'^users/(?P<fb_username>[-\w.]+)/questionnaire/(?P<category>[-\w]+)/(?P<status>[-\w]+)/$','freyalove.api.views.questionnaire.filter_questions'),
     url(r'^questionnaire/questions/add/$', 'freyalove.api.views.questionnaire.answer'),
 
     # Index

freyalove/users/models.py

@@ -141,11 +141,11 @@ def wink_notify(sender, instance, **kwargs):
     except Wink.DoesNotExist:
         # wink creation
         if not instance.received and not instance.accepted:
-            notify.send(instance.from_profile.user_object, recipient=instance.from_profile, verb="winked at", action_object=instance, target=instance.to_profile)
+            notify.send(instance, recipient=instance.to_profile.user_object, verb="winked at")
     if instance.received == wink_in_db.received:
         pass
     if not wink_in_db.accepted and instance.accepted: # wink response
-        notify.send(instance.to_profile.user_object, ecipient=instance.to_profile, verb="winked at", action_object=instance, target=instance.from_profile)
+        notify.send(instance, recipient=instance.to_profile.user_object, verb="winked back")
 
 # Register with freyalove.notifications
-pre_save.connect(wink_notify, sender=Wink, dispatch_uid="wink_presave")
+#pre_save.connect(wink_notify, sender=Wink, dispatch_uid="wink_presave")

www/templates/views/activities/recent.html

@@ -8,15 +8,15 @@ <h3>Recent Activity</h3>
 			<li>
 				{{#FRIEND_JOIN}}
 				Your friend
-				{{#friend}}<a href="/profile/{{id}}" title="Profile of {{name}}">{{name}}</a>{{/friend}}
+				{{#friend}}<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a>{{/friend}}
 				joined FreyaLove.
 				{{/FRIEND_JOIN}}
 
 				{{#ARRANGED_SEXYTIME}}
 				Your friends
-				{{#from}}<a href="/profile/{{id}}" title="Profile of {{name}}">{{name}}</a>{{/from}}
+				{{#from}}<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a>{{/from}}
 				and
-				{{#to}}<a href="/profile/{{id}}" title="Profile of {{name}}">{{name}}</a>{{/to}}
+				{{#to}}<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a>{{/to}}
 				are going to <span class="where">{{where}}</span>
 				on <span class="when">{{when}}</span>.
 				{{#notes}}

www/templates/views/conversations/conversation.html

@@ -1,6 +1,6 @@
 <section class="conversations-conversation">
 	<header>
-		<h2>Conversation with {{#participants}}{{name}}{{/participants}}</h2>
+		<h2>Conversation with {{#participants}}{{firstName}} {{lastName}}{{/participants}}</h2>
 		<p><a href="/conversations">View All Conversations</a></p>
 	</header>
 	<article>
@@ -9,14 +9,14 @@ <h2>Conversation with {{#participants}}{{name}}{{/participants}}</h2>
 				{{#messages}}
 				<li>
 					{{#from}}
-						<a href="/profile/{{id}}" title="Profile of {{name}}">
-							<img src="{{photo}}" alt="{{name}}" />
+						<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">
+							<img src="{{photo}}" alt="{{firstName}} {{lastName}}" />
 						</a>
 					{{/from}}
 					<div class="conversation-content">
 						<p>
 							{{#from}}
-								<a href="/profile/{{id}}" title="Profile of {{name}}">{{name}}</a>
+								<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a>
 							{{/from}}
 							<span class="when">{{when}}</span>
 						</p>

www/templates/views/conversations/menu.html

@@ -14,10 +14,10 @@ <h3>Conversations</h3>
 				{{/from}}{{/lastMessage}}
 				{{#lastMessage}}
 					{{#from}}
-					<img src="{{photo}}" alt="{{name}}" />
+					<img src="{{photo}}" alt="{{firstName}} {{lastName}}" />
 					{{/from}}
 					<div class="popup-conversation-profile-details">
-						<p>{{#from}}{{name}}{{/from}}</p>
+						<p>{{#from}}{{firstName}} {{lastName}}{{/from}}</p>
 						<p>{{body}}</p>
 						<p>{{when}}</p>
 					</div>

www/templates/views/conversations/recent.html

@@ -12,11 +12,11 @@ <h2>Inbox</h2>
 				<li class="{{#UNREAD}}un{{/UNREAD}}read">
 					{{#lastMessage}}
 					{{#from}}
-					<img src="{{photo}}" alt="{{name}}" />
+					<img src="{{photo}}" alt="{{firstName}} {{lastName}}" />
 					{{/from}}
 					<div class="conversation-content">
 						<p>
-							<span class="name">{{#from}}{{name}}{{/from}}</span>
+							<span class="name">{{#from}}{{firstName}} {{lastName}}{{/from}}</span>
 							<span class="when">{{when}}</span>
 						</p>
 						<p>{{body}}</p>

www/templates/views/friends/all.html

@@ -6,8 +6,8 @@ <h3>Your Friends ({{count}})</h3>
 		<ul>
 			{{#friends}}
 			<li>
-				<a href="/profile/{{id}}" title="Profile of {{name}}">
-					<img src="{{photo}}" alt="{{name}}" />
+				<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">
+					<img src="{{photo}}" alt="{{firstName}} {{lastName}}" />
 				</a>
 			</li>
 			{{/friends}}

www/templates/views/friends/common.html

@@ -6,14 +6,14 @@ <h3>Common Friends ({{count}})</h3>
 		<ul>
 			{{#friends}}
 			<li>
-				<a href="/profile/{{id}}" title="Profile of {{name}}">
-					<img src="{{photo}}" alt="{{name}}" />
+				<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">
+					<img src="{{photo}}" alt="{{firstName}} {{lastName}}" />
 				</a>
 			</li>
 			{{/friends}}
 		</ul>
 		{{#matchmaker}}
-		<p>You were introduced by <a href="/profile/{{id}}" title="Profile of {{name}}">{{name}}</a></p>
+		<p>You were introduced by <a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a></p>
 		{{/matchmaker}}
 	</article>
 </section>

www/templates/views/friends/profile.html

@@ -2,7 +2,7 @@
 <img id="profile-pic" src="{{photo}}../dummy/user1.png" alt="My profile picture" />
 	<div id="profile-snapshot">
 	<h1>
-		{{name}}
+		{{firstName}} {{lastName}}
 		{{#isMe}}
 			me
 		{{/isMe}}

www/templates/views/friends/search.html

@@ -6,12 +6,12 @@ <h2>Found {{count}} Search Results for {{query}}</h2>
 		<ol>
 			{{#friends}}
 			<li>
-				<a href="/profile/{{id}}" title="Profile of {{name}}">
-					<img src="{{photo}}" alt="{{name}}" />
+				<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">
+					<img src="{{photo}}" alt="{{firstName}} {{lastName}}" />
 				</a>
 				<div class="search-profile-details">
 					<p>
-						<a href="/profile/{{id}}" class="name" title="Profile of {{name}}">{{name}}</a>
+						<a href="/profile/{{id}}" class="name" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a>
 					</p>
 
 					{{#dateOfBirth}}

www/templates/views/header/menu.html

@@ -30,7 +30,7 @@ <h1>
 			<form method="get" class="search">
 				<input type="text" name="query" maxlength="100" placeholder="Find friends..." />
 			</form>
-			<a class="name" href="/profile/{{id}}" title="View my profile">{{name}}</a>
+			<a class="name" href="/profile/{{id}}" title="View my profile">{{firstName}} {{lastName}}</a>
 			<a class="signout" href="#" title="Sign out">Sign out</a>
 		</nav>
 	</div>

www/templates/views/matches/couples.html

@@ -9,17 +9,17 @@ <h2>Aren’t they just cute together? Introduce them!</h2>
 				{{#items}}
 				<li{{#selected}} class="selected"{{/selected}}>
 					<a href="/matchmaker/{{#first}}{{id}}{{/first}}/with/{{#second}}{{id}}{{/second}}"
-						title="Compare the profiles of {{#first}}{{name}}{{/first}} and {{#second}}{{name}}{{/second}}">
+						title="Compare the profiles of {{#first}}{{firstName}} {{lastName}}{{/first}} and {{#second}}{{firstName}} {{lastName}}{{/second}}">
 						{{#first}}
 						<div class="first">
-							<img src="{{photo}}" alt="{{name}}" />
-							<h5>{{name}}</h5>
+							<img src="{{photo}}" alt="{{firstName}} {{lastName}}" />
+							<h5>{{firstName}} {{lastName}}</h5>
 						</div>
 						{{/first}}
 						{{#second}}
 						<div class="second">
-							<img src="{{photo}}" alt="{{name}}" />
-							<h5>{{name}}</h5>
+							<img src="{{photo}}" alt="{{firstName}} {{lastName}}" />
+							<h5>{{firstName}} {{lastName}}</h5>
 						</div>
 						{{/second}}
 					</a>

www/templates/views/matches/singles.html

@@ -7,9 +7,9 @@ <h2>Hmmm... These Girls Look Good For You...</h2>
 			<ol>
 				{{#items}}
 				<li{{#selected}} class="selected"{{/selected}}>
-					<img src="{{photo}}" alt="{{name}}" style="background-image: url({{photo}})" />
+					<img src="{{photo}}" alt="{{firstName}} {{lastName}}" style="background-image: url({{photo}})" />
 
-					<h3><a href="/profile/{{id}}" id="name" title="Profile of {{name}}">{{name}}</a></h3>
+					<h3><a href="/profile/{{id}}" id="name" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a></h3>
 
 					{{#age}}
 					<p class="age">Age {{age}}</p>
@@ -33,7 +33,7 @@ <h5>About</h5>
 					</div>
 					{{/about}}
 
-					<a href="/profile/{{id}}" class="button cta" title="Profile of {{name}}">Check her out!</a>
+					<a href="/profile/{{id}}" class="button cta" title="Profile of {{firstName}} {{lastName}}">Check her out!</a>
 				</li>
 				{{/items}}
 			</ol>

www/templates/views/matchmakers/top.html

@@ -6,9 +6,9 @@ <h3>Top Matchmakers</h3>
 		<ol>
 			{{#matchmakers}}
 			<li>
-				<img src="{{photo}}" alt="Picture of {{name}}" />
+				<img src="{{photo}}" alt="Picture of {{firstName}} {{lastName}}" />
 				<div class="matchmaker-points">
-					<p><a href="/profile/{{id}}" title="Profile of {{name}}">{{name}}</a></p>
+					<p><a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a></p>
 					<p>{{points}} points</p>
 				</div>
 			</li>

www/templates/views/notifications/menu.html

@@ -7,13 +7,13 @@ <h3>Notifications</h3>
 			{{#notifications}}
 			<li>
 				{{#WINK_RECEIVED}}
-				{{#from}}<a href="/profile/{{id}}" title="Profile of {{name}}">{{name}}</a> smiled at you. <a href="#" class="smile_back">Smile back.</a>{{/from}}
+				{{#from}}<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a> smiled at you. <a href="#" class="smile_back">Smile back.</a>{{/from}}
 				{{/WINK_RECEIVED}}
 
 				{{#MATCH_INTRODUCTION}}
-				{{#matchmaker}}<a href="/profile/{{id}}" title="Profile of {{name}}">{{name}}</a>{{/matchmaker}}
+				{{#matchmaker}}<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a>{{/matchmaker}}
 				introduced you to
-				{{#to}}<a href="/profile/{{id}}" title="Profile of {{name}}">{{name}}</a>{{/to}}
+				{{#to}}<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a>{{/to}}
 				{{/MATCH_INTRODUCTION}}
 			</li>
 			{{/notifications}}

www/templates/views/sexytimes/menu.html

@@ -7,13 +7,13 @@ <h3>Upcoming Dates</h3>
 			{{#sexyTimes}}
 			<li>
 				{{#from}}
-				<a href="/profile/{{id}}" title="Profile of {{name}}">
-					<img src="{{photo}}" alt="{{name}}" />
+				<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">
+					<img src="{{photo}}" alt="{{firstName}} {{lastName}}" />
 				</a>
 				{{/from}}
 				<p>
 					You're meeting
-					{{#from}}<a href="/profile/{{id}}" title="Profile of {{name}}">{{name}}</a>{{/from}}
+					{{#from}}<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a>{{/from}}
 					<span class="when">{{when}}</span>
 					at <span class="where">{{where}}</span>.
 				</p>

www/templates/views/sexytimes/upcoming.html

@@ -7,13 +7,13 @@ <h3>Upcoming Dates</h3>
 			{{#sexyTimes}}
 			<li>
 				{{#from}}
-				<a href="/profile/{{id}}" title="Profile of {{name}}">
-					<img src="{{photo}}" alt="{{name}}" />
+				<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">
+					<img src="{{photo}}" alt="{{firstName}} {{lastName}}" />
 				</a>
 				{{/from}}
 				<p>
 					You're meeting
-					{{#from}}<a href="/profile/{{id}}" title="Profile of {{name}}">{{name}}</a>{{/from}}
+					{{#from}}<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">{{firstName}} {{lastName}}</a>{{/from}}
 					<span class="when">{{when}}</span>
 					at <span class="where">{{where}}</span>.
 				</p>

www/templates/views/user/profile.html

@@ -3,7 +3,7 @@
 <img id="profile-pic" src="{{photo}}" alt="Your profile picture" />
 <div id="profile-snapshot">
 	<h1>
-		{{name}}
+		{{firstName}} {{lastName}}
 		{{#isMe}}
 			<!-- TODO: remove after testing -->
 			me

www/templates/views/winks/received.html

@@ -9,9 +9,9 @@ <h2>Hey, somebody winked at you!</h2>
 				{{#items}}
 				{{#from}}
 				<li{{#selected}} class="selected"{{/selected}}>
-					<a href="/profile/{{id}}" title="Profile of {{name}}">
-						<img src="{{photo}}" alt="{{name}}" />
-						<h6>{{name}}</h6>
+					<a href="/profile/{{id}}" title="Profile of {{firstName}} {{lastName}}">
+						<img src="{{photo}}" alt="{{firstName}} {{lastName}}" />
+						<h6>{{firstName}} {{lastName}}</h6>
 					</a>
 				</li>
 				{{/from}}