Changeset 1167

Show
Ignore:
Timestamp:
06/17/08 14:44:46 (7 months ago)
Author:
tonkla
Message:

add trivial features

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/controllers/profile_controller.rb

    r1091 r1167  
    4242          (@site.user_profile_visibility == User.private && @used_by_owner) 
    4343      @accessible = true   
    44     elsif @owner.is_public? || (@owner.is_protected? && @user) || (@owner.is_private? && @used_by_owner) 
     44    elsif @owner.is_public? || (@owner.is_protected? && @user) || (@owner.is_private? && @used_by_owner) || $WEBMASTERS.include?(@user.username) 
    4545      @accessible = true 
    4646    else 

  • trunk/app/views/admin/confirm_delete_content.html.erb

    r1159 r1167  
    2626            <p><%= _("Last Name") + ": " + @obj.lastname %></p> 
    2727            <p><%= _("Screen Name") + ": " + @obj.screenname %></p> 
     28            <p><%= _("Number of Journal Entries") + ": " + @obj.journal_entries.size.to_s %></p> 
    2829            <p><%= _("Number of Blog(s)") + ": " + @obj.blogs.size.to_s %></p> 
    2930            <p><%= _("Number of Post(s)") + ": " + @obj.posts.size.to_s %></p> 

  • trunk/app/views/profile/user.html.erb

    r1131 r1167  
    3131        <tr> 
    3232          <td><%= _("Email") + ":" %></td> 
    33           <td><%= link_to _("Email Me"), email_user_url(:username => @owner.username) %></td> 
     33          <td> 
     34            <% if @user == @owner %> 
     35              <%= @owner.email %> 
     36            <% else %> 
     37              <%= link_to _("Email Me"), email_user_url(:username => @owner.username) %> 
     38            <% end %> 
     39          </td> 
    3440        </tr> 
    3541        <% unless @owner.screenname.blank? -%> 

  • trunk/app/views/shared/_menu.html.erb

    r1166 r1167  
    677677</div> 
    678678 
     679 
    679680<!-- JavaScripts --> 
    680681<script type="text/javascript">