alicestrt/vvvw
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
alicestrt 2020-09-08 20:08:37 +02:00
commit 86f35d2501
5 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -1,5 +1,2 @@
<<<<<<< HEAD
__pycache__/hello.cpython-36.pyc
=======
>>>>>>> 1d65f57b16fbe60821690c0ff92fd6535e64f1e7
__pycache__/
static/audio/

BIN
static/audio/FreshMythsDifferentTimes_performance_podcast.mp3 Normal file
View File

Binary file not shown.

2
static/css/style.css
View File

@ -3,6 +3,8 @@
padding-top: 100px;
}
.draggable img {
opacity: 0.7;
#video2 {
padding-top: 100px;
position: relative;

56
static/js/draggable.js
View File

@ -1,43 +1,21 @@
//Make the DIV element draggagle:
dragElement(document.getElementById("draggable"));
// draggable
$(document).ready(function() {
var a = 3;
var dragOpts = {
cursor: "move",
cursor: "grab",
// axis: "y",
distance: "0",
// cursorAt: {
// top: 0,
// left: 0
// }
};
function dragElement(elmnt) {
var pos1 = 0, pos2 = 0, pos3 = 0, pos4 = 0;
if (document.getElementById(elmnt.id + "header")) {
/* if present, the header is where you move the DIV from:*/
document.getElementById(elmnt.id + "header").onmousedown = dragMouseDown;
} else {
/* otherwise, move the DIV from anywhere inside the DIV:*/
elmnt.onmousedown = dragMouseDown;
}
$('.draggable').draggable({
start: function(event, ui) { $(this).css("z-index", a++); }
});
function dragMouseDown(e) {
e = e || window.event;
e.preventDefault();
// get the mouse cursor position at startup:
pos3 = e.clientX;
pos4 = e.clientY;
document.onmouseup = closeDragElement;
// call a function whenever the cursor moves:
document.onmousemove = elementDrag;
}
function elementDrag(e) {
e = e || window.event;
e.preventDefault();
// calculate the new cursor position:
pos1 = pos3 - e.clientX;
pos2 = pos4 - e.clientY;
pos3 = e.clientX;
pos4 = e.clientY;
// set the element's new position:
elmnt.style.top = (elmnt.offsetTop - pos2) + "px";
elmnt.style.left = (elmnt.offsetLeft - pos1) + "px";
}
function closeDragElement() {
/* stop moving when mouse button is released:*/
document.onmouseup = null;
document.onmousemove = null;
}
}
});

16
templates/perspectiveB.html
View File

@ -1,19 +1,29 @@
<!doctype html>
<html>
<style>
#draggable {
.draggable {
position: absolute;
}
</style>
<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script src="../static/js/draggable.js"></script>
<link href="../static/css/style.css" rel="stylesheet" type="text/css">
<head>
<title>PerspectiveB</title>
<h1>VVVW - PerspectiveB</h1>
</head>
<body>
<div id="draggable">
<div class="draggable">
<img src="../static/images/test1.jpeg" width='500px' alt="test">
</div>
<script src="../static/js/draggable.js"></script>
<div class="draggable">
<img src="../static/images/test2.jpeg" width='500px' alt="test">
</div>
<div class="draggable">
<img src="../static/images/test3.jpeg" width='500px' alt="test">
</div>
</body>
</html>