Commit 36566aeb6314c7f1fd8d4667877500066c112b8d
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Merge branch 'stable' of gitlab.com:participa/noosfero into stable
Showing
2 changed files
with
1 additions
and
3 deletions
Show diff stats
plugins/comment_paragraph/views/comment_paragraph_plugin_profile/_comment_paragraph.html.erb
... | ... | @@ -15,7 +15,6 @@ |
15 | 15 | </td> |
16 | 16 | <td valign="top"> |
17 | 17 | <div align="center"> |
18 | - <% if logged_in? %> | |
19 | 18 | <%= |
20 | 19 | url = { :profile => profile_identifier, :controller => 'comment_paragraph_plugin_profile', :action => 'view_comments', :paragraph_id => paragraph_id, :article_id => article_id} |
21 | 20 | link_to_remote( |
... | ... | @@ -31,7 +30,6 @@ |
31 | 30 | :'data-url' => url_for(url) |
32 | 31 | } |
33 | 32 | )%> |
34 | - <% end %> | |
35 | 33 | </div> |
36 | 34 | <div class="side-comment" id="side_comment_<%= paragraph_id %>" data-paragraph="<%= paragraph_id %>" style="display:none"> |
37 | 35 | <div class="comment-paragraph-loading-<%= paragraph_id %>" style="position: absolute;"> | ... | ... |
plugins/video/views/content_viewer/_video.html.erb
... | ... | @@ -12,7 +12,7 @@ |
12 | 12 | <link type="text/css" rel="stylesheet" href="https://vjs.zencdn.net/4.5.1/video-js.css" /> |
13 | 13 | <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto" |
14 | 14 | width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>" |
15 | - data-setup='<%=CGI::escapeHTML("{ \"techOrder\": [\"video\"], \"src\": \"#{@page.video_url}\", \"loop\": true, \"autoplay\": false }") %>'> | |
15 | + data-setup='<%=CGI::escapeHTML("{ \"techOrder\": [\"vimeo\"], \"src\": \"#{@page.video_url}\", \"loop\": true, \"autoplay\": false }") %>'> | |
16 | 16 | <%= @page.no_browser_support_message %> |
17 | 17 | </video> |
18 | 18 | <script src="https://vjs.zencdn.net/4.5.1/video.js"></script> | ... | ... |