Download as
Browse Code »

Commit 237e35795826be58c91efdaffce67fee6fcb36cd

Authored by Evandro Jr
2 parents c21a1cd3 95136489
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'stable' of gitlab.com:participa/noosfero into stable

Showing 2 changed files with 2 additions and 4 deletions   Show diff stats
plugins/comment_paragraph/views/comment_paragraph_plugin_profile/_comment_paragraph.html.erb
  Diff comments   View file @237e357
@@ -15,7 +15,6 @@ @@ -15,7 +15,6 @@
15 </td> 15 </td>
16 <td valign="top"> 16 <td valign="top">
17 <div align="center"> 17 <div align="center">
18 - <% if logged_in? %>  
19 <%= 18 <%=
20 url = { :profile => profile_identifier, :controller => 'comment_paragraph_plugin_profile', :action => 'view_comments', :paragraph_id => paragraph_id, :article_id => article_id} 19 url = { :profile => profile_identifier, :controller => 'comment_paragraph_plugin_profile', :action => 'view_comments', :paragraph_id => paragraph_id, :article_id => article_id}
21 link_to_remote( 20 link_to_remote(
@@ -31,7 +30,6 @@ @@ -31,7 +30,6 @@
31 :'data-url' => url_for(url) 30 :'data-url' => url_for(url)
32 } 31 }
33 )%> 32 )%>
34 - <% end %>  
35 </div> 33 </div>
36 <div class="side-comment" id="side_comment_<%= paragraph_id %>" data-paragraph="<%= paragraph_id %>" style="display:none"> 34 <div class="side-comment" id="side_comment_<%= paragraph_id %>" data-paragraph="<%= paragraph_id %>" style="display:none">
37 <div class="comment-paragraph-loading-<%= paragraph_id %>" style="position: absolute;"> 35 <div class="comment-paragraph-loading-<%= paragraph_id %>" style="position: absolute;">
plugins/video/views/content_viewer/_video.html.erb
  Diff comments   View file @237e357
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <link type="text/css" rel="stylesheet" href="https://vjs.zencdn.net/4.5.1/video-js.css" /> 3 <link type="text/css" rel="stylesheet" href="https://vjs.zencdn.net/4.5.1/video-js.css" />
4 <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto" 4 <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto"
5 width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>" 5 width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>"
6 - data-setup='<%=CGI::escapeHTML("{ \"techOrder\": [\"youtube\"], \"src\": \"#{@page.video_url}\" }") %>'> 6 + data-setup='{ "techOrder": ["youtube"], "src": "<%= @page.video_url %>" }'>
7 <%= @page.no_browser_support_message %> 7 <%= @page.no_browser_support_message %>
8 </video> 8 </video>
9 <script src="https://vjs.zencdn.net/4.5.1/video.js"></script> 9 <script src="https://vjs.zencdn.net/4.5.1/video.js"></script>
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <link type="text/css" rel="stylesheet" href="https://vjs.zencdn.net/4.5.1/video-js.css" /> 12 <link type="text/css" rel="stylesheet" href="https://vjs.zencdn.net/4.5.1/video-js.css" />
13 <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto" 13 <video id="embedded_video" src="" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="auto"
14 width="<%= @page.fitted_width %>" height="<%= @page.fitted_height %>" 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='{ "techOrder": ["vimeo"], "src": "<%= @page.video_url %>", "loop": true, "autoplay": false }'>
16 <%= @page.no_browser_support_message %> 16 <%= @page.no_browser_support_message %>
17 </video> 17 </video>
18 <script src="https://vjs.zencdn.net/4.5.1/video.js"></script> 18 <script src="https://vjs.zencdn.net/4.5.1/video.js"></script>