kevin/r2c
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add id long lat content

Browse Source
This commit is contained in:
kevin
2018-09-09 17:06:42 +02:00
parent 75dbc56676
commit 323aaff2cb
29 changed files with 204 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/themes/r2c/blueprints/default.yaml
+1 -1
View File
@@ -12,4 +12,4 @@ form:
fields:
header.body_classes:
markdown: true
description: 'Available classes in Quark Theme (space separated):<br />`header-fixed`, `header-animated`, `header-dark`, `header-transparent`, `sticky-footer`'
description: 'Available classes in Quark Theme (space separated):<br />`header-fixed`, `header-animated`, `header-dark`, `header-transparent`, `sticky-footer`'
user/themes/r2c/blueprints/modular/image.yaml
+33
View File
@@ -0,0 +1,33 @@
title: Text
'@extends': default
form:
fields:
tabs:
fields:
content:
fields:
header.media_order:
label: Page Media (first one will be displayed next to your content)
header.image_align:
type: select
label: Image position
classes: fancy
default: left
options:
'left': 'Left'
'right': 'Right'
options:
fields:
identifiant:
type: section
title: Identifiant
fields:
header.id:
type: text
label: Id
multiple: true
user/themes/r2c/blueprints/modular/mappoint.yaml
+45
View File
@@ -0,0 +1,45 @@
title: Text
'@extends': default
form:
fields:
tabs:
fields:
content:
fields:
header.media_order:
label: Page Media (first one will be displayed next to your content)
header.image_align:
type: select
label: Image position
classes: fancy
default: left
options:
'left': 'Left'
'right': 'Right'
options:
fields:
identifiant:
type: section
title: Identifiant
fields:
header.id:
type: text
label: Id
multiple: true
coordonees:
type: section
title: Coordonées
fields:
header.long:
type: text
label: Longitude
header.lat:
type: text
label: Latitude
user/themes/r2c/blueprints/modular/text.yaml
+14
View File
@@ -17,3 +17,17 @@ form:
options:
'left': 'Left'
'right': 'Right'
options:
fields:
identifiant:
type: section
title: Identifiant
fields:
header.id:
type: text
label: Id
multiple: true
user/themes/r2c/css-compiled/template.css
+14 -10
View File
File diff suppressed because one or more lines are too long
user/themes/r2c/css-compiled/template.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
@font-face{font-family:CooperHewitt;src:url(../fonts/CooperHewitt/CooperHewitt-Bold.eot);src:url(../fonts/CooperHewitt/CooperHewitt-Bold.eot?#iefix) format('embedded-opentype'),url(../fonts/CooperHewitt/CooperHewitt-Bold.woff) format('woff'),url(../fonts/CooperHewitt/CooperHewitt-Bold.ttf) format('truetype'),url(../fonts/CooperHewitt/CooperHewitt-Bold.svg#CooperHewitt) format('svg')}@font-face{font-family:CooperHewitt-BoldItalic;src:url(../fonts/CooperHewitt/CooperHewitt-BoldItalic.eot);src:url(../fonts/CooperHewitt/CooperHewitt-BoldItalic.eot?#iefix) format('embedded-opentype'),url(../fonts/CooperHewitt/CooperHewitt-BoldItalic.woff) format('woff'),url(../fonts/CooperHewitt/CooperHewitt-BoldItalic.ttf) format('truetype'),url(../fonts/CooperHewitt/CooperHewitt-BoldItalic.svg#CooperHewitt-BoldItalic) format('svg')}@font-face{font-family:rubik;src:url(../fonts/rubik/Rubik-Light.eot);src:url(../fonts/rubik/Rubik-Light.eot?#iefix) format('embedded-opentype'),url(../fonts/rubik/Rubik-Light.woff) format('woff'),url(../fonts/rubik/Rubik-Light.ttf) format('truetype'),url(../fonts/rubik/Rubik-Light.svg#rubik) format('svg')}@font-face{font-family:Rubik-Bold;src:url(../fonts/rubik/Rubik-Bold.eot);src:url(../fonts/rubik/Rubik-Bold.eot?#iefix) format('embedded-opentype'),url(../fonts/rubik/Rubik-Bold.woff) format('woff'),url(../fonts/rubik/Rubik-Bold.ttf) format('truetype'),url(../fonts/rubik/Rubik-Bold.svg#Rubik-Bold) format('svg')}@font-face{font-family:cmu-concrete-ita;src:url(../fonts/Concrete/cmunoti.eot);src:url(../fonts/Concrete/cmunoti.eot?#iefix) format('embedded-opentype'),url(../fonts/Concrete/cmunoti.woff) format('woff'),url(../fonts/Concrete/cmunoti.ttf) format('truetype'),url(../fonts/Concrete/cmunoti.svg#cmu-concrete-ita) format('svg')}*{box-sizing:border-box}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{font:inherit;font-size:16px;margin:0;padding:0;vertical-align:baseline;border:0}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body,html{height:100%}body{line-height:1}ol,ul{list-style:none}a{text-decoration:none;color:#000}blockquote,q{quotes:none}img{width:100%;height:100%;vertical-align:bottom}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}table{border-spacing:0;border-collapse:collapse}p{font-style:normal}em{font-style:italic}strong{font-family:Rubik-Bold}h1{font-size:1.2rem;line-height:50px}h1 a{font-family:CooperHewitt;font-weight:400}h2{font-family:CooperHewitt-BoldItalic;font-size:1.1rem;line-height:50px}p{font-family:rubik;font-size:1rem;line-height:1.3rem}p a{font-family:cmu-concrete-ita}.top>div:nth-child(1){color:#fff}.top>div:nth-child(1) a{color:#ff0054}#header{padding:0 20px}body{overflow:hidden}#page{height:100%;background:#e6e6e6}#page .navbar{width:100%;height:50px}#page .handler{position:absolute;z-index:999;top:50%;width:50px;height:50px;cursor:-webkit-grab;cursor:grab;border-radius:25px}#page .hand1{left:calc((100%/3) - 25px);opacity:.5;background:green}#page .hand2{right:calc((100%/3) - 25px);opacity:.5;background:red}#page .mouseDown{cursor:-webkit-grabbing;cursor:grabbing}#page #start{width:100%;height:calc(100% - 50px)}#page #start .bottom,#page #start .top{display:-ms-inline-flexbox;display:inline-flex;width:100%;-ms-flex-pack:justify;justify-content:space-between}#page #start img{transition:filter .5s;filter:grayscale(100%) contrast(4)}#page #start img:hover{transition:filter .5s;filter:grayscale(0)}#page #start .top{position:relative;height:calc(100% / 2)}#page #start .top>div:nth-child(-n+2){padding:0 20px}#page #start .top>div:nth-child(1){background:#969696}#page #start .bottom{position:absolute;top:calc(100% / 2 + 25px);bottom:0;height:auto}#page #start .bottom>div:nth-child(1){background:red}#page #start .blocs{overflow-y:auto;width:calc(100% / 3);min-width:200px;margin:2px}#page #start .blocs:nth-child(2){left:calc(100% / 3);background:#fff}#page #start .blocs:nth-child(3){background:#fff}#mapid{height:180px}
@font-face{font-family:CooperHewitt;src:url(../fonts/CooperHewitt/CooperHewitt-Bold.eot);src:url(../fonts/CooperHewitt/CooperHewitt-Bold.eot?#iefix) format('embedded-opentype'),url(../fonts/CooperHewitt/CooperHewitt-Bold.woff) format('woff'),url(../fonts/CooperHewitt/CooperHewitt-Bold.ttf) format('truetype'),url(../fonts/CooperHewitt/CooperHewitt-Bold.svg#CooperHewitt) format('svg')}@font-face{font-family:CooperHewitt-BoldItalic;src:url(../fonts/CooperHewitt/CooperHewitt-BoldItalic.eot);src:url(../fonts/CooperHewitt/CooperHewitt-BoldItalic.eot?#iefix) format('embedded-opentype'),url(../fonts/CooperHewitt/CooperHewitt-BoldItalic.woff) format('woff'),url(../fonts/CooperHewitt/CooperHewitt-BoldItalic.ttf) format('truetype'),url(../fonts/CooperHewitt/CooperHewitt-BoldItalic.svg#CooperHewitt-BoldItalic) format('svg')}@font-face{font-family:rubik;src:url(../fonts/rubik/Rubik-Light.eot);src:url(../fonts/rubik/Rubik-Light.eot?#iefix) format('embedded-opentype'),url(../fonts/rubik/Rubik-Light.woff) format('woff'),url(../fonts/rubik/Rubik-Light.ttf) format('truetype'),url(../fonts/rubik/Rubik-Light.svg#rubik) format('svg')}@font-face{font-family:Rubik-Bold;src:url(../fonts/rubik/Rubik-Bold.eot);src:url(../fonts/rubik/Rubik-Bold.eot?#iefix) format('embedded-opentype'),url(../fonts/rubik/Rubik-Bold.woff) format('woff'),url(../fonts/rubik/Rubik-Bold.ttf) format('truetype'),url(../fonts/rubik/Rubik-Bold.svg#Rubik-Bold) format('svg')}@font-face{font-family:cmu-concrete-ita;src:url(../fonts/Concrete/cmunoti.eot);src:url(../fonts/Concrete/cmunoti.eot?#iefix) format('embedded-opentype'),url(../fonts/Concrete/cmunoti.woff) format('woff'),url(../fonts/Concrete/cmunoti.ttf) format('truetype'),url(../fonts/Concrete/cmunoti.svg#cmu-concrete-ita) format('svg')}*{box-sizing:border-box}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{font:inherit;font-size:16px;margin:0;padding:0;vertical-align:baseline;border:0}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body,html{height:100%}body{line-height:1}ol,ul{list-style:none}a{text-decoration:none;color:#000}blockquote,q{quotes:none}img{width:100%;height:100%;vertical-align:bottom}blockquote:after,blockquote:before,q:after,q:before{content:'';content:none}table{border-spacing:0;border-collapse:collapse}p{font-style:normal}em{font-style:italic}strong{font-family:Rubik-Bold}h1{font-size:1.2rem;line-height:50px}h1 a{font-family:CooperHewitt;font-weight:400}h2{font-family:CooperHewitt-BoldItalic;font-size:1.1rem;line-height:50px}p{font-family:rubik;font-size:1rem;line-height:1.3rem;margin-bottom:12px}p a{font-family:cmu-concrete-ita}p strong{font-family:CooperHewitt-BoldItalic}.top>div:nth-child(1){color:#fff}.top>div:nth-child(1) a{color:#00f}body{overflow:hidden;background:#e6e6e6}#page{height:100%}#page .navbar{width:100%;height:50px}#page .handler{position:absolute;z-index:999;top:50%;width:50px;height:50px;cursor:-webkit-grab;cursor:grab;border-radius:25px}#page .hand1{left:calc((100%/3) - 25px);opacity:.5;background:green}#page .hand2{right:calc((100%/3) - 25px);opacity:.5;background:red}#page .mouseDown{cursor:-webkit-grabbing;cursor:grabbing}#page #start{width:100%;height:calc(100% - 50px)}#page #start .bottom,#page #start .top{display:-ms-inline-flexbox;display:inline-flex;width:100%;-ms-flex-pack:justify;justify-content:space-between}#page #start img{transition:filter .5s;filter:grayscale(100%) contrast(4)}#page #start img:hover{transition:filter .5s;filter:grayscale(0)}#page #start .top{position:relative;height:calc(100% / 2)}#page #start .top>div:nth-child(-n+2){padding:0 20px}#page #start .top>div:nth-child(1){background:#969696}#page #start .bottom{position:absolute;top:calc(100% / 2 + 25px);bottom:0;height:auto}#page #start .blocs{overflow-y:auto;width:calc(100% / 3);min-width:200px;margin:2px}#page #start .blocs:nth-child(2){left:calc(100% / 3);background:#fff}#page #start .blocs:nth-child(3){background:#fff}#page #start #links canvas{top:0;left:0}#page #start #links canvas[resize]{width:100vw;height:100vh}#page #start #streetmap>div:nth-of-type(1){height:100%}#page #start #streetmap #mapid{width:100%;height:100%}
user/themes/r2c/css/styles_paperjs.css
-4
View File
@@ -1,4 +0,0 @@
canvas[resize] {
width: 100%;
height: 100%;
}
user/themes/r2c/js/script.js
+27 -33
View File
@@ -22,7 +22,6 @@ function clickhand(){
};
function drag() {
var $hand1 = $( ".hand1" );
var $hand2 = $( ".hand2" );
@@ -98,7 +97,7 @@ function drag() {
"top": yPos2 + 2,
});
$links.css({
$stmp.css({
"width": xPos,
"top": yPos2 + 2,
});
@@ -107,7 +106,7 @@ function drag() {
"width": Bw2,
});
$stmp.css({
$links.css({
"width": Dw3,
});
}
@@ -169,27 +168,48 @@ function drag() {
// "width": xPos,
"height": yPos - 2,
});
$itw.css({
"width": Bw2,
"height": yPos - 2,
});
$img.css({
"width": xPos3,
"height": yPos - 2,
});
$bottom.css({
"top": yPos2 + 2,
})
});
$rs.css({
"width": Bw2,
});
$stmp.css({
$links.css({
"width": xPos3,
});
}
});
};
function dragcanvas() {
var $links = $('#links canvas');
var $reseau = $('#reseaux-sociaux svg')
$links.draggable({
// containment:".bottom",
scroll: false
});
$reseau.draggable({
// containment:".bottom",
scroll: false
});
}
function map() {
var mymap = L.map('mapid').setView([51.505, -0.09], 13);
@@ -201,39 +221,13 @@ function map() {
id: 'mapbox.streets'
}).addTo(mymap);
L.marker([51.5, -0.09]).addTo(mymap)
.bindPopup("<b>Hello world!</b><br />I am a popup.").openPopup();
L.circle([51.508, -0.11], 500, {
color: 'red',
fillColor: '#f03',
fillOpacity: 0.5
}).addTo(mymap).bindPopup("I am a circle.");
L.polygon([
[51.509, -0.08],
[51.503, -0.06],
[51.51, -0.047]
]).addTo(mymap).bindPopup("I am a polygon.");
var popup = L.popup();
function onMapClick(e) {
popup
.setLatLng(e.latlng)
.setContent("You clicked the map at " + e.latlng.toString())
.openOn(mymap);
}
mymap.on('click', onMapClick);
}
$(document).ready(function() {
wrap();
map();
// scrollbar();
dragcanvas();
clickhand();
drag();
// scrollbar();
});
user/themes/r2c/scss/configuration/_config.scss
+2
View File
@@ -13,6 +13,8 @@
// $fem
// $fbold
$marginbody: 35px;
// header
$heightH: (25px);
user/themes/r2c/scss/template/_header.scss
+2 -2
View File
@@ -1,3 +1,3 @@
#header{
padding: 0 20px;
#page{
// margin: 0 25px;
}
user/themes/r2c/scss/template/_section.scss
+28 -9
View File
@@ -1,10 +1,10 @@
body{
overflow: hidden;
background:rgb(230, 230, 230);
}
#page{
height: 100%;
background:rgb(230, 230, 230);
.navbar{
width: 100%;
height: 50px;
@@ -67,14 +67,9 @@ body{
height: auto;
top: $H50-25;
bottom: 0;
& > div{
&:nth-child(1){
background: red;
}
}
}
.blocs{
// position: relative;
overflow-y: auto;
margin: 2px;
width: $W33;
@@ -87,7 +82,31 @@ body{
background: white;
}
}
#links{
canvas{
top: 0;
left: 0;
}
canvas[resize] {
width: 100vw;
height: 100vh;
}
}
#reseaux-sociaux{
svg{
// width: 100vw;
// height: 100vh;
}
}
#streetmap{
& > div:nth-of-type(1){
height: 100%;
}
#mapid {
width: 100%;
height: 100%;
}
}
}
}
#mapid { height: 180px; }
user/themes/r2c/scss/template/_typography.scss
+5 -1
View File
@@ -17,9 +17,13 @@ p{
font-family: $rubik;
font-size: 1rem;
line-height: 1.3rem;
margin-bottom: 12px;
a{
font-family: $cmu;
}
strong{
font-family: $CooperHewitt-italic;
}
}
.top{
@@ -27,7 +31,7 @@ p{
&:nth-child(1){
color: white;
a{
color: rgb(255, 0, 84);
color: rgb(0, 0, 255);
}
}
}
user/themes/r2c/templates/modular/mappoint.html.twig
+4
View File
@@ -0,0 +1,4 @@
{% set grid_size = theme_var('grid-size') %}
{% set image = page.media.images|first %}
{{ content }}
user/themes/r2c/templates/modular/streetmap.html.twig
+1 -1
View File
@@ -3,10 +3,10 @@
{% macro pageLinkName(text) %}{{ text|lower|replace({' ':'_'}) }}{% endmacro %}
{% block body %}
<div id="mapid"></div>
{% for module in page.collection %}
<div id="{{ _self.pageLinkName(module.folder)|replace({"0":"", "1":"", "2":"", "3":"", "4":"", "5":"", "6":"", "7":"", "8":"", "9":"", ".":"","_":"" }) }}">
{{ module.content }}
<div id="mapid"></div>
</div>
{% endfor %}
{% endblock %}
user/themes/r2c/templates/partials/base.html.twig
+5 -5
View File
@@ -21,8 +21,7 @@
{% do assets.addCss('theme://css/styles_3djs.css') %}
{% do assets.addCss('theme://css/styles_paperjs.css') %}
{# % do assets.addCss('theme://css/leaflet.css.css') % #}
<link rel="stylesheet" href="user/themes/r2c/css/leaflet.css" integrity="sha512-puBpdR0798OZvTTbP4A8Ix/l+A4dHDD0DGqYW6RQ+9jxkRFclaxxQb/SJAWZfWAkuyeQUytO7+7N4QKrDh+drA=="
crossorigin=""/>
<link rel="stylesheet" href="user/themes/r2c/css/leaflet.css" crossorigin=""/>
{% endblock %}
{{ assets.css() }}
@@ -34,13 +33,14 @@
{% do assets.addJs('theme://js/d3.js', {group:'bottom'}) %}
{% do assets.addJs('theme://js/script_d3js.js', {group:'bottom'}) %}
{% do assets.addJs('theme://js/paper_full.js', {group:'bottom'}) %}
{% do assets.addJs('theme://js/paper_full.js', {group:'bottom'}) %}
{# % do assets.addJs('theme://js/leaflet.js', {group:'bottom'}) % #}
{# do assets.addJs('theme://js/script_paperjs.js', {type:'text/paperscript', canvas:'canvas', group:'bottom'}) #}
<script type="text/paperscript" src="user/themes/r2c/js/script_paperjs.js" canvas="canvas"></script>
<script src="user/themes/r2c/js/leaflet.js"
integrity="sha512-nMMmRyTVoLYqjP9hrbed9S+FzjZHW5gY1TWCHA5ckwXZBadntCNs8kEqAWdrb9O7rxbCaA4lKTIWjDXZxflOcA=="
crossorigin=""></script>
<script src="user/themes/r2c/js/leaflet.js" crossorigin=""></script>
{% endblock %}
{{ assets.js() }}