From 61c32004327aa4fa71a38fe13fba72c24ce7555b Mon Sep 17 00:00:00 2001
From: Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
Date: Wed, 15 Feb 2012 16:36:08 -0200
Subject: [PATCH] Rename toogle -> toggle

---
 plugins/mezuro/lib/mezuro_plugin.rb                    |  2 +-
 plugins/mezuro/public/javascripts/autoreload.js        |  2 +-
 plugins/mezuro/public/javascripts/toggle.js            |  6 ++++++
 plugins/mezuro/public/javascripts/toogle.js            |  6 ------
 plugins/mezuro/views/content_viewer/_autoreload.rhtml  | 21 ++++++++++++++++-----
 plugins/mezuro/views/content_viewer/_source_tree.rhtml |  6 +++---
 plugins/mezuro/views/content_viewer/show_project.rhtml | 25 +++++--------------------
 7 files changed, 32 insertions(+), 36 deletions(-)
 create mode 100644 plugins/mezuro/public/javascripts/toggle.js
 delete mode 100644 plugins/mezuro/public/javascripts/toogle.js

diff --git a/plugins/mezuro/lib/mezuro_plugin.rb b/plugins/mezuro/lib/mezuro_plugin.rb
index 1ead1ab..40eaa45 100644
--- a/plugins/mezuro/lib/mezuro_plugin.rb
+++ b/plugins/mezuro/lib/mezuro_plugin.rb
@@ -17,7 +17,7 @@ class MezuroPlugin < Noosfero::Plugin
   end
 
   def js_files
-    ['javascripts/results.js', 'javascripts/toogle.js', 'javascripts/autoreload.js']
+    ['javascripts/results.js', 'javascripts/toggle.js', 'javascripts/autoreload.js']
   end
 
 end
diff --git a/plugins/mezuro/public/javascripts/autoreload.js b/plugins/mezuro/public/javascripts/autoreload.js
index c50b039..0715091 100644
--- a/plugins/mezuro/public/javascripts/autoreload.js
+++ b/plugins/mezuro/public/javascripts/autoreload.js
@@ -5,7 +5,7 @@ function show_autoreload($){
   var project_name = $('#autoreload').attr('data-project-name');
   var endpoint = '/profile/' + profile + '/plugins/mezuro/autoreload/' + project;
 
-  jQuery('#autoreload').html('Loading ...'); // #FIXME
+  jQuery('#autoreload').html('Loading results for ...' + project_name); // #FIXME
   $.get(endpoint, {project_name: project_name}, show_page_with_results);
   return false;
 }
diff --git a/plugins/mezuro/public/javascripts/toggle.js b/plugins/mezuro/public/javascripts/toggle.js
new file mode 100644
index 0000000..312b692
--- /dev/null
+++ b/plugins/mezuro/public/javascripts/toggle.js
@@ -0,0 +1,6 @@
+function toggle(id){
+  var suffixes = ['_hidden', '_plus', '_minus'];
+  for (var i in suffixes){
+    jQuery('#' + id + suffixes[i]).toggle();
+  }
+}
\ No newline at end of file
diff --git a/plugins/mezuro/public/javascripts/toogle.js b/plugins/mezuro/public/javascripts/toogle.js
deleted file mode 100644
index 9398094..0000000
--- a/plugins/mezuro/public/javascripts/toogle.js
+++ /dev/null
@@ -1,6 +0,0 @@
-function toogle(id){
-  var suffixes = ['_hidden', '_plus', '_minus'];
-  for (var i in suffixes){
-    jQuery('#' + id + suffixes[i]).toggle();
-  }
-}
\ No newline at end of file
diff --git a/plugins/mezuro/views/content_viewer/_autoreload.rhtml b/plugins/mezuro/views/content_viewer/_autoreload.rhtml
index 1529501..5d44274 100644
--- a/plugins/mezuro/views/content_viewer/_autoreload.rhtml
+++ b/plugins/mezuro/views/content_viewer/_autoreload.rhtml
@@ -1,4 +1,19 @@
-<% if @project_content.project.state == 'READY' %>
+<% if ! @project_content.project.error.nil? %>
+  <h3><%= _('ERROR') %></h3>
+  <p>
+    <%= "State when error ocurred: #{@project_content.project.state}" %>
+    <br/>
+    <% error = @project_content.project.error %>
+    <%= error.message %>
+    <ul><% error.stack_trace.each do |trace| %>
+      <li><%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %></li>
+    <% end %></ul>
+  </p>
+<% elsif @project_content.project.state.end_with?('ING') %>
+  
+  <%= _("Loading results for %s ...") % @project_content.project.name %>
+
+<% elsif @project_content.project.state == 'READY' %>
  
   <h3><%= _('LAST RESULT') %></h3>
   <% @project_result = @project_content.project_result %>
@@ -30,8 +45,4 @@
     jQuery(results);
   </script>
 
-<% else %>
-
-  <%= _("Loading results for %s ...") % project_content.project.name %>
-
 <% end %>.
diff --git a/plugins/mezuro/views/content_viewer/_source_tree.rhtml b/plugins/mezuro/views/content_viewer/_source_tree.rhtml
index 3f9145d..773375c 100644
--- a/plugins/mezuro/views/content_viewer/_source_tree.rhtml
+++ b/plugins/mezuro/views/content_viewer/_source_tree.rhtml
@@ -5,9 +5,9 @@
     <tr>
       <td width="10%">
         <img alt="+" src="/plugins/mezuro/images/plus.png" class="link"
-          id="<%= module_name %>_plus" onclick="toogle('<%= module_name %>')"/>
+          id="<%= module_name %>_plus" onclick="toggle('<%= module_name %>')" style="display: none"/>
         <img alt="-" src="/plugins/mezuro/images/minus.png" class="link"
-          id="<%= module_name %>_minus" onclick="toogle('<%= module_name %>')" style="display: none"/>
+          id="<%= module_name %>_minus" onclick="toggle('<%= module_name %>')"/>
       </td>
       <td>
         <a href="#" class="module-result-link" data-module-name="<%= module_name %>">
@@ -15,7 +15,7 @@
         </a>
       </td>
     </tr> 
-    <tr id="<%= module_name %>_hidden" style="display: none">
+    <tr id="<%= module_name %>_hidden">
       <td></td> 
       <td style="text-align: left">
         <% source_tree.children.each do |child| %>
diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml
index 3624ebb..28da86a 100644
--- a/plugins/mezuro/views/content_viewer/show_project.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -30,24 +30,9 @@
 
 <br />
 
-<% if ! @project.error.nil? %>
-  <h3><%= _('ERROR') %></h3>
-  <p>
-    <%= "State when error ocurred: #{@project.state}" %>
-    <br/>
-    <% error = @project.error %>
-    <%= error.message %>
-    <ul><% error.stack_trace.each do |trace| %>
-      <li><%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %></li>
-    <% end %></ul>
-  </p>
-<% else %>
-
-  <div id='autoreload' data-profile="<%= @project_content.profile.identifier %>" data-project-id='<%= @project_content.id %>' data-project-name='<%= @project.name %>' data-project-state='<%= @project.state %>'>
-  </div> 
+<div id='autoreload' data-profile="<%= @project_content.profile.identifier %>" data-project-id='<%= @project_content.id %>' data-project-name='<%= @project.name %>' data-project-state='<%= @project.state %>'>
+</div> 
   
-  <script type="text/javascript">
-    jQuery(show_autoreload);
-  </script>
-
-<% end %>
+<script type="text/javascript">
+  jQuery(show_autoreload);
+</script>
\ No newline at end of file
--
libgit2 0.21.2