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

added genres an langues condition to search, added close column bouton

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-03-19 22:15:44 +01:00
parent 4d2a3f85ce
commit 6af6e60946
12 changed files with 367 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sites/all/themes/custom/edlptheme/assets/dist/img/close.svg
Vendored
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 2.6458333 2.6458334"><g fill="none"><g stroke="#000" stroke-width=".265"><path d="M.111.111l2.424 2.424M.111 2.535L2.535.11" stroke-width=".15170455000000002"/></g><path style="isolation:auto;mix-blend-mode:normal" d="M1.883 0H.763A.76.76 0 0 0 0 .762v1.121c0 .423.34.763.762.763h1.121a.76.76 0 0 0 .763-.763V.763A.76.76 0 0 0 1.883 0z" color="#000" overflow="visible"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 456 B

sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js
Vendored
+39 -5
View File
@@ -24,10 +24,14 @@
initAjaxLinks();
if (_$body.is('.path-productions')) {
if (_$body.is('.path-productions')){
initProductions();
}
if(_$body.is('.path-frontpage')){
addCloseBtnToCols();
}
// initScrollbars();
initEvents();
};
@@ -50,7 +54,7 @@
})
.on('close_entree', function(e){
// e.tid available
closeAllModals();
backToFrontPage();
});
}
@@ -392,7 +396,7 @@
// return drupalSettings.path.baseUrl + drupalSettings.path.pathPrefix + path;
// };
var path = window.location.origin + drupalSettings.path.baseUrl + ajax_path;
var path = window.location.origin + Drupal.url(ajax_path);
$.getJSON(path, {})
.done(function(data){
onAjaxLinkLoaded(data, $link, sys_path);
@@ -414,9 +418,13 @@
// replace all content with newly loaded
// TODO: build a system to replace or append contents (like studio + search)
_$row.html(data.rendered);
// add close btn
if(sys_path != 'procuction'){
addCloseBtnToCols();
}
// add body class for currently loaded content
var body_classes = [
'path-'+sys_path.replace(/\//g, '-'),
@@ -452,11 +460,37 @@
_$body.trigger({'type':'new-content-ajax-loaded'});
// TODO: call behaviours
// call behaviours
Drupal.attachBehaviors(_$row[0]);
};
function addCloseBtnToCols(){
$('.col', _$row).each(function(index, el) {
if($('span.close-col-btn', this).length)
return true;
$(this).children('.wrapper').append($('<span>')
.addClass('close-col-btn')
.on('click', function(e){
// check for theme attribute and emmit event
var $col = $(this).parents('.col');
var theme = $col.attr('theme');
if(theme != ''){
_$body.trigger({'type':theme+'-col-closed'});
}
// remove the col
$col.remove();
// if row is empty call closeAllModals()
if(!$('.col', _$row).length){
backToFrontPage();
}
})
);
});
};
// ___
// / __|___ _ _ _ __ _ _ ___
// | (__/ _ \ '_| '_ \ || (_-<
sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css
Vendored
+79 -52
View File
@@ -1303,7 +1303,7 @@ main[role="main"] .layout-content {
transition: opacity 0.5s ease-in-out;
opacity: 1; }
body.ajax-loading main[role="main"] .layout-content {
body.ajax-loading main[role="main"] .layout-content .col:not([theme="edlp_search_search_form"]) {
opacity: 0.2; }
body.ajax-loading main[role="main"]:before {
@@ -1321,6 +1321,22 @@ body.ajax-loading main[role="main"]:before {
background-repeat: no-repeat;
background-position: center; }
main[role="main"] span.close-col-btn {
pointer-events: all;
cursor: pointer;
position: absolute;
top: 0;
right: 0;
padding: 0 !important;
margin: 0.5em;
display: block;
width: 10px;
height: 10px;
background-image: url(../img/close.svg);
background-repeat: no-repeat;
background-position: center;
background-size: contain; }
#audio-player {
position: absolute;
top: 0;
@@ -1805,58 +1821,69 @@ body.ajax-loading main[role="main"]:before {
font-size: 0.756em;
padding: 0.1em;
margin: 1em 0 0 0;
float: right; }
float: right;
opacity: 1;
-webkit-transition: opacity 0.3s ease-in-out;
transition: opacity 0.3s ease-in-out; }
#edlp-search-form.ajax-loading input[type="submit"] {
opacity: 0.2;
pointer-events: none; }
.col[theme="edlp_search_results"] article .entrees span {
display: inline-block;
width: 8px;
height: 8px;
background-color: black;
margin-right: 3px; }
.col[theme="edlp_search_results"] article .entrees span[tid='134'] {
background-color: var(--e-col-134); }
.col[theme="edlp_search_results"] article .entrees span[tid='121'] {
background-color: var(--e-col-121); }
.col[theme="edlp_search_results"] article .entrees span[tid='125'] {
background-color: var(--e-col-125); }
.col[theme="edlp_search_results"] article .entrees span[tid='119'] {
background-color: var(--e-col-119); }
.col[theme="edlp_search_results"] article .entrees span[tid='132'] {
background-color: var(--e-col-132); }
.col[theme="edlp_search_results"] article .entrees span[tid='122'] {
background-color: var(--e-col-122); }
.col[theme="edlp_search_results"] article .entrees span[tid='129'] {
background-color: var(--e-col-129); }
.col[theme="edlp_search_results"] article .entrees span[tid='120'] {
background-color: var(--e-col-120); }
.col[theme="edlp_search_results"] article .entrees span[tid='130'] {
background-color: var(--e-col-130); }
.col[theme="edlp_search_results"] article .entrees span[tid='118'] {
background-color: var(--e-col-118); }
.col[theme="edlp_search_results"] article .entrees span[tid='127'] {
background-color: var(--e-col-127); }
.col[theme="edlp_search_results"] article .entrees span[tid='133'] {
background-color: var(--e-col-133); }
.col[theme="edlp_search_results"] article .entrees span[tid='128'] {
background-color: var(--e-col-128); }
.col[theme="edlp_search_results"] article .entrees span[tid='124'] {
background-color: var(--e-col-124); }
.col[theme="edlp_search_results"] article .entrees span[tid='116'] {
background-color: var(--e-col-116); }
.col[theme="edlp_search_results"] article .entrees span[tid='117'] {
background-color: var(--e-col-117); }
.col[theme="edlp_search_results"] article .entrees span[tid='131'] {
background-color: var(--e-col-131); }
.col[theme="edlp_search_results"] article .entrees span[tid='126'] {
background-color: var(--e-col-126); }
.col[theme="edlp_search_results"] article .entrees span[tid='123'] {
background-color: var(--e-col-123); }
.col[theme="edlp_search_results"] article h2.node-title {
margin: 0 0 0.3em 0;
font-size: 1em;
font-weight: 500;
text-transform: none; }
.col[theme="edlp_search_results"] {
opacity: 1;
-webkit-transition: opacity 0.3s ease-in-out;
transition: opacity 0.3s ease-in-out; }
.col[theme="edlp_search_results"].ajax-loading {
opacity: 0.2; }
.col[theme="edlp_search_results"] article .entrees span {
display: inline-block;
width: 8px;
height: 8px;
background-color: black;
margin-right: 3px; }
.col[theme="edlp_search_results"] article .entrees span[tid='134'] {
background-color: var(--e-col-134); }
.col[theme="edlp_search_results"] article .entrees span[tid='121'] {
background-color: var(--e-col-121); }
.col[theme="edlp_search_results"] article .entrees span[tid='125'] {
background-color: var(--e-col-125); }
.col[theme="edlp_search_results"] article .entrees span[tid='119'] {
background-color: var(--e-col-119); }
.col[theme="edlp_search_results"] article .entrees span[tid='132'] {
background-color: var(--e-col-132); }
.col[theme="edlp_search_results"] article .entrees span[tid='122'] {
background-color: var(--e-col-122); }
.col[theme="edlp_search_results"] article .entrees span[tid='129'] {
background-color: var(--e-col-129); }
.col[theme="edlp_search_results"] article .entrees span[tid='120'] {
background-color: var(--e-col-120); }
.col[theme="edlp_search_results"] article .entrees span[tid='130'] {
background-color: var(--e-col-130); }
.col[theme="edlp_search_results"] article .entrees span[tid='118'] {
background-color: var(--e-col-118); }
.col[theme="edlp_search_results"] article .entrees span[tid='127'] {
background-color: var(--e-col-127); }
.col[theme="edlp_search_results"] article .entrees span[tid='133'] {
background-color: var(--e-col-133); }
.col[theme="edlp_search_results"] article .entrees span[tid='128'] {
background-color: var(--e-col-128); }
.col[theme="edlp_search_results"] article .entrees span[tid='124'] {
background-color: var(--e-col-124); }
.col[theme="edlp_search_results"] article .entrees span[tid='116'] {
background-color: var(--e-col-116); }
.col[theme="edlp_search_results"] article .entrees span[tid='117'] {
background-color: var(--e-col-117); }
.col[theme="edlp_search_results"] article .entrees span[tid='131'] {
background-color: var(--e-col-131); }
.col[theme="edlp_search_results"] article .entrees span[tid='126'] {
background-color: var(--e-col-126); }
.col[theme="edlp_search_results"] article .entrees span[tid='123'] {
background-color: var(--e-col-123); }
.col[theme="edlp_search_results"] article h2.node-title {
margin: 0 0 0.3em 0;
font-size: 0.8em;
font-weight: 500;
text-transform: none; }
body.path-agenda main .col > .wrapper {
height: 100%; }