Skip to content

Commit

Permalink
Merge pull request #28 from ipsos-org/Deploy-support-website
Browse files Browse the repository at this point in the history 
Deploy support website
  • Loading branch information
@muellmusik
muellmusik authored Feb 6, 2020
2 parents 9dc3b13 + 7eeb1e2 commit 1177b12
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 33 deletions.
20 changes: 20 additions & 0 deletions client/ipsosboard.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,26 @@ body {
margin-left: 0px;
float: left;
}
.background {
position: fixed;
box-sizing: border-box;
height: 100%;
width: 100%;
top:0;
bottom:0;
left:0;
right:0;
z-index: 0;
}
iframe{
position: fixed;
height: 100%;
width: 100%;
top:0;
bottom:0;
left:0;
right:0;
}

/*
table {
Expand Down
11 changes: 6 additions & 5 deletions client/ipsosboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=0.6">
<link rel="stylesheet" href="ipsosboard.css">
</head>

<body>
<div class="background">
<iframe src="IPSOS_support_website/background/index.html" style="border:none;"></iframe></div>
<div class="container-fluid">
<div class="row rowmb">
<div class="col-sm-3">
<h2>Interactive Physics Sonification System</h2>
</div>
<div class="col-sm-4"></div>
<div class="col-sm-5" style="padding-top: 15px;">
<a href="IPSOS_support_website/support.html" title="Learn more about IPSOS, Particle Physics, Sonification, and Synthesis"><h4>Information and Support Materials</h4></a>
<a href="IPSOS_support_website/support.html" title="Learn more about IPSOS, Particle Physics, Sonification, and Synthesis" target="_blank"><h4>Information and Support Materials</h4></a>
</div>
</div>
{{> ipsosboard}}
Expand Down Expand Up @@ -75,7 +76,7 @@ <h2>Interactive Physics Sonification System</h2>

<div class="col-md-7">
<div class="table-responsive">
<table class="table table-sm table-bordered table-striped" id="matrix-table">
<table class="table table-sm table-bordered table-striped" id="matrix-table" style="background:white;">
<thead class="thead-light">
<tr class="text-center">
<th style="position: sticky; left:0px;"></th>
Expand Down Expand Up @@ -113,7 +114,7 @@ <h2>Interactive Physics Sonification System</h2>

<div class="col-md-5">
<div class="table-responsive">
<table class="table table-bordered table-striped table-sm" id="ranges-table">
<table class="table table-bordered table-striped table-sm" id="ranges-table" style="background:white;">
<tbody>
<tr class="text-center">
<td><span id="attack-low"></span></td>
Expand Down Expand Up @@ -153,7 +154,7 @@ <h2>Interactive Physics Sonification System</h2>
</table>
</div>
<div class="table-responsive">
<table class="table table-sm table-bordered" id="playback-table" style="margin-top: 1px;">
<table class="table table-sm table-bordered" id="playback-table" style="margin-top: 1px; background:white;">
<tbody>
<tr>
<td class="text-center"><button type="button" class="btn btn-warning btn-lg" id="cell1" data-type="playbutton" data-playind="0">1</button></td>
Expand Down
Binary file removed public/IPSOS_support_website/.demo.html.icloud
View file
Binary file not shown.
54 changes: 27 additions & 27 deletions public/IPSOS_support_website/background/particles.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var pJS = function(tag_id, params){
width: 1
},
move: {
enable: true,
enable: false,
speed: 2,
direction: 'none',
random: false,
Expand All @@ -91,11 +91,11 @@ var pJS = function(tag_id, params){
detect_on: 'canvas',
events: {
onhover: {
enable: true,
enable: false,
mode: 'grab'
},
onclick: {
enable: true,
enable: false,
mode: 'push'
},
resize: true
Expand Down Expand Up @@ -125,7 +125,7 @@ var pJS = function(tag_id, params){
},
mouse:{}
},
retina_detect: false,
retina_detect: true,
fn: {
interact: {},
modes: {},
Expand Down Expand Up @@ -157,9 +157,9 @@ var pJS = function(tag_id, params){
pJS.fn.retinaInit = function(){

if(pJS.retina_detect && window.devicePixelRatio > 1){
pJS.canvas.pxratio = window.devicePixelRatio;
pJS.canvas.pxratio = window.devicePixelRatio;
pJS.tmp.retina = true;
}
}
else{
pJS.canvas.pxratio = 1;
pJS.tmp.retina = false;
Expand Down Expand Up @@ -363,7 +363,7 @@ var pJS = function(tag_id, params){
this.vx_i = this.vx;
this.vy_i = this.vy;



/* if shape is image */

Expand Down Expand Up @@ -392,7 +392,7 @@ var pJS = function(tag_id, params){
}
}



};

