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

search is ok! (remains to sync search and corpus map

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-03-19 15:07:19 +01:00
parent 973483a6eb
commit a7f736f919
29 changed files with 656 additions and 147 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
+11 -6
View File
@@ -4,7 +4,7 @@
var _$body = $('body');
var _is_front = _$body.is('.path-frontpage');
var _$corpus_canvas;
var _$content_container = $('main[role="main"]>.layout-content');
var _$row = $('main[role="main"]>.layout-content>.row');
var _$ajaxLinks;
var _audio_player;
var _randomPlayer;
@@ -41,6 +41,9 @@
.on('on-studio-chutier-updated', function(e){
initAjaxLinks();
})
.on('search-results-loaded',function(e){
initAjaxLinks();
})
.on('open_entree', function(e){
// e.tid available
closeAllModals();
@@ -410,7 +413,9 @@
_$body.removeClass('ajax-loading');
// replace all content with newly loaded
_$content_container.html(data.rendered);
// TODO: build a system to replace or append contents (like studio + search)
_$row.html(data.rendered);
// add body class for currently loaded content
var body_classes = [
@@ -448,7 +453,7 @@
_$body.trigger({'type':'new-content-ajax-loaded'});
// TODO: call behaviours
Drupal.attachBehaviors(_$content_container);
Drupal.attachBehaviors(_$row[0]);
};
@@ -553,7 +558,7 @@
// |_| |_| \___/\__,_|\_,_\__|\__|_\___/_||_/__/
function initProductions(){
console.log('theme : initProductions');
var $grid = $('.row', _$content_container).masonry({
var $grid = $('.row', _$row).masonry({
itemSelector:'.col',
columnWidth:'.col-2'
});
@@ -562,7 +567,7 @@
$grid.imagesLoaded().progress( function() {
$grid.masonry('layout');
});
// var $grid = $('.row', _$content_container).imagesLoaded( function() {
// var $grid = $('.row', _$row).imagesLoaded( function() {
// // init Masonry after all images have loaded
// $grid.masonry({
// itemSelector:'.col',
@@ -591,7 +596,7 @@
function closeAllModals(){
console.log('theme : closeAllModals');
// TODO: animate the remove
_$content_container.html('');
_$row.html('');
_$ajaxLinks.removeClass('is-active');
};
sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css
Vendored
+68 -3
View File
@@ -1086,6 +1086,11 @@ a:focus {
.col-11-offset-1:last-child {
padding-right: 0; }
.col.float-right {
float: right;
padding-right: 0;
padding-left: 1em; }
body, html {
position: relative;
width: 100%;
@@ -1108,6 +1113,18 @@ header[role="banner"] {
height: 100%;
position: relative; }
aside.messages {
border: none;
z-index: 99;
position: absolute;
left: 5%;
top: 100px;
width: 80%;
max-height: 600px;
background-color: rgba(255, 255, 255, 0.8);
padding: 0;
overflow-y: auto; }
main[role="main"] {
z-index: 1;
position: absolute;
@@ -1124,9 +1141,6 @@ main[role="main"] {
width: 100%;
height: 100%;
overflow: hidden; }
main[role="main"] .layout-content > .messages {
max-height: 500px;
overflow: auto; }
main[role="main"] .layout-content > * {
pointer-events: auto; }
@@ -1671,6 +1685,57 @@ body.ajax-loading main[role="main"]:before {
padding-left: 1em;
border-left: 1px solid #aaa; }
.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; }
body.path-agenda main .col > .wrapper {
height: 100%; }
sites/all/themes/custom/edlptheme/assets/scripts/main.js
+11 -6
View File
@@ -4,7 +4,7 @@
var _$body = $('body');
var _is_front = _$body.is('.path-frontpage');
var _$corpus_canvas;
var _$content_container = $('main[role="main"]>.layout-content');
var _$row = $('main[role="main"]>.layout-content>.row');
var _$ajaxLinks;
var _audio_player;
var _randomPlayer;
@@ -41,6 +41,9 @@
.on('on-studio-chutier-updated', function(e){
initAjaxLinks();
})
.on('search-results-loaded',function(e){
initAjaxLinks();
})
.on('open_entree', function(e){
// e.tid available
closeAllModals();
@@ -410,7 +413,9 @@
_$body.removeClass('ajax-loading');
// replace all content with newly loaded
_$content_container.html(data.rendered);
// TODO: build a system to replace or append contents (like studio + search)
_$row.html(data.rendered);
// add body class for currently loaded content
var body_classes = [
@@ -448,7 +453,7 @@
_$body.trigger({'type':'new-content-ajax-loaded'});
// TODO: call behaviours
Drupal.attachBehaviors(_$content_container);
Drupal.attachBehaviors(_$row[0]);
};
@@ -553,7 +558,7 @@
// |_| |_| \___/\__,_|\_,_\__|\__|_\___/_||_/__/
function initProductions(){
console.log('theme : initProductions');
var $grid = $('.row', _$content_container).masonry({
var $grid = $('.row', _$row).masonry({
itemSelector:'.col',
columnWidth:'.col-2'
});
@@ -562,7 +567,7 @@
$grid.imagesLoaded().progress( function() {
$grid.masonry('layout');
});
// var $grid = $('.row', _$content_container).imagesLoaded( function() {
// var $grid = $('.row', _$row).imagesLoaded( function() {
// // init Masonry after all images have loaded
// $grid.masonry({
// itemSelector:'.col',
@@ -591,7 +596,7 @@
function closeAllModals(){
console.log('theme : closeAllModals');
// TODO: animate the remove
_$content_container.html('');
_$row.html('');
_$ajaxLinks.removeClass('is-active');
};
sites/all/themes/custom/edlptheme/assets/styles/app.scss
+35 -1
View File
@@ -587,6 +587,39 @@ main[role="main"]{
}
}
// ___ _
// / __| ___ __ _ _ _ __| |_
// \__ \/ -_) _` | '_/ _| ' \
// |___/\___\__,_|_| \__|_||_|
#edlp-search-form{
}
.col[theme="edlp_search_results"]{
article{
.entrees{
span{
@include entrie-micro-square;
}
}
h2.node-title{
margin:0 0 0.3em 0;
font-size: 1em;
font-weight: 500;
text-transform: none;
}
// .description{
// p{
// margin:0;
// font-size: 0.75em;
// }
// }
}
}
// _ _ _ _ _
// /_\ (_)__ ___ __ | \| |___ __| |___
// / _ \ | / _` \ \ / | .` / _ \/ _` / -_)
@@ -692,6 +725,7 @@ body.path-productions{
}
}
}
// ___ _
// | __|__ ___| |_ ___ _ _
// | _/ _ \/ _ \ _/ -_) '_|
@@ -1041,8 +1075,8 @@ footer{
}
}
$icons_w:20px;
@mixin iconlinkblock($bgimgurl) {
$icons_w:20px;
pointer-events: all;
margin-left: 0.5em;
a{
sites/all/themes/custom/edlptheme/assets/styles/base/_grid.scss
+6
View File
@@ -73,3 +73,9 @@ $med-bp:1080px;
}
}
}
.col.float-right{
float: right;
padding-right: 0;
padding-left: $default_gap;
}
sites/all/themes/custom/edlptheme/assets/styles/base/_layout.scss
+10 -4
View File
@@ -36,6 +36,16 @@ header[role="banner"]{
}
}
aside.messages{
border: none;
z-index: 99;
position: absolute;
left:5%; top:100px;
width:80%; max-height: 600px;
background-color: rgba(255,255,255,0.8);
padding:0;
overflow-y: auto;
}
main[role="main"]{
// outline:1px solid green;
@@ -51,10 +61,6 @@ main[role="main"]{
.layout-content{
width: 100%; height:100%;
overflow:hidden;
&>.messages{
max-height: 500px;
overflow: auto;
}
&>*{
pointer-events: auto;
}