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);
-	-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, #F7F1E0, #E0C77E);
+	-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-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-gradient(linear, left top, left bottom, from( #ECE0BC ), to( #BD9932 ));
+	background-image: -webkit-linear-gradient( #ECE0BC , #BD9932 );
+	background-image: -moz-linear-gradient( #ECE0BC , #BD9932 );
+	background-image: -ms-linear-gradient( #ECE0BC , #BD9932 );
+	background-image: -o-linear-gradient( #ECE0BC , #BD9932 );
+	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/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|
-          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)

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') {
-				wapper.html(respText);	
-			};
-			if(textSta == 'error')
-				wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");
+		if (textSta == 'success') {
+			if(isBanner=="true"){
+				wapper.html(respText);
+				var banner = banners[banner_index];
+				$(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/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/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/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_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 :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_albums,:imgs,:get_image_json]
+  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
-    album = GalleryAlbum.find(params[:album_id])
-    images = album.gallery_images.all
-    output = Array.new
+  def get_image_json
+    album = GalleryAlbum.where(:_id => params[:album_id])
+    if album.first.present?
+      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)]
-			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/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/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>
-										<%= 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>

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>

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>