From daebaa43f8b80d1ce00a59b447c1cb848947c65a Mon Sep 17 00:00:00 2001
From: unknown <Spen@Spen-VAIO.(none)>
Date: Fri, 17 Feb 2012 19:45:48 +0800
Subject: [PATCH] update announcement & web_resource widget

---
 .../announcement/announcement.json            |  2 +-
 .../widget/bulletins/bulletins_list.html.erb  | 12 +++---
 .../widget/bulletins/index.html.erb           | 28 ++++++-------
 .../widget/bulletins_controller.rb            | 30 -------------
 .../widget/web_links_controller.rb            |  9 ++--
 .../app/models/web_resource_tag.rb            |  5 +++
 .../widget/bulletins/index.html.erb           | 42 -------------------
 .../widget/web_links/index.html.erb           | 10 +++--
 8 files changed, 39 insertions(+), 99 deletions(-)
 delete mode 100644 vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/bulletins_controller.rb
 delete mode 100644 vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/bulletins/index.html.erb

diff --git a/vendor/built_in_modules/announcement/announcement.json b/vendor/built_in_modules/announcement/announcement.json
index 76516b50..77026d91 100644
--- a/vendor/built_in_modules/announcement/announcement.json
+++ b/vendor/built_in_modules/announcement/announcement.json
@@ -7,6 +7,6 @@
   "update_info": "Some info",
   "create_date": "11-11-2011",
 	"app_pages":  ["bulletins"],
-	"widgets": ["bulletins"],
+	"widgets": ["bulletins","bulletins_list"],
 	"enable_frontend": true
 }
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_list.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_list.html.erb
index e110b5c9..99204965 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_list.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_list.html.erb
@@ -2,7 +2,6 @@
 
 <% if @bulletins and !@bulletins.nil? %>
 
-<!-- tag -->
 <div class="tag_block">
 	<ul class="tag_list">
 		<% @tags.each do |tag| %>
@@ -11,15 +10,18 @@
 	</ul>
 </div>
 
-<!-- news -->
-<div class="news_block">
-	<h3 class="news_title"><%= t('公告訊息')%></h3>
+<% @tags.each_with_index do |tag, index| %>
+<div id="news_<%= index %>" class="news_block">
+	<h3 class="news_title2"><%= t('公告訊息')%></h3>
+	<div class="news_prev">prev</div>
+	<div class="news_next">next</div>
 	<ul class="news_list">
-		<% @bulletins.each do |post| %>
+		<% tag.bulletins.each do |post| %>
 		<li><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post) %></li>
 		<% end %>
 	</ul>
 </div>
+<% end %>
 
 <% end %>
 
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 b6ef3597..8aa261ef 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
@@ -2,21 +2,19 @@
 
 <% if @bulletins and !@bulletins.nil? %>
 
-<div class="topic_news">
-<div class="topic_news2">
-	<h2 class="topic_title"><%= t('焦點新聞')%></h2>
-	<%= link_to "more+",panel_announcement_front_end_bulletins_path(), :class => "topic_note" %>
-	<ul>
-		<% @bulletins.each do |post| %>
-		<li>
-			<div class="news_img"><%= image_tag(post.image.url, :size => "290x130") if post.image.file %></div>
-			<h3 class="h3 news_title"><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post) %></h3>
-			<p class="news_wrap"><%= post.subtitle[I18n.locale] %></p>
-		</li>
-		<% end %>
-	</ul>
-</div>
-</div>
+<h2 class="topic_title"><%= t('焦點新聞')%></h2>
+<%= link_to "more+",panel_announcement_front_end_bulletins_path(), :class => "topic_note" %>
+<div class="topic_prev">previous page</div>
+<div class="topic_next">next page</div>
+<ul>
+	<% @bulletins.each do |post| %>
+	<li>
+		<div class="news_img"><%= image_tag(post.image.url, :size => "290x130") if post.image.file %></div>
+		<h3 class="h3 news_title"><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post) %></h3>
+		<p class="news_wrap"><%= post.subtitle[I18n.locale] %></p>
+	</li>
+	<% end %>
+</ul>
 
 <% end %>
 
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/bulletins_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/bulletins_controller.rb
deleted file mode 100644
index 5ba9ffc0..00000000
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/bulletins_controller.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class Panel::Announcement::Widget::BulletinsController < ObitWidgetController
-
-  def initialize
-    super
-    @app_title = NewBlog::MOUDLEAPP_TITLE
-  end
-  
-  # GET /bulletins
-  # GET /bulletins.xml
-  
-  def index
-	
-	# deadline
-  
-    @bulletin = Bulletin.where( :postdate.lte => Date.today ).desc(:is_top, :postdate).first
-
-    @bulletins = Bulletin.widget_datas
-	
-	get_categorys
-	
-  end
-  
-  
-  protected
-  
-  def get_categorys
-    @bulletin_categorys = BulletinCategory.excludes('disabled' => true)
-  end
-  
-end
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
index 9bfc0d88..ac271ea0 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
@@ -12,11 +12,14 @@ class Panel::WebResource::Widget::WebLinksController < ObitWidgetController
 	
 	# deadline
   
