Skip to content

N
NAP-wordpress
Commit a699e6f3 authored by imac's avatar imac
Browse files
Options

[Bugfix/Update]JIRA && Add Loading

parent 5a729d76
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 101 deletions
wp-content/themes/nap/assets/css/main.css
View file @ a699e6f3
...@@ -1434,6 +1434,7 @@ label.chevron.bottom::first-letter { ...@@ -1434,6 +1434,7 @@ label.chevron.bottom::first-letter {
font-size: 9px; font-size: 9px;
line-height: 12px; line-height: 12px;
margin-top: 4px; margin-top: 4px;
padding: 0 2px;
} }
.product-info{ .product-info{
width: 56.5%; width: 56.5%;
...@@ -2588,6 +2589,7 @@ div.wpcf7-mail-sent-ok{ ...@@ -2588,6 +2589,7 @@ div.wpcf7-mail-sent-ok{
/* --------------*/ /* ---------->>> Loading <<<-----------*/ /* --------------*/ /* --------------*/ /* ---------->>> Loading <<<-----------*/ /* --------------*/
#loading-container-subpage,
#loading-container{ #loading-container{
background-color: #fff; background-color: #fff;
width: 100%; width: 100%;
...@@ -2599,12 +2601,14 @@ div.wpcf7-mail-sent-ok{ ...@@ -2599,12 +2601,14 @@ div.wpcf7-mail-sent-ok{
transition: all .2s ease; transition: all .2s ease;
z-index: 9999999999999999; z-index: 9999999999999999;
} }
#loading-container-subpage{
display: none;
}
#loading-center-absolute { #loading-center-absolute {
/* background: url(../img/logo-loader.png) no-repeat center center;*/ /* background: url(../img/logo-loader.png) no-repeat center center;*/
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 200px; height: 38px;
/*opacity: 0.3;*/ /*opacity: 0.3;*/
background-size: contain; background-size: contain;
max-width: 200px; max-width: 200px;
...@@ -2617,5 +2621,22 @@ div.wpcf7-mail-sent-ok{ ...@@ -2617,5 +2621,22 @@ div.wpcf7-mail-sent-ok{
-webkit-transform: translateY(-50%); -webkit-transform: translateY(-50%);
-moz-transform: translateY(-50%); -moz-transform: translateY(-50%);
-o-transform: translateY(-50%); -o-transform: translateY(-50%);
}
} .load-4 .ring-1 {animation: loadingD 1.5s .3s cubic-bezier(.17,.37,.43,.67) infinite;}
\ No newline at end of file .load-4 p {
padding-top: 10px;
}
.ring-1 {
width: 10px;
height: 10px;
margin: 0 auto;
padding: 10px;
border: 7px dashed #182566;
border-radius: 100%;
}
@keyframes loadingD {
0 {transform: rotate(0deg);}
50% {transform: rotate(180deg);}
100% {transform: rotate(360deg);}
}
\ No newline at end of file
wp-content/themes/nap/assets/css/responsive.css
View file @ a699e6f3
...@@ -782,7 +782,7 @@ ...@@ -782,7 +782,7 @@
margin-top: 0px; margin-top: 0px;
} }
.pa_format ul li { .pa_format ul li {
max-width: 60px; /*max-width: 60px;*/
margin: 0 10px; margin: 0 10px;
} }
/* Page CMS */ /* Page CMS */
...@@ -955,6 +955,9 @@ ...@@ -955,6 +955,9 @@
.panel .product-list article{ .panel .product-list article{
width: 145px; width: 145px;
} }
.phototheque-content .panel .product-list{
padding: 0px;
}
.panel .product-list article figure{ .panel .product-list article figure{
height: 145px; height: 145px;
width: 145px; width: 145px;
......
wp-content/themes/nap/assets/js/main.js
View file @ a699e6f3
...@@ -38,8 +38,8 @@ $(function(){ ...@@ -38,8 +38,8 @@ $(function(){
nav.parent().removeClass("show-nav"); nav.parent().removeClass("show-nav");
$('.main-nav .nav-content .footer').remove(); $('.main-nav .nav-content .footer').remove();
setTimeout(function(){ setTimeout(function(){
$('.right-panel-wrapper').css('z-index','9999999'); $('.right-panel-wrapper').css('z-index','9999999');
},500) },500)
} }
setTimeout(function(){ setTimeout(function(){
...@@ -47,14 +47,14 @@ $(function(){ ...@@ -47,14 +47,14 @@ $(function(){
},330) },330)
nav.stop().slideToggle(); nav.stop().slideToggle();
}); });
} }
$.fn.loadPageContent = function(){ $.fn.loadPageContent = function(){
if ($('body').find('header').length > 1){ if ($('body').find('header').length > 1){
$('body').find('header').last().parent().remove(); $('body').find('header').last().parent().remove();
$('.right-panel-wrapper').css('top', $('.nav-header').outerHeight()); $('.right-panel-wrapper').css('top', $('.nav-header').outerHeight());
$('html').css('overflow','auto'); $('html').css('overflow','auto');
} }
//$('.load-page').removeClass('fadeOutUp').addClass('animated fadeInUp') //$('.load-page').removeClass('fadeOutUp').addClass('animated fadeInUp')
$('ul.phototheque').find('li').first().addClass('current'); $('ul.phototheque').find('li').first().addClass('current');
...@@ -74,10 +74,10 @@ $(function(){ ...@@ -74,10 +74,10 @@ $(function(){
document.getElementById('load-page').addEventListener('scroll', window.scrollAnimation.throttledEvent, false); document.getElementById('load-page').addEventListener('scroll', window.scrollAnimation.throttledEvent, false);
$(document).find('ul.phototheque').on('click',' li.parent-cat>a',function(e){ $(document).find('ul.phototheque').on('click',' li.parent-cat>a',function(e){
var windowWidth = $(window).width(); var windowWidth = $(window).width();
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
$('.phototheque>li').removeClass('current'); $('.phototheque>li').removeClass('current');
$(this).parent().addClass('current'); $(this).parent().addClass('current');
//if (windowWidth < 860){ //if (windowWidth < 860){
//$('.nav-phototeque .nav-content>ul>li').addClass('animated fadeOutLeft'); //$('.nav-phototeque .nav-content>ul>li').addClass('animated fadeOutLeft');
//$('.nav-phototeque .nav-content li.current').removeClass('fadeOutLeft').addClass('fadeInRight'); //$('.nav-phototeque .nav-content li.current').removeClass('fadeOutLeft').addClass('fadeInRight');
...@@ -85,9 +85,9 @@ $(function(){ ...@@ -85,9 +85,9 @@ $(function(){
//$('.nav-phototeque .nav-content li.current ul').css('display','inline-block !important'); //$('.nav-phototeque .nav-content li.current ul').css('display','inline-block !important');
//.phototheque-content nav li //.phototheque-content nav li
//}else{ //}else{
$('.phototheque .subcat').slideUp('slow'); $('.phototheque .subcat').slideUp('slow');
$('.phototheque .off .subcat').slideUp(); $('.phototheque .off .subcat').slideUp();
$(this).parent().find('.subcat').slideDown('slow'); $(this).parent().find('.subcat').slideDown('slow');
//} //}
...@@ -96,17 +96,23 @@ $(function(){ ...@@ -96,17 +96,23 @@ $(function(){
$('.gallery-wrapper').removeClass('hidden-elem').addClass('animated visible-elem fadeInUp'); $('.gallery-wrapper').removeClass('hidden-elem').addClass('animated visible-elem fadeInUp');
},0) },0)
} }
function appendLoading() {
$('.load-page').append($('#loading-container-subpage').clone());
$('#loading-container-subpage').show();
}
//load content page on left Panel //load content page on left Panel
$(document).find('.to-slide').on('click','a',function(e){ $(document).find('.to-slide').on('click','a',function(e){
$('html').css('overflow','hidden'); $('html').css('overflow','hidden');
appendLoading();
e.preventDefault(); e.preventDefault();
var link = $(this).attr("href"), var link = $(this).attr("href"),
windowWidth = $(window).width(); windowWidth = $(window).width();
$('.load-page').parent().addClass('active'); $('.load-page').parent().addClass('active');
history.pushState(null, null, link); history.pushState(null, null, link);
$('.load-page').load(link,function(){ $('.load-page').load(link,function(){
console.log('load page');
$.fn.loadPageContent(); $.fn.loadPageContent();
$('#loading-container-subpage').hide();
}); });
if (windowWidth < 860){ if (windowWidth < 860){
$( ".c-hamburger" ).trigger( "click" ); $( ".c-hamburger" ).trigger( "click" );
...@@ -135,14 +141,13 @@ $(function(){ ...@@ -135,14 +141,13 @@ $(function(){
}).on('click','.scrolled',function(){ }).on('click','.scrolled',function(){
$(this).removeClass('scrolled'); $(this).removeClass('scrolled');
$("html, body").animate({ scrollTop: 0 }, "slow"); $("html, body").animate({ scrollTop: 0 }, "slow");
setTimeout(function(){
$('.footer-home-content').find('.nav-content').remove(); $('.footer-home-content').find('.nav-content').remove();
//$('.home-footer-nav .nav-wrapper').css('top','initial'); $('.home-down-wrapper').css('top','initial');
$('.home-down-wrapper').css('top','initial'); $('.footer-home-content').removeClass('fixed');
$('.footer-home-content').removeClass('fixed'); $('.main').height($(window).innerHeight());
$('.main').height($(window).innerHeight()); },600)
return false; return false;
}); });
//Get file name of uploaded file //Get file name of uploaded file
$('#file-p').on('change',function(e){ $('#file-p').on('change',function(e){
...@@ -371,47 +376,47 @@ $(function(){ ...@@ -371,47 +376,47 @@ $(function(){
} }
}, },
}); });
$(document).on('click', '.moveDown', function(){ $(document).on('click', '.moveDown', function(){
$.fn.fullpage.moveSectionDown(); $.fn.fullpage.moveSectionDown();
}); });
}
$.fn.getMenuBg = function(){
var imgSrc = $('header .nav-content > ul').find(' > li.current').data('img'),
windowWidth = $(window).width(),
navwWidth = $('.nav-wrapper').width(),
navHeight = $('.nav-header').outerHeight();
$('.container-bg').css({
'background-image': "url("+ imgSrc +")",
'opacity' : 0,
})
tlBg = new TimelineMax();
tlBg.to('.container-bg',0.9,{opacity:1},0.5);
tlBg.from('.full-slides',1.2,{opacity:0, width:0},0.4);
if (windowWidth > 860){
tlBg.to('.container-bg',1.2,{width:navwWidth},0.4);
} }
$.fn.getMenuBg = function(){ }
var imgSrc = $('header .nav-content > ul').find(' > li.current').data('img'), $.fn.appendMap = function(){
windowWidth = $(window).width(), var $this = $(this);
navwWidth = $('.nav-wrapper').width(), if (!(this.find('.map').length)){
navHeight = $('.nav-header').outerHeight(); this.append($('.map'));
$('.container-bg').css({
'background-image': "url("+ imgSrc +")",
'opacity' : 0,
})
tlBg = new TimelineMax();
tlBg.to('.container-bg',0.9,{opacity:1},0.5);
tlBg.from('.full-slides',1.2,{opacity:0, width:0},0.4);
if (windowWidth > 860){
tlBg.to('.container-bg',1.2,{width:navwWidth},0.4);
}
} }
$.fn.appendMap = function(){ setTimeout(function(){
var $this = $(this); initMap();
if (!(this.find('.map').length)){ },330)
this.append($('.map')); }
$.fn.appendMobileMenu = function(){
var $this = $(this);
setTimeout(function(){
if (!($this.find('li.current').length)){
$('.main-nav .nav-content li.current').addClass('to-replace');
$('.main-nav .nav-content li.current').clone(true).find('ul').remove().end().appendTo($this);
$this.find("li.current").append($('.main-nav.nav-wrapper li.current ul'));
} }
setTimeout(function(){ $('.right-container').css('padding-top',$this.parent().outerHeight());
initMap(); },2000)
},330)
}
$.fn.appendMobileMenu = function(){
var $this = $(this);
setTimeout(function(){
if (!($this.find('li.current').length)){
$('.main-nav .nav-content li.current').addClass('to-replace');
$('.main-nav .nav-content li.current').clone(true).find('ul').remove().end().appendTo($this);
$this.find("li.current").append($('.main-nav.nav-wrapper li.current ul'));
}
$('.right-container').css('padding-top',$this.parent().outerHeight());
},2000)
} }
//Responsive function //Responsive function
$.fn.responsive = function(){ $.fn.responsive = function(){
var footerHeight = $('footer').height(), var footerHeight = $('footer').height(),
...@@ -562,16 +567,16 @@ $(items).each(function () { ...@@ -562,16 +567,16 @@ $(items).each(function () {
if (refElement.length && refElement.position().top - ( $(".main").outerHeight() / 2 - titleHeight - $(".footer").outerHeight() ) <= scrollPos && refElement.position().top + refElement.height() > scrollPos) { if (refElement.length && refElement.position().top - ( $(".main").outerHeight() / 2 - titleHeight - $(".footer").outerHeight() ) <= scrollPos && refElement.position().top + refElement.height() > scrollPos) {
if ( timer ) clearTimeout(timer); if ( timer ) clearTimeout(timer);
timer = setTimeout(function(){ timer = setTimeout(function(){
$('.subcat a').removeClass("active"); $('.subcat a').removeClass("active");
currLink.addClass("active"); currLink.addClass("active");
if ($('nav ul ul').find('li.active')){ if ($('nav ul ul').find('li.active')){
$('nav ul li').removeClass('current').addClass('off'); $('nav ul li').removeClass('current').addClass('off');
parent = currLink.parent().parent().parent(); parent = currLink.parent().parent().parent();
parent.addClass('current').removeClass('off'); parent.addClass('current').removeClass('off');
$('.phototheque .off .subcat').stop().slideUp(); $('.phototheque .off .subcat').stop().slideUp();
parent.find('ul').stop().slideDown(); parent.find('ul').stop().slideDown();
} }
}, 330); }, 330);
} }
else{ else{
...@@ -623,7 +628,7 @@ function checkFilterContactWrapper(){ ...@@ -623,7 +628,7 @@ function checkFilterContactWrapper(){
$('.contact-form .footer').outerHeight() + $('.contact-form .footer').outerHeight() +
$('.filter-wrapper').outerHeight() $('.filter-wrapper').outerHeight()
> $(window).outerHeight() )*/ > $(window).outerHeight() )*/
) )
{ {
$('.contact-form .footer').addClass('fixed'); $('.contact-form .footer').addClass('fixed');
}else{ }else{
...@@ -671,10 +676,10 @@ $(document).ready(function(){ ...@@ -671,10 +676,10 @@ $(document).ready(function(){
$.fn.open_nav(); $.fn.open_nav();
if ($(document).find('#load-page').children().length){ if ($(document).find('#load-page').children().length){
scrollAnchor("#load-page", true); scrollAnchor("#load-page", true);
}else{ }else{
scrollAnchor('html,body', false); scrollAnchor('html,body', false);
} }
$('.news-btn').open_news(); $('.news-btn').open_news();
$('.close-btn').close_news(); $('.close-btn').close_news();
$('.filter-wrapper').open_filter(); $('.filter-wrapper').open_filter();
......
wp-content/themes/nap/footer.php
View file @ a699e6f3
</div> </div>
<div class="right-panel-wrapper abs-full fixed transition"> <div class="right-panel-wrapper abs-full fixed transition">
<div id="load-page" class="load-page transition"></div> <div id="load-page" class="load-page transition"></div>
</div>
<footer class="blue-bg"> <footer class="blue-bg">
<?php wp_footer(); ?> <?php wp_footer(); ?>
<div class="footer font-small animated fadeInUp"> <div class="footer font-small animated fadeInUp">
...@@ -66,6 +65,19 @@ ...@@ -66,6 +65,19 @@
</div> </div>
</div> </div>
</div> </div>
<div id="loading-container-subpage">
<div class="loading-wrapper">
<div class="loading">
<div id="loading-center-absolute">
<div class="load-4">
<div class="ring-1"></div>
<p class= "center">Loading . . .</p>
</div>
</div>
</div>
</div>
</div>
</div>
<script src="<?php echo home_url('wp-content/themes/nap/assets/js/jQuery-v1-11.min.js') ?>"></script> <script src="<?php echo home_url('wp-content/themes/nap/assets/js/jQuery-v1-11.min.js') ?>"></script>
<script src="<?php echo home_url('wp-content/themes/nap/assets/js/jquery-ui.min.js') ?>"></script> <script src="<?php echo home_url('wp-content/themes/nap/assets/js/jquery-ui.min.js') ?>"></script>
<script src="<?php echo home_url('wp-content/themes/nap/assets/js/vendors/TweenMax.min.js') ?>"></script> <script src="<?php echo home_url('wp-content/themes/nap/assets/js/vendors/TweenMax.min.js') ?>"></script>
......
wp-content/themes/nap/header.php
View file @ a699e6f3
<!DOCTYPE html> <!DOCTYPE html>
<html <?php language_attributes(); ?> class="no-js no-svg"> <html <?php language_attributes(); ?> class="no-js no-svg">
<link href="<?php echo home_url('wp-content/themes/nap/assets/css/normalize.css') ?>" rel="stylesheet" type="text/css"> <link href="<?php echo home_url('wp-content/themes/nap/assets/css/normalize.css') ?>" rel="stylesheet" type="text/css">
<link href="<?php echo home_url('wp-content/themes/nap/assets/fonts/stylesheet.css') ?>" rel="stylesheet" type="text/css"> <link href="<?php echo home_url('wp-content/themes/nap/assets/fonts/stylesheet.css') ?>" rel="stylesheet" type="text/css">
<link href="<?php echo home_url('wp-content/themes/nap/assets/css/slick-theme.css') ?>?v=432" rel="stylesheet" type="text/css"> <link href="<?php echo home_url('wp-content/themes/nap/assets/css/slick-theme.css') ?>?v=432" rel="stylesheet" type="text/css">
<link href="<?php echo home_url('wp-content/themes/nap/assets/css/slick.css') ?>?v=432" rel="stylesheet" type="text/css"> <link href="<?php echo home_url('wp-content/themes/nap/assets/css/slick.css') ?>?v=432" rel="stylesheet" type="text/css">
<link href="<?php echo home_url('wp-content/themes/nap/assets/css/animate.css') ?>" rel="stylesheet" type="text/css"> <link href="<?php echo home_url('wp-content/themes/nap/assets/css/animate.css') ?>" rel="stylesheet" type="text/css">
<link href="<?php echo home_url('wp-content/themes/nap/assets/css/animsition.min.css') ?>" rel="stylesheet" type="text/css"> <link href="<?php echo home_url('wp-content/themes/nap/assets/css/animsition.min.css') ?>" rel="stylesheet" type="text/css">
<link href="<?php echo home_url('wp-content/themes/nap/assets/css/main.css') ?>?v=454" rel="stylesheet" type="text/css"> <link href="<?php echo home_url('wp-content/themes/nap/assets/css/main.css') ?>?v=454" rel="stylesheet" type="text/css">
<link href="<?php echo home_url('wp-content/themes/nap/assets/css/responsive.css') ?>?v=432" rel="stylesheet" type="text/css"> <link href="<?php echo home_url('wp-content/themes/nap/assets/css/responsive.css') ?>?v=432" rel="stylesheet" type="text/css">
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/png" href="images/favicon.png" /> <link rel="icon" type="image/png" href="images/favicon.png" />
<head> <head>
<meta charset="<?php bloginfo('charset'); ?>"> <meta charset="<?php bloginfo('charset'); ?>">
<meta name="viewport" content="width=device-width, initial-scale=1 ,user-scalable = no"> <meta name="viewport" content="width=device-width, initial-scale=1 ,user-scalable = no">
<?php wp_head(); ?> <?php wp_head(); ?>
</head> </head>
<div id="loading-container"> <div id="loading-container">
<div class="loading-wrapper"> <div class="loading-wrapper">
<div class="loading"> <div class="loading">
<div id="loading-center-absolute"></div> <div id="loading-center-absolute">
<div class="load-4">
<div class="ring-1"></div>
<p class= "center">Loading . . .</p>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="main"> </div>
<div class="main">
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment