Download as
Browse Code »

Commit 311e9dd22e560764f18f6ceb1a1b6df71b14eae6

Authored by Carlos Morais
2 parents 6e215742 819ac7fb
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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 17 end
18 18  
19 19 def js_files
20   - ['javascripts/dynamic.js', 'javascripts/toggle.js']
  20 + ['javascripts/dynamic.js', 'javascripts/source_tree_toggle.js']
21 21 end
22 22  
23 23 end
... ...
plugins/mezuro/public/javascripts/source_tree_toggle.js 0 → 100644
  Diff comments   View file @311e9dd
... ... @@ -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   -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 5 <tr>
6 6 <td width="10%">
7 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 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 11 </td>
12 12 <td>
13 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 45 <% elsif @project.state.end_with?('ING') %>
46 46 <h3><%= _('Service is ') + @project.state.downcase + ' ' + @project.name + '...' %></h3>
47 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 49 <% end %>
50 50  
51 51 <div id="ids" data-profile="<%= @page.profile.identifier %>" data-content='<%= @page.id %>'/>
... ...