Expand All @@ -402,7 +402,7 @@ var pJS = function(tag_id, params){
var p = this;

if(p.radius_bubble != undefined){
var radius = p.radius_bubble;
var radius = p.radius_bubble;
}else{
var radius = p.radius;
}
Expand Down Expand Up @@ -491,9 +491,9 @@ var pJS = function(tag_id, params){
pJS.canvas.ctx.lineWidth = pJS.particles.shape.stroke.width;
pJS.canvas.ctx.stroke();
}

pJS.canvas.ctx.fill();

};


Expand Down Expand Up @@ -664,7 +664,7 @@ var pJS = function(tag_id, params){
pJS.tmp.count_svg = 0;
pJS.fn.particlesEmpty();
pJS.fn.canvasClear();

/* restart */
pJS.fn.vendors.start();

Expand All @@ -684,14 +684,14 @@ var pJS = function(tag_id, params){

var opacity_line = pJS.particles.line_linked.opacity - (dist / (1/pJS.particles.line_linked.opacity)) / pJS.particles.line_linked.distance;

if(opacity_line > 0){
if(opacity_line > 0){

/* style */
var color_line = pJS.particles.line_linked.color_rgb_line;
pJS.canvas.ctx.strokeStyle = 'rgba('+color_line.r+','+color_line.g+','+color_line.b+','+opacity_line+')';
pJS.canvas.ctx.lineWidth = pJS.particles.line_linked.width;
//pJS.canvas.ctx.lineCap = 'round'; /* performance issue */

/* path */
pJS.canvas.ctx.beginPath();
pJS.canvas.ctx.moveTo(p1.x, p1.y);
Expand Down Expand Up @@ -725,7 +725,7 @@ var pJS = function(tag_id, params){
p2.vy += ay;

}


}

Expand Down Expand Up @@ -805,7 +805,7 @@ var pJS = function(tag_id, params){
if(dist_mouse <= pJS.interactivity.modes.bubble.distance){

if(ratio >= 0 && pJS.interactivity.status == 'mousemove'){

/* size */
if(pJS.interactivity.modes.bubble.size != pJS.particles.size.value){

Expand Down Expand Up @@ -854,7 +854,7 @@ var pJS = function(tag_id, params){
if(pJS.interactivity.status == 'mouseleave'){
init();
}

}

/* on click event */
Expand Down Expand Up @@ -933,7 +933,7 @@ var pJS = function(tag_id, params){
repulseRadius = pJS.interactivity.modes.repulse.distance,
velocity = 100,
repulseFactor = clamp((1/repulseRadius)*(-1*Math.pow(dist_mouse/repulseRadius,2)+1)*repulseRadius*velocity, 0, 50);

var pos = {
x: p.x + normVec.x * repulseFactor,
y: p.y + normVec.y * repulseFactor
Expand All @@ -946,7 +946,7 @@ var pJS = function(tag_id, params){
p.x = pos.x;
p.y = pos.y;
}

}


Expand Down Expand Up @@ -1001,15 +1001,15 @@ var pJS = function(tag_id, params){
// }else{
// process();
// }


}else{

if(pJS.tmp.repulse_clicking == false){

p.vx = p.vx_i;
p.vy = p.vy_i;

}

}
Expand Down Expand Up @@ -1039,7 +1039,7 @@ var pJS = function(tag_id, params){
pJS.canvas.ctx.strokeStyle = 'rgba('+color_line.r+','+color_line.g+','+color_line.b+','+opacity_line+')';
pJS.canvas.ctx.lineWidth = pJS.particles.line_linked.width;
//pJS.canvas.ctx.lineCap = 'round'; /* performance issue */

/* path */
pJS.canvas.ctx.beginPath();
pJS.canvas.ctx.moveTo(p.x, p.y);
Expand Down Expand Up @@ -1155,7 +1155,7 @@ var pJS = function(tag_id, params){
}

});

}


Expand Down Expand Up @@ -1359,7 +1359,7 @@ var pJS = function(tag_id, params){
pJS.fn.vendors.init();
pJS.fn.vendors.draw();
}

}

}else{
Expand Down Expand Up @@ -1406,7 +1406,7 @@ var pJS = function(tag_id, params){
pJS.fn.vendors.eventsListeners();

pJS.fn.vendors.start();



};
Expand Down Expand Up @@ -1538,4 +1538,4 @@ window.particlesJS.load = function(tag_id, path_config_json, callback){
};
xhr.send();

};
};
2 changes: 1 addition & 1 deletion public/IPSOS_support_website/support.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<body>
<div class="reveal">
<div class="slides">
<section data-background-iframe="background/index.html" data-background-interactive>
<section data-background-iframe="background/index.html">
<section id="home" data-markdown style="text-align: center;" data-menu-title="Home">
<textarea data-template>
# The IPSOS app
Expand Down

0 comments on commit 1177b12

Please sign in to comment.