Include a user URL in JSON and XML responses

[rails.git] / app / views / user / view.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 04c78a9002afac9ff058aed6312da420fb7c8110..04fc4cb3b09346184981d3f27aca73108949fcaf 100644 (file)
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -11,7 +11,10 @@
     <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
     <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
     |
     <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
     <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
     |

+    <%= link_to t('user.view.my notes'), :controller => 'notes', :action=> 'mine' %>
+    |

     <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
     <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>

+    <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>

     |
     <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %>
     |
     |
     <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %>
     |


@@ -33,10 +36,13 @@
     <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %>
     <span class='count-number'><%= number_with_delimiter(@this_user.traces.size) %></span>
     |
     <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %>
     <span class='count-number'><%= number_with_delimiter(@this_user.traces.size) %></span>
     |

+    <%= link_to t('user.view.notes'), :controller => 'notes', :action=> 'mine' %>
+    |

     <!-- Displaying another user's profile page -->
     <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
     |
     <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
     <!-- Displaying another user's profile page -->
     <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
     |
     <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>

+    <span class='count-number'><%= number_with_delimiter(@this_user.diary_entries.size) %></span>

     |
     <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
     |
     |
     <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %>
     |


@@ -95,7 +101,7 @@
 </p>
 
 <% if @user and @user.administrator? -%>
 </p>
 
 <% if @user and @user.administrator? -%>

-  <p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>  
+  <p><b><%= t 'user.view.email address' %></b> <%= @this_user.email %></p>

   <% unless @this_user.creation_ip.nil? -%>
   <p><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></p>
   <% end -%>
   <% unless @this_user.creation_ip.nil? -%>
   <p><b><%= t 'user.view.created from' %></b> <%= @this_user.creation_ip %></p>
   <% end -%>


@@ -113,16 +119,14 @@
       <%= javascript_include_tag "user" %>
     <% end %>
     <%
       <%= javascript_include_tag "user" %>
     <% end %>
     <%

-      data = {
+      user_data = {

         :lon => @user.home_lon,
         :lat => @user.home_lat,
         :lon => @user.home_lon,
         :lat => @user.home_lat,

-        :zoom => 12,
-        :marker => {
-          :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"})
-        }
+        :icon => image_path("marker-red.png"),
+        :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"})

       }
     %>
       }
     %>

-    <%= content_tag "div", "", :id => "map", :class => "user_map", :data => data %>
+    <%= content_tag "div", "", :id => "map", :class => "user_map", :data => {:user => user_data} %>

   <% end %>
 
   <% friends = @this_user.friends.collect { |f| f.befriendee } %>
   <% end %>
 
   <% friends = @this_user.friends.collect { |f| f.befriendee } %>