diff --git a/index.php b/index.php index 1cd82fa..15a16f4 100644 --- a/index.php +++ b/index.php @@ -9,6 +9,7 @@ + diff --git a/js/draggable.js b/js/draggable.js new file mode 100644 index 0000000..72ee9a0 --- /dev/null +++ b/js/draggable.js @@ -0,0 +1,53 @@ +// draggable + +$(document).ready(function() { + var a = 3; + $('.draggable').draggable({ + start: function(event, ui) { $(this).css("z-index", a++); } +}); +// $('#resize').resizable({handles: 'se'}).draggable({ +// start: function(event, ui) { $(this).css("z-index", a++); } +// });; + + // font size relative to div draggable/resizable size + var $wrapper = $(".scaleable-wrapper"); + $wrapper.each(function (d) { + var $this = $(this); + // var elHeight = $this.outerHeight(); + var elWidth = $this.outerWidth(); + + $this.resizable({ + resize: doResize + }); + + function doResize(event, ui) { + + var scale, origin; + + scale = Math.min( + // ui.size.height / elHeight, + ui.size.width / elWidth + ); + // scale=1.0; + // scale=2*scale + + $this.css({ + // transform: "translate(-50%, -50%) " + "scale(" + scale + ")" + transform: "translate(0%, 0%) " + "scale(" + scale + ")" + + }); + + } + + var starterData = { + size: { + // height: $this.height(), + width: $this.width() + } + } + // console.log("starterData", starterData, this); + doResize(null, starterData); + + + }); +}); \ No newline at end of file diff --git a/js/main.js b/js/main.js index 50af07a..5961106 100644 --- a/js/main.js +++ b/js/main.js @@ -1,64 +1,4 @@ // designed by Angeliki Diakrousi -// draggable - -$(document).ready(function() { - var a = 3; - $('.draggable').draggable({ - start: function(event, ui) { $(this).css("z-index", a++); } -}); -// $('#resize').resizable({handles: 'se'}).draggable({ -// start: function(event, ui) { $(this).css("z-index", a++); } -// });; - - // font size relative to div draggable/resizable size - var $wrapper = $(".scaleable-wrapper"); - $wrapper.each(function (d) { - var $this = $(this); - // var elHeight = $this.outerHeight(); - var elWidth = $this.outerWidth(); - - $this.resizable({ - resize: doResize - }); - - function doResize(event, ui) { - - var scale, origin; - - scale = Math.min( - // ui.size.height / elHeight, - ui.size.width / elWidth - ); - // scale=1.0; - // scale=2*scale - - $this.css({ - // transform: "translate(-50%, -50%) " + "scale(" + scale + ")" - transform: "translate(0%, 0%) " + "scale(" + scale + ")" - - }); - - } - - var starterData = { - size: { - // height: $this.height(), - width: $this.width() - } - } - // console.log("starterData", starterData, this); - doResize(null, starterData); - - - }); - - - - - - - - // scripts for tab button function openCity(evt, cityName) { @@ -80,7 +20,7 @@ $(document).ready(function() { var a1 = document.getElementById("a1"), a2 = document.getElementById("a2"), but = document.getElementById("but"); -but.addEventListener("click", function () { + but.addEventListener("click", function () { if (a1.paused) { a1.play(); a2.play(); @@ -263,9 +203,8 @@ window.onclick2 = function(event) { } } } -} +}; // for thesis // var socket = new WebSocket(`wss://hypothes.is/ws?access_token=${'6879-n8AksBoSB7kYoQ3eEwzpEr3nFQEmSp3XN-0PcKL_Sik'}`) -}); \ No newline at end of file diff --git a/player.html b/player.html index 09e00fb..9a42d65 100644 --- a/player.html +++ b/player.html @@ -73,7 +73,7 @@ $("#katalin").click(function(){ - +
diff --git a/podcast1.php b/podcast1.php index 1e3bb52..3b47588 100644 --- a/podcast1.php +++ b/podcast1.php @@ -2,113 +2,13 @@ - - - + - - - - - - - - -

"Mediating Speech" @@ -233,7 +133,103 @@ echo '

'; } - + + + + + + + + + + + + + + +