diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-09 10:00:39 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-09 10:03:33 +0000 |
| commit | d310ce34b0d3518dfc54d533b201882dbcaef251 (patch) | |
| tree | 8faa3a5a36bb8ab98306532b488cbef822823625 | |
| parent | 7fe278c99aa3b68651c85f27ad02cb4be69dc0d7 (diff) | |
| parent | 58719d9ab8b3e33f914028b5970ca9a9878bb3d9 (diff) | |
Merge branch 'atlatszo_dev' into rails-3-develop
| -rw-r--r-- | app/views/user/wall.html.erb | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/app/views/user/wall.html.erb b/app/views/user/wall.html.erb index 190cc0a6d..6699c55fa 100644 --- a/app/views/user/wall.html.erb +++ b/app/views/user/wall.html.erb @@ -1,16 +1,19 @@ <% @title = h(@display_user.name) + _(" - wall") %> -<% if @is_you %> <div class="medium_column"> - <p><%= _('You can change the requests and users you are following on <a href="{{profile_url}}">your profile page</a>.', :profile_url => show_user_profile_path) %> - <%= render :partial => 'change_receive_email' %> + <% if @is_you %> + <h2><%= _("My wall") %></h2> + <p><%= _('You can change the requests and users you are following on <a href="{{profile_url}}">your profile page</a>.', :profile_url => show_user_profile_path) %></p> + <%= render :partial => 'change_receive_email' %> + <% else %> + <h2><%= _("This is <a href=\"{{profile_url}}\">{{user_name}}'s</a> wall", :profile_url => show_user_profile_path, :user_name => h(@display_user.name)) %></h2> + <% end %> </div> -<% end %> <div id="user_profile_search"> - <% if !@feed_results.nil? %> - <% for result in @feed_results %> - <%= render :partial => 'request/wall_listing', :locals => { :event => result, :info_request => result.info_request } %> - <% end %> - <% end %> - - + <% if !@feed_results.nil? and !@feed_results.empty? %> + <% for result in @feed_results %> + <%= render :partial => 'request/wall_listing', :locals => { :event => result, :info_request => result.info_request } %> + <% end %> + <% else %> + <p><%= _("There is nothing to display yet.") %></p> + <% end %> </div> |