From 451d73897b4c38a4c55a62494583636f3ebcfc1b Mon Sep 17 00:00:00 2001
From: chris <chris.vilayphiou@gmail.com>
Date: Thu, 1 Nov 2012 09:30:12 +0800
Subject: [PATCH] Fix bugs: 	Page content: after edit and redirect to
 index, there's a gap between the headers and the first row 	TinyMCE: the
 size of the textarea change depending on the language

---
 app/assets/javascripts/tinymce_orbit.js.erb            |  9 +++++++--
 .../panel/news/back_end/news_bulletins/_form.html.erb  | 10 ++++------
 .../page_content/back_end/page_contexts/_form.html.erb |  2 +-
 .../page_content/back_end/page_contexts/index.html.erb |  2 --
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/tinymce_orbit.js.erb b/app/assets/javascripts/tinymce_orbit.js.erb
index 364acb0e..975485a3 100644
--- a/app/assets/javascripts/tinymce_orbit.js.erb
+++ b/app/assets/javascripts/tinymce_orbit.js.erb
@@ -14,7 +14,8 @@ function load_tinymce() {
     theme_advanced_toolbar_align : "left",
     theme_advanced_statusbar_location : "bottom",
     theme_advanced_resizing : true,
-  relative_urls : false,
+    relative_urls : false,
+
     // Skin options
     skin : "o2k7",
     skin_variant : "silver",
@@ -46,7 +47,11 @@ function load_tinymce() {
 
     // Valide HTML elements
     valid_elements : '*[*]',
-    valid_children : '*[*]'
+    valid_children : '*[*]',
+
+    // Height & width
+    height : '400',
+    width : '100%'
   });
 }
 function myFileBrowser(field_name, url, type, win) {
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
index 45c4ec76..1b7e1f19 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
@@ -20,16 +20,14 @@
               	<img class="pull-left upload-picture" src="/assets/default-img.png" />
               <% end %>
           </div>
+					<span class="alert widgetInfo"><%= t("ad.widget_info_for_ad_image_size", :best_size=> "290px x 150px") %></span>
 					<div class="controls file-upload input-prepend">
-					<label class="control-label add-on btn" for="input-upload">
 						<%= t(:browse) %>
-						<%= f.file_field :image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
-					</label>
-					<span id='fu' class="file-name"></span>
+						<%= f.file_field :image, :id => "input-upload", :class => '', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
+					<!-- <span id='fu' class="file-name"></span>
 					<br>
 					<input name='fu' class="input-medium" type="text">
-					<span class="alert widgetInfo"><%= t("ad.widget_info_for_ad_image_size", :best_size=> "290px x 150px") %></span>
-					<br>
+					<br> -->
 					<% if @news_bulletin.image.file %>
 					  <%= f.check_box :remove_image %>
 					  <%= t(:delete_file) %>
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 900a6ce8..f10615f3 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
@@ -25,7 +25,7 @@
 					<%= f.label :context, t(:content) %>
 					<%= f.fields_for :context_translations do |f| %>
 						<%= I18nVariable.from_locale(locale) %>
-						<%= f.text_area locale, :style => "width:100%;height:400px;", :class => 'tinymce_textarea', :value => (@page_context.context_translations[locale] rescue nil) %>
+						<%= f.text_area locale, :style => "width:100%;", :class => 'tinymce_textarea', :value => (@page_context.context_translations[locale] rescue nil) %>
 					<% end %>
 				</div>
 				
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
index 1ab0f27a..163e9753 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
@@ -1,5 +1,3 @@
-
-<%= flash_messages %>
 <%= render 'filter' %>
 
 <table class="table main-list">