diff --git a/freyalove/urls.py b/freyalove/urls.py index cce5232..8fe555f 100644 --- a/freyalove/urls.py +++ b/freyalove/urls.py @@ -18,10 +18,10 @@ url(r'^users/friends/leaderboard/summary/$', 'freyalove.api.views.currentuser.leaderboard'), # OTHER USERS - url(r'^users/(?P[-\w]+)/profile/$', 'freyalove.api.views.otherusers.profile'), - url(r'^users/(?P[-\w]+)/profile/summary/$', 'freyalove.api.views.otherusers.profile_summary'), - url(r'^users/(?P[-\w]+)/friends/$', 'freyalove.api.views.otherusers.friends'), - url(r'^users/friends/(?P[-\w]+)/mutual/$', 'freyalove.api.views.otherusers.mutual_friends'), + url(r'^users/(?P[-\w.]+)/profile/$', 'freyalove.api.views.otherusers.profile'), + url(r'^users/(?P[-\w.]+)/profile/summary/$', 'freyalove.api.views.otherusers.profile_summary'), + url(r'^users/(?P[-\w.]+)/friends/$', 'freyalove.api.views.otherusers.friends'), + url(r'^users/friends/(?P[-\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[-\w+]+)/questions/answered/$', 'freyalove.api.views.matchmaking.answered'), # QUESTIONNAIRE - url(r'^users/(?P[-\w]+)/questionnaire/categories/$', 'freyalove.api.views.questionnaire.categories'), - url(r'^users/(?P[-\w]+)/questionnaire/questions/random/(?P[-\w]+)/$','freyalove.api.views.questionnaire.random_questions'), - url(r'^users/(?P[-\w]+)/questionnaire/(?P[-\w]+)/(?P[-\w]+)/$','freyalove.api.views.questionnaire.filter_questions'), + url(r'^users/(?P[-\w.]+)/questionnaire/categories/$', 'freyalove.api.views.questionnaire.categories'), + url(r'^users/(?P[-\w.]+)/questionnaire/questions/random/(?P[-\w]+)/$','freyalove.api.views.questionnaire.random_questions'), + url(r'^users/(?P[-\w.]+)/questionnaire/(?P[-\w]+)/(?P[-\w]+)/$','freyalove.api.views.questionnaire.filter_questions'), url(r'^questionnaire/questions/add/$', 'freyalove.api.views.questionnaire.answer'), # Index diff --git a/freyalove/users/models.py b/freyalove/users/models.py index 9da51e1..5786d60 100644 --- a/freyalove/users/models.py +++ b/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") diff --git a/www/templates/views/activities/recent.html b/www/templates/views/activities/recent.html index 26161c2..b294ea4 100644 --- a/www/templates/views/activities/recent.html +++ b/www/templates/views/activities/recent.html @@ -8,15 +8,15 @@

