bachir/edlp_d8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

home for mobile is ok

Browse Source
This commit is contained in:
bachir
2018-04-26 21:41:43 +02:00
parent 2ee7077ecf
commit f0c2883d0e
24 changed files with 7999 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js
Vendored
+1668 -56
View File
File diff suppressed because it is too large Load Diff
sites/all/themes/custom/edlptheme/assets/dist/scripts/redirect.min.js
Vendored
+56 -3
View File
@@ -1,4 +1,57 @@
console.log('EDLP THEME redirect.js');
void 0;function checkMobile(){var user_agent=navigator.userAgent||navigator.vendor||window.opera;return/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge|maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm(os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(user_agent)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(user_agent.substr(0,4));}
if(typeof edlp_mobile!="undefined"){void 0;void 0;var device_redirect=false;var device_is_mobile=checkMobile();void 0;void 0;switch(true){case(device_is_mobile&&!edlp_mobile.is_mobile_domain):void 0;device_redirect=true;window.location.replace(window.location.protocol+'//'+edlp_mobile.mobile_url);break;case(edlp_mobile.is_mobile_domain&&!device_is_mobile):void 0;device_redirect=true;window.location.replace(window.location.protocol+'//'+edlp_mobile.desktop_url);break;default:void 0;break;}}
if(edlp.redirect&&!device_redirect){void 0;void 0;edlp.sys_path=edlp.sys_path.replace(/^\//,'');edlp.url=window.location.pathname;edlp.hash=window.location.hash;window.localStorage.setItem('edlp_origin',JSON.stringify(edlp));window.location.replace(window.location.origin+'/'+edlp.lang_code);}else{void 0;}
function checkMobile(){
var user_agent = navigator.userAgent||navigator.vendor||window.opera;
return /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(user_agent) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(user_agent.substr(0,4));
}
// var edlp_mobile is provided by edlp_mobile.module file
if(typeof edlp_mobile != "undefined"){
// console.log(edlp_mobile);
// console.log('window.location', window.location);
var device_redirect = false;
var device_is_mobile = checkMobile();
// console.log('is_mobile_domain', edlp_mobile.is_mobile_domain);
// console.log('device_is_mobile', device_is_mobile);
edlp_mobile.device_is_mobile = device_is_mobile;
switch(true){
case (device_is_mobile && !edlp_mobile.is_mobile_domain):
// console.log('redirect to mobile domain', window.location.protocol +'//'+ edlp_mobile.mobile_url);
device_redirect = true;
// TODO: redirect to mobile domain
window.location.replace(window.location.protocol +'//'+ edlp_mobile.mobile_url);
break;
case (edlp_mobile.is_mobile_domain && !device_is_mobile):
// console.log('redirect to desktop domain', window.location.protocol +'//'+ edlp_mobile.desktop_url);
device_redirect = true;
// TODO: redirect to desktop domain
window.location.replace(window.location.protocol +'//'+ edlp_mobile.desktop_url);
break;
default:
// console.log('do not redirect');
break;
}
if(device_is_mobile){
document.documentElement.className += "is-mobile";
}
}
// var edlp is provided by edlp_ajax.module file
if(edlp.redirect && !device_redirect && !device_is_mobile){
console.log('redirect', edlp);
console.log('window.location', window.location);
// window.localStorage.setItem('edlp_origin_path', edlp.sys_path.replace(/^\//, ''));
edlp.sys_path = edlp.sys_path.replace(/^\//, '');
// window.localStorage.setItem('edlp_origin_url', window.location.pathname);
edlp.url = window.location.pathname;
// window.localStorage.setItem('edlp_origin_hash', window.location.hash);
edlp.hash = window.location.hash;
window.localStorage.setItem('edlp_origin', JSON.stringify(edlp));
// redirect to home
window.location.replace(window.location.origin+'/'+edlp.lang_code);
}else{
console.log('history do not redirect');
}
sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css
Vendored
+3087 -1
View File
File diff suppressed because one or more lines are too long
sites/all/themes/custom/edlptheme/assets/scripts/main.js
+3 -3
View File
@@ -24,8 +24,8 @@
function init(){
console.log("EdlpTheme init()");
if(!drupalSettings.path.isFront)
return;
// if(!drupalSettings.path.isFront)
// return;
initEvents();
@@ -1659,7 +1659,7 @@
} // end EdlpTheme()
$(document).ready(function($) {
if(drupalSettings.path.isFront){
if(drupalSettings.path.isFront && !edlp_mobile.device_is_mobile){
var edlptheme = new EdlpTheme();
}else{
$('body').attr('booted', 'booted');
sites/all/themes/custom/edlptheme/assets/scripts/redirect.js
+12 -8
View File
@@ -7,33 +7,37 @@ function checkMobile(){
// var edlp_mobile is provided by edlp_mobile.module file
if(typeof edlp_mobile != "undefined"){
console.log(edlp_mobile);
console.log('window.location', window.location);
// console.log(edlp_mobile);
// console.log('window.location', window.location);
var device_redirect = false;
var device_is_mobile = checkMobile();
console.log('is_mobile_domain', edlp_mobile.is_mobile_domain);
console.log('device_is_mobile', device_is_mobile);
// console.log('is_mobile_domain', edlp_mobile.is_mobile_domain);
// console.log('device_is_mobile', device_is_mobile);
edlp_mobile.device_is_mobile = device_is_mobile;
switch(true){
case (device_is_mobile && !edlp_mobile.is_mobile_domain):
console.log('redirect to mobile domain', window.location.protocol +'//'+ edlp_mobile.mobile_url);
// console.log('redirect to mobile domain', window.location.protocol +'//'+ edlp_mobile.mobile_url);
device_redirect = true;
// TODO: redirect to mobile domain
window.location.replace(window.location.protocol +'//'+ edlp_mobile.mobile_url);
break;
case (edlp_mobile.is_mobile_domain && !device_is_mobile):
console.log('redirect to desktop domain', window.location.protocol +'//'+ edlp_mobile.desktop_url);
// console.log('redirect to desktop domain', window.location.protocol +'//'+ edlp_mobile.desktop_url);
device_redirect = true;
// TODO: redirect to desktop domain
window.location.replace(window.location.protocol +'//'+ edlp_mobile.desktop_url);
break;
default:
console.log('do not redirect');
// console.log('do not redirect');
break;
}
if(device_is_mobile){
document.documentElement.className += "is-mobile";
}
}
// var edlp is provided by edlp_ajax.module file
if(edlp.redirect && !device_redirect){
if(edlp.redirect && !device_redirect && !device_is_mobile){
console.log('redirect', edlp);
console.log('window.location', window.location);
// window.localStorage.setItem('edlp_origin_path', edlp.sys_path.replace(/^\//, ''));
sites/all/themes/custom/edlptheme/assets/styles/app.scss
+111 -35
View File
@@ -89,6 +89,10 @@ header[role="banner"]{
white-space: nowrap;
text-indent: 500px;
overflow: hidden;
html.is-mobile &{
$w:170px;
width:$w; height:$w * 0.22;
}
}
}
opacity: 1;
@@ -151,6 +155,16 @@ header[role="banner"]{
}
}
}
html.is-mobile &{
// outline: 1px solid orange;
margin-top:4px;
li{
a{
font-size: 0.680em;
padding:0; margin:0;
}
}
}
}
.block-language{
@@ -1651,40 +1665,6 @@ footer{
}
}
// .block-language{
// display: inline-block;
// position: relative;
// ul{
// position: absolute;
// bottom:0;
// margin:0;
// padding:0;
// transform-origin: left bottom;
// transform: rotateZ(-45deg);
// white-space: nowrap;
// pointer-events: all;
// li{
// margin:0; padding:0;
// list-style: none;
// display: inline-block;
// &:last-of-type{
// &:before{
// content:"/";
// margin:0 0.2em;
// }
// }
// a{
// color: inherit;
// text-decoration: none;
// font-size: 0.756em;
// }
// &.is-active{
// a{color: red;}
// }
// }
// }
// }
nav#block-productions.block-menu{
position: relative;
pointer-events: none;
@@ -1926,14 +1906,15 @@ footer{
}
$icons_w:20px;
$mobile_icon_w:15px;
@mixin iconlinkblock($bgimgurl, $bgimgurlactive) {
pointer-events: all;
margin-left: 0.5em;
// @include btn;
a{
box-sizing: border-box;
$wh:$icons_w;
display: block;
$wh:$icons_w;
width:$wh; height:$wh;
text-indent: $wh*2;
margin: 0;
@@ -1950,6 +1931,12 @@ footer{
// background-color: red;
background-image: $bgimgurlactive;
}
html.is-mobile &{
$wh:$mobile_icon_w;
width:$wh; height:$wh;
text-indent: $wh*2;
}
}
}
@@ -2041,6 +2028,95 @@ footer{
margin-left: 0.2em;
}
.block-language{
float: none;
margin-top: 0;
margin-right: 2em;
ul{
margin:0; padding:0;
li{
display: inline-block; vertical-align: middle;
list-style: none;
pointer-events: all;
a{
font-size: 0.690em;
color:inherit;
text-decoration: none;
text-transform: capitalize;
margin-left: 0.8em;
@include btn;
&:before{
content: "";
display:inline-block;
$sq:0.6em;
width: $sq; height:$sq;
border: 1px solid red;
margin-right: 0.3em;
}
}
&.is-active,
&:hover{
a:before{
border-color: red;
background-color: red;
}
}
}
}
html.is-mobile &{
// outline: 1px solid green;
border-left: none;
ul{
margin-right:0.5em;
}
li{
line-height: 0;
a{
padding:0;
margin:0;
// &:before{display: none;}
&.is-active{
display:none;
}
}
}
}
}
html.is-mobile &{
position: fixed;
box-sizing: border-box;
bottom:0; left:0;
width:100%;
background-color: #fff;
padding-top:0;
padding-bottom:0;
.region-footer-left, .region-footer-right{
width: 50%;
>*{
margin:0.4em 0!important;
}
}
#block-footer, .block-language{
// margin-top: 0;
li{
display: inline-block;
a{
font-size: 0.680em;
&:before{
$sq:5px;
width: $sq; height:$sq;
}
}
}
}
.region-footer-right{
text-align: right;
}
}
}
// _ _ _ ___
sites/all/themes/custom/edlptheme/assets/styles/base/_grid.scss
+6 -1
View File
@@ -28,8 +28,13 @@ $med-bp:1080px;
@mixin col($col, $offset: 0, $sum: $default_sum, $gap: $default_gap, $align: top) {
@extend %col-reset;
padding-left: $gap*$offset;
padding-right: $gap;
@if $col == $default_sum {
padding-right: 0;
}@else{
padding-right: $gap;
}
&:last-child{padding-right: 0;}
margin-left: percentage(($col/$sum)*$offset);
// @media only screen and (min-width: 768px) {
sites/all/themes/custom/edlptheme/assets/styles/base/_layout.scss
+15 -1
View File
@@ -37,6 +37,15 @@ header[role="banner"]{
}
}
}
html.is-mobile header[role="banner"]{
position:fixed;
box-sizing: border-box;
top:0; left:0; width:100%;
background-color: #fff;
>.wrapper{
height:50px;
}
}
aside.messages{
border: none;
@@ -49,7 +58,7 @@ aside.messages{
overflow-y: auto;
}
main[role="main"]{
html:not(.is-mobile) main[role="main"]{
// outline:1px solid green;
z-index: 1;
position: absolute;
@@ -69,6 +78,11 @@ main[role="main"]{
}
}
html.is-mobile main[role="main"]{
padding:80px 1em 40px;
// background-color: blue;
}
body.toolbar-horizontal.toolbar-themes.toolbar-no-tabs{
main[role="main"]{
padding-top: 7em + 1em;
sites/all/themes/custom/edlptheme/templates/navigation/links--language-block.html.twig
-1
View File
@@ -43,7 +43,6 @@
{%- endif -%}
<ul{{ attributes }}>
{%- for item in links -%}
<!-- {{ dump(item) }} -->
<li{{ item.attributes }}>
{%- if item.link -%}
{{ item.link }}