daily commit

vendor/built_in_modules/announcement/announcement.json

@@ -1,17 +1,24 @@
-{
-  "title": "announcement",
-  "version": "0.1",
-  "organization": "Rulingcom",
-  "author": "RD dep",
-  "intro": "A simple blog……",
-  "update_info": "Some info",
-  "create_date": "11-11-2011",
-  "app_pages":  ["bulletins"],
-  "widgets": {
-    "index":["1","2","3","4","5"],
-    "bulletins_and_web_links":[]
-  },
-  "category": ["BulletinCategory"],
-  "widget_fields":["title","category","postdate"],
-  "enable_frontend": true
-}
+ {
+"app_pages":["bulletins"],
+"author":"RD dep",
+"create_date":"11-11-2011",
+"enable_frontend":true,
+"get_default_widget":{"query":"Bulletin.all","image":"image"},
+"intro":"A simple blog",
+"key":"announcement",
+"organization":"Rulingcom",
+"title":"Announcement",
+"update_info":"Some info",
+"version":"0.1",
+"widget_fields":[["title","announcement.default_widget.title"],
+                      ["bulletin_category_with_title","announcement.default_widget.bulletin_category_with_title"],
+                      ["postdate","announcement.default_widget.postdate"]],
+                      "widget_fields_link_method":{"title":{"method":"panel_announcement_front_end_bulletin_path","args":"self"},
+                      "bulletin_category_with_title":{"method":"panel_announcement_front_end_bulletins_path",
+                    "args":{"category_id":["bulletin_category","id"]}
+  }},
+"widget_options":null,
+"widget_options_fields_i18n":null,
+"widgets":{"index":["1","2"],
+"default_widget":["typeA","typeC","typeB_style2","typeB_style3","typeB_style4"]
+}}

vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb

@@ -70,13 +70,6 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
     
   end
   
-  def bulletins_and_web_links
-    @tags = AnnouncementTag.any_in(key: ['students', 'alumni', 'employee', 'guest']).asc(:order)
-    @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0]
-    @bulletins = @selected_tag.get_visible_bulletins(:postdate).available_for_lang(I18n.locale).can_display.page(params[:page]).per(5) rescue nil
-    @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links(:created_at).available_for_lang(I18n.locale).page(params[:page]).per(5) rescue nil
-  end
-  
   def reload_bulletins
     @selected_tag = AnnouncementTag.find(params[:tag_id])
     @bulletins = @selected_tag.get_visible_bulletins(:postdate).available_for_lang(I18n.locale).can_display.page(params[:page]).per(5) rescue nil

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_and_web_links.html.erb

@@ -1,23 +0,0 @@
-<div class="tag_block">
-	<ul id='bulletins_web_links_tags' class="tag_list">
-		<%= render :partial => 'tag', :collection => @tags %>
-	</ul>
-</div>
-
-<div class="news_block">
-	<h3 class="news_title2"><%= link_to t("announcement.bulletins"), panel_announcement_front_end_bulletins_path, :class => 'more' %></h3>
-	<ul id='bulletins_web_links_bulletins' class="news_list">
-		<%= render 'bulletins' if @bulletins %>
-	</ul>
-</div>
-
-<div class="links_block">
-	<h3 class="links_title"><%= t(:related_links) %></h3>
-	<ul id='bulletins_web_links_web_links' class="links_list">
-		<%= render 'web_links' if @web_links %>
-	</ul>
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "news_link" %>
-<% end %>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_and_web_links.js.erb

@@ -1,3 +0,0 @@
-$('#bulletins_web_links_tags').html("<%= j render :partial => 'tag', :collection => @tags %>")
-$('#bulletins_web_links_bulletins').html("<%= j render 'bulletins' if @bulletins %>")
-$('#bulletins_web_links_web_links').html("<%= j render 'web_links' if @web_links %>")