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-29 14:58:34 +02:00
commit ce69065a36
4 changed files with 29738 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11008
static/js/jquery-1.12.4.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

18706
static/js/jquery-ui.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

2
templates/base.html
View File

@ -18,5 +18,7 @@
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<script src="../static/js/jquery-1.12.4.js"></script>
<script src="../static/js/jquery-ui.js"></script>
</body> </body>
</html> </html>

45
templates/hello.html
View File

@ -1,35 +1,30 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}Hello{% endblock %} {% block title %}Hello{% endblock %}
{% block body %} {% block body %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<div class="row"> <div class="row">
<div class="col-md-9"> <div class="col-md-9">
<div class="map_area">Map area <div class="map_area">Map area
<div class="row"> <div class="row">
<div class="col-md-9"> <div class="col-md-1 col-sm-4">
<div id="show1"><audio controls>
<source src="../static/audio/myths.mp3" type="audio/mpeg">
Your browser does not support the audio tag.
</audio></div>
<svg id="first_circle" onclick="scrolldiv()">
<circle cx="50" cy="50" r="2rem" stroke="green" stroke-width="4" fill="yellow" />
<svg id="first_circle angela" onclick="scrolldiv()"> <text id="angela" x="50" y="50" text-anchor="middle">hello </text>
<circle cx="50" cy="50" r="2rem" stroke="green" stroke-width="4" fill="yellow" /> </svg>
<a href="#" >Angela<text x="50" y="50" text-anchor="middle">hello </text></a>
</svg>
</div> </div>
<div class="col-md-1 col-sm-4"> <div class="col-md-1 col-sm-4">
<svg id="second_circle"> <svg id="second_circle">
<circle cx="50" cy="50" r='2rem' stroke="red" stroke-width="2" fill="gray" /> <circle cx="50" cy="50" r='2rem' stroke="red" stroke-width="2" fill="gray" />
<text x="50" y="50" text-anchor="middle">hello boys </text> <text x="50" y="50" text-anchor="middle">hello boys </text>
</svg> </svg>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-10"> <div class="col-md-9">
<audio controls> <audio controls>
<source src="../static/audio/myths.mp3" type="audio/mpeg"> <source src="../static/audio/myths.mp3" type="audio/mpeg">
Your browser does not support the audio tag. Your browser does not support the audio tag.
@ -41,6 +36,10 @@
<div class="col-md-10"> <div class="col-md-10">
<div class="image_area"> <div class="image_area">
<p>image</p> <p>image</p>
<div id="show1"><audio controls>
<source src="../static/audio/HNI_Soundinstall_3tracks_together1.mp3" type="audio/mpeg">
Your browser does not support the audio tag.
</audio></div>
<img src="../static/images/test_small.jpeg" alt="poem"> <img src="../static/images/test_small.jpeg" alt="poem">
</div> </div>
</div> </div>
@ -81,17 +80,17 @@
</div> </div>
</div> </div>
<script type="text/javascript"> <script>
$("#angela").click(function() {
$("#show1").fadeIn()
console.log("around")
});
function scrolldiv() { function scrolldiv() {
var elem = document.getElementById("ele"); var elem = document.getElementById("ele");
elem.scrollIntoView(); elem.scrollIntoView();
} }
</script> </script>
<script type="text/javascript">
$("#angela").click(function(){
$("#show1").fadeIn()
console.log("around")gi
});
</script>
{% endblock %} {% endblock %}