Diff
Modified: trunk/app/controllers/reviews_controller.rb (2725 => 2726)
--- trunk/app/controllers/reviews_controller.rb 2011-10-20 18:22:27 UTC (rev 2725)
+++ trunk/app/controllers/reviews_controller.rb 2011-10-20 21:59:30 UTC (rev 2726)
@@ -31,7 +31,7 @@
respond_to do |format|
format.html {
- @lod_nir = review_url(:id => @review.id, :workflow_id => @reviewable.id)
+ @lod_nir = workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id)
@lod_html = formatted_workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'html')
@lod_rdf = formatted_workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'rdf')
@lod_xml = formatted_workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'xml')
@@ -185,7 +185,7 @@
respond_to do |format|
format.html {
if attr
- redirect_to reviews_url(params[:workflow_id])
+ redirect_to workflow_reviews_url(params[:workflow_id])
else
redirect_to workflows_url
end
Modified: trunk/app/views/home/_latest_reviews.rhtml (2725 => 2726)
--- trunk/app/views/home/_latest_reviews.rhtml 2011-10-20 18:22:27 UTC (rev 2725)
+++ trunk/app/views/home/_latest_reviews.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
@@ -21,7 +21,7 @@
</span>
<div class="box_standout" style="font-size: 85%; margin: 0.4em 2em; padding: 0.2em 0.5em;">
<p>
- <b><%= link_to h(r.title), review_url(r.reviewable, r) -%></b>
+ <b><%= link_to h(r.title), workflow_review_url(r.reviewable, r) -%></b>
<br/>
<span style="color: #666666;">
<% if (rating = r.associated_rating) -%>
@@ -32,7 +32,7 @@
</span>
</p>
<%= truncate(strip_html(white_list(r.review)), 150) %>
- <p style="text-align: right;">[ <%= link_to "More", review_url(r.reviewable, r) -%> ]</p>
+ <p style="text-align: right;">[ <%= link_to "More", workflow_review_url(r.reviewable, r) -%> ]</p>
</div>
<br/>
</li>
Modified: trunk/app/views/reviews/_reviews.rhtml (2725 => 2726)
--- trunk/app/views/reviews/_reviews.rhtml 2011-10-20 18:22:27 UTC (rev 2725)
+++ trunk/app/views/reviews/_reviews.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
@@ -2,7 +2,7 @@
<h2>
<%= icon "review", nil, "Reviews", { :style => "vertical-align: middle;" }, "" -%>
- <span style="vertical-align: middle;"><%= link_to "Reviews", reviews_path(reviewable) %></span>
+ <span style="vertical-align: middle;"><%= link_to "Reviews", workflow_reviews_path(reviewable) %></span>
<span class="count_text" style="vertical-align: middle;">(<%= reviewable.reviews.length %>)</span>
</h2>
@@ -10,7 +10,7 @@
<% unless reviewable.reviews.empty? %>
<ul class="sectionIcons">
- <li><%= icon('review', new_review_path(reviewable), nil, nil, 'Write your own Review') %></li>
+ <li><%= icon('review', new_workflow_review_path(reviewable), nil, nil, 'Write your own Review') %></li>
</ul>
<a name="reviews"></a>
<%= render :partial => "reviews/table", :locals => { :reviewable => reviewable, :collection => reviewable.reviews } %>
@@ -18,8 +18,8 @@
<p><i>No reviews yet</i></p>
<a name="reviews"></a>
<p style="margin-top: 0.6em;">
- <strong><%= link_to "Be the first to review!", new_review_url(reviewable) %></strong>
+ <strong><%= link_to "Be the first to review!", new_workflow_review_url(reviewable) %></strong>
</p>
<% end %>
-</div>
\ No newline at end of file
+</div>
Modified: trunk/app/views/reviews/_table.rhtml (2725 => 2726)
--- trunk/app/views/reviews/_table.rhtml 2011-10-20 18:22:27 UTC (rev 2725)
+++ trunk/app/views/reviews/_table.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
@@ -11,7 +11,7 @@
<td class="mid" style="text-align: left;">
<p style="margin-top:0; padding-top:0; font-weight:bold; font-size: 108%;">
<%= icon "review", nil, nil, nil, '' %>
- Title: <%= link_to h(review.title), review_url(reviewable, review) %>
+ Title: <%= link_to h(review.title), workflow_review_url(reviewable, review) %>
</p>
<p>
@@ -36,14 +36,14 @@
<p class="none_text">No text</p>
<% end %>
<p style="text-align: right;">
- [ <%= link_to "more", review_url(reviewable, review) %> ]
+ [ <%= link_to "more", workflow_review_url(reviewable, review) %> ]
</p>
</div>
</td>
<td class="actions" style="width: 80px;">
- <%= icon "show", review_path(reviewable, review), nil, nil, "View" %>
+ <%= icon "show", workflow_review_path(reviewable, review), nil, nil, "View" %>
<% if review.allow_edit?(logged_in? ? current_user : nil) %>
- <%= icon('edit', edit_review_path(reviewable, review), nil, nil, 'Edit') %>
+ <%= icon('edit', edit_workflow_review_path(reviewable, review), nil, nil, 'Edit') %>
<% end %>
</td>
</tr>
Modified: trunk/app/views/reviews/edit.rhtml (2725 => 2726)
--- trunk/app/views/reviews/edit.rhtml 2011-10-20 18:22:27 UTC (rev 2725)
+++ trunk/app/views/reviews/edit.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
@@ -6,7 +6,7 @@
<center>
<div class="box_form" style="width: 460px; margin: 2em 0; text-align: left;">
- <% form_for(:review, :url ="" review_path(@reviewable, @review), :html => { :method => :put }) do |form| %>
+ <% form_for(:review, :url ="" workflow_review_path(@reviewable, @review), :html => { :method => :put }) do |form| %>
<%= render :partial => 'form', :object => form %>
<br/><br/>
<center><%= submit_tag 'Update', :disable_with => "Updating..." %></center>
Modified: trunk/app/views/reviews/index.rhtml (2725 => 2726)
--- trunk/app/views/reviews/index.rhtml 2011-10-20 18:22:27 UTC (rev 2725)
+++ trunk/app/views/reviews/index.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
@@ -3,7 +3,7 @@
<h1>Reviews (<%= @reviews.length %>)</h1>
<ul class="sectionIcons">
- <li><%= icon('review', new_review_path(@reviewable), nil, nil, 'Write a Review') %></li>
+ <li><%= icon('review', new_workflow_review_path(@reviewable), nil, nil, 'Write a Review') %></li>
</ul>
<%= render :partial => "for_reviewable" %>
@@ -12,4 +12,4 @@
<%= render :partial => "reviews/table", :locals => { :reviewable => @reviewable, :collection => @reviews } %>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: trunk/app/views/reviews/new.rhtml (2725 => 2726)
--- trunk/app/views/reviews/new.rhtml 2011-10-20 18:22:27 UTC (rev 2725)
+++ trunk/app/views/reviews/new.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
@@ -6,7 +6,7 @@
<center>
<div class="box_form" style="width: 460px; margin: 2em 0; text-align: left;">
- <% form_for :review, :url ="" reviews_path(@reviewable) do |form| -%>
+ <% form_for :review, :url ="" workflow_reviews_path(@reviewable) do |form| -%>
<%= render :partial => 'form', :object => form %>
<br/><br/>
<center><%= submit_tag "Create", :disable_with => "Creating..." %></center>
Modified: trunk/app/views/reviews/show.rhtml (2725 => 2726)
--- trunk/app/views/reviews/show.rhtml 2011-10-20 18:22:27 UTC (rev 2725)
+++ trunk/app/views/reviews/show.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
@@ -6,9 +6,9 @@
<% if @review.allow_edit?(user) %>
<ul class="sectionIcons">
- <li><%= icon('edit', edit_review_path(@reviewable, @review), nil, nil, 'Edit') %></li>
+ <li><%= icon('edit', edit_workflow_review_path(@reviewable, @review), nil, nil, 'Edit') %></li>
<li>
- <%= icon('destroy', review_path(@reviewable, @review), nil, { :confirm => 'Are you sure you want to delete this review? NOTE: any associated rating will NOT be deleted.', :method => :delete }, 'Delete') %>
+ <%= icon('destroy', workflow_review_path(@reviewable, @review), nil, { :confirm => 'Are you sure you want to delete this review? NOTE: any associated rating will NOT be deleted.', :method => :delete }, 'Delete') %>
</li>
</ul>
<% end %>
Modified: trunk/app/views/services/_table.rhtml (2725 => 2726)
--- trunk/app/views/services/_table.rhtml 2011-10-20 18:22:27 UTC (rev 2725)
+++ trunk/app/views/services/_table.rhtml 2011-10-20 21:59:30 UTC (rev 2726)
@@ -24,6 +24,7 @@
<span style="float: right; margin-left: 1em;">
<% mon_text = "Latest Monitoring Status: <b>#{service.monitor_label}</b><br/>#{service.monitor_message}<br/> Last checked: #{timeago_fuzzy(service.monitor_last_checked)}" %>
<%= image_tag service.monitor_small_symbol_url, :style => "margin-left: 0.5em;", :title => tooltip_title_attrib(mon_text), :alt => mon_text -%>
+ <%= link_to('Workflows', workflows_path(:filter => "WSDL_ENDPOINT=(\"#{service.wsdl}\")")) -%>
</span>
<% end %>