Skip to content
Extraits de code Groupes Projets
Valider d55a21c4 rédigé par Maxwell Salzberg's avatar Maxwell Salzberg
Parcourir les fichiers

just kidding. totally going to namespace users

parent d407be03
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -52,7 +52,7 @@ module ApplicationHelper ...@@ -52,7 +52,7 @@ module ApplicationHelper
opts[:class] ||= "" opts[:class] ||= ""
opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person opts[:class] << " self" if defined?(user_signed_in?) && user_signed_in? && current_user.person == person
if person.local? if person.local?
"<a href='#{person.diaspora_handle.split('@')[0]}' class='#{opts[:class]}'> "<a href=/u/'#{person.diaspora_handle.split('@')[0]}' class='#{opts[:class]}'>
#{h(person.name)} #{h(person.name)}
</a>".html_safe </a>".html_safe
else else
...@@ -72,7 +72,7 @@ module ApplicationHelper ...@@ -72,7 +72,7 @@ module ApplicationHelper
link_to person_image_tag(person, opts[:size]), person_photos_path(person) link_to person_image_tag(person, opts[:size]), person_photos_path(person)
else else
if person.local? if person.local?
"<a href='#{person.diaspora_handle.split('@')[0]}' class='#{opts[:class]}'> "<a href='/u/#{person.diaspora_handle.split('@')[0]}' class='#{opts[:class]}'>
#{person_image_tag(person)} #{person_image_tag(person)}
</a>".html_safe </a>".html_safe
else else
......
...@@ -154,7 +154,7 @@ Diaspora::Application.routes.draw do ...@@ -154,7 +154,7 @@ Diaspora::Application.routes.draw do
get 'mobile/toggle', :to => 'home#toggle_mobile', :as => 'toggle_mobile' get 'mobile/toggle', :to => 'home#toggle_mobile', :as => 'toggle_mobile'
get ':username' => 'people#show', :as => 'user_profile' get '/u/:username' => 'people#show', :as => 'user_profile'
# Startpage # Startpage
root :to => 'home#show' root :to => 'home#show'
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter