From 93335035453a0043b135ab7e79a75a8ffbffd32d Mon Sep 17 00:00:00 2001
From: unknown <Spen@Spen-VAIO.(none)>
Date: Fri, 10 Aug 2012 15:33:28 +0800
Subject: [PATCH] demo_site widget edit

---
 config/list.yml                                |  2 +-
 .../announcement/announcement.json             |  4 ++--
 .../front_end/bulletins/index.html.erb         | 18 +++++++++---------
 .../widget/bulletins/_index.html.erb           | 18 +++++++++---------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/config/list.yml b/config/list.yml
index 55bebb77..f723c5ff 100644
--- a/config/list.yml
+++ b/config/list.yml
@@ -37,4 +37,4 @@ widget_field_type:
   - status
   - tag
   - viewcount
-  - host
\ No newline at end of file
+  - poster
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/announcement.json b/vendor/built_in_modules/announcement/announcement.json
index a9f245f2..7d68bc1e 100644
--- a/vendor/built_in_modules/announcement/announcement.json
+++ b/vendor/built_in_modules/announcement/announcement.json
@@ -8,9 +8,9 @@
   "create_date": "11-11-2011",
   "app_pages":  ["bulletins"],
   "widgets": {
-    "index":["1","2"],
+    "index":["1","2","3","4","5"],
     "bulletins_and_web_links":[]
   },
-  "widget_fields":["title","subtitle","date","image","status"],
+  "widget_fields":["title","category","postdate"],
   "enable_frontend": true
 }
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
index 48d30d1d..8da1b143 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
@@ -33,7 +33,7 @@
 				<% elsif ff[1] == 'category' %>
 					<%= post.send("#{post.class.to_s.underscore}_#{ff[0]}").i18n_variable[I18n.locale] rescue nil %>
 				<% elsif ff[1] == 'img' %>
-					<div class="newsimg app-pic"><%= image_tag(post.image.url) %></div>
+					<div class="img app-pic"><%= image_tag(post.send(wf[0]).url) %></div>
 				<% elsif ff[1] == 'text' %>
 					<%#= post.send("#{ff[0]}[#{I18n.locale}]").html_safe %>
 					<%= post.send("#{ff[0]}")[I18n.locale].html_safe %>
@@ -49,7 +49,7 @@
 				<% elsif ff[1] == 'tag' %>
 				<% elsif ff[1] == 'viewcount' %>
 					<%= dislpay_view_count(post) %>
-				<% elsif ff[1] == 'host' %>
+				<% elsif ff[1] == 'poster' %>
 					<%= User.from_id(post.update_user_id).name rescue ''%>
 				<% end %>
 				</span>
@@ -66,7 +66,7 @@
 		<ul class="newslist">
 		<% @bulletins.each do |post| %>
 			<li class="<%= cycle('odd', '')%>">
-				<div class="newsimg app-pic"><%= image_tag(post.image.url) %></div>
+				<div class="img app-pic"><%= image_tag(post.image.url) %></div>
 				
 				<% @item.frontend_field.each do |ff|  %>
 				<span class="<%= ff[1] %>">
@@ -91,7 +91,7 @@
 				<% elsif ff[1] == 'tag' %>
 				<% elsif ff[1] == 'viewcount' %>
 					<%= dislpay_view_count(post) %>
-				<% elsif ff[1] == 'host' %>
+				<% elsif ff[1] == 'poster' %>
 					<%= User.from_id(post.update_user_id).name rescue ''%>
 				<% end %>
 				</span>
@@ -108,7 +108,7 @@
 		
 		<% @bulletins.each do |post| %>
 			<li class="<%= cycle('odd', '')%>">
-				<div class="newsimg app-pic"><%= image_tag(post.image.url) %></div>
+				<div class="img app-pic"><%= image_tag(post.image.url) %></div>
 				<div class="wrap">
 					<% @item.frontend_field.each do |ff|  %>
 					<span class="<%= ff[1] %>">
@@ -133,7 +133,7 @@
 					<% elsif ff[1] == 'tag' %>
 					<% elsif ff[1] == 'viewcount' %>
 						<%= dislpay_view_count(post) %>
-					<% elsif ff[1] == 'host' %>
+					<% elsif ff[1] == 'poster' %>
 						<%= User.from_id(post.update_user_id).name rescue ''%>
 					<% end %>
 					</span>
@@ -152,7 +152,7 @@
 		
 		<% @bulletins.each do |post| %>
 			<li class="<%= cycle('odd', '')%>">
-				<div class="newsimg app-pic"><%= image_tag(post.image.url) %></div>
+				<div class="img app-pic"><%= image_tag(post.image.url) %></div>
 				<div class="wrap">
 					<% @item.frontend_field.each do |ff|  %>
 					<span class="<%= ff[1] %>">
