Fix Ad_Banner Image loading bug

Conflicts:

	app/views/front/show_banner.html.erb

Gemfile

@@ -1,6 +1,8 @@
 source 'http://rubygems.org'
 gem 'rails', "~> 3.2.9"
 
+gem 'savon', '~> 2.2.0'
+
 gem "brakeman"
 gem 'mime-types'
 

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

@@ -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);
+	background-image: -webkit-linear-gradient(top, #F7F1E0, #E0C77E);
-	-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;
+	-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8),inset 0 1px 0 #F6EAA5,0 -1px 0 #F7F1E0 inset;
 }
 .header h1.ui-title {
 	margin: 8px 30%;
@@ -116,13 +116,14 @@ div[data-role="page"] {
 	margin-left: -15px;
 	font-size: 20px;
 	/*color: #727272;*/
-	color: #7CA6C5;
+	color: #FCF2D2;
 	/*background-color: #252525;*/
-	background-color: #144366;
+	background-color: #E4CF91;
 	border-radius: 0 0 5px 5px;
 	height: 15px;
 	line-height: 16px;
 	box-shadow: 1px 2px 2px rgba(0, 0, 0, .5);
+	text-shadow: 0 -1px 1px #6D6C6C;
 }
 .header .language .ui-btn-text {
 	left: 0;
@@ -135,14 +136,14 @@ div[data-role="page"] {
 	background-image: none;
 }
 .header .ui-btn-up-a {
-	border: 1px solid #133547;
+	border: 1px solid #949494;
 	background-color: #0C4C64;
-	background-image: -webkit-gradient(linear, left top, left bottom, from( #0D6691 ), to( #0E3A4B ));
+	background-image: -webkit-gradient(linear, left top, left bottom, from( #ECE0BC ), to( #BD9932 ));
-	background-image: -webkit-linear-gradient( #0D6691 , #0E3A4B );
+	background-image: -webkit-linear-gradient( #ECE0BC , #BD9932 );
-	background-image: -moz-linear-gradient( #0D6691 , #0E3A4B );
+	background-image: -moz-linear-gradient( #ECE0BC , #BD9932 );
-	background-image: -ms-linear-gradient( #0D6691 , #0E3A4B );
+	background-image: -ms-linear-gradient( #ECE0BC , #BD9932 );
-	background-image: -o-linear-gradient( #0D6691 , #0E3A4B );
+	background-image: -o-linear-gradient( #ECE0BC , #BD9932 );
-	background-image: linear-gradient( #0D6691 , #0E3A4B );
+	background-image: linear-gradient( #ECE0BC , #BD9932 );
 }
 .header h1 img {
 	height: 30px;

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/controllers/sessions_controller.rb

@@ -0,0 +1,111 @@
+# encoding: utf-8
+
+class SessionsController < Devise::SessionsController
+	prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
+
+  require 'savon'
+
+  def create 
+
+
+    @SYS_USER = "rulingcom"
+    @SYS_PASS = "pxm87912tkx"
+    @LDAP_USER = params[:user][:user_id]
+    @LDAP_PASS = params[:user][:password]
+
+    if @LDAP_USER == 'rulingcom'
+
+      resource = User.first(conditions:{user_id: @LDAP_USER})
+      
+      if !resource.blank?
+
+        resource_name = resource.class.to_s.downcase
+        sign_in(resource_name, resource)
+        redirect_to after_sign_in_path_for(resource)
+
+      else
+
+        flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
+        redirect_to :root
+        
+      end
+
+    else
+
+      client = Savon.client(wsdl: 'http://ap.ydu.edu.tw/LDAP_WS/RulingcomDataService.asmx?wsdl',filters: [:SYS_USER, :SYS_PASS, :LDAP_USER, :LDAP_PASS])
+
+      client.operations
+      
+      response = client.call(:login_chk, message: { 
+        "SYS_USER" => @SYS_USER, 
+        "SYS_PASS" =>  @SYS_PASS,
+        "LDAP_USER" => @LDAP_USER, 
+        "LDAP_PASS" => @LDAP_PASS, 
+        "User_IP" => request.remote_ip
+      })
+
+      @datas = response.body[:login_chk_response][:login_chk_result][:string]
+
+      if !@datas[0].blank? and ( @datas[0] == 'P' or @datas[0] == 'U' ) #使用者帳號回傳P，單位帳號回傳U
+
+        resource = User.first(conditions:{user_id: @LDAP_USER})
+        
+        if !resource.blank?
+
+          resource_name = resource.class.to_s.downcase
+          sign_in(resource_name, resource)
+          redirect_to after_sign_in_path_for(resource)
+
+        else #認證通過無帳號要新增
+
+          @new_user = User.new
+
+          @new_user.user_id = @LDAP_USER
+          @new_user.admin = false
+          @new_user.email = "#{@LDAP_USER}@ydu.edu.tw"
+          @new_user.password = "#{@LDAP_USER}@ydu.edu.tw"
+          @new_user.created_at = DateTime.now
+          @new_user.updated_at = DateTime.now
+          
+          @new_user.cache_dept = { "zh_tw" => ( @datas[1] ? @datas[1] : nil ), "en" => ( @datas[1] ? @datas[1] : nil ) }
+
+          @new_user.first_name_translations = {}
+        
+          @new_user.first_name_translations["zh_tw"] = ( @datas[1] ? @datas[1] : nil )
+        
+          @new_user.first_name_translations["en"] = ( @datas[1] ? @datas[1] : nil )
+
+          # @new_user.first_name = ( @datas[1] ? @datas[1] : nil )
+
+          if @datas[0] == 'P'
+          
+            @new_user.last_name_translations = {}
+          
+            @new_user.last_name_translations["zh_tw"] = ( @datas[2] ? @datas[2] : nil )
+          
+            @new_user.last_name_translations["en"] = ( @datas[2] ? @datas[2] : nil )
+
+            # @new_user.last_name = ( @datas[2] ? @datas[2] : nil )
+
+          end
+
+          @new_user.save
+
+          resource_name = @new_user.class.to_s.downcase
+          sign_in(resource_name, @new_user)
+          redirect_to after_sign_in_path_for(@new_user)
+
+        end
+
+
+      else
+        flash[:error] = "很抱歉,您無此權限或帳號登入本站,請洽本站管理員<br />Sorry, you don't have the account or authority to login. Please contact the website administrator."
+        redirect_to :root
+      end
+
+    end
+
+  end
+
+
+end

app/models/user/user.rb

@@ -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,26 +1,19 @@
-<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'>
     <% (images = @ad_banner.ad_images).shuffle.each do |ad_image| %>
       <% if ad_image.display? %>
-        <img src='<%= ad_image.file %>' alt='<%= ad_image.title || ' ' %>' title='<%= ad_image.title || ' ' %>' time_to_next='<%= @ad_banner.transition_msec %>' link_open='<%= ad_image.link_open %>' link_url='<%= ad_image_link(ad_image) %>' style=' <%= 'cursor:pointer;' if !ad_image_link(ad_image).blank? %>'/>  
+        <img src='<%= ad_image.file %><%= "?update=".to_s << Time.now().to_i.to_s %>' alt='<%= ad_image.title || ' ' %>' title='<%= ad_image.title || ' ' %>' time_to_next='<%= @ad_banner.transition_msec %>' link_open='<%= ad_image.link_open %>' link_url='<%= ad_image_link(ad_image) %>' style=' <%= 'cursor:pointer;' if !ad_image_link(ad_image).blank? %>'/>  
       <% 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_count":"<%= @ad_banner.ad_images.length %>",
+                "image_loaded":0
+              };
+  banners.push(banner);
+</script>

config/routes.rb

@@ -2,6 +2,7 @@ Orbit::Application.routes.draw do
   # get "robots.txt" => 'robots#index'
 
 
+  devise_for :users,:controllers => {:sessions => 'sessions'}
 
   devise_for :users do
     match "/users_passwd" => "desktop/registrations#update", :as => :users_passwd, :via => :put

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|
+        ret << (ret.include?("?") ? "&#{args.to_param}" : "?#{args.to_param}") if args
-          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
         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,26 +1,57 @@
+var banners = [];
+var banner_index = 0;
+
 $(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"));
+			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){
+function ajax_load_proc(wapper,url,isBanner){
 	$.get(encodeURI(url), {}, function(respText,textSta,XML){ 
-			if (textSta == 'success') {
+		if (textSta == 'success') {
-				wapper.html(respText);	
+			if(isBanner=="true"){
-			};
+				wapper.html(respText);
-			if(textSta == 'error')
+				var banner = banners[banner_index];
-				wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
+				$(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>");
 	});
 }
 
+function BannerCycle(banner_index){
+	var banner = banners[banner_index];
+	if (!!$.prototype.cycle && (banner.image_loaded==$(banner.banner_name+" img").length)){
+    	$(banner.banner_name).ready(function() {
+			$(banner.banner_name).cycle({
+				delay: -1000,
+				fx: banner.banner_fx,
+				timeoutFn: getTimeout,
+				pager: banner.banner_pager,
+				pagerAnchorBuilder: function(idx, slide) { return "<li><a href='#'></a></li>"; }
+			});
+		});
+	}else{
+		if(!$.prototype.cycle) $.getScript('/static/jquery.cycle.all.latest.js');
+		setTimeout("BannerCycle("+banner_index+")",500);
+	}
+}
+
 // Ad Banner FX code [start]
 function getTimeout() { 
     return $(this).attr('time_to_next'); 

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/bulletins_controller.rb

@@ -95,7 +95,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # GET /bulletins/1/edit
   def edit
     @bulletin = Bulletin.find(params[:id])
-    if !current_user.admin? && (@bulletin.is_rejected? || @bulletin.is_checked?)
+    # if !current_user.admin? && (@bulletin.is_rejected? || @bulletin.is_checked?)
+    if (@bulletin.create_user_id !=  current_or_guest_user.id) and !is_manager?
       redirect_to :action => :index
     else
       # @summary_variable = @bulletin.summary_variable
@@ -137,11 +138,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
       @bulletin.create_user_id = current_user.id
       @bulletin.update_user_id = current_user.id
-      if(is_manager? || is_admin?)
+      # if(is_manager? || is_admin?)
         @bulletin.is_checked = true
         @bulletin.is_rejected = false
         @bulletin.de_pending
-      end
+      # end
 
       respond_to do |format|
         if @bulletin.save
@@ -221,11 +222,11 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
       respond_to do |format|
 
         if @bulletin.update_attributes(params[:bulletin])
-          if(is_manager? || is_admin?)
+          # if(is_manager? || is_admin?)
             @bulletin.is_checked = true
             @bulletin.is_rejected = false
             @bulletin.de_pending!
-          end
+          # end
           # if (params[:bulletin][:is_checked] == "false")
           #   @bulletin.is_rejected = true
           #   @bulletin.save!
@@ -251,7 +252,9 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # DELETE /bulletins/1
   # DELETE /bulletins/1.xml
   def destroy
+
     @bulletin = Bulletin.find(params[:id])
+
     # @bulletin.bulletin_files.destroy
     @bulletin.destroy
 
@@ -261,6 +264,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
       # format.xml  { head :ok }
       format.js
     end
+
+
   end
 
   # def top_edit

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/views/panel/announcement/back_end/bulletins/_bulletin.html.erb

@@ -34,7 +34,7 @@
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
 				<% if (bulletin.create_user_id ==  current_or_guest_user.id) || is_manager? %>
-					<% if current_or_guest_user.admin? || (!bulletin.is_rejected? && !bulletin.is_checked?) %>
+					<%# if current_or_guest_user.admin? || (!bulletin.is_rejected? && !bulletin.is_checked?) %>
 						<li><%= link_to t(:edit), edit_panel_announcement_back_end_bulletin_path(bulletin) %></li>
 						<li class="dropdown">
 							<a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t(:quick_edit) %><b class="caret"></b></a>
@@ -46,7 +46,7 @@
 								<li><%#= link_to t(:file_), load_quick_edit_panel_announcement_back_end_bulletin_path(bulletin, :type => 'files'), :remote => true %></li>
 							</ul>
 						</li>
-					<% end %>
+					<%# end %>
 
 				<% end -%>
 				<% if show_delete_link(bulletin) %>

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_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', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
+	<%= 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_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', :tag_id => @selected_tag.id}, :remote => true, :class => 'next' %>
+	<%= 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

@@ -35,6 +35,6 @@ 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

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

@@ -35,6 +35,6 @@ zh_tw:
     update_bulletin_category_success: 更新類別成功
     url: 連結位置
     widget:
-      bulletins_and_web_links: 索引
+      bulletins_and_web_links: 分眾頁籤
       index: 索引
       search: 搜尋

vendor/built_in_modules/announcement/init.rb

@@ -52,6 +52,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/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb

@@ -3,9 +3,10 @@ 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_imgs_json,:get_albums,:imgs]
-  before_filter :force_order_for_user,:except => [:index,:show,:get_album_json,:get_imgs_json,:get_albums,:imgs]
+  before_filter :force_order_for_user,:except => [:index,:show,:get_album_json,:get_albums,:imgs,:get_image_json]
-  before_filter :for_app_sub_manager,: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_albums,:imgs,:get_image_json]
+
   # before_filter lambda
   
   def index
@@ -126,17 +127,18 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
         album_cover_file: "http://#{request.host_with_port}#{album.cover_path}",
         album_name: album.name,
         album_tag_names: tag_names,
-        album_link:"http://#{request.host_with_port}#{panel_gallery_back_end_album_get_imgs_json_path(album)}"
+        album_link:"http://#{request.host_with_port}/panel/gallery/back_end/albums/get_image_json?album_id=#{album.id}"
       }
     end
 
     render :json=>JSON.pretty_generate(output)
   end
 
-  def get_imgs_json
+  def get_image_json
-    album = GalleryAlbum.find(params[:album_id])
+    album = GalleryAlbum.where(:_id => params[:album_id])
-    images = album.gallery_images.all
+    if album.first.present?
-    output = Array.new
+      images = album.first.gallery_images.all
+      output = Array.new
 
     images.each do |image|
       tags = Tag.find(image.tagged_ids).map{|t| t.name}
@@ -150,6 +152,7 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
     end
 
     render :json=>JSON.pretty_generate(output)
+   end
   end
 
   def imgs

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)]
+		if @album_images.count > @total
-			values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
+			@randoms = []
-			@images << values
+			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/gallery/config/routes.rb

@@ -7,13 +7,14 @@ Rails.application.routes.draw do
       	match "upload_image" => "albums#upload_image"
       	match "save_tags" => "tags#save_tags"
       	match "albums/save_tags" => "tags#save_tags"
+
+        match "albums/get_image_json" => "albums#get_image_json"
         
        	resources :albums do 
       		match "set_cover" => "albums#set_cover"
       		match "imgs" => "albums#imgs"
       		match "upload_panel" => "albums#upload_panel"
       		match "images_tags" => "albums#images_tags"
-          match "get_imgs_json" => "albums#get_imgs_json"
 
           collection do
             get "get_album_json"

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

@@ -0,0 +1,36 @@
+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
+
+end

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

@@ -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 }

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

@@ -6,6 +6,7 @@ Rails.application.routes.draw do
         match "locations/get_locations" => "locations#get_locations"
 
         resources :locations
+        resources :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/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb

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

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>
+                  <% if !web_link.title.empty? %>
-                    <%= link_to web_link.title, web_link.url, {:target => '_blank', :title => web_link.title, :class=>"o-links-title"} %>
+                    <li>
-                    <div class="o-links-description"><%= web_link.context %></div>
+                        <%= link_to web_link.title, web_link.url, {:target => '_blank', :title => web_link.title, :class=>"o-links-title"} %>
-                  </li>
+                        <div class="o-links-description"><%= web_link.context %></div>
+                    </li>
+                  <% end %>
                 <% end %>
               </ul>
             </div>

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

@@ -1,6 +1,6 @@
 <ul>
 	<% @web_links.each do |widget| -%>
-		<li><%= link_to widget.title, widget.url, {:target => '_blank', :title => widget.title} %></li>
+			<li><%= link_to widget.title, widget.url, {:target => '_blank', :title => widget.title} %></li>
 	<% end -%>		
 </ul>