fix ntue new member default non-administrator and announcement image size & file name cannot be null

Conflicts:

	app/views/front/show_banner.html.erb
	public/static/kernel.js

app/assets/javascripts/tinymce_orbit.js.erb

@@ -15,6 +15,11 @@ function load_tinymce() {
     theme_advanced_statusbar_location : "bottom",
     theme_advanced_resizing : true,
 
+    // Domain Absolute URLs
+    relative_urls : false,
+    remove_script_host : false,
+    document_base_url: window.location.protocol + '//' + window.location.host,
+
     // Skin options
     skin : "o2k7",
     skin_variant : "silver",

app/assets/stylesheets/mobile/orbit-mobile.css.erb

@@ -101,8 +101,8 @@ div[data-role="page"] {
 	border: none;
 	z-index: 50;
 	/*background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#545b60), to(#191a1c));*/
-	background-image: -webkit-linear-gradient(top, #5282A6, #133757);
-	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
+	background-image: -webkit-linear-gradient(top, #6D35AF, #391C69);
+	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 #AE73F5, 0 -1px 0 rgba(31, 32, 36, 1) inset;
 }
 .header h1.ui-title {
 	margin: 8px 30%;
@@ -116,9 +116,9 @@ div[data-role="page"] {
 	margin-left: -15px;
 	font-size: 20px;
 	/*color: #727272;*/
-	color: #7CA6C5;
+	color: #C5A7D3;
 	/*background-color: #252525;*/
-	background-color: #144366;
+	background-color: #38177F;
 	border-radius: 0 0 5px 5px;
 	height: 15px;
 	line-height: 16px;
@@ -135,14 +135,14 @@ div[data-role="page"] {
 	background-image: none;
 }
 .header .ui-btn-up-a {
-	border: 1px solid #133547;
-	background-color: #0C4C64;
+	border: 1px solid #7220A0;
+	background-color: #9B2DCF;
 	background-image: -webkit-gradient(linear, left top, left bottom, from( #0D6691 ), to( #0E3A4B ));
-	background-image: -webkit-linear-gradient( #0D6691 , #0E3A4B );
-	background-image: -moz-linear-gradient( #0D6691 , #0E3A4B );
-	background-image: -ms-linear-gradient( #0D6691 , #0E3A4B );
-	background-image: -o-linear-gradient( #0D6691 , #0E3A4B );
-	background-image: linear-gradient( #0D6691 , #0E3A4B );
+	background-image: -webkit-linear-gradient(#9B1DF0, #5F2879);
+	background-image: -moz-linear-gradient(#9B1DF0, #5F2879);
+	background-image: -ms-linear-gradient(#9B1DF0, #5F2879);
+	background-image: -o-linear-gradient(#9B1DF0, #5F2879);
+	background-image: linear-gradient(#9B1DF0, #5F2879);
 }
 .header h1 img {
 	height: 30px;

app/controllers/default_widget_controller.rb

@@ -12,24 +12,20 @@ class DefaultWidgetController< OrbitWidgetController
 
   def query_for_default_widget
     @ori_class_name =  @default_widget["query"].split('.')[0]
-    @ori_query =  @default_widget["query"]
-    result = nil
-    result_objects = nil
-    result =  eval(@ori_query)
+    @result =  eval(@default_widget["query"])
     if !params["tag_id"].blank?
       if params["category_id"].blank? #has tag no cate
-        result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
       else #has tag and cate
-        result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
-        result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
+        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
       end
     elsif params["category_id"].blank?  #no tag no cate
-      
     else #no tag has cate
-      result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
+      
+      @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
     end
-
-    eval("result.#{@default_widget[:sorting_query]}")
+    eval("@result.#{@default_widget[:sorting_query]}")
   end
 
   def search_result

app/controllers/front_controller.rb

@@ -73,7 +73,7 @@ class FrontController < ApplicationController
     res << " active" if (current_page.id.eql?(page.id) || current_page.descendant_of?(page))
     res << "'>"
     root = "/"
-    res << "<a href='#{(page.class.to_s.eql?('Page') ? root + page.path : page.url)}'><span>#{page.title}</span></a>"
+    res << "<a href='#{(page.class.to_s.eql?('Page') ? root + page.path : page.url)}' target=#{(page.class.to_s.eql?('Page') ? '_self' : '_blank')} ><span>#{page.title}</span></a>"
     if page.visible_children.size > 0 && current < menu.levels
       res << "<span class='dot'></span>"
       res << menu_level(page, current_page, current + 1, menu)

app/helpers/application_helper.rb

@@ -220,7 +220,7 @@ module ApplicationHelper
       javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
     end
     javascripts << "<script type='text/javascript' src='/assets/lib/jquery.preload-min.js'></script>\n"
-    javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
+    # javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
     javascripts << "<script type='text/javascript' src='/static/kernel.js'></script>\n"
     # javascripts << "<script type='text/javascript' src='/assets/social-share-button.js'></script>\n"
     javascripts << "<script type='text/javascript' src='/assets/lib/social-share-button.js'></script>\n"

app/models/user/user.rb

@@ -7,7 +7,7 @@ class User
   
   mount_uploader :avatar, AvatarUploader
   
-  field :admin, :type => Boolean, :default => true
+  field :admin, :type => Boolean, :default => false
   field :active_role
   field :user_id
   field :sid
@@ -42,7 +42,6 @@ class User
 
   before_create :initialize_desktop
   before_save :rebuild_status_record
-  before_save :save_roles
   scope :remote_account, where(:nccu_id.ne => nil)
   scope :not_guest_user, all_of(:name.ne => "guest")
 
@@ -89,9 +88,9 @@ class User
     var[:id].each do |id,val|  
       # binding.pry if id == '5052c5b22b5c49ab02000004'
       if (val=="true")
-        self.roles = self.roles.reject{|t| t.id.to_s==id}
+        self.role_ids.reject!{|t| t.to_s == id}
       elsif(val=="false")
-        self.roles << Role.find(id)
+        self.role_ids += Array(id)
       end
     end
   end
@@ -106,9 +105,9 @@ class User
       # binding.pry if id == '5052c5b22b5c49ab02000004'
 	  
       if ( self.roles.include?(@roid) == false or val=="true")
-        self.sub_roles = self.sub_roles.reject{|t| t.id.to_s==id}
+        self.sub_role_ids.reject!{|t| t.to_s == id}
       elsif(val=="false")
-        self.sub_roles << SubRole.find(id)
+        self.sub_role_ids += Array(id)
       end
 	  
     end
@@ -273,10 +272,6 @@ class User
   end
   
   protected
-    def save_roles
-      # self.roles = self.sub_roles.collect{|t| t.role}.uniq
-      self.roles = self.roles.uniq
-    end
 
   def rebuild_status_record
     self.status_record = {}

app/views/front/show_banner.html.erb

@@ -1,19 +1,3 @@
-<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>
-<script type='text/javascript'>
-  jQuery(function( $ ){     
-
-      $('#slideshow-<%= @ad_banner.title.dehumanize %>').cycle({
-        delay: -1000,
-        fx: "<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>",
-        timeoutFn: getTimeout,
-        pager: '.banner_nav-<%= @ad_banner.title.dehumanize %>',
-        pagerAnchorBuilder: function(idx, slide) {
-          return "<li><a href='#'></a></li>";
-        }
-      });
-  });
-</script>
-
 <div style='position:relative'>
   <ul id='banner_nav' class='clear banner_nav-<%= @ad_banner.title.dehumanize %>'></ul>
   <div id='slideshow-<%= @ad_banner.title.dehumanize %>' class='slideshow'>
@@ -23,4 +7,15 @@
       <% end %>
     <% end %>
   </div>
-</div>
+</div>
+<script type='text/javascript'>
+  var banner = {"banner_name":"#slideshow-<%= @ad_banner.title.dehumanize %>",
+                "banner_fx":"<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>",
+                "banner_pager":".banner_nav-<%= @ad_banner.title.dehumanize %>",
+                "image_loaded":0,
+                "time_to_next":<%= @ad_banner.transition_msec %>,
+                "current":0,
+                "best_size": "<%= @ad_banner.best_size %>"
+              };
+  banners.push(banner);
+</script>

app/views/front/show_page_sub_menu.html.erb

@@ -4,7 +4,7 @@
     <ul class='list'>
       <% @menu_page.visible_children.each do |child| %>
         <li class="<%= @page_id.eql?(child.id) ? 'active' : nil %>">
-          <a href="<%= (child.class.to_s.eql?('Page') ? '/' + child.path : child.url) %>"><%= child.title %></a>
+          <a href="<%= (child.class.to_s.eql?('Page') ? '/' + child.path : child.url) %>" <%= "target=_blank" if child.class.to_s.eql?('Page').blank? %> ><%= child.title %></a>
         </li>
       <% end %>
     </ul>

app/views/mobile/dialog_contact.mobile.erb

@@ -3,9 +3,5 @@
 <% end %>
 
 <ul>
-  <li>總機電話：<a href="tel:+886229393091">02-29393091</a></li>
-  <li>傳真：02-29379611</li>
-  <li>緊急重大事件通聯窗口：校內分機 66119、66110</li>
-  <li>總值日室：<a href="tel:+88229387132">02-29387132</a></li>
-  <li>駐警衛室：<a href="tel:+88229387129">02-29387129</a></li>
+  <li>電話：<a href="tel:+886227321104">+886-2-2732-1104</a> <a href="tel:+886266396688">+886-2-6639-6688</a></li>
 </ul>

app/views/mobile/map.mobile.erb

@@ -5,6 +5,6 @@
 <div id='map_canvas'></div>
 
 <script type='text/javascript'>
-  var $map_center = "24.987449, 121.576117"
+  var $map_center = "25.024562,121.544611"
   var $map_zoom = 17
 </script>

lib/parsers/parser_front_end.rb

@@ -32,13 +32,7 @@ module ParserFrontEnd
         ret = ''
         part = PagePart.find(front['part_id']) if front['part_id']
         ret << eval("\"#{front['path']}\"") rescue ''
-        args.each do |index,arg|
-          if index=="tag_id" || index=="category_id"
-            ret << (ret.include?("?") ? "&#{index}[]=#{arg}": "?#{index}[]=#{arg}" )
-            else
-            ret << (ret.include?("?") ? "&#{index}=#{arg}": "?#{index}=#{arg}" )    
-          end
-        end if args
+        ret << (ret.include?("?") ? "&#{args.to_param}" : "?#{args.to_param}") if args
         fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div class='dymanic_load widget' path='#{ret}'></div>")
       end
       front.swap(fragment)

lib/tasks/migrate.rake

@@ -326,4 +326,44 @@ namespace :migrate do
     `mongo #{Mongoid.config.database.name} --eval "db.tags.remove({_type: {$ne: 'Tag'}})"`
   end
 
+  task :add_missing_user_link => :environment do
+    User.all.each do |user|
+      user.role_ids.uniq!
+      user.sub_role_ids.uniq!
+      user.save
+      user.roles.each do |role|
+        unless role.user_ids.include?(user.id)
+          role.user_ids << user.id
+          role.save
+        end
+      end
+      user.sub_roles.each do |sub_role|
+        unless sub_role.user_ids.include?(user.id)
+          sub_role.user_ids << user.id
+          sub_role.save
+        end
+      end
+    end
+    Role.all.each do |role|
+      role.user_ids.uniq!
+      role.save
+      role.users.each do |user|
+        unless user.role_ids.include?(role.id)
+          user.role_ids << role.id
+          user.save
+        end
+      end
+    end
+    SubRole.all.each do |sub_role|
+      sub_role.user_ids.uniq!
+      sub_role.save
+      sub_role.users.each do |user|
+        unless user.sub_role_ids.include?(sub_role.id)
+          user.sub_role_ids << sub_role.id
+          user.save
+        end
+      end
+    end
+  end
+
 end

public/static/kernel.js

@@ -1,45 +1,72 @@
-$(document).ready(function() {
-	
-	$.each($(".dymanic_load"),function(){
-		if($(this).attr("path")==''){$(this).html("App setting Failed");} 
-		
-		if($(this).attr("path")!=''){
-				 ajax_load_proc($(this),$(this).attr("path"));
-				} 
-			}
-			);
-	$("#main_content").addClass("module");
-	});
+var banners = [];
+var banner_index = 0;
+$q = jQuery;
+$q.getScript('/static/jquery.cycle.all.latest.js');
 
-function ajax_load_proc(wapper,url){
-	$.get(encodeURI(url), {}, function(respText,textSta,XML){ 
-			if (textSta == 'success') {
-				wapper.html(respText);	
-			};
-			if(textSta == 'error')
-				wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
-	});
+$(document).ready(function() {
+    $.each($(".dymanic_load"),function(){
+        if($(this).attr("path")==''){$(this).html("App setting Failed");} 
+        if($(this).attr("path")!=''){
+            if($(this).attr("path").indexOf("show_banner")>0){
+                    ajax_load_proc($(this),$(this).attr("path"),"true");         
+            }else{
+                    ajax_load_proc($(this),$(this).attr("path"),$(this).attr("path"));
+            }
+        }});
+    $("#main_content").addClass("module");
+});
+
+function ajax_load_proc(wapper,url,isBanner){
+    $.get(encodeURI(url), {}, function(respText,textSta,XML){ 
+        if (textSta == 'success') {
+            if(isBanner=="true"){
+                wapper.html(respText);
+                var banner = banners[banner_index];
+                if($(banner.banner_name+" img").length>1){
+                	$(banner.banner_name+" > img").each(function(){
+	                        $(this).load(function(){ banner.image_loaded++; });
+	                });
+	                BannerCycle(banner_index);
+                }
+                banner_index++;
+            }else{
+                wapper.html(respText);
+            }        
+        };
+        if(textSta == 'error')
+                wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
+    });
 }
 
-// Ad Banner FX code [start]
-function getTimeout() { 
-    return $(this).attr('time_to_next'); 
-} 
+function BannerCycle(banner_index){
+    var banner = banners[banner_index];
+    if (banner.image_loaded==$(banner.banner_name+" img").length){
+        $q(banner.banner_name).cycle({
+            delay: -1000,
+            fx: banner.banner_fx,
+            timeout: banner.time_to_next,
+            pager: banner.banner_pager,
+            pagerAnchorBuilder: function(idx, slide) { return "<li><a href='#'></a></li>"; }
+         });
+    }else{
+            setTimeout("BannerCycle("+banner_index+")",500);
+    }
+}
 
 $(document).ready(function() { 
-	$(document).on('click', '.slideshow img', function()
-	{
-		if($(this).attr('link_url')!='')
-		{
-			if($(this).attr('link_open')=='new_window')
-			{
-				window.open($(this).attr('link_url'));
-			} 
-			else
-			{
-				document.location.href=$(this).attr('link_url')
-			}
-		}
-	})
+        $(document).on('click', '.slideshow img', function()
+        {
+                if($(this).attr('link_url')!='')
+                {
+                        if($(this).attr('link_open')=='new_window')
+                        {
+                                window.open($(this).attr('link_url'));
+                        } 
+                        else
+                        {
+                                document.location.href=$(this).attr('link_url')
+                        }
+                }
+        })
 });
-//    Ad Banner FX code [end]
+//    Ad Banner FX code [end]

vendor/built_in_modules/announcement/app/assets/stylesheets/announcement/bulletins_and_web_links.css

@@ -0,0 +1,78 @@
+
+.mega_tab_block {
+    clear: both;
+    position: relative;
+}
+
+.mega_tab_block h3 {
+    font: 22px/100% 'arial',sans-serif;
+    margin: 0 0 10px;
+    padding: 0;
+}
+
+.mega_tab_block .pagination {
+    float: left;
+    height: auto;
+    margin: 10px 0 0;
+    width: auto;
+}
+.mega_tab_block .pagination a {
+    background: none repeat scroll 0 0 #EEEEEE;
+    display: block;
+    float: left;
+    margin: 0 5px 0 0;
+    padding: 10px;
+}
+
+
+.tag_block {
+    clear: both;
+    margin: 0 0 20px;
+    position: relative;
+}
+.mega_tab_block .tag_list {
+    background: none repeat scroll 0 0 #EEEEEE;
+    margin: 0;
+    overflow: hidden;
+    padding: 0 0 0 5px;
+}
+.mega_tab_block .tag_list li {
+    float: left;
+    list-style: none outside none;
+}
+.mega_tab_block .tag_list li a {
+    background: none repeat scroll 0 0 #DDDDDD;
+    float: left;
+    margin: 0 5px 0 0;
+    padding: 10px;
+}
+
+.news_block {
+    clear: both;
+    margin: 0 0 20px;
+    overflow: hidden;
+    position: relative;
+}
+.mega_tab_block .news_list {
+    margin: 0;
+    padding: 0;
+}
+.mega_tab_block .news_list li {
+    list-style: none outside none;
+    padding: 5px 0;
+}
+
+
+.links_block {
+    clear: both;
+    overflow: hidden;
+    position: relative;
+}
+.mega_tab_block .links_list {
+    margin: 0;
+    padding: 0;
+}
+.mega_tab_block .links_list li {
+    list-style: none outside none;
+    padding: 5px 0;
+}

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

@@ -9,12 +9,12 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
 #     @module_app = ModuleApp.where(:title=>'Announcement').first
 #   end
 # =======
-  before_filter :for_app_manager,:except => [:index,:get_categorys_json,:get_bulletins_json]
+  before_filter :for_app_manager,:except => [:index,:get_categorys_json,:get_bulletins_json, :get_bulletin_categories]
 
 
   before_filter :force_order_for_visitor,:only=>[:index,:get_categorys_json,:get_bulletins_json]
-  before_filter :force_order_for_user,:except => [:index,:get_categorys_json,:get_bulletins_json]
-  before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json,:get_bulletins_json]
+  before_filter :force_order_for_user,:except => [:index,:get_categorys_json,:get_bulletins_json, :get_bulletin_categories]
+  before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json,:get_bulletins_json, :get_bulletin_categories]
 
   def index
     @bulletin_categorys = get_categories_for_index("BulletinCategory")
@@ -53,6 +53,25 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
     render :json => JSON.pretty_generate(data)
   end
 
+  def get_bulletin_categories
+    I18n.locale = params[:locale] || :zh_tw
+    @categories = BulletinCategory.all.order_by(:title, :asc)
+    respond_to do |format|
+      format.json {
+        custom_categories = @categories.inject([]) do |data, category|
+          data << {
+            title: category.title,
+            link_html: "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletins_path(category_id: category.id, locale: I18n.locale)}",
+            link_json: "#{request.protocol}#{request.host_with_port}#{get_bulletins_panel_announcement_back_end_bulletins_path(category_id: category.id, locale: I18n.locale, format: 'json')}",
+            link_rss: "#{request.protocol}#{request.host_with_port}#{get_bulletins_panel_announcement_back_end_bulletins_path(category_id: category.id, locale: I18n.locale, format: 'rss')}"
+          }
+        end
+        render json: JSON.pretty_generate(custom_categories)
+      }
+      format.rss {}
+    end
+  end
+
   def get_bulletins_json
     bulletin = BulletinCategory.find(params[:bulletin_category_id]).bulletins
     p bulletin

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

@@ -7,8 +7,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   #  before_filter :for_admin_only,:only => [:]
   #  before_filter :for_app_manager,:only => [:index,:show,] 
   before_filter :force_order_for_visitor,:only=>[:index,:show,:get_sorted_and_filtered_bulletins]
-  before_filter :force_order_for_user,:except => [:index,:show,:get_sorted_and_filtered_bulletins]
-  before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_bulletins]
+  before_filter :force_order_for_user,:except => [:index,:show,:get_sorted_and_filtered_bulletins, :get_bulletins]
+  before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_bulletins, :get_bulletins]
 
   before_filter :only => [ :new,:create,:edit,:update,:create] do |controller|
     controller.get_categorys('BulletinCategory')
@@ -23,6 +23,9 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
 
   def index
+
+    email_group_data
+
     # @bulletins = Bulletin.all
     # @bulletins = Bulletin.desc("postdate desc")
     get_categorys('BulletinCategory',params[:bulletin_category_id])
@@ -116,6 +119,9 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # POST /bulletins
   # POST /bulletins.xml
   def create
+
+    email_group_data
+    
     @tags = get_tags
     if params[:bulletin_link]
 
@@ -221,6 +227,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
   def update
 
+    email_group_data
+
       @bulletin = Bulletin.find(params[:id])
 
       # @bulletin.image.clear if params[:bulletin][:image_del] == '1'
@@ -312,6 +320,48 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     redirect_to panel_announcement_back_end_bulletins_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end
 
+  # ================================================================
+  # language:
+  #   - default: zh_tw
+  #   - specify language: locale=[string]
+  # category:
+  #   - default: no category
+  #   - specify: category_id=[ID]
+  # pagination:
+  #   - default: 10
+  #   - specify the number of results: per=[number]
+  #   - specify the page: page=[number]
+  # ================================================================
+  def get_bulletins
+    I18n.locale = params[:locale] || :zh_tw
+    bulletins = params[:category_id] ? Bulletin.where(bulletin_category_id: params[:category_id]).order_by(:created_at, :desc) : Bulletin.all.order_by(:created_at, :desc)
+    bulletins = bulletins.reject{|b| b.title_translations[I18n.locale.to_s].blank?}
+    @bulletins = Kaminari.paginate_array(bulletins).page(params[:page]).per(params[:per] || 10)
+
+    respond_to do |format|
+      format.json { 
+        custom_bulletins = @bulletins.inject([]) do |data, bulletin|
+          deadline = bulletin.deadline.nil? ? t(:no_deadline) : display_date_time(bulletin.deadline)
+          image_url = "#{'/' unless bulletin.image.url.start_with?('/')}#{bulletin.image.url}"
+          data << {
+            title: bulletin.title,
+            link: "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletin_path(bulletin, category_id: bulletin.bulletin_category.id, locale: I18n.locale)}",
+            image: "#{request.protocol}#{request.host_with_port}#{image_url}",
+            category: bulletin.bulletin_category.title,
+            description: bulletin.subtitle,
+            postdate: display_date_time(bulletin.postdate),
+            deadline: deadline,
+            tag: bulletin.sorted_tags.map{|tag| tag.name}
+          }
+        end
+        render json: JSON.pretty_generate(custom_bulletins)
+      }
+      format.rss  { 
+        @category = BulletinCategory.find(params[:category_id]) rescue nil
+      }
+    end
+  end
+
 
   protected
 

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

@@ -66,14 +66,75 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
     
   end
   
+  def bulletins_and_web_links
+  
+    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
+    
+    @title = @part.title_translations[I18n.locale.to_s]
+    
+    if !@part.blank? and @part.widget_data_count
+      @page_num = @part.widget_data_count
+    else
+      @page_num = 5
+    end
+
+    date_now = Time.now
+
+    if !params[:tag_id].blank?
+      @tags = Tag.any_in(:_id => params[:tag_id]).asc(:created_at)
+    elsif params[:tag_id].blank? and !@part.tag.blank?
+      @tags = Tag.any_in(:_id => @part.tag).asc(:created_at)
+    else
+      @ModuleApp_b = ModuleApp.first(:conditions => {:key=>'announcement'})
+      @tags = Tag.where(:module_tag_id => @ModuleApp_b.id).asc(:created_at)
+    end
+
+    @selected_tag = Tag.find(params[:id]).first rescue @tags[0]
+
+    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => @selected_tag.id.to_s, :is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate).page(params[:page]).per(@page_num) rescue nil
+
+    if @part.widget_style == 'bulletins_and_web_links'
+      @ModuleApp_w = ModuleApp.first(:conditions => {:key=>'web_resource'})
+      @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp_w.id})
+      @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
+    end
+    
+  end
+  
   def reload_bulletins
-    @selected_tag = Tag.find(params[:tag_id])
-    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => params[:tag_id]).where(:is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, sort).page(params[:page]).per(5) rescue nil
+  
+    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
+    
+    @title = @part.title_translations[I18n.locale.to_s]
+    
+    if !@part.blank? and @part.widget_data_count
+      @page_num = @part.widget_data_count
+    else
+      @page_num = 5
+    end
+    
+    date_now = Time.now
+
+    @selected_tag = Tag.find(params[:tag_id]).first
+    @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => @selected_tag.id.to_s, :is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, :postdate).page(params[:page]).per(@page_num) rescue nil
   end
   
   def reload_web_links
-    @selected_tag = Tag.find(params[:tag_id])
-    @web_links = WebLink.where(:name => @selected_tag.name).where(:is_hidden => false).desc(:is_top, sort).available_for_lang(I18n.locale).page(params[:page]).per(5) rescue nil
+  
+    @part = PagePart.find(params[:part_id]) if !params[:part_id].blank?
+    
+    if !@part.blank? and @part.widget_data_count
+      @page_num = @part.widget_data_count
+    else
+      @page_num = 5
+    end
+    
+    date_now = Time.now
+
+    @selected_tag = Tag.find(params[:tag_id]).first
+    @ModuleApp = ModuleApp.first(:conditions => {:key=>'web_resource'})
+    @link_selected_tag = Tag.first(:conditions => {:name => @selected_tag.name, :module_tag_id => @ModuleApp.id})
+    @web_links = WebLink.where(:tagged_ids => @link_selected_tag.id.to_s, :is_hidden => false).desc(:is_top,:created_at).available_for_lang(I18n.locale).page(params[:page]).per(@page_num) rescue nil
   end
 
   def bulletins_side_bar

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

@@ -11,4 +11,14 @@ class BulletinFile
   
   belongs_to :bulletin
 
+  validate :check_file_title
+
+  private
+
+  def check_file_title
+    if self.title.blank?
+      errors.add( :file,  I18n.t("announcement.file_name_not_null"))
+    end
+  end
+
 end

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/get_bulletin_categories.rss.builder

@@ -0,0 +1,16 @@
+xml.instruct! :xml, :version => "1.0" 
+xml.rss :version => "2.0" do
+  xml.channel do
+    xml.title t('announcement.announcement') + ' ' + t('announcement.categories')
+    xml.link "#{request.protocol}#{request.host_with_port}#{get_bulletin_categories_panel_announcement_back_end_bulletin_categorys_path(format: 'rss')}"
+
+    @categories.each do |category|
+      xml.item do
+        xml.title category.title
+        xml.pubDate category.created_at.to_s(:rfc822)
+        xml.link "#{request.protocol}#{request.host_with_port}#{get_bulletins_panel_announcement_back_end_bulletins_path(category_id: category.id, locale: I18n.locale, format: 'rss')}"
+        xml.guid "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletins_path(category_id: category.id)}"
+      end
+    end
+  end
+end

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

@@ -22,7 +22,7 @@
               	<img class="pull-left upload-picture" src="/assets/default-img.png" />
               <% end %>
           </div>
-					<span class="alert widgetInfo"><%= t("ad.widget_info_for_ad_image_size", :best_size=> "290px x 150px") %></span>
+					<span class="alert widgetInfo"><%= t("ad.widget_info_for_ad_image_size", :best_size=> "290px x 230px") %></span>
 					<div class="controls file-upload input-prepend">
 						<%= t(:browse) %>
 						<%= f.file_field :image, :id => "input-upload", :class => '', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
@@ -278,32 +278,29 @@
                     <div id="content-box">
                         <hr />
 
-												<%#= f.datetime_picker :email_sentdate, :picker_type => 'separated', :label => t("announcement.email_sentdate") %>
-												
-												<br /> 
+										
+						<br /> 
 
-				                <%= f.label :email_group ,t("announcement.email_group")%>
-				                <div class="form-inline">
-				                    <ul class="nav nav-pills">
-														<% @email_group_data.collect do |k,v| %>
-															<li class="pull-left">
-															<%= check_box_tag 'bulletin[email_group][]', k, (@bulletin.email_group.nil? ?  false : @bulletin.email_group.include?(k)), :id => "field-#{k}" %>
-															<label for="field-<%= k %>"><%= v["name"] %></label>
-															<%= hidden_field_tag 'bulletin[email_group][]', '' %>
-															</li>
-														<% end %>
-				                    </ul>
-				                </div>
+		                <%= f.label :email_group ,t("announcement.email_group")%>
+		                <div class="form-inline">
+		                    <ul class="nav nav-pills">
+								<% @email_group_data.collect do |k,v| %>
+									<li class="pull-left">
+									<%= check_box_tag 'bulletin[email_group][]', k, (@bulletin.email_group.nil? ?  false : @bulletin.email_group.include?(k)), :id => "field-#{k}" %>
+									<label for="field-<%= k %>"><%= v["name"] %></label>
+									<%= hidden_field_tag 'bulletin[email_group][]', '' %>
+									</li>
+								<% end if !@email_group_data.blank? %>
+		                    </ul>
+		                </div>
 
 
-										    <%= f.label :other_mailaddress ,"#{t("announcement.other_mailaddress")}(#{t("announcement.other_mailaddress_note")})"%>
-												<%= f.text_area :other_mailaddress, :class=>"span12", :cols=>"25", :rows=>"10" %>
+					    <%= f.label :other_mailaddress ,"#{t("announcement.other_mailaddress")}(#{t("announcement.other_mailaddress_note")})"%>
+						<%= f.text_area :other_mailaddress, :class=>"span12", :cols=>"25", :rows=>"10" %>
 
                     </div>
 
 
-                    
-
                 </div>
             </div>
         </div>

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

@@ -1,5 +1,7 @@
 <% # encoding: utf-8 %>
 
+<%= f.error_messages %>
+
 <tr id="<%= "bulletin_file_#{form_bulletin_file.id}" if !form_bulletin_file.new_record? %>" class='list_item'>
   <td>
     <div class="control-group">

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/get_bulletins.rss.builder

@@ -0,0 +1,21 @@
+xml.instruct! :xml, :version => "1.0" 
+xml.rss :version => "2.0" do
+  xml.channel do
+    if @category
+      xml.title @category.title
+    else
+      xml.title t('announcement.announcement')
+    end
+    xml.link "#{request.protocol}#{request.host_with_port}#{get_bulletins_panel_announcement_back_end_bulletins_path(bulletin_category_id: @category.try(:id), format: 'rss')}"
+
+    @bulletins.each do |bulletin|
+      xml.item do
+        xml.title bulletin.title
+        xml.pubDate bulletin.postdate.to_s(:rfc822)
+        xml.description bulletin.subtitle
+        xml.link "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletin_path(bulletin, category_id: bulletin.bulletin_category.id, locale: I18n.locale)}"
+        xml.guid "#{request.protocol}#{request.host_with_port}#{panel_announcement_front_end_bulletin_path(bulletin)}"
+      end
+    end
+  end
+end

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

@@ -1,10 +1,10 @@
 <% @bulletins.each do |bulletin| %>
 	<li>
-		<%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id , :tag_id => @selected_tag.id )  %>
+		<%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category_id , :part_id => params[:part_id], :tag_id => [@selected_tag.id] )  %>
 	</li>
 <% end %>
 
 <div class='pagination'>
-	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @bulletins, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @bulletins, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_bulletins', :part_id => params[:part_id], :tag_id => [@selected_tag.id]}, :remote => true, :class => 'next' %>
 </div>

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

@@ -1,3 +1,3 @@
 <li>
-	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
+	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:inner=>true, :id => [tag.id], :part_id=>params[:part_id]), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
 </li>

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

@@ -5,6 +5,6 @@
 <% end %>
 
 <div class='pagination'>
-	<%= link_to_previous_page @web_links, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
-	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
+	<%= link_to_previous_page @web_links, 'Previous Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'previous' %>
+	<%= link_to_next_page @web_links, 'Next Page', :params => {:controller => 'widget/bulletins', :action => 'reload_web_links', :part_id => params[:part_id], :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
 </div>

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

@@ -0,0 +1,36 @@
+<div class="mega_tab_block">
+
+	<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' %>
+			<%= link_to @title, panel_announcement_front_end_bulletins_path, :class => 'more' %>
+		</h3>
+		<ul id='bulletins_web_links_bulletins' class="news_list">
+			<%= render 'bulletins' if @bulletins %>
+		</ul>
+	</div>
+
+	<% if @part.widget_style == 'bulletins_and_web_links' %>
+
+	<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>
+
+	<% end %>
+
+</div>
+
+<% content_for :page_specific_javascript do %>
+	<%= javascript_include_tag "news_link" %>
+<% end %>
+
+<%= stylesheet_link_tag "announcement/bulletins_and_web_links" %>

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

@@ -0,0 +1,3 @@
+$('#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 %>")

vendor/built_in_modules/announcement/config/locales/en.yml

@@ -25,6 +25,7 @@ en:
     file: Attachment
     file_description: File Description
     file_name: File Name
+    file_name_not_null: Name cannot be null
     frontend:
       bulletins: Announcement front-end
       search_result: Search result
@@ -36,7 +37,7 @@ en:
     update_bulletin_category_success: Update Category Successfully
     url: URL
     widget:
-      bulletins_and_web_links: Bulletins and Web Resources
+      bulletins_and_web_links: Differential Nav.
       index: Index
       search: Search
     email_eminder: Email Reminder

vendor/built_in_modules/announcement/config/locales/zh_tw.yml

@@ -25,6 +25,7 @@ zh_tw:
     file: 附加檔案
     file_description: 檔案描述
     file_name: 檔案名稱
+    file_name_not_null: 名稱不得為空值
     frontend:
       bulletins: 公告前台
       search_result: 搜尋結果頁
@@ -36,7 +37,7 @@ zh_tw:
     update_bulletin_category_success: 更新類別成功
     url: 連結位置
     widget:
-      bulletins_and_web_links: 索引
+      bulletins_and_web_links: 分眾頁籤
       index: 索引
       search: 搜尋
     email_eminder: 寄送提醒

vendor/built_in_modules/announcement/config/routes.rb

@@ -17,6 +17,7 @@ Rails.application.routes.draw do
             get 'load_quick_edit'
           end
           collection do
+            get "get_bulletins"
             post "preview"
             put "preview"
             get 'delete'
@@ -27,6 +28,7 @@ Rails.application.routes.draw do
 
         resources :bulletin_categorys do
           collection do
+            get "get_bulletin_categories"
             get 'get_categorys_json'
           end
           # if want to use json

vendor/built_in_modules/announcement/init.rb

@@ -30,13 +30,13 @@ module Announcement
     widgets do
       default_widget do
 	  sorting 'desc(:postdate)'
-        query 'Bulletin.can_display.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
+        query 'Bulletin.can_display.available_for_lang(I18n.locale).any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
         enable ["typeA","typeB_style3","typeC"]
         image :image
         field :postdate
         link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self,:preview=>true}
         link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
-        field :subtitle
+        link_field :subtitle,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self,:preview=>true}
         field :bulletin_create_dept
         link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
       end
@@ -53,6 +53,11 @@ module Announcement
         widget_i18n "announcement.widget.search"
       end
 
+      customize_widget "bulletins_and_web_links" do
+        widget_i18n "announcement.widget.bulletins_and_web_links"
+        style ["bulletins_and_links","bulletins_only"]
+      end
+
       # item "index","announcement.widget.index",:default_template=>true,:fields=>["title","category","postdate"]
       # item "bulletins_and_web_links","announcement.widget.bulletins_and_web_links"
     end

vendor/built_in_modules/er_email/app/controllers/panel/er_email/back_end/email_ers_controller.rb

@@ -126,9 +126,9 @@ class Panel::ErEmail::BackEnd::EmailErsController < OrbitBackendController
     respond_to do |format|
       if @email_er.save
 
-          # if @email_er.is_checked == true and !@email_er.is_rejected
-          #   send_email_data(@email_er)
-          # end
+          if @email_er.is_checked == true and !@email_er.is_rejected
+            send_email_data(@email_er)
+          end
 
         format.html { redirect_to(panel_er_email_back_end_email_ers_url) }
         format.xml  { render :xml => @email_er, :status => :created, :location => @email_er }

vendor/built_in_modules/er_email/app/models/email_er.rb

@@ -77,13 +77,14 @@ class EmailEr
 
       if email_group_data.include?(egroup) and (egroup == '0' or egroup == '1' or egroup == '2' or egroup == '3')
 
-        group_mail << "#{email_group_data[egroup]["email"]}(#{email_group_data[egroup]["name"]})"
+        #group_mail << "#{email_group_data[egroup]["email"]}(#{email_group_data[egroup]["name"]})"
+        group_mail << "#{email_group_data[egroup]["name"]}"
 
       elsif email_group_data.include?(egroup) and egroup == '4'
 
         self.other_mailaddress.split(",").each do |otmail|
 
-          group_mail <<  "#{otmail}(#{email_group_data[egroup]["name"]})" 
+          group_mail <<  "#{otmail}(#{email_group_data[egroup]["name"]})"
 
         end
 

vendor/built_in_modules/er_email/app/models/email_er_file.rb

@@ -15,7 +15,7 @@ class EmailErFile
 	private
 
   def file_size
-    if file.file.size > 1.megabytes
+    if file.file.size > 10.megabytes
       errors.add( :file,  I18n.t("er_email.email_file_limit"))
     end
   end

vendor/built_in_modules/er_email/app/views/panel/er_email/back_end/email_ers/_form.html.erb

@@ -105,7 +105,7 @@
 	$(document).ready(function() {
 		$('#add_plugin_file a.add').live('click', function(){
 			var new_id = $(this).prev().attr('value');
-			var old_id = new RegExp("new_add_plugin_files", "g");
+			var old_id = new RegExp("new_email_er_files", "g");
 			$(this).prev().attr('value', parseInt(new_id) + 1);
 			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_file', f, :email_er_files) %>").replace(old_id, new_id));
 		});

vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb

@@ -3,7 +3,7 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
 
   # before_filter :force_order_for_user, :except => [:index,:get_album_json,:get_imgs_json]
 
-  before_filter :force_order_for_visitor,:only=>[:index,:show,:get_album_json,:get_imgs_json,:get_albums,:imgs]
+  before_filter :force_order_for_visitor,:only=>[:index,:show,:get_albums,:imgs]
   before_filter :force_order_for_user,:except => [:index,:show,:get_album_json,:get_imgs_json,:get_albums,:imgs]
   before_filter :for_app_sub_manager,:except => [:index,:show,:get_album_json,:get_imgs_json,:get_albums,:imgs]
   # before_filter lambda

vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb

@@ -5,6 +5,9 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
   def show
     @album = GalleryAlbum.find(params[:id])
     @tags = Tag.find(@album.tagged_ids).map{|t| t.name}
+   respond_to do |format|
+    format.json { render json: @album }
+   end
   end
 
   def get_albums

vendor/built_in_modules/gallery/app/controllers/panel/gallery/widget/albums_controller.rb

@@ -9,15 +9,38 @@ class Panel::Gallery::Widget::AlbumsController < OrbitWidgetController
 		@album = GalleryAlbum.find(@part.widget_options['album_id']) rescue nil
 		@album_images = @album.gallery_images if @album
 
+		
 		@settings = {"vertical"=>vertical,"horizontal"=>horizontal}   #[note] horizontal has it's limitation from 2 to 6
 		@class = "c" + @settings["horizontal"].to_s
 		@total = @settings["vertical"] * @settings["horizontal"]
 		@rnd = Random.new
 		@images = []
-		for i in 0..@total-1
-			image = @album_images[@rnd.rand(0...@album_images.count)]
-			values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
-			@images << values
+
+		if @album_images.count > @total
+			@randoms = []
+			until @randoms.count == @total do
+				r = @rnd.rand(0...@album_images.count)
+				if !@randoms.include?r
+					@randoms << r
+					image = @album_images[r]
+					values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
+					@images << values
+				end
+			end
+		elsif @album_images.count == @total
+			@album_images.each do |image|
+				values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
+				@images << values
+			end
+		else
+			@album_images.each do |image|
+				values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
+				@images << values
+			end
+			until @images.count == @total do
+				values = {"show_link"=>"javascript:void(0);","thumb"=>"assets/gallery/nodata.jpg"}
+				@images << values
+			end
 		end
 	end
 

vendor/built_in_modules/location/app/controllers/panel/location/back_end/location_categories_controller.rb

@@ -0,0 +1,52 @@
+class Panel::Location::BackEnd::LocationCategoriesController < OrbitBackendController
+
+	def index
+		@categorylist = LocationCategory.all
+		@new_category = LocationCategory.new
+	end
+
+	def create
+		@category = LocationCategory.new(params[:location_category])
+		@category.save!
+		respond_to do |h|
+			h.js
+		end
+	end
+
+	def edit
+		@category = LocationCategory.find(params[:id])
+		render :layout => false
+	end 
+
+	def update 
+		@category = LocationCategory.find(params[:id])
+		@category.update_attributes(params[:location_category])
+		respond_to do |h|
+			h.js
+		end
+	end
+
+
+	def destroy
+		@category = LocationCategory.find(params['id'])
+		@category.delete
+		render :json=>{"success"=>"true"}.to_json
+	end
+
+  	def get_location_categories
+    	location_categories = LocationCategory.all
+   	    @data = Array.new
+
+   	     location_categories.each do |category|
+   	       I18n.locale = :en
+           name_en = category.name
+   	       I18n.locale = :zh_tw
+           name_zh_tw = category.name
+           category_id = category.id.to_s
+      	   @data << { name_en: name_en, name_zh_tw: name_zh_tw, category_id: category_id, location_link: "http://ntue.tp.rulingcom.com/panel/location/back_end/locations/get_categorywise_locations?category_id=#{category_id}"}
+    	 end
+
+         render :json => JSON.pretty_generate(@data)
+  	end
+
+end

vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb

@@ -2,7 +2,7 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
   include AdminHelper
 
   before_filter :force_order_for_visitor,:only => [:index, :new, :edit, :create, :update, :delete]
-  before_filter :force_order_for_user,:except => [:get_locations,:index]
+  before_filter :force_order_for_user,:except => [:get_locations,:index,:get_categorywise_locations]
 
   def index
     @location_infos = LocationInfo.all
@@ -14,7 +14,6 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
 
   def new
     @location_info = LocationInfo.new
-
     respond_to do |format|
       format.html # new.html.erb
       format.json { render json: @location }
@@ -74,4 +73,25 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
 
     render :json => JSON.pretty_generate({location: @data})
   end
+
+ def get_categorywise_locations
+    location_infos = LocationInfo.where(:location_category_id => params[:category_id])
+    @data = Array.new    
+
+    location_infos.each do |location|
+
+      picurl = location.file.blank? ? '' : "http://#{request.host_with_port + location.file.url}"
+      thumburl = location.file.blank? ? '' : "http://#{request.host_with_port + location.file.thumb.url}"
+
+      @data << { id: location.id.to_s,
+                 name: location.name,
+                 pic_url: picurl,
+                 thumb_url: thumburl,
+                 longitude: location.longitude,
+                 latitude: location.latitude,
+                 description: location.description }
+    end
+
+    render :json => JSON.pretty_generate(@data)
+  end
 end

vendor/built_in_modules/location/app/models/location.rb

@@ -8,4 +8,6 @@ class Location
   field :description
   field :longitude, type: Float
   field :latitude, type: Float
+
+  belongs_to :location_category
 end

vendor/built_in_modules/location/app/models/location_category.rb

@@ -0,0 +1,14 @@
+class LocationCategory
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  # include OrbitCoreLib::ObjectAuthable
+
+  # ObjectAuthTitlesOptions = %W{new_album}
+  # APP_NAME = "album"
+
+  field :name, localize: true
+
+  has_many :location_infos, :autosave => true, :dependent => :destroy
+
+end

vendor/built_in_modules/location/app/models/location_info.rb

@@ -9,6 +9,8 @@ class LocationInfo
   field :longitude, type: Float
   field :latitude, type: Float
 
+  belongs_to :location_category
+
   validates :file, presence: true
   validates :longitude,
             numericality: { less_than_or_equal_to: 180.0, greater_than_or_equal_to: -180.0 },

vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/_category.html.erb

@@ -0,0 +1,13 @@
+  <div class="tag clear">
+      <div class="tagitem">
+        <i class="icon-folder-close"></i>
+        <% @site_valid_locales.each do |locale| %>
+       		<span class="value" for="<%= locale %>"><%= category.name_translations[locale] rescue nil %> </span>
+       	<% end %>
+      </div>
+      <div class="action">
+        <%= link_to(t(:delete_), panel_location_back_end_location_category_path(category), :method => :delete, :confirm => t("sure?"), :remote => true, :class => "delete") %>
+         <%= link_to(t(:edit), edit_panel_location_back_end_location_category_path(category), :remote => true, :class => "edit") %>
+      	<%#= show_gallery_category_permission_link(category) %>
+      </div>
+    </div>

vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/create.js.erb

@@ -0,0 +1,2 @@
+var dom = $("<%= j render :partial => 'category', :object => @category %>");
+$("div#tags").append(dom);

vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/edit.html.erb

@@ -0,0 +1,10 @@
+<%= form_for @category, :url => panel_location_back_end_location_category_path(@category), :remote => true do |f| %>
+  <%= f.fields_for :name_translations do |name| %>
+    <% @site_valid_locales.each do |locale| %>
+      <%= label_tag(locale,t("location.new_category")+"["+I18nVariable.from_locale(locale)+"]") %>
+      <%= name.text_field locale, :value =>(@category.name_translations[locale]) %> 
+    <% end %>
+  <% end %>
+<%= f.submit "Save", :class=> "btn btn-primary temp_save_btn" %>
+<a href="#" class="btn btn-primary" id="temp_cancel_btn" onclick="return false;"><%= I18n.t(:cancel) %></a>
+<% end %> 

vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/index.html.erb

@@ -0,0 +1,41 @@
+<div id="tags" class="clear">
+    <%= render :partial => 'category', :collection => @categorylist %>  
+</div>
+<div class="form-actions form-fixed form-inline pagination-right">
+    <%= form_for @new_category, :url => {:action => "create"}, :remote => true do |f| %>
+        <%= f.fields_for :name_translations do |name| %>
+	          <% @site_valid_locales.each do |locale| %>
+              <%= label_tag(locale,t("location.new_category")+"["+I18nVariable.from_locale(locale)+"]") %>
+              <%= name.text_field locale %> 
+            <% end %>
+        <% end %>
+        <%= f.submit "Save", :class=> "btn btn-primary" %>
+    <% end %> 
+</div>
+
+<script type="text/javascript">
+var deleteCategory = function(a){
+	  	var parent = a.parent().parent();
+       parent.hide("slide",function(){parent.remove();})
+	}
+  var parent;
+	var editCategory = function(a,data){
+    parent = a.parent().parent();
+      var parenthtml = parent.html();
+      var tempdom = $("<div class='tagitem'></div>");
+      tempdom.append(data);
+      parent.html(tempdom);
+      tempdom.find("a#temp_cancel_btn").click(function(){
+        parent.html(parenthtml);
+      })
+	}
+
+  $(document).ready(function(){
+      $("#tags div.action a.delete").live('ajax:success', function(){
+        deleteCategory($(this));
+      })
+      $("#tags div.action a.edit").live('ajax:success',function(evt, data, status, xhr){
+        editCategory($(this),data);
+      })
+  })
+</script>

vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/update.js.erb

@@ -0,0 +1,2 @@
+var dom = $("<%= j render :partial => 'category', :object => @category %>");
+parent.html(dom.html());

vendor/built_in_modules/location/app/views/panel/location/back_end/locations/_form.html.erb

@@ -9,6 +9,12 @@
       <% end %>
     </div>
   </div>
+  <div class="control-group">
+    <label class="control-label" for=""><%= t "category" %></label>
+    <div class="controls">
+     <%= f.select(:location_category_id, LocationCategory.all.collect {|p| [ p.name, p.id ] },{:prompt => t("location.select_category")},:class => "validate input-xlarge") %>
+    </div>
+  </div>
   <div class="control-group">
     <label class="control-label" for=""><%= t 'picture' %></label>
     <div class="controls">
@@ -20,7 +26,7 @@
     <label class="control-label" for=""><%= t 'coordinates' %></label>
     <div class="controls">
       <%= f.text_field :longitude, :class=>"span2", :placeholder => "Longitude" %>
-      <%= f.text_field :latitude, :class=>"span2", :placeholder => "Langitude" %>
+      <%= f.text_field :latitude, :class=>"span2", :placeholder => "Lantitude" %>
     </div>
   </div>
   <div class="control-group">

vendor/built_in_modules/location/app/views/panel/location/back_end/locations/new.html.erb

@@ -1,3 +1,3 @@
-<%= form_for @location_info, :url=>  panel_location_back_end_locations_path, :html => { :class=>"form-horizontal"} do |f| %>
+<%= form_for @location_info, :url=>  panel_location_back_end_locations_path, :html => { :class=>"form-horizontal",:multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
 <% end  %>

vendor/built_in_modules/location/config/locales/en.yml

@@ -1,3 +1,6 @@
 en:
-  location:
-    location: Location
+    location: Location
+    locations: Locations
+    new_category: "New Category"
+    save: Save
+    select_category: "Select Category"

vendor/built_in_modules/location/config/routes.rb

@@ -4,8 +4,12 @@ Rails.application.routes.draw do
       namespace :back_end do 
 
         match "locations/get_locations" => "locations#get_locations"
+        match "locations/get_categorywise_locations" => "locations#get_categorywise_locations"
 
         resources :locations
+        resources :location_categories, :except => [:show]
+        match "location_categories/get_location_categories" => "location_categories#get_location_categories"
+
       end
     end
   end

vendor/built_in_modules/location/init.rb

@@ -1,6 +1,6 @@
 module Location
   OrbitApp.registration "Location",:type=> 'ModuleApp' do
-    module_label 'location.location'
+    module_label 'locations'
     base_url File.expand_path File.dirname(__FILE__)    
     # personal_plugin :enable => true,:path=>"panel/location/plugin/profile",:i18n=>'admin.location'
     
@@ -32,12 +32,19 @@ module Location
     # end
     
     side_bar do
-      head_label_i18n  'location.location',:icon_class=>"icons-location"
+      head_label_i18n  'locations',:icon_class=>"icons-location"
       available_for [:admin,:guest,:manager,:sub_manager]
       active_for_controllers ({:private=>['locations']})
 
       head_link_path "panel_location_back_end_locations_path"
 
+      context_link 'categories',
+                     :link_path=>"panel_location_back_end_location_categories_path" ,
+                     :priority=>1,
+                     :active_for_action=>{:localtion_categories=>:index},
+                     :available_for => [:manager]
+
+
     end
   end
 end

vendor/built_in_modules/video/app/controllers/panel/video/back_end/channel_videos_controller.rb

@@ -1,6 +1,6 @@
 class Panel::Video::BackEnd::ChannelVideosController < OrbitBackendController
   before_filter :force_order_for_visitor,:only => [:index, :new, :edit, :delete]
-  before_filter :force_order_for_user,:except => [:index]
+  before_filter :force_order_for_user,:except => [:index, :get_channel_videos, :get_channels]
 
   def index
     @channel_videos = ChannelVideo.all         
@@ -17,7 +17,7 @@ class Panel::Video::BackEnd::ChannelVideosController < OrbitBackendController
 
     respond_to do |format|
       format.html
-      format.json { render json: @location }
+      format.json { render json: @channel_videos }
     end
   end
 
@@ -55,4 +55,47 @@ class Panel::Video::BackEnd::ChannelVideosController < OrbitBackendController
     redirect_to panel_video_back_end_channel_videos_url
 
   end
+
+  def get_channels
+    @channels = ChannelVideo.all
+    @data = Array.new
+
+    @channels.each do |channel|
+            client = YouTubeIt::Client.new(:dev_key => "AI39si5KGPg8rhKLBfmeukit2tCSP_B9lT8igiNICbrbgUXQoAdYGvsyCGCmO1wGnr1OW4bDRv-ESolwk-rdBNIAgVTL9VYaEA")
+            @client_videos = client.videos_by(:user => channel.channel_name)
+            number_of_videos = @client_videos.videos.length
+            name  = channel.channel_name 
+            channel_id = channel.id.to_s
+           @data << { channel_name: name, channel_link: "http://ntue.tp.rulingcom.com/panel/video/back_end/channel_videos/get_channel_videos?channel_id=#{channel_id}", number_of_videos: number_of_videos }
+       end
+
+     render :json => JSON.pretty_generate(@data)
+  end
+
+  def get_channel_videos
+    @channel_video = ChannelVideo.where(:_id => params[:channel_id])
+    @channel_video.each do |channel|
+      client = YouTubeIt::Client.new(:dev_key => "AI39si5KGPg8rhKLBfmeukit2tCSP_B9lT8igiNICbrbgUXQoAdYGvsyCGCmO1wGnr1OW4bDRv-ESolwk-rdBNIAgVTL9VYaEA")
+      @client_videos = client.videos_by(:user => channel.channel_name)         
+      @data = Array.new
+
+
+         @client_videos.videos.each do |video|
+            # url = video.player_url 
+            title = video.title
+            description = video.description
+            author = video.author.name
+            channel_name = channel.channel_name
+            video.media_content.each do |m|
+              if m.mime_type == "video/3gpp"
+                @url = m.url     
+              end         
+            end
+           # category_id = category.id.to_s
+           @data << { title: title, description: description, url: @url, author: author, channel_name: channel_name}
+       end
+
+         render :json => JSON.pretty_generate(@data)
+      end
+    end
 end

vendor/built_in_modules/video/config/routes.rb

@@ -4,6 +4,9 @@ Rails.application.routes.draw do
       namespace :back_end do 
         match "videos/get_videos" => "videos#get_videos"
         resources :videos
+        match "channel_videos/get_channels" => "channel_videos#get_channels"
+        match "channel_videos/get_channel_videos" => "channel_videos#get_channel_videos"
+
         resources :channel_videos
       end
 

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

@@ -10,11 +10,13 @@
 						<div class="o-links-list">
 							<ul>
 								<% web_links.page(params[:page_main]).per(@page_num).each do |web_link| %>
+								<% if !web_link.title.blank? %>
 									<li>
 										<%= link_to web_link.title, web_link.url, {:target => '_blank', :title => web_link.title, :class=>"o-links-title"} %>
 										<div class="o-links-description"><%= web_link.context %></div>
 									</li>
 								<% end %>
+								<% end %>
 							</ul>
 						</div>
 					</li>

vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb

@@ -8,10 +8,12 @@
             <div class="o-links-list">
               <ul>
                 <% web_links.page(params[:page_main]).per(@page_num).each do |web_link| %>
-                  <li>
-                    <%= link_to web_link.title, web_link.url, {:target => '_blank', :title => web_link.title, :class=>"o-links-title"} %>
-                    <div class="o-links-description"><%= web_link.context %></div>
-                  </li>
+                  <% if !web_link.title.empty? %>
+                    <li>
+                        <%= link_to web_link.title, web_link.url, {:target => '_blank', :title => web_link.title, :class=>"o-links-title"} %>
+                        <div class="o-links-description"><%= web_link.context %></div>
+                    </li>
+                  <% end %>
                 <% end %>
               </ul>
             </div>