Recent Activity

  • {{#FRIEND_JOIN}} Your friend - {{#friend}}{{name}}{{/friend}} + {{#friend}}{{firstName}} {{lastName}}{{/friend}} joined FreyaLove. {{/FRIEND_JOIN}} {{#ARRANGED_SEXYTIME}} Your friends - {{#from}}{{name}}{{/from}} + {{#from}}{{firstName}} {{lastName}}{{/from}} and - {{#to}}{{name}}{{/to}} + {{#to}}{{firstName}} {{lastName}}{{/to}} are going to {{where}} on {{when}}. {{#notes}} diff --git a/www/templates/views/conversations/conversation.html b/www/templates/views/conversations/conversation.html index 9386563..54e1517 100644 --- a/www/templates/views/conversations/conversation.html +++ b/www/templates/views/conversations/conversation.html @@ -1,6 +1,6 @@
    -

    Conversation with {{#participants}}{{name}}{{/participants}}

    +

    Conversation with {{#participants}}{{firstName}} {{lastName}}{{/participants}}

    View All Conversations

    @@ -9,14 +9,14 @@

    Conversation with {{#participants}}{{name}}{{/participants}}

    {{#messages}}
  • {{#from}} - - {{name}} + + {{firstName}} {{lastName}} {{/from}}

    {{#from}} - {{name}} + {{firstName}} {{lastName}} {{/from}} {{when}}

    diff --git a/www/templates/views/conversations/menu.html b/www/templates/views/conversations/menu.html index e005500..00624e8 100644 --- a/www/templates/views/conversations/menu.html +++ b/www/templates/views/conversations/menu.html @@ -14,10 +14,10 @@

    Conversations

    {{/from}}{{/lastMessage}} {{#lastMessage}} {{#from}} - {{name}} + {{firstName}} {{lastName}} {{/from}}
    -

    {{#from}}{{name}}{{/from}}

    +

    {{#from}}{{firstName}} {{lastName}}{{/from}}

    {{body}}

    {{when}}

    diff --git a/www/templates/views/conversations/recent.html b/www/templates/views/conversations/recent.html index 8ba4292..8603ecb 100644 --- a/www/templates/views/conversations/recent.html +++ b/www/templates/views/conversations/recent.html @@ -12,11 +12,11 @@

    Inbox

  • {{#lastMessage}} {{#from}} - {{name}} + {{firstName}} {{lastName}} {{/from}}

    - {{#from}}{{name}}{{/from}} + {{#from}}{{firstName}} {{lastName}}{{/from}} {{when}}

    {{body}}

    diff --git a/www/templates/views/friends/all.html b/www/templates/views/friends/all.html index 1a1d1bf..4905ec9 100644 --- a/www/templates/views/friends/all.html +++ b/www/templates/views/friends/all.html @@ -6,8 +6,8 @@

    Your Friends ({{count}})

      {{#friends}}
    • - - {{name}} + + {{firstName}} {{lastName}}
      • {{/friends}} diff --git a/www/templates/views/friends/common.html b/www/templates/views/friends/common.html index d943359..ff6a4b9 100644 --- a/www/templates/views/friends/common.html +++ b/www/templates/views/friends/common.html @@ -6,14 +6,14 @@

      Common Friends ({{count}})

      {{#matchmaker}} -

      You were introduced by {{name}}

      +

      You were introduced by {{firstName}} {{lastName}}

      {{/matchmaker}}
    • diff --git a/www/templates/views/friends/profile.html b/www/templates/views/friends/profile.html index 6a1ca2a..719b01f 100644 --- a/www/templates/views/friends/profile.html +++ b/www/templates/views/friends/profile.html @@ -2,7 +2,7 @@ My profile picture

    - {{name}} + {{firstName}} {{lastName}} {{#isMe}} me {{/isMe}} diff --git a/www/templates/views/friends/search.html b/www/templates/views/friends/search.html index 6c88a7b..6d1e706 100644 --- a/www/templates/views/friends/search.html +++ b/www/templates/views/friends/search.html @@ -6,12 +6,12 @@

    Found {{count}} Search Results for {{query}}

      {{#friends}}
    1. - - {{name}} + + {{firstName}} {{lastName}}

      - {{name}} + {{firstName}} {{lastName}}

      {{#dateOfBirth}} diff --git a/www/templates/views/header/menu.html b/www/templates/views/header/menu.html index 1a4a286..988a460 100644 --- a/www/templates/views/header/menu.html +++ b/www/templates/views/header/menu.html @@ -30,7 +30,7 @@

      - {{name}} + {{firstName}} {{lastName}} Sign out

      diff --git a/www/templates/views/matches/couples.html b/www/templates/views/matches/couples.html index 07cdde8..e5f124c 100644 --- a/www/templates/views/matches/couples.html +++ b/www/templates/views/matches/couples.html @@ -9,17 +9,17 @@

      Aren’t they just cute together? Introduce them!

      {{#items}} + title="Compare the profiles of {{#first}}{{firstName}} {{lastName}}{{/first}} and {{#second}}{{firstName}} {{lastName}}{{/second}}"> {{#first}}
      - {{name}} -
      {{name}}
      + {{firstName}} {{lastName}} +
      {{firstName}} {{lastName}}
      {{/first}} {{#second}}
      - {{name}} -
      {{name}}
      + {{firstName}} {{lastName}} +
      {{firstName}} {{lastName}}
      {{/second}}       diff --git a/www/templates/views/matches/singles.html b/www/templates/views/matches/singles.html index 9a5f417..0aefd10 100644 --- a/www/templates/views/matches/singles.html +++ b/www/templates/views/matches/singles.html @@ -7,9 +7,9 @@

      Hmmm... These Girls Look Good For You...

        {{#items}} - {{name}} + {{firstName}} {{lastName}} -

        {{name}}

        +

        {{firstName}} {{lastName}}

        {{#age}}

        Age {{age}}

        @@ -33,7 +33,7 @@
        About
    {{/about}} - Check her out! + Check her out!
    • {{/items}} diff --git a/www/templates/views/matchmakers/top.html b/www/templates/views/matchmakers/top.html index 7f5a6b4..5bc67a6 100644 --- a/www/templates/views/matchmakers/top.html +++ b/www/templates/views/matchmakers/top.html @@ -6,9 +6,9 @@

    Top Matchmakers

      {{#matchmakers}}
    1. - Picture of {{name}} + Picture of {{firstName}} {{lastName}}
      -

      {{name}}

      +

      {{firstName}} {{lastName}}

      {{points}} points

      2. diff --git a/www/templates/views/notifications/menu.html b/www/templates/views/notifications/menu.html index 500a788..40d59a9 100644 --- a/www/templates/views/notifications/menu.html +++ b/www/templates/views/notifications/menu.html @@ -7,13 +7,13 @@

      Notifications

      {{#notifications}}
    2. {{#WINK_RECEIVED}} - {{#from}}{{name}} smiled at you. Smile back.{{/from}} + {{#from}}{{firstName}} {{lastName}} smiled at you. Smile back.{{/from}} {{/WINK_RECEIVED}} {{#MATCH_INTRODUCTION}} - {{#matchmaker}}{{name}}{{/matchmaker}} + {{#matchmaker}}{{firstName}} {{lastName}}{{/matchmaker}} introduced you to - {{#to}}{{name}}{{/to}} + {{#to}}{{firstName}} {{lastName}}{{/to}} {{/MATCH_INTRODUCTION}}
      3. {{/notifications}} diff --git a/www/templates/views/sexytimes/menu.html b/www/templates/views/sexytimes/menu.html index f4bab3f..7f73a61 100644 --- a/www/templates/views/sexytimes/menu.html +++ b/www/templates/views/sexytimes/menu.html @@ -7,13 +7,13 @@

      Upcoming Dates

      {{#sexyTimes}}
    3. {{#from}} - - {{name}} + + {{firstName}} {{lastName}} {{/from}}

      You're meeting - {{#from}}{{name}}{{/from}} + {{#from}}{{firstName}} {{lastName}}{{/from}} {{when}} at {{where}}.

      diff --git a/www/templates/views/sexytimes/upcoming.html b/www/templates/views/sexytimes/upcoming.html index 2d9eb46..df5e011 100644 --- a/www/templates/views/sexytimes/upcoming.html +++ b/www/templates/views/sexytimes/upcoming.html @@ -7,13 +7,13 @@

      Upcoming Dates

      {{#sexyTimes}}
    4. {{#from}} - - {{name}} + + {{firstName}} {{lastName}} {{/from}}

      You're meeting - {{#from}}{{name}}{{/from}} + {{#from}}{{firstName}} {{lastName}}{{/from}} {{when}} at {{where}}.

      diff --git a/www/templates/views/user/profile.html b/www/templates/views/user/profile.html index 2c3c8c0..5d5e836 100644 --- a/www/templates/views/user/profile.html +++ b/www/templates/views/user/profile.html @@ -3,7 +3,7 @@ Your profile picture

      - {{name}} + {{firstName}} {{lastName}} {{#isMe}} me diff --git a/www/templates/views/winks/received.html b/www/templates/views/winks/received.html index a993429..69c3217 100644 --- a/www/templates/views/winks/received.html +++ b/www/templates/views/winks/received.html @@ -9,9 +9,9 @@

      Hey, somebody winked at you!

      {{#items}} {{#from}} - - {{name}} -
      {{name}}
      +       + {{firstName}} {{lastName}} +
      {{firstName}} {{lastName}}
      5. {{/from}}