From fd432f30babed6242466fafa1a907a97ad4699e8 Mon Sep 17 00:00:00 2001
From: chris <chris.vilayphiou@gmail.com>
Date: Sat, 27 Jul 2013 15:50:34 +0800
Subject: [PATCH] Fix cktext_area and removing of files and links

---
 .../announcement/back_end/bulletins/_form.html.erb |  2 +-
 .../back_end/bulletins/_form_file.html.erb         | 14 ++++++++------
 .../back_end/bulletins/_form_link.html.erb         | 13 ++++++++-----
 .../back_end/archive_files/_form_file.html.erb     | 14 ++++++++------
 .../back_end/page_contexts/_form.html.erb          |  2 +-
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 165aeb72..728eb3b6 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -194,7 +194,7 @@
           <div class="controls">
             <div class="textarea">
               <%= f.fields_for :text_translations do |f| %>
-                <%= f.cktext_area locale, rows: 5, class: "input-block-level", id: "content_#{locale}", name: "content_#{locale}", :value => (@bulletin.text_translations[locale] rescue nil) %>
+                <%= f.cktext_area locale, rows: 5, class: "input-block-level", :value => (@bulletin.text_translations[locale] rescue nil) %>
               <% end %>
             </div>
           </div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb
index 4e66fe1a..8c0a5766 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb
@@ -40,14 +40,16 @@
       <% end %>
     </span>
     </span>
-    <span class="delete_file add-on btn" title="<%= form_file.new_record? ? t(:remove) : t(:delete_) %>">
-      <% if form_file.new_record? %>
+    <% if form_file.new_record? %>
+      <span class="delete_file add-on btn" title="<%= t(:delete_) %>">
         <a class="icon-trash"></a>
-      <% else %> 
+      </span>
+    <% else %> 
+      <span class="remove_existing_record add-on btn" title="<%= t(:remove) %>">
         <%= f.hidden_field :id %>
-        <a class="remove_existing_record icon-remove"></a>
+        <a class="icon-remove"></a>
         <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
-      <% end %>
-    </span>
+      </span>
+    <% end %>
   </div>
 </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb
index 84217228..f31a16ce 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb
@@ -11,13 +11,16 @@
       </span>
     <% end %>
   </span>
-  <span class="delete_link add-on btn" title="<%= form_link.new_record? ? t(:remove) : t(:delete_) %>">
-    <% if form_link.new_record? %>
+  
+  <% if form_link.new_record? %>
+    <span class="delete_link add-on btn" title="<%= t(:delete_) %>">
       <a class="icon-trash"></a>
-    <% else %>  
+    </span>
+  <% else %>  
+    <span class="remove_existing_record add-on btn" title="<%= t(:remove) %>">
       <%= f.hidden_field :id %>
       <a class="remove_existing_record icon-remove"></a>
       <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
-    <% end %>
-  </span>
+    </span>
+  <% end %>
 </div>
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form_file.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form_file.html.erb
index baa91244..4d58c1b0 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form_file.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form_file.html.erb
@@ -50,15 +50,17 @@
       <%= hidden_field_tag 'archive_file[archive_file_multiples_attributes][0][choose_lang][]', '' %>
     </span>
 
-    <span class="delete_file add-on btn" title="<%= t(:delete) %>">
-      <% if form_file.new_record? %>
+    <% if form_file.new_record? %>
+      <span class="delete_file add-on btn" title="<%= t(:delete_) %>">
         <a class="icon-trash"></a>
-      <% else %> 
+      </span>
+    <% else %>
+      <span class="remove_existing_record add-on btn" title="<%= t(:remove) %>">
         <%= f.hidden_field :id %>
-        <a class="remove_existing_record icon-remove"></a>
+        <a class=" icon-remove"></a>
         <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
-      <% end %>
-    </span>
+      </span>
+    <% end %>
   </div>
 </div>
 
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
index c2164c12..cfd32bc8 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
@@ -31,7 +31,7 @@
             <div class="controls">
               <div class="textarea">
                 <%= f.fields_for :context_translations do |f| %>
-	                <%= f.cktext_area locale, rows: 5, class: "input-block-level", id: "content_#{locale}", name: "content_#{locale}", :value => (@page_context.context_translations[locale] rescue nil) %>
+	                <%= f.cktext_area locale, rows: 5, class: "input-block-level", :value => (@page_context.context_translations[locale] rescue nil) %>
 	              <% end %>
               </div>
             </div>