-    @web_link = WebLink.where( :is_hidden => false ).desc(:is_top, :name).first
+    # @web_link = WebLink.where( :is_hidden => false ).desc(:is_top, :name).first
 
-    @web_links = WebLink.widget_datas
+    @web_links = WebLink.widget_datas.limit(5)
 	
-	get_categorys
+	# get_categorys
+  	
+  	module_app = ModuleApp.first(:conditions => {:key => 'web_resource'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
 	
   end
   
diff --git a/vendor/built_in_modules/web_resource/app/models/web_resource_tag.rb b/vendor/built_in_modules/web_resource/app/models/web_resource_tag.rb
index 85f263b3..2355cb5e 100644
--- a/vendor/built_in_modules/web_resource/app/models/web_resource_tag.rb
+++ b/vendor/built_in_modules/web_resource/app/models/web_resource_tag.rb
@@ -2,4 +2,9 @@ class WebResourceTag < Tag
   
   has_and_belongs_to_many :web_links
   
+  
+  def get_visible_links(sort = :name)
+	self.web_links.where(:is_hidden => false).desc(:is_top, sort)
+  end
+
 end
\ No newline at end of file
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/bulletins/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/bulletins/index.html.erb
deleted file mode 100644
index 2c4cd153..00000000
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/bulletins/index.html.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-<% if @bulletin and !@bulletin.nil? %>
-
-<div id="col1" class="col">
-	<h1 class="h1 ini_heading col_title"><%= @bulletin.title %></h1>
-	<p class="ini_txt"><%= @bulletin.subtitle %></p>
-	<%= link_to "read more >",panel_announcement_front_end_bulletin_path(@bulletin.id) %>
-	<a class="btn" href="">read more &gt;</a>
-</div>
-
-<% end %>
-
-<% if @bulletins and !@bulletins.nil? %>
-
-<div id="col2" class="col">
-<h1 class="h1 ini_heading col_title">news</h1>
-<ul class="ini_list">
-	<% @bulletins.each do |post| %>
-	<li><span class="time"><%= post.postdate.to_s.gsub("-", "") %></span><%= link_to post.title,panel_announcement_front_end_bulletin_path(post) %></li>
-	<% end %>
-</ul>
-<%= link_to "read more >",panel_announcement_front_end_bulletins_path(), :class => "btn" %>
-<a class="btn" href="announcement">read more &gt;</a>
-</div>
-
-<div id="col2" class="col">
-<h1 class="h1 ini_heading col_title">news</h1>
-<ul class="ini_list">
-	<% @bulletins.each do |post| %>
-	<li>
-	<%= image_tag(post.image.url, :size => "160x140") if post.image.file %>
-	<h4><%= post.title %></h4>
-	<%= post.subtitle %>
-	</li>
-	<% end %>
-</ul>
-<%= link_to "read more >",panel_announcement_front_end_bulletins_path(), :class => "btn" %>
-<a class="btn" href="announcement">read more &gt;</a>
-</div>
-
-<% end %>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb
index 265b0710..8b617206 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb
@@ -2,13 +2,17 @@
 
 <% if @web_links and !@web_links.nil? %>
 
-<div class="links_block">
+<% @tags.each_with_index do |tag, index| %>
+<div id="links_<%= index %>" class="links_block">
 	<h3 class="links_title"><%= t('相關連結')%></h3>
+	<div class="links_prev">prev</div>
+	<div class="links_next">next</div>
 	<ul class="links_list">
-		<% @web_links.each do |post| %>
+		<%# tag.web_links.each do |post| %>
+		<% tag.get_visible_links(:name).each do |post| %>
 		<li><%= link_to post.name[I18n.locale], post.url, {:target => '_blank', :title => post.name[I18n.locale]} %></li>
 		<% end %>
 	</ul>
 </div>
-
+<% end %>
 <% end %>