diff options
Diffstat (limited to 'app/views/admin_user')
| -rw-r--r-- | app/views/admin_user/_user_table.rhtml | 8 | ||||
| -rw-r--r-- | app/views/admin_user/show.rhtml | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/views/admin_user/_user_table.rhtml b/app/views/admin_user/_user_table.rhtml index 9c996b542..a4227e017 100644 --- a/app/views/admin_user/_user_table.rhtml +++ b/app/views/admin_user/_user_table.rhtml @@ -4,14 +4,14 @@ <div class="accordion-heading accordion-toggle"> <span class="item-title"> <a href="#user_<%=user.id%>" data-toggle="collapse" data-parent="requests"><i class="icon-chevron-right"></i></a> - <% if user.admin_level == "super" %> + <% if user.admin_level == "super" %> <span class="label">superuser</span> - <% end %> - <%= link_to("#{h(user.name)}", user_admin_url(user))%> + <% end %> + <%= link_to("#{h(user.name)}", admin_user_show_path(user))%> <%= link_to("(#{h(user.email)})", "mailto:#{h(user.email)}")%> </span> <span class="item-metadata"> - updated <%=I18n.l(user.updated_at, :format => "%e %B %Y %H:%M:%S")%> + updated <%=I18n.l(user.updated_at, :format => "%e %B %Y %H:%M:%S")%> </span> </div> <div id="user_<%=user.id%>" class="accordion-body collapse"> diff --git a/app/views/admin_user/show.rhtml b/app/views/admin_user/show.rhtml index 30251d211..ccf2694b9 100644 --- a/app/views/admin_user/show.rhtml +++ b/app/views/admin_user/show.rhtml @@ -5,7 +5,7 @@ <% if @admin_user.profile_photo %> <div class="user_photo_on_admin"> <% form_tag "../clear_profile_photo/#{@admin_user.id}", :multipart => true, :class => "form" do %> - <img src="<%= main_url(get_profile_photo_url(:url_name => @admin_user.url_name, :only_path => true)) %>"> + <img src="<%= get_profile_photo_url(:url_name => @admin_user.url_name) %>"> <br> <%= submit_tag "Clear photo", :class => "btn btn-info" %> <% end %> @@ -32,7 +32,7 @@ <%=link_to @admin_user.email, "mailto:#{h @admin_user.email}"%> <% elsif column_name == 'email_bounce_message' %> <% unless @admin_user.email_bounce_message.empty? %> - <%= link_to _("See bounce message"), "../show_bounce_message/#{@admin_user.id}"%> + <%= link_to _("See bounce message"), admin_user_show_bounce(@admin_user.id) %> <% end %> <% else %> <%=h admin_value(value)%> @@ -48,10 +48,10 @@ </tbody> </table> + <%= link_to 'Edit', '../edit/' + @admin_user.id.to_s, :class => "btn btn-primary" %> -<%= link_to 'Public page', main_url(user_url(@admin_user)), :class => "btn" %> +<%= link_to 'Public page', user_path(@admin_user), :class => "btn" %> <%= link_to "Log in as #{@admin_user.name} (also confirms their email)", "../login_as/#{@admin_user.id}", :class => "btn btn-info" %> -</p> <hr> @@ -75,7 +75,7 @@ <td><%=h post_redirect.id %></td> <% for column in PostRedirect.content_columns.map { |c| c.name } %> <% if column == 'email_token' %> - <td><%=link_to post_redirect.send(column), main_url(confirm_url(:email_token => post_redirect.send(column), :only_path => true)) %></td> + <td><%=link_to post_redirect.send(column), confirm_path(:email_token => post_redirect.send(column)) %></td> <% else %> <td><%=h post_redirect.send(column) %></td> <% end %> |