From 7c44e94285928a0c4d5d7d77d696d12e3f73533d Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Wed, 23 May 2012 11:46:19 +0800
Subject: [PATCH 1/2] Order list by created_at desc Add best image size in news
 new

---
 app/controllers/orbit_backend_controller.rb                   | 2 +-
 config/locales/zh_tw.yml                                      | 2 +-
 .../panel/announcement/back_end/bulletins_controller.rb       | 2 ++
 .../panel/announcement/back_end/bulletins/_form.html.erb      | 2 +-
 .../panel/news/back_end/news_bulletins_controller.rb          | 2 ++
 .../views/panel/news/back_end/news_bulletins/_form.html.erb   | 4 ++--
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index 339f7ede..28f99fa2 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -155,7 +155,7 @@ class OrbitBackendController< ApplicationController
 
 
   def get_viewable(object_class)
-    objects = get_objects(object_class)
+    objects = get_objects(object_class).order_by(:created_at, :desc)
     Kaminari.paginate_array(objects).page(params[:page]).per(10)
   end
 
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index e9de6f11..ea0264b7 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -36,7 +36,7 @@ zh_tw:
   submit: 送出
   sure?: 您肯定嗎?
   update: 更新
-  update: 更新失敗
+  update_failed: 更新失敗
   view: 檢視
   view_count: 查看次數
   yes_: "Yes"
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index b6566b7e..c7d46eb2 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -135,6 +135,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 	else  
   
 		@bulletin = Bulletin.new(params[:bulletin])
+    @bulletin.deadline = nil if @bulletin.deadline < @bulletin.postdate
 		
 		@bulletin.create_user_id = current_user.id
 		@bulletin.update_user_id = current_user.id
@@ -243,6 +244,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   	else
     
   		@bulletin = Bulletin.find(params[:id])
+      @bulletin.deadline = nil if @bulletin.deadline < @bulletin.postdate
   		
   		@bulletin.update_user_id = current_user.id
   		
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 05247251..c515dc65 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
@@ -15,7 +15,7 @@
 					<div  class="upload-picture">
               <!--請程式務必將圖片尺寸加入到行內裡-->
               <% if @bulletin.image %>
-              	<%= image_tag @bulletin.image, :width=> "456", :height=>'700' rescue ''%>
+              	<%= image_tag @bulletin.image rescue ''%>
               <% else %>
               	<img class="pull-left upload-picture" src="/assets/default-img.png" />
               <% end %>
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
index 46bd2f02..b725da6d 100644
--- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
+++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
@@ -136,6 +136,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
 	else  
   
 		@news_bulletin = NewsBulletin.new(params[:news_bulletin])
+    @news_bulletin.deadline = nil if @news_bulletin.deadline < @news_bulletin.postdate
 		
 		@news_bulletin.create_user_id = current_user.id
 		@news_bulletin.update_user_id = current_user.id
@@ -244,6 +245,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
   	else
     
   		@news_bulletin = NewsBulletin.find(params[:id])
+      @news_bulletin.deadline = nil if @news_bulletin.deadline < @news_bulletin.postdate
   		
   		@news_bulletin.update_user_id = current_user.id
   		
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 38c2db31..eb2a2d95 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
@@ -15,11 +15,10 @@
 					<div  class="upload-picture">
               <!--請程式務必將圖片尺寸加入到行內裡-->
               <% if @news_bulletin.image %>
-              	<%= image_tag @news_bulletin.image, :width=> "456", :height=>'700' rescue ''%>
+              	<%= image_tag @news_bulletin.image rescue ''%>
               <% else %>
               	<img class="pull-left upload-picture" src="/assets/default-img.png" />
               <% end %>
-
           </div>
 					<div class="controls file-upload input-prepend">
 					<label class="control-label add-on btn" for="input-upload">
@@ -29,6 +28,7 @@
 					<span id='fu' class="file-name"></span>
 					<br>
 					<input name='fu' class="input-medium" type="text">
+					<span class="alert widgetInfo"><%= t("admin.ad.widget_info_for_ad_image_size", :best_size=> "290px x 150px") %></span>
 					<br>
 					<% if @news_bulletin.image.file %>
 					  <%= f.check_box :remove_image %>

From 006b84f6a1dc7e806940b433cf4af92b7775dc38 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Wed, 23 May 2012 12:06:09 +0800
Subject: [PATCH 2/2] Ray's fix for ie

---
 app/assets/stylesheets/style.css.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb
index fa79084f..0a3ba76a 100644
--- a/app/assets/stylesheets/style.css.erb
+++ b/app/assets/stylesheets/style.css.erb
@@ -722,6 +722,9 @@
 	box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1);
 }
 
+#category_id, #module_app_id {
+	width: auto;
+}
 
 [class^="icons-"] {
 	display: inline-block;