removed fixme tags from views and put into trac

diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml
index d17d58c2c6d947fa42077edb908df63577eb8005..8597380c5fc0275cc242d7fb2eaaef322b4ef0f7 100644 (file)
--- a/app/views/diary_entry/list.rhtml
+++ b/app/views/diary_entry/list.rhtml
@@ -1,3 +1,3 @@
 <h3>most recent posts:</h3>
 <h3>most recent posts:</h3>

-FIXME: geoRSS needed.<br><br>
+<br />

 <%= render :partial => 'diary_entry/diary_entry', :collection => @entries %>
 <%= render :partial => 'diary_entry/diary_entry', :collection => @entries %>

diff --git a/app/views/user/diary.rhtml b/app/views/user/diary.rhtml
index a5a91ee0f7443756e813fa73432e152293f02e34..106cfd73fad2eac13d999ddcf6530a8389094834 100644 (file)
--- a/app/views/user/diary.rhtml
+++ b/app/views/user/diary.rhtml
@@ -4,5 +4,5 @@
 <% end %>
 
 <h3>recent posts:</h3>
 <% end %>
 
 <h3>recent posts:</h3>

-FIXME: geoRSS needed<br><br>
+<br><br>

 <%= render :partial => 'diary_entry/diary_entry', :collection => @this_user.diary_entries %>
 <%= render :partial => 'diary_entry/diary_entry', :collection => @this_user.diary_entries %>

diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml
index e1222c64e394c31dbf408209b4bc5fa647264a0e..a3e77cba8864015a0ca0a5d33485856b84222432 100644 (file)
--- a/app/views/user/new.rhtml
+++ b/app/views/user/new.rhtml
@@ -13,7 +13,6 @@ By creating an account, you agree that all work uploaded to openstreetmap.org an
   <tr><td>retype password:</td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 50, :maxlength => 255}) %></td></tr>
 </table>
 <br>
   <tr><td>retype password:</td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 50, :maxlength => 255}) %></td></tr>
 </table>
 <br>

-FIXME OL map so people can submit where they live

 <br>
 <input type="submit" value="Signup">
 
 <br>
 <input type="submit" value="Signup">
 

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index 6f6bdb450540ba7d30077322188da03d35a5c73e..78016e639edba0294780eef2ac2cf2cc793643e6 100644 (file)
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -50,18 +50,18 @@
 <%end%>
 
 <br />
 <%end%>
 
 <br />

-<br />
-<%= link_to 'show unread messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>
+<%= link_to 'show all messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>

 <br />
 <br />
 <br />
 <br />

+Go to <%= link_to 'your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %> to see who's mapping in your area.

 
 

-<%= link_to 'go to your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %><br /><br />

 
 <% else %>
 
 <% else %>

-<%= link_to 'send message', :controller => 'message', :action => 'new', :display_name => @this_user.display_name %><br /><br /> 
+<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %><br /><br /> 

 <%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %><br /><br />
 <% end %>
 <%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %><br /><br />
 <% end %>

-
+<br />
+<br />

 <%= link_to 'diary', :controller => 'user', :action => 'diary', :display_name => @this_user.display_name %><br /><br />
 
 
 <%= link_to 'diary', :controller => 'user', :action => 'diary', :display_name => @this_user.display_name %><br /><br />