Merge pull request #34 from finnlabs/fix/various_bugs_on_textilizable_block

Fix/various bugs on textilizable block

app/views/my_projects_overviews/_block_textilizable.html.erb

@@ -20,34 +20,30 @@ See doc/COPYRIGHT.md for more details.
 ++#%>
 
 <div id="block_<%= block_name.dasherize %>" class="mypage-box">
-
+  <div class="handle">
-  <% content_for block_name do %>
+    <% content_for block_name do %>
-    <div class="handle">
+      <div id="<%= block_name %>-form-div" style="display: none;" ng-non-bindable>
-      <div id="<%= block_name %>-form-div" style="display: none;">
         <div class="box-actions">
           <a href="#" onclick="return resetTextilizable('<%= block_name %>');"
              class="icon icon-cancel"><%= l(:button_cancel) %></a>
-
-          <a href="#" onclick="return saveTextilizable('<%= block_name %>');"
-             class="icon icon-save1"><%= l(:button_save) %></a>
         </div>
         <div style="clear: right;"></div>
-          <%= form_for :overview,
+        <%= form_for :overview,
-                       :url => {:action => 'update_custom_element'},
+                     :url => {:action => 'update_custom_element'},
-                       :html => {:id => "block_form_#{block_name.dasherize}",
+                     :html => {:id => "block_form_#{block_name.dasherize}",
-                                 :class => nil,
+                               :class => nil,
-                                 :method => :put,
+                               :method => :put,
-                                 :multipart => true} do |f| %>
+                               :multipart => true} do |f| %>
 
-            <%= hidden_field_tag 'block_name', block_name %>
+              <%= hidden_field_tag 'block_name', block_name %>
-            <%= text_field_tag "block_title_#{block_name}", block_title %>
+              <%= text_field_tag "block_title_#{block_name}", block_title %>
-            <%= text_area_tag "textile_#{block_name}", textile, :cols => 40, :rows => 5, :class => 'wiki-edit' %>
+              <%= text_area_tag "textile_#{block_name}", textile, :cols => 40, :rows => 5, :class => 'wiki-edit' %>
-            <%= wikitoolbar_for "textile_#{block_name}" %>
+              <%= wikitoolbar_for "textile_#{block_name}" %>
+            <p><label><%=l(:label_attachment_plural)%></label><br />
+              <%= render :partial => 'attachments/form' %>
+            </p>
             <%= submit_tag l(:button_save),
-            :id => "#{block_name}-form-submit", :style => "display:none;" %>
+                :id => "#{block_name}-form-submit" %>
-          <p><label><%=l(:label_attachment_plural)%></label><br />
-            <%= render :partial => 'attachments/form' %>
-          </p>
         <% end %>
       </div>
       <div id="<%= block_name %>-preview-div" class="wiki">
@@ -63,11 +59,11 @@ See doc/COPYRIGHT.md for more details.
               %>
         </div>
       </div>
-    </div>
+    <% end %>
-  <% end %>
+    <%= render :partial => "textilizable",
-  <%= render :partial => "textilizable",
+      :locals => { :block_title => block_title,
-             :locals => { :block_title => block_title,
+                   :textile => textile,
-                          :textile => textile,
+                   :block_name => block_name }
-                          :block_name => block_name }
+                 %>
-        %>
+  </div>
 </div>

app/views/my_projects_overviews/_textilizable.html.erb

@@ -22,5 +22,9 @@ See doc/COPYRIGHT.md for more details.
 <h2 class="page-layout-only"><%= block_title || l(:label_custom_element) %></h2>
 <% if defined? block_name %>
   <%= content_for block_name %>
+  <div id="<%= block_name %>-text">
+    <%= textilizable(textile, :object => overview) %>
+  </div>
+<% else %>
+  <%= textilizable(textile, :object => overview) %>
 <% end %>
-<%= textilizable(textile, :object => overview) %>

app/views/my_projects_overviews/page_layout.html.erb

@@ -77,15 +77,9 @@ function removeBlock(block) {
     updateSelect();
 }
 
-function saveTextilizable(name) {
-    $(name + "-form-submit").click();
-    return false;
-}
-
 function resetTextilizable(name) {
     $("textile_" + name).setValue(window["page_layout-textile" + name] + "");
-    $(name + '-form-div').toggle();
+    toggleTextilizableVisibility(name);
-    $(name + '-preview-div').toggle();
     return false;
 }
 
@@ -93,12 +87,16 @@ function editTextilizable(name) {
     var textile_name = $("textile_" + name);
     if (textile_name != null) {
       window["page_layout-textile" + name] = textile_name.getValue();
-      $(name + '-form-div').toggle();
+      toggleTextilizableVisibility(name);
-      $(name + '-preview-div').toggle();
     }
     return false;
 }
 
+function toggleTextilizableVisibility(name) {
+  $(name + '-form-div').toggle();
+  $(name + '-preview-div').toggle();
+  $(name + '-text').toggle();
+}
 function addBlock() {
   new Ajax.Updater('list-hidden',
                    $('block-form').action,