Merge branch 'design_team' into ldap

Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb

vendor/built_in_modules/web_resource/app/models/web_link.rb

@@ -69,10 +69,10 @@ class WebLink
   protected
   
   def set_key
-    if name.new_record?
+    if name && name.new_record?
       name.key = 'name'
     end
-    if context.new_record?
+    if context && context.new_record?
       context.key = 'context'
     end
   end

vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb

@@ -13,7 +13,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.postdate') %></b>
-  <%= @bulletin.postdate %>
+  <%= display_date(@bulletin.postdate) %>
 	</li>
 	<li>
   <b><%= t('announcement.title') %></b>
@@ -50,7 +50,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.最後修改時間') %></b>
-  <%= @bulletin.updated_at %>
+  <%= display_date(@bulletin.updated_at) %>
 	</li>
 
 

vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb

@@ -13,7 +13,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.postdate') %></b>
-  <%= @bulletin.postdate %>
+  <%= display_date(@bulletin.postdate) %>
 	</li>
 	<li>
   <b><%= t('announcement.title') %></b>
@@ -50,7 +50,7 @@
 	</li>
 	<li>
   <b><%= t('announcement.最後修改時間') %></b>
-  <%= @bulletin.updated_at.strftime("%Y-%m-%d %H:%I:%S") %>
+  <%= display_date_time(@bulletin.updated_at) %>
 	</li>