[Logilogi-svn] SF.net SVN: logilogi:[1550] trunk

Revision: 1550
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1550&view=rev
Author:   wybow
Date:     2009-08-22 14:08:41 +0000 (Sat, 22 Aug 2009)

Log Message:
-----------
Fixed IE-bug with missing body of comments in IE

Modified Paths:
--------------
    trunk/app/controllers/logis_controller.rb
    trunk/app/views/comments/_new.html.erb
    trunk/app/views/logis/_edit.html.erb
    trunk/app/views/logis/_side_menu.html.erb
    trunk/app/views/votes/create.js.rjs
    trunk/config/initializers/action_view.rb
    trunk/lib/tasks/server.rake
    trunk/public/javascripts/application.js

Modified: trunk/app/controllers/logis_controller.rb
===================================================================
--- trunk/app/controllers/logis_controller.rb	2009-08-21 13:45:50 UTC (rev 1549)
+++ trunk/app/controllers/logis_controller.rb	2009-08-22 14:08:41 UTC (rev 1550)
@@ -314,7 +314,7 @@
 
   def side_menu
     if !@selected
-      if @logi.untagged?
+      if @logi.untagged? and @logi.comments_on_logis.size > 0
         @selected = "comments_on"
       elsif @logi.home_page?
         @selected = "home_page"

Modified: trunk/app/views/comments/_new.html.erb
===================================================================
--- trunk/app/views/comments/_new.html.erb	2009-08-21 13:45:50 UTC (rev 1549)
+++ trunk/app/views/comments/_new.html.erb	2009-08-22 14:08:41 UTC (rev 1550)
@@ -30,7 +30,10 @@
     <%= render :partial => 'logis/check', :locals => {:name => 'comment'} %>
   <% end -%>
 
-  <%= render :partial => 'application/submit', :locals => {:form => form} %>
+  <% render :layout => 'application/panel', :locals => {:id => "submit"} do %>
+    <label><%= _('Submit') %></label>
+    <%= form.submit _('Submit'), : "$('logi_form').submit()" %>
+  <% end %>
 <% end %>
 
 <% javascript_tag do -%>
@@ -39,7 +42,7 @@
 
 <% if selected == "new_logi" %>
   <% javascript_tag do -%>
-    logi_editor.initialize_tiny_mce_now();
+    logi_editor.initialize_tiny_mce_now_in_ff();
   <% end -%>
 <% end %>
 </div>

Modified: trunk/app/views/logis/_edit.html.erb
===================================================================
--- trunk/app/views/logis/_edit.html.erb	2009-08-21 13:45:50 UTC (rev 1549)
+++ trunk/app/views/logis/_edit.html.erb	2009-08-22 14:08:41 UTC (rev 1550)
@@ -2,18 +2,18 @@
   <label class="for_title">Title:</label>
   <%= hidden_field_tag 'logi[link_string]', '' %>
   <%= text_field_tag 'logi[title]', (logi_version.nil? ? nil : logi_version.title), 
-          :class => "logi_title",
-          : "logiLogisOnChange(tinyMCE.getInstanceById('logi_body')," +
-              " $('logi_title'), #{GlobalConfig.maximum_logi_version_size})" %>
+          :class => "logi_title", :id => "logi_edit_title",
+          : "logiLogisOnChange(tinyMCE.getInstanceById('logi_edit_body')," +
+              " $('logi_edit_title'), #{GlobalConfig.maximum_logi_version_size})" %>
 
   <div id="EditorDiv" style="visibility: hidden;">
     <%= text_area_tag 'logi[body]', 
             (logi_version.nil? ? nil : h(logi_version.body)),
-            :class => 'editable', :id => 'logi_body' %>
+            :class => 'editable', :id => 'logi_edit_body' %>
   </div>
 
   <% javascript_tag do -%>
-    logi_editor = new LogiEditor('logi_body','EditorDiv','logi_title',
+    logi_editor = new LogiEditor('logi_edit_body','EditorDiv','logi_edit_title',
         <%= GlobalConfig.maximum_logi_version_size %>,
         <%= (local_assigns[:defer] ? 'true' : 'false') %>);
   <% end -%>

Modified: trunk/app/views/logis/_side_menu.html.erb
===================================================================
--- trunk/app/views/logis/_side_menu.html.erb	2009-08-21 13:45:50 UTC (rev 1549)
+++ trunk/app/views/logis/_side_menu.html.erb	2009-08-22 14:08:41 UTC (rev 1550)
@@ -22,7 +22,8 @@
     <% end %>
   <% end %>
   <% if selected == "comments_on" %>
-    <%= render :partial => 'snippets_list', :locals => {:logis => @logi.comments_on_logis} %>
+    <%= render :partial => 'snippets_list',
+        :locals => {:logis => @logi.comments_on_logis} %>
   <% end %>
   <% javascript_tag do -%>
     mcorners.run();

Modified: trunk/app/views/votes/create.js.rjs
===================================================================
--- trunk/app/views/votes/create.js.rjs	2009-08-21 13:45:50 UTC (rev 1549)
+++ trunk/app/views/votes/create.js.rjs	2009-08-22 14:08:41 UTC (rev 1550)
@@ -1,3 +1,3 @@
 page.replace_html 'ratings', :partial => 'votes/show', :locals => {:vote => @vote, :rating => @rating}
 page.replace_html 'votes', :partial => "logis/recent_votes", :locals => {:votes => @votes}
-page.replace_html 'rating_current', :partial => "logis/rating_current", :locals => {:rating => @rating}
+page.replace_html_if_exists 'rating_current', :partial => "logis/rating_current", :locals => {:rating => @rating}

Modified: trunk/config/initializers/action_view.rb
===================================================================
--- trunk/config/initializers/action_view.rb	2009-08-21 13:45:50 UTC (rev 1549)
+++ trunk/config/initializers/action_view.rb	2009-08-22 14:08:41 UTC (rev 1550)
@@ -71,6 +71,16 @@
       end
     end
 
+    module PrototypeHelper
+      class JavaScriptGenerator #:nodoc:
+        module GeneratorMethods
+          def replace_html_if_exists(id, *options_for_render)
+            call "if($('#{id}')) Element.update", id, render(*options_for_render)
+          end
+        end
+      end
+    end
+
     module JavaScriptHelper
       def button_to_function(name, *args, &block)
         html_options = args.extract_options!.symbolize_keys

Modified: trunk/lib/tasks/server.rake
===================================================================
--- trunk/lib/tasks/server.rake	2009-08-21 13:45:50 UTC (rev 1549)
+++ trunk/lib/tasks/server.rake	2009-08-22 14:08:41 UTC (rev 1550)
@@ -14,7 +14,7 @@
 
     desc "Restarts the edge-server"
     task :restart do
-      sh "cap logilogi:server:restart -S stage=production"
+      sh "cap logilogi:server:restart -S stage=edge"
     end
   end
 

Modified: trunk/public/javascripts/application.js
===================================================================
--- trunk/public/javascripts/application.js	2009-08-21 13:45:50 UTC (rev 1549)
+++ trunk/public/javascripts/application.js	2009-08-22 14:08:41 UTC (rev 1550)
@@ -165,6 +165,12 @@
     }
   },
 
+  initialize_tiny_mce_now_in_ff: function() {
+    if (!Prototype.Browser.IE && !OSystem.MacOS) {
+      this.initialize_tiny_mce_now();
+    }
+  },
+
   initialize_tiny_mce_now: function() {
     tinyMCE.init({
       mode: "textareas",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.