aboutsummaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin_general/index.html.erb4
-rw-r--r--app/views/admin_incoming_message/_actions.html.erb (renamed from app/views/admin_request/_incoming_message_actions.html.erb)2
-rw-r--r--app/views/admin_incoming_message/edit.html.erb2
-rw-r--r--app/views/admin_raw_email/show.html.erb (renamed from app/views/admin_request/show_raw_email.html.erb)2
-rw-r--r--app/views/admin_request/show.html.erb2
5 files changed, 6 insertions, 6 deletions
diff --git a/app/views/admin_general/index.html.erb b/app/views/admin_general/index.html.erb
index ba9396ceb..0991ea2f5 100644
--- a/app/views/admin_general/index.html.erb
+++ b/app/views/admin_general/index.html.erb
@@ -37,9 +37,9 @@
<tr>
<td>
<% if message.get_body_for_quoting.strip.size == 0 %>
- <%= link_to "(no body)", admin_request_show_raw_email_path(message.raw_email_id) %>
+ <%= link_to "(no body)", admin_raw_email_path(message.raw_email_id) %>
<% else %>
- <%= link_to excerpt(message.get_body_for_quoting, "", :radius => 60), admin_request_show_raw_email_path(message.raw_email_id) %>
+ <%= link_to excerpt(message.get_body_for_quoting, "", :radius => 60), admin_raw_email_path(message.raw_email_id) %>
<% end %>
</td>
<td class="span2">
diff --git a/app/views/admin_request/_incoming_message_actions.html.erb b/app/views/admin_incoming_message/_actions.html.erb
index 672ce3ae2..5541f2819 100644
--- a/app/views/admin_request/_incoming_message_actions.html.erb
+++ b/app/views/admin_incoming_message/_actions.html.erb
@@ -47,7 +47,7 @@
<div class="control-group">
<label class="control-label">Inspect email</label>
<div class="controls">
- <%= link_to "View raw email", admin_request_show_raw_email_path(incoming_message.raw_email_id), :class => "btn" %>
+ <%= link_to "View raw email", admin_raw_email_path(incoming_message.raw_email_id), :class => "btn" %>
</div>
</div>
<% end %>
diff --git a/app/views/admin_incoming_message/edit.html.erb b/app/views/admin_incoming_message/edit.html.erb
index 1088edcab..210d3bbd6 100644
--- a/app/views/admin_incoming_message/edit.html.erb
+++ b/app/views/admin_incoming_message/edit.html.erb
@@ -1,5 +1,5 @@
<%= render :partial => 'intro', :locals => {:incoming_message => @incoming_message } %>
-<%= render :partial => 'admin_request/incoming_message_actions', :locals => { :incoming_message => @incoming_message } %>
+<%= render :partial => 'actions', :locals => { :incoming_message => @incoming_message } %>
<fieldset class="form-horizontal">
<legend>Prominence</legend>
<%= form_tag admin_incoming_update_path(@incoming_message), :class => "form form-inline" do %>
diff --git a/app/views/admin_request/show_raw_email.html.erb b/app/views/admin_raw_email/show.html.erb
index da22b6069..83c81b8fb 100644
--- a/app/views/admin_request/show_raw_email.html.erb
+++ b/app/views/admin_raw_email/show.html.erb
@@ -52,7 +52,7 @@
</p>
<div>
- <%= render :partial => 'incoming_message_actions', :locals => { :incoming_message => @raw_email.incoming_message } %>
+ <%= render :partial => 'admin_incoming_message/actions', :locals => { :incoming_message => @raw_email.incoming_message } %>
</div>
<h2>Raw email</h2>
diff --git a/app/views/admin_request/show.html.erb b/app/views/admin_request/show.html.erb
index 2ca4f5733..b21dcc05e 100644
--- a/app/views/admin_request/show.html.erb
+++ b/app/views/admin_request/show.html.erb
@@ -297,7 +297,7 @@
<thead>
<tr>
<td colspan="2" class="well">
- <%= render :partial => 'incoming_message_actions', :locals => { :incoming_message => incoming_message } %>
+ <%= render :partial => 'admin_incoming_message/actions', :locals => { :incoming_message => incoming_message } %>
</td>
</tr>
</thead>