Download as
Browse Code »

Commit 311e9dd22e560764f18f6ceb1a1b6df71b14eae6

Authored by Carlos Morais
2 parents 6e215742 819ac7fb
Exists in master and in 28 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_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Merge branch 'ajax-autoload' of gitorious.org:+mezuro/noosfero/mezuro into ajax-autoload

Showing 5 changed files with 10 additions and 10 deletions   Show diff stats
plugins/mezuro/lib/mezuro_plugin.rb
  Diff comments   View file @311e9dd
@@ -17,7 +17,7 @@ class MezuroPlugin < Noosfero::Plugin @@ -17,7 +17,7 @@ class MezuroPlugin < Noosfero::Plugin
17 end 17 end
18 18
19 def js_files 19 def js_files
20 - ['javascripts/dynamic.js', 'javascripts/toggle.js'] 20 + ['javascripts/dynamic.js', 'javascripts/source_tree_toggle.js']
21 end 21 end
22 22
23 end 23 end
plugins/mezuro/public/javascripts/source_tree_toggle.js 0 → 100644
  Diff comments   View file @311e9dd
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +function source_tree_toggle(id){
  2 + var suffixes = ['_hidden', '_plus', '_minus'];
  3 + for (var i in suffixes){
  4 + jQuery('#' + id + suffixes[i]).toggle();
  5 + }
  6 +}
plugins/mezuro/public/javascripts/toggle.js
View file @6e21574
@@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
1 -function my_toggle(id){  
2 - var suffixes = ['_hidden', '_plus', '_minus'];  
3 - for (var i in suffixes){  
4 - jQuery('#' + id + suffixes[i]).toggle();  
5 - }  
6 -}  
plugins/mezuro/views/content_viewer/_source_tree.rhtml
  Diff comments   View file @311e9dd
@@ -5,9 +5,9 @@ @@ -5,9 +5,9 @@
5 <tr> 5 <tr>
6 <td width="10%"> 6 <td width="10%">
7 <img alt="+" src="/plugins/mezuro/images/plus.png" class="link" 7 <img alt="+" src="/plugins/mezuro/images/plus.png" class="link"
8 - id="<%= module_name %>_plus" onclick="my_toggle('<%= module_name %>')"/> 8 + id="<%= module_name %>_plus" onclick="source_tree_toggle('<%= module_name %>')"/>
9 <img alt="-" src="/plugins/mezuro/images/minus.png" class="link" 9 <img alt="-" src="/plugins/mezuro/images/minus.png" class="link"
10 - id="<%= module_name %>_minus" onclick="my_toggle('<%= module_name %>')" style="display: none"/> 10 + id="<%= module_name %>_minus" onclick="source_tree_toggle('<%= module_name %>')" style="display: none"/>
11 </td> 11 </td>
12 <td> 12 <td>
13 <a href="#" class="module-result-link" data-module-name="<%= module_name %>"> 13 <a href="#" class="module-result-link" data-module-name="<%= module_name %>">
plugins/mezuro/views/content_viewer/show_project.rhtml
  Diff comments   View file @311e9dd
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <% elsif @project.state.end_with?('ING') %> 45 <% elsif @project.state.end_with?('ING') %>
46 <h3><%= _('Service is ') + @project.state.downcase + ' ' + @project.name + '...' %></h3> 46 <h3><%= _('Service is ') + @project.state.downcase + ' ' + @project.name + '...' %></h3>
47 <% elsif @project.state == 'READY' %> 47 <% elsif @project.state == 'READY' %>
48 - <%= render :partial => 'project_result', :locals => { :project_result => @page.project_result } %> 48 + <%= render :partial => 'content_viewer/project_result', :locals => { :project_result => @page.project_result } %>
49 <% end %> 49 <% end %>
50 50
51 <div id="ids" data-profile="<%= @page.profile.identifier %>" data-content='<%= @page.id %>'/> 51 <div id="ids" data-profile="<%= @page.profile.identifier %>" data-content='<%= @page.id %>'/>