Download as
Browse Code »

Commit 8e131944a3be1ec6ad042b91d69b7d0b4226260f

Authored by Leandro Santos
1 parent 1a6baee6
Exists in master and in 26 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

adding require-login-popup for actions that must be logged in to work

Showing 6 changed files with 4 additions and 5 deletions   Show diff stats
app/views/blocks/profile_info_actions/_join_leave_community.html.erb
  Diff comments   View file @8e13194
1 -<div class='join-leave-button'> 1 +<div class='join-leave-button require-login-popup'>
2 <% if logged_in? %> 2 <% if logged_in? %>
3 <% if profile.members.include?(user) %> 3 <% if profile.members.include?(user) %>
4 <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url, 4 <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
app/views/layouts/application-ng.html.erb
  Diff comments   View file @8e13194
@@ -78,6 +78,5 @@ @@ -78,6 +78,5 @@
78 if content.respond_to?(:call) then instance_exec(&content).html_safe else content.html_safe end 78 if content.respond_to?(:call) then instance_exec(&content).html_safe else content.html_safe end
79 end.join("\n") 79 end.join("\n")
80 %> 80 %>
81 - <%= javascript_include_tag 'require_login' %>  
82 </body> 81 </body>
83 </html> 82 </html>
plugins/require_auth_to_comment/views/require_auth_to_comment_plugin_admin/index.html.erb
  Diff comments   View file @8e13194
1 <h1><%= _('Require auth to comment Settings')%></h1> 1 <h1><%= _('Require auth to comment Settings')%></h1>
2 2
3 -<% form_for(:settings) do |f| %> 3 +<%= form_for(:settings) do |f| %>
4 4
5 <div class="require-type"> 5 <div class="require-type">
6 <strong> 6 <strong>
plugins/vote/public/style.css
  Diff comments   View file @8e13194
1 .vote-actions { 1 .vote-actions {
2 - position: absolute;  
3 top: 40px; 2 top: 40px;
4 right: 0px; 3 right: 0px;
5 } 4 }
plugins/vote/views/vote/_vote.html.erb
  Diff comments   View file @8e13194
@@ -5,7 +5,7 @@ reload_url = url_for(:controller =&gt; &#39;vote_plugin_profile&#39;, :profile =&gt; profile.i @@ -5,7 +5,7 @@ reload_url = url_for(:controller =&gt; &#39;vote_plugin_profile&#39;, :profile =&gt; profile.i
5 5
6 <span id="vote_<%= model %>_<%= target.id %>_<%= vote %>" data-reload_url=<%= reload_url %> class="vote-action action <%= action %>-action"> 6 <span id="vote_<%= model %>_<%= target.id %>_<%= vote %>" data-reload_url=<%= reload_url %> class="vote-action action <%= action %>-action">
7 7
8 - <%= link_to content_tag(:span, count, :class=>'like-action-counter') + content_tag(:span, '', :class=>"action-icon #{action}"), url, :class => "#{active ? 'like-action-active':''} require-login-popup" %> 8 + <%= link_to content_tag(:span, count, :class=>'like-action-counter') + content_tag(:span, '', :class=>"action-icon #{action}"), url, :class => "#{active ? 'like-action-active':''} #{user ? '':'disabled'} require-login-popup" %>
9 9
10 <% if !voters.blank? %> 10 <% if !voters.blank? %>
11 <span class="vote-detail"> 11 <span class="vote-detail">
public/javascripts/application.js
  Diff comments   View file @8e13194
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
27 *= require manage-products.js 27 *= require manage-products.js
28 *= require catalog.js 28 *= require catalog.js
29 *= require autogrow.js 29 *= require autogrow.js
  30 +*= require require_login.js
30 */ 31 */
31 32
32 // scope for noosfero stuff 33 // scope for noosfero stuff