@@ -177,7 +177,7 @@
 					<% elsif ff[1] == 'tag' %>
 					<% elsif ff[1] == 'viewcount' %>
 						<%= dislpay_view_count(post) %>
-					<% elsif ff[1] == 'host' %>
+					<% elsif ff[1] == 'poster' %>
 						<%= User.from_id(post.update_user_id).name rescue ''%>
 					<% end %>
 					</span>
@@ -219,7 +219,7 @@
 				<% elsif ff[1] == 'tag' %>
 				<% elsif ff[1] == 'viewcount' %>
 					<%= dislpay_view_count(post) %>
-				<% elsif ff[1] == 'host' %>
+				<% elsif ff[1] == 'poster' %>
 					<%= User.from_id(post.update_user_id).name rescue ''%>
 				<% end %>
 				</span>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
index 79cbc3aa..51f48505 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
@@ -28,7 +28,7 @@
 				<% elsif wf[1] == 'category' %>
 					<%= post.send("#{post.class.to_s.underscore}_#{wf[0]}").i18n_variable[I18n.locale] rescue nil %>
 				<% elsif wf[1] == 'img' %>
-					<div class="newsimg app-pic"><%= image_tag(post.send(wf[0]).url) %></div>
+					<div class="img app-pic"><%= image_tag(post.send(wf[0]).url) %></div>
 				<% elsif wf[1] == 'text' %>
 					<%#= post.send("#{wf[0]}[#{I18n.locale}]").html_safe %>
 					<%= post.send("#{wf[0]}")[I18n.locale].html_safe %>
@@ -44,7 +44,7 @@
 				<% elsif wf[1] == 'tag' %>
 				<% elsif wf[1] == 'viewcount' %>
 					<%= dislpay_view_count(post) %>
-				<% elsif wf[1] == 'host' %>
+				<% elsif wf[1] == 'poster' %>
 					<%= User.from_id(post.update_user_id).name rescue ''%>
 				<% end %>
 				</span>
@@ -67,7 +67,7 @@
 		<ul class="newslist">
 		<% @bulletins.each do |post| %>
 			<li class="<%= cycle('odd', '')%>">
-				<div class="newsimg app-pic"><%= image_tag(post.image.url) %></div>
+				<div class="img app-pic"><%= image_tag(post.image.url) %></div>
 				
 				<% @widget_fields.each do |wf|  %>
 				<span class="<%= wf[1] %>">
@@ -92,7 +92,7 @@
 				<% elsif wf[1] == 'tag' %>
 				<% elsif wf[1] == 'viewcount' %>
 					<%= dislpay_view_count(post) %>
-				<% elsif wf[1] == 'host' %>
+				<% elsif wf[1] == 'poster' %>
 					<%= User.from_id(post.update_user_id).name rescue ''%>
 				<% end %>
 				</span>
@@ -115,7 +115,7 @@
 		
 		<% @bulletins.each do |post| %>
 			<li class="<%= cycle('odd', '')%>">
-				<div class="newsimg app-pic"><%= image_tag(post.image.url) %></div>
+				<div class="img app-pic"><%= image_tag(post.image.url) %></div>
 				<div class="wrap">
 					<% @widget_fields.each do |wf|  %>
 					<span class="<%= wf[1] %>">
@@ -140,7 +140,7 @@
 					<% elsif wf[1] == 'tag' %>
 					<% elsif wf[1] == 'viewcount' %>
 						<%= dislpay_view_count(post) %>
-					<% elsif wf[1] == 'host' %>
+					<% elsif wf[1] == 'poster' %>
 						<%= User.from_id(post.update_user_id).name rescue ''%>
 					<% end %>
 					</span>
@@ -165,7 +165,7 @@
 		
 		<% @bulletins.each do |post| %>
 			<li class="<%= cycle('odd', '')%>">
-				<div class="newsimg app-pic"><%= image_tag(post.image.url) %></div>
+				<div class="img app-pic"><%= image_tag(post.image.url) %></div>
 				<div class="wrap">
 					<% @widget_fields.each do |wf|  %>
 					<span class="<%= wf[1] %>">
@@ -190,7 +190,7 @@
 					<% elsif wf[1] == 'tag' %>
 					<% elsif wf[1] == 'viewcount' %>
 						<%= dislpay_view_count(post) %>
-					<% elsif wf[1] == 'host' %>
+					<% elsif wf[1] == 'poster' %>
 						<%= User.from_id(post.update_user_id).name rescue ''%>
 					<% end %>
 					</span>
@@ -238,7 +238,7 @@
 				<% elsif wf[1] == 'tag' %>
 				<% elsif wf[1] == 'viewcount' %>
 					<%= dislpay_view_count(post) %>
-				<% elsif wf[1] == 'host' %>
+				<% elsif wf[1] == 'poster' %>
 					<%= User.from_id(post.update_user_id).name rescue ''%>
 				<% end %>
 				</span>