Commit ce28f728f1fa9ba66e05fceffc30492f72f8bd26

Authored by Victor Costa
2 parents f2eb9480 93b18340

Merge branch 'AI2942-pairwise_plugin' into stable

plugins/pairwise/views/content_viewer/prompt.html.erb
1 1 <% extend PairwisePlugin::Helpers::ViewerHelper %>
2 2  
3   -<% if embeded %>
4   - <%= javascript_include_tag :defaults, 'jquery-latest.js',
5   - 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
6   - 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
7   - 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
8   - 'add-and-join', 'report-abuse', 'catalog', 'manage-products',
9   - 'jquery-ui-timepicker-addon', :cache => 'cache-general' %>
10   -<% end %>
  3 +<%= render :file => 'layouts/_javascript' if embeded %>
11 4  
12 5 <%= render :partial => 'content_viewer/prompt_body', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => nil, :source => (defined?(source) ? source : '') }%>
... ...