Merge branch 'new_announcement_dev'

Gemfile

@@ -9,6 +9,9 @@ gem 'devise'
 gem 'exception_notification' # Send error trace
 gem 'execjs'
 gem 'jquery-rails'
+
+gem 'kaminari'
+
 gem 'mini_magick'
 gem 'mongoid'
 gem 'radius'
@@ -17,7 +20,8 @@ gem 'ruby-debug19'
 gem 'rubyzip'
 gem 'sinatra'
 gem 'sprockets'
-# gem 'therubyracer' # For linux
+#gem 'therubyracer' # For linux
+#gem 'libv8', '3.3.10.4'
 
 # Gems used only for assets and not required
 # in production environments by default.

Gemfile.lock

@@ -78,6 +78,10 @@ GEM
       railties (~> 3.0)
       thor (~> 0.14)
     json (1.6.5)
+    kaminari (0.13.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     mail (2.3.0)
@@ -211,6 +215,7 @@ DEPENDENCIES
   execjs
   factory_girl_rails
   jquery-rails
+  kaminari
   mini_magick
   mongoid
   radius

Rakefile

@@ -2,6 +2,7 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
+require 'rake/dsl_definition'
 require 'rake'
 
 PrototypeR4::Application.load_tasks

app/models/design/design.rb

@@ -20,7 +20,7 @@ class Design
   validates_presence_of :title
   validates_presence_of :author
   
-  after_save :parse_css_for_images
+  # after_save :parse_css_for_images
  
   def new_files=(*attrs)
     attrs[0].map  do |key,items_ary|   #Loop by JSs,Themes,Imgs

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

@@ -12,7 +12,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < ObitWidgetController
   
 	date_now = Time.now
 	
-    @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate)
+    @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(1)
 
 	get_categorys
   end

vendor/built_in_modules/announcement/app/models/bulletin.rb

@@ -72,7 +72,7 @@ class Bulletin
     # find(:all, :conditions => {:postdate => {"$lte" => Date.today}, deadline: nil} ).desc( :is_top, :postdate)
 	# where( :postdate.lte => date_now ).where( :deadline => nil ).desc(:is_top, :postdate)
 	# any_of({ :title => "test" },{:deadline => nil, :title => "123"})
-	any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).limit(5)
+	any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate)
 
 
   end

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb

@@ -33,18 +33,18 @@
 	</li>
 	<li>
 	<li>
+	<b><%= t('announcement.link') %></b>
+	<% @bulletin.bulletin_links.each do | blink | %>
+    <%= link_to blink.name, blink.url, :target => '_blank' %>
+	<% end %>
+	</li>
+	<li>
 	<b><%= t('announcement.file') %></b>
 	<% @bulletin.bulletin_files.each do | bfile | %>
 	<%= link_to bfile.filetitle, bfile.file.url, {:target => '_blank', :title => bfile.description} if bfile.file.file %>
 	<% end %>
 	</li>
 	<li>
-  <% if @bulletin.url? %>
-  <b><%= t('announcement.url') %></b>
-  <%= link_to @bulletin.url, @bulletin.url, :target => '_blank' %>
-  <% end %>
-	</li>
-	<li>
   <b><%= t('announcement.張貼者') %></b>
   <%= User.find(@bulletin.create_user_id).name %>
 	</li>

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb

@@ -2,6 +2,8 @@
 
 <%= flash_messages %>
 
+<%= paginate @bulletins %>
+
 <h1><%= t('bulletin.list_announcement') %></h1>
 
 

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

@@ -1,13 +1,18 @@
 
 
+<% 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">
@@ -18,3 +23,20 @@
 <%= 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 %>

vendor/built_in_modules/announcement/config/routes.rb

@@ -5,9 +5,9 @@ Rails.application.routes.draw do
       namespace :back_end do
         root :to => "bulletins#index"
         resources :bulletins
-		    resources :bulletin_categorys, :controller => 'bulletin_categorys' do
+		resources :bulletin_categorys, :controller => 'bulletin_categorys' do
-			    match "quick_edit/:bulletin_category_id" => "bulletin_categorys#quick_edit" ,:as => :quick_edit
+			match "quick_edit/:bulletin_category_id" => "bulletin_categorys#quick_edit" ,:as => :quick_edit
-		    end
+		end
       end
       namespace :front_end do
         root :to => "bulletins#index"
@@ -18,4 +18,5 @@ Rails.application.routes.draw do
       end
     end
   end
+ match "/appfront/*path" => redirect("/panel/*path")
 end