forked from saurabh/orbit4-5
Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5
This commit is contained in:
commit
f62b3c7ae4
2
Gemfile
2
Gemfile
|
|
@ -42,7 +42,7 @@ gem 'usagewatch_ext'
|
|||
gem 'ckeditor'
|
||||
gem 'unicorn'
|
||||
gem 'zhconv'
|
||||
|
||||
gem 'time_difference'
|
||||
gem 'execjs'
|
||||
gem 'therubyracer'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
(function($) {
|
||||
$("document").ready(function(){
|
||||
// Get link data-attribute and make the banner clickable
|
||||
$('.w-ad-banner__slide').not('[data-link=""]').addClass('cursor').on("click",function(){
|
||||
$('.w-ad-banner__slide').not('[data-link=""]').not(".youtube").addClass('cursor').on("click",function(){
|
||||
window.open($(this).data("link"),"_blank");
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -75,10 +75,19 @@ class PagesController < ApplicationController
|
|||
end
|
||||
params[:url] = page.url
|
||||
categories = []
|
||||
page.categories.each do |c|
|
||||
category = Category.find(c) rescue nil
|
||||
if !category.nil? && !category.disable
|
||||
categories << c
|
||||
if page.module == "member"
|
||||
page.categories.each do |c|
|
||||
category = Role.find(c) rescue nil
|
||||
if !category.nil? && !category.disabled
|
||||
categories << c
|
||||
end
|
||||
end
|
||||
else
|
||||
page.categories.each do |c|
|
||||
category = Category.find(c) rescue nil
|
||||
if !category.nil? && !category.disable
|
||||
categories << c
|
||||
end
|
||||
end
|
||||
end
|
||||
categories = ["all"] if categories.blank?
|
||||
|
|
|
|||
|
|
@ -151,6 +151,10 @@ module OrbitBackendHelper
|
|||
end
|
||||
end
|
||||
|
||||
def user_authenticated_categories
|
||||
@user_authenticated_categories
|
||||
end
|
||||
|
||||
def is_user_sub_manager?
|
||||
@current_user_is_sub_manager
|
||||
end
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@
|
|||
|
||||
// Necessary for Responsive images
|
||||
function bullEye() {
|
||||
$(".bullseye").bullseye({
|
||||
fadeEffect: false
|
||||
});
|
||||
// $(".bullseye").bullseye({
|
||||
// fadeEffect: false
|
||||
// });
|
||||
}
|
||||
|
||||
// Adding class to submenu that has dropdown items
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@
|
|||
position: absolute;
|
||||
right: 1em;
|
||||
bottom: 1em;
|
||||
z-index: 100;
|
||||
z-index: 102;
|
||||
|
||||
li {
|
||||
display: inline-block;
|
||||
|
|
@ -158,4 +158,8 @@
|
|||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.cycle-slide-active{
|
||||
z-index: 101 !important;
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
<div class="w-ad-banner ad-banner-widget-2 container">
|
||||
<div class="w-ad-banner__wrap cycle-slideshow"
|
||||
data-list="images"
|
||||
data-level="0"
|
||||
data-cycle-slides=".w-ad-banner__slide"
|
||||
data-cycle-log="false"
|
||||
data-overlay=".w-ad-banner__caption"
|
||||
data-pager=".w-ad-banner__pager"
|
||||
data-pager-template="<li><a href='#'></a></li>"
|
||||
data-pager-active-class="active-slide"
|
||||
data-cycle-youtube=true
|
||||
data-cycle-youtube-autostart=false
|
||||
>
|
||||
<div class="w-ad-banner__slide {{class}}"
|
||||
data-link="{{link}}"
|
||||
data-cycle-title="{{title}}"
|
||||
data-cycle-desc="{{context}}"
|
||||
data-overlay-template="<h2>{{title}}</h2>{{desc}}"
|
||||
>
|
||||
<img class="w-ad-banner__image" src="{{image_link}}">
|
||||
</div>
|
||||
<div class="w-ad-banner__slide youtube {{class}}"
|
||||
data-link=""
|
||||
>
|
||||
<a class="w-ad-banner__slide" href="https://www.youtube.com/v/f7AU2Ozu8eo?version=3&hl=en_US&rel=0&enablejsapi=1">Paul Irish</a>
|
||||
</div>
|
||||
</div>
|
||||
<ul class="w-ad-banner__pager"></ul>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
<div class="w-ad-banner ad-banner-widget-2 container">
|
||||
<div class="w-ad-banner__wrap cycle-slideshow"
|
||||
data-list="images"
|
||||
data-level="0"
|
||||
data-cycle-timeout="3000"
|
||||
data-cycle-slides=".w-ad-banner__slide"
|
||||
data-cycle-log="false"
|
||||
data-overlay=".w-ad-banner__caption"
|
||||
data-cycle-auto-height="640:360"
|
||||
data-pager=".w-ad-banner__pager"
|
||||
data-pager-template="<li><a href='#'></a></li>"
|
||||
data-pager-active-class="active-slide"
|
||||
data-cycle-youtube="true"
|
||||
data-cycle-youtube-autostart="false">
|
||||
|
||||
{{html}}
|
||||
</div>
|
||||
<ul class="w-ad-banner__pager"></ul>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$("document").ready(function(){
|
||||
// total_players = $("*[data-youtube-id]").length
|
||||
$("*[data-youtube-id]").each(function(){
|
||||
var obj = $(this).find("embed");
|
||||
obj.attr("id",$(this).data("youtube-id"));
|
||||
})
|
||||
});
|
||||
function onYouTubePlayerReady(playerId) {
|
||||
var y = document.getElementById(playerId);
|
||||
y.addEventListener("onStateChange", "onytplayerStateChange");
|
||||
}
|
||||
function onytplayerStateChange(newState) {
|
||||
if(newState == 0){
|
||||
$(".cycle-slideshow").cycle("resume");
|
||||
}else if(newState == 1){
|
||||
$(".cycle-slideshow").cycle("pause");
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -9,10 +9,10 @@
|
|||
"thumbnail" : "thumbnail-block.png"
|
||||
},
|
||||
{
|
||||
"filename" : "ad_banner_widget2",
|
||||
"filename" : "ad_banner_widget2_video",
|
||||
"name" : {
|
||||
"zh_tw" : "2. 橫幅輪播 ( 圖片, 導航圖示 )",
|
||||
"en" : "2. Carousel ( image, navigation )"
|
||||
"en" : "2. Carousel ( image, navigation, video )"
|
||||
},
|
||||
"thumbnail" : "thumbnail-block.png"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
<div id="orbit_calendar">
|
||||
<div id='sec1' class="cal-fn">
|
||||
<div class="btn-toolbar" id="navigation">
|
||||
<div id="calendar-nav">
|
||||
<button class="btn" id="today_btn">Today</button>
|
||||
<div class="btn-group">
|
||||
<button class="btn" id="prev_month_btn">
|
||||
<i class="icon-chevron-left"></i>
|
||||
</button>
|
||||
<button class="btn" id="next_month_btn">
|
||||
<i class="icon-chevron-right"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-inline" id="range_selection"></div>
|
||||
</div>
|
||||
<div id='sec3' class="btn-toolbar">
|
||||
<div class="btn-group calendar_mode">
|
||||
<button class="btn mode_switch" data-mode="agendaDay" >day</button>
|
||||
<button class="btn mode_switch" data-mode="agendaWeek" >week</button>
|
||||
<button class="btn active mode_switch" data-mode="month" >month</button>
|
||||
<button class="btn mode_switch" data-mode="agenda" >agenda</button>
|
||||
</div>
|
||||
<button id="refresh_btn" class="btn">
|
||||
<i class="icons-cycle"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div id="view_holder">
|
||||
<h3 id="current_title" class="current_day_title"></h3>
|
||||
<div id="calendar"></div>
|
||||
<div id="calendar_agenda"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="event_quick_view" class="modal" style="width: 300px; display:none; margin:0 0 0 0;"></div>
|
||||
<div id="calendar-loading">Loading...</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
var calendar = new Calendar("#calendar","{{page_id}}");
|
||||
</script>
|
||||
|
|
@ -5,6 +5,7 @@ gem 'gallery', git: 'http://gitlab.tp.rulingcom.com/saurabh/gallery.git'
|
|||
gem 'links', git: 'http://gitlab.tp.rulingcom.com/saurabh/links.git'
|
||||
gem 'page_content', git: 'http://gitlab.tp.rulingcom.com/saurabh/pagecontent.git'
|
||||
gem 'faq', git: 'http://gitlab.tp.rulingcom.com/saurabh/faq.git'
|
||||
gem 'calendar', git: 'http://gitlab.tp.rulingcom.com/harry/calendar.git'
|
||||
#Personal Plugins
|
||||
gem 'personal_journal', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-journal.git'
|
||||
gem 'personal_conference', git: 'http://gitlab.tp.rulingcom.com/saurabh/personal-conference.git'
|
||||
|
|
|
|||
Loading…
Reference in New Issue