Skip to content

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

[Update]Redmine #649 : Structural change + fixed menu

parent 76e735c6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1272 additions and 1240 deletions
wp-content/themes/nap/assets/css/main.css
View file @ 2fc92e00
......@@ -954,9 +954,7 @@ footer{
/* ==========================================================================
VII/ Pages...............ALL pages
========================================================================== */
/* --------------*/ /* ---------->>> HOME <<<-----------*/ /* --------------*/
#home {
position: relative;
height: 100%;
......@@ -970,6 +968,10 @@ VII/ Pages...............ALL pages
.img-wrapper img{
display: none;
}
#home .img-wrapper.fixed{
position: fixed;
left: 0;
}
.news-btn{
position: absolute;
top: 50px;
......@@ -1782,7 +1784,7 @@ label.chevron.bottom::first-letter {
}
.container-bg{
position: fixed;
z-index: 99;
z-index: 9999999;
background-size: cover;
opacity: 0;
}
......@@ -2169,6 +2171,9 @@ label.chevron.bottom::first-letter {
padding: 0px 10px 0px 15px;
padding-bottom: 100px;
}
.right-container .contact-wrapper .right-panel{
padding: 0px;
}
.panel section > h2{
padding-top: 80px;
}
......@@ -2295,10 +2300,10 @@ label.chevron.bottom::first-letter {
padding-top: 30px;
}
/* --------------*/ /* ---------->>> Uniqpaper <<<-----------*/ /* --------------*/
#uniqpaper .cover-wrapper{
#cat-151 .cover-wrapper{
top: 0;
}
#uniqpaper .right-container .left-panel {
#cat-151 .right-container .left-panel {
width: 47.2%;
}
.floated-bloc{
......
wp-content/themes/nap/assets/css/responsive.css
View file @ 2fc92e00
......@@ -201,7 +201,7 @@
padding: 65px 20px;
}
/*Uniqpaper*/
#uniqpaper .right-container .left-panel {
#cat-151 .right-container .left-panel {
width: 34%;
}
.floated-bloc{
......@@ -219,6 +219,9 @@
.contact-form .footer{
padding: 30px 22px 32px;
}
.right-container .contact-wrapper .right-panel{
padding: 0px;
}
/* Catalogue */
.right-container .left-panel{
width: 37%;
......@@ -288,6 +291,9 @@
.right-panel-wrapper{
top: 0px !important;
}
.container-bg{
height: auto !important;
}
}
@media screen and (max-width: 860px) {
/* general */
......@@ -317,6 +323,12 @@
.rounded{
padding: 8px 22px 11px;
}
.mobile-nav{
display: none;
}
#catalogue .mobile-nav{
display: block;
}
/* Helper */
.close-btn{
top: 15px;
......@@ -388,12 +400,12 @@
letter-spacing: 0px;
}
/*Uniqpaper*/
#uniqpaper .right-container .left-panel {
#cat-151 .right-container .left-panel {
position: relative;
width: 100%;
left: initial !important;
}
#uniqpaper .cover-wrapper{
#cat-151 .cover-wrapper{
display: block;
}
.floated-bloc{
......
wp-content/themes/nap/assets/js/main.js
View file @ 2fc92e00
This diff is collapsed.
wp-content/themes/nap/assets/js/nap.js
View file @ 2fc92e00
jQuery(document).ready(function() {
jQuery('p').each(function() {
var $this = jQuery(this);
if($this.html().replace(/\s|&nbsp;/g, '').length == 0) {
$this.remove();
}
});
jQuery(document).on('click', ".download_file", function() {
var id;
var download_link = jQuery('.download_file_link').attr('href');
......@@ -17,9 +17,9 @@ jQuery(document).ready(function() {
else
id = variation_id;
var link = download_link + 'variation_id=' + id;
window.open(link, '_blank');
return false;
});
......@@ -29,7 +29,7 @@ jQuery(document).ready(function() {
jQuery('.list-animation section').show();
jQuery('article').removeClass('selected');
jQuery('article').removeClass('hidden');
var tabcolor = [];
i = 0;
......@@ -54,7 +54,7 @@ jQuery(document).ready(function() {
jQuery("#pa_univers .selected").each(function() {
tabunivers[i++] = jQuery(this).text();
});
var sku = jQuery("#sku-search").val();
var selected_colors = tabcolor.join(',');
......@@ -74,9 +74,9 @@ jQuery(document).ready(function() {
jQuery(this).hide();
}
});
});
jQuery(window).on('load',function() {
jQuery('.filter-bloc').removeClass('active');
jQuery('.filter-bloc ').each(function() {
......@@ -99,8 +99,8 @@ jQuery(document).ready(function() {
jQuery(this).hide();
}
});
if(result_found == false)
{jQuery('.search_notfound').text(' Aucun produit ne correspond à votre recherche');
console.log(result_found);
......@@ -110,13 +110,13 @@ jQuery(document).ready(function() {
jQuery(window).bind("popstate", function(e) {
/*jQuery(window).bind("popstate", function(e) {
var state = e.originalEvent.state;
if ( state === null ) {
if ( state === null ) {
var back_link = jQuery('.close-panel .circle-btn a').attr('href');
window.location.href = back_link;
}
});
}
});*/
});
......
wp-content/themes/nap/contact.php
View file @ 2fc92e00
This diff is collapsed.
wp-content/themes/nap/footer-page-content.php 0 → 100644
View file @ 2fc92e00
</div> <!-- END right-container -->
<?php
if (!(isset($_POST['ajax']))) {
get_footer();
} ?>
wp-content/themes/nap/footer.php
View file @ 2fc92e00
......@@ -17,7 +17,7 @@
<li class="<?php if( !is_user_logged_in() ) echo " login-user"; else echo " to-slide";?>"><?php if ( is_user_logged_in() ) {?><a href="<?php echo get_permalink(3364);?>">photothèque</a><?php } else echo "<a>photothèque</a>"; ?></li>
<li class="to-slide"><a href="<?php echo get_permalink(171)?>">mentions légales</a></li>
</ul>
</div>
</div>
</div>
</footer>
<div class="popup-container">
......@@ -33,7 +33,7 @@
<input type="password" name="pwd" id="pwd" placeholder = "Mot de passe" />
<button class="btn rounded white-btn" type="submit" class="nl-btn">Se connecter</button>
</form>-->
<?php
<?php
$popoup = array(
'echo' => true,
// Default 'redirect' value takes the user back to the request URI.
......@@ -63,7 +63,7 @@
</div>
</div>
</div>
<div id="loading-container-subpage">
<div id="loading-container-subpage" class = "loading-container-subpage">
<div class="loading-wrapper">
<div class="loading">
<div id="loading-center-absolute">
......
wp-content/themes/nap/front-page.php
View file @ 2fc92e00
<?php
get_header();
get_sidebar();
$url = nap_attachment_image($ID);
?>
<div id="home">
<div class="container-bg abs-full hidden"></div>
<?php get_sidebar(); ?>
<div data-defaultimg ='<?php echo $url ;?>' class="transition img-wrapper" style ="background-image: url('<?php echo $url ;?>')"></div>
<div class="header mobile-nav display--only-mobile blue-bg fixed">
<div class="nav-wrapper blue-bg">
<ul></ul>
</div>
</div>
<div class="right-container">
<div class="news-btn circle-btn add-icon font-small animated zoomIn"><span>Nouveautés</span></div>
<aside class="news-wrapper container ">
<div class="news-header crete">
......@@ -17,34 +30,34 @@ $url = nap_attachment_image($ID);
while ( has_sub_field('nap_nouveautes',135) ) :
?>
<article class = "row <?php the_sub_field('nv_taille');?>">
<a href="<?php echo the_sub_field('nv_lien');?>">
<figure>
<img src="<?php the_sub_field('nv_image');?>" alt="Nouveautés">
<figcaption>
<?php htmlspecialchars(the_sub_field('nv_titre'));?>
</figcaption>
</figure>
</a>
</article>
<?php
<article class = "row <?php the_sub_field('nv_taille');?>">
<a href="<?php echo the_sub_field('nv_lien');?>">
<figure>
<img src="<?php the_sub_field('nv_image');?>" alt="Nouveautés">
<figcaption>
<?php htmlspecialchars(the_sub_field('nv_titre'));?>
</figcaption>
</figure>
</a>
</article>
<?php
endwhile;
endif;
?>
</div>
</aside>
<!--Menu for mobile-->
<div class="home-footer-nav display--only-mobile">
<div class="header">
<div class="nav-wrapper footer-home-content">
<div class="home-down-wrapper blue-bg"></div>
<span class = "home-down chevron bottom hidden-elem pink-btn abs-center"></span>
</div>
endif;
?>
</div>
</aside>
<!--Menu for mobile-->
<div class="home-footer-nav display--only-mobile">
<div class="header">
<div class="nav-wrapper footer-home-content">
<div class="home-down-wrapper blue-bg"></div>
<span class = "home-down chevron bottom hidden-elem pink-btn abs-center"></span>
</div>
</div>
</div><!--END home -->
<?php
</div>
</div><!--END home -->
</div>
<?php
get_footer();
get_footer();
wp-content/themes/nap/functions.php
View file @ 2fc92e00
......@@ -310,7 +310,7 @@ function nap_menu() {
} else {
$nappe_sets = false;
}
$menu.= '<li class ="parent-cat to-slide" data-page = "' . $category_id . '" data-img = "' . nap_category_image($category_id) . '"><a href="' . get_term_link($cat->slug, 'product_cat') . '">' . $cat->name . '</a>';
$menu.= '<li class ="parent-cat to-slide-cat" data-page = "' . $category_id . '" data-img = "' . nap_category_image($category_id) . '"><a href="' . get_term_link($cat->slug, 'product_cat') . '">' . $cat->name . '</a>';
$args2 = array(
'taxonomy' => $taxonomy,
......
wp-content/themes/nap/header-page-content.php 0 → 100644
View file @ 2fc92e00
<?php
if (!defined('ABSPATH')) {
exit; // Exit if accessed directly
}
if (!(isset($_POST['ajax']))) {
get_header();
}
$product;
$cate = get_queried_object();
$extClass = "";
if (is_product_category()){
$cateID = $cate->term_id;
$id = "catalogue";
}else{
$cateID = get_the_ID();
$id = 'cat-'.$cateID;
}
if ($cateID == 154){ //page stories
$extClass = "full-slides right";
}
?>
<div class="container clearfix" id="<?php echo $id ?>" data-page = "<?php echo $cateID; ?>">
<?php if (!(isset($_POST['ajax']))) { ?>
<?php if ($cateID == 154){ //page stories ?>
<div class="container-bg abs-full" style="background-image: url('<?php echo nap_attachment_image(154);?>')"></div>
<?php } else { ?>
<div class="container-bg abs-full"></div>
<?php } ?>
<?php get_sidebar(); } ?>
<?php if (is_product_category()){ ?>
<div class="header mobile-nav display--only-mobile blue-bg fixed">
<div class="nav-wrapper blue-bg">
<ul></ul>
</div>
</div>
<?php } // is_product_category ?>
<div class="right-container <?php echo $extClass ?>">
wp-content/themes/nap/header.php
View file @ 2fc92e00
......@@ -32,4 +32,3 @@
</div>
</div>
<div class="main">
wp-content/themes/nap/nav-list.php
View file @ 2fc92e00
<div class="nav-content font-big">
<?php
$arrow = 'arrow-white nav-page';
if (isset($current_page) and $current_page == 'phototheque') {
$arrow = 'arrow-blue phototheque';
}
?>
<ul class = "main-list-nav <?php echo $arrow ?>">
<?php echo nap_menu(); ?>
<li class="to-slide" data-page = "uniqpaper" data-img = "<?php echo nap_attachment_image(151);?>"><a href="<?php echo get_permalink(151);?>">Personnalisation</a></li>
<?php
$arrow = 'arrow-white nav-page';
if (isset($current_page) and $current_page == 'phototheque') {
$arrow = 'arrow-blue phototheque';
}
?>
<ul class = "main-list-nav <?php echo $arrow ?>">
<?php echo nap_menu(); ?>
<li class="to-slide-cat" data-page = "151" data-img = "<?php echo nap_attachment_image(151);?>"><a href="<?php echo get_permalink(151);?>">Personnalisation</a></li>
</ul>
<?php if (!(isset($current_page) and $current_page == 'phototheque')) { ?>
<ul class= "font-medium arrow-pink pink-list">
<li class="to-slide-cat" data-page = "154" data-img = "<?php echo nap_attachment_image(154);?>"><a href="<?php echo get_permalink(154);?>">Stories</a></li>
<li class="to-slide-cat" data-page = "157" data-img = "<?php echo nap_attachment_image(157);?>" ><a href="<?php echo get_permalink(157);?>">Contact</a></li>
</ul>
<?php if (!(isset($current_page) and $current_page == 'phototheque')) { ?>
<ul class= "font-medium arrow-pink pink-list">
<li class="to-slide" data-page = "stories" data-img = "<?php echo nap_attachment_image(154);?>"><a href="<?php echo get_permalink(154);?>">Stories</a></li>
<li class="to-slide" data-page = "contact" data-img = "<?php echo nap_attachment_image(157);?>" ><a href="<?php echo get_permalink(157);?>">Contact</a></li>
</ul>
<?php } ?>
<?php } ?>
</div>
wp-content/themes/nap/stories.php
View file @ 2fc92e00
<?php
/**
* Template Name: Stories
*
*/
get_header();
* Template Name: Stories
*
*/
$post_ID = get_the_ID();
if (!(isset($_POST['ajax']))) {
get_template_part( 'header', 'page-content' );
}
?>
<div class="container clearfix" data-page = "stories">
<div class="container-bg abs-full" style="background-image: url('<?php echo nap_attachment_image(154);?>')"></div>
<?php get_sidebar(); ?>
<div class="full-slides right-container right">
<div id="fullpage">
<span class = "moveDown chevron bottom hidden-elem"></span>
<?php
if (get_field('stories', 154)):
while (has_sub_field('stories', 154)) :
?>
<div class="section " style = "background-image:url('<?php the_sub_field('st_image'); ?>')">
<div class="bloc">
<div class="header-bloc">
<span>01</span>
<h2><?php the_sub_field('st_titre'); ?></h2>
</div>
<div class="desc-content">
<h3><?php the_sub_field('st_citation'); ?></h3>
<?php htmlspecialchars(the_sub_field('st_texte')); ?>
</div>
</div>
</div>
<?php
endwhile;
endif;
?>
<div class="hidden data-elem" data-postid ="cat-<?php echo $post_ID ?>" data-page = "<?php echo $post_ID ?>" data-class="full-slides right"></div>
<div id="fullpage">
<span class = "moveDown chevron bottom hidden-elem"></span>
<?php
if (get_field('stories', 154)):
while (has_sub_field('stories', 154)) :
?>
<div class="section " style = "background-image:url('<?php the_sub_field('st_image'); ?>')">
<div class="bloc">
<div class="header-bloc">
<span>01</span>
<h2><?php the_sub_field('st_titre'); ?></h2>
</div>
<div class="desc-content">
<h3><?php the_sub_field('st_citation'); ?></h3>
<?php htmlspecialchars(the_sub_field('st_texte')); ?>
</div>
</div>
</div>
</div>
<?php
endwhile;
endif;
?>
</div>
<?php
get_footer();
if (!(isset($_POST['ajax']))) {
get_template_part( 'footer', 'page-content' );
}
?>
wp-content/themes/nap/uniqpaper.php
View file @ 2fc92e00
<?php
<?php
/**
* Template Name: Personnalisation
*
*/
get_header(); ?>
<div class="container clearfix" id="uniqpaper" data-page = "uniqpaper">
<div class="container-bg abs-full"></div>
<?php get_sidebar(); ?>
<div class="right-container">
<div class="left-panel fixed-full position--after-menu ">
<div class="cover-wrapper abs-full transition" style = "background-image: url('<?php echo get_field('pers_image',151)?>')"></div>
<div class="abs floated-bloc">
<h2><?php echo get_field('pers_titre',151)?></h2>
<div class="text-content"><?php echo get_field('pers_texte',151)?></div>
</div>
</div>
* Template Name: Personnalisation
*
*/
$post_ID = get_the_ID();
if (!(isset($_POST['ajax']))) {
get_template_part( 'header', 'page-content' );
}
?>
<div class="hidden data-elem" data-postid ="cat-<?php echo $post_ID ?>" data-page = "<?php echo $post_ID ?>"></div>
<div class="left-panel fixed-full position--after-menu ">
<div class="cover-wrapper abs-full transition" style = "background-image: url('<?php echo get_field('pers_image',151)?>')"></div>
<div class="abs floated-bloc">
<h2><?php echo get_field('pers_titre',151)?></h2>
<div class="text-content"><?php echo get_field('pers_texte',151)?></div>
</div>
<div class="right-panel right">
<div class="form-wrapper clearfix">
<!--<form action="#" method="POST">
<h2>Information sur le produit</h2>
<textarea name = "description" placeholder="Describe yourself here..."> </textarea>
<h2>Vos coordonnées</h2>
<div class="clearfix">
<div class="row left half-col">
<input placeholder = "Nom" type="text" name="name" id="name" value="" />
<input placeholder = "Prénom" type="text" name="fname" id="fname" value="" />
<input placeholder = "Société" type="text" name="soc" id="soc" value="" />
</div>
<div class="row right half-col">
<input placeholder = "Mail" type="text" name="mail" id="mail" value="" />
<input placeholder = "Téléphone" type="text" name="phone" id="phone" value="" />
</div>
</div>
<div class="center">
<input type = "submit" class="btn pink-btn rounded" value = 'Envoyer'>
</div>
</form>-->
<?php echo do_shortcode( '[contact-form-7 id="663" title="Personnalisation form"]' ); ?>
</div>
</div>
<div class="right-panel right">
<div class="form-wrapper clearfix">
<?php echo do_shortcode( '[contact-form-7 id="663" title="Personnalisation form"]' ); ?>
</div>
</div>
<?php get_footer();
\ No newline at end of file
<?php
if (!(isset($_POST['ajax']))) {
get_template_part( 'footer', 'page-content' );
}
?>
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