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

Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw

master
nglk 4 years ago
parent
dfb597c083 b2c033be00
commit
4651622cd5
4 changed files with 71 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      hello.py
  2. 23
      static/css/style.css
  3. 19
      templates/base.html
  4. 48
      templates/hello.html

4
hello.py
View File

@ -18,10 +18,10 @@ def dated_url_for(endpoint, **values):
@app.route('/') @app.route('/')
def hello_world(): def hello_world():
return 'VVVW' return render_template('hello.html')
# @app.route('/hello/<name>') @app.route('/hello/<name>')
@app.route('/perspectiveB/') @app.route('/perspectiveB/')
def perspectiveB(): def perspectiveB():
return render_template('perspectiveB.html') return render_template('perspectiveB.html')

23
static/css/style.css
View File

@ -1,4 +1,27 @@
/* Everything*/
* {
border: 1px black solid;
}
/*Main areas*/
.map_area {
text-align: center;
margin-top: 200px;
}
.image_area {
margin-top: 10px;
padding-right: 20px;
}
.image_area img {
width: 200px;
height: 150px;
}
.iframe_area {
margin-top: 10px;
padding-right: 20px;
}
#video1 { #video1 {
margin-top: 300px; margin-top: 300px;
} }

19
templates/base.html
View File

@ -0,0 +1,19 @@
<!doctype html>
<html>
<head>
{% block head %}
<title>{% block title %}VVVW{% endblock %}</title>
<link rel="stylesheet" href="../static/css/style.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
{% endblock %}
</head>
<body>
<div class="container-fluid">
{% block body %} {% endblock %}
</div>
<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://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
</body>
</html>

48
templates/hello.html
View File

@ -1,23 +1,29 @@
<!doctype html> {% extends "base.html" %}
<html> {% block title %}Hello{% endblock %}
<style> {% block body %}
#draggable { <div class="row">
position: absolute; <div class="col-md-9">
} <div class="map_area">Map area</div>
</style> </div>
<head> <div class="col-md-3">
<title>Hello from Flask</title> <div class="row">
{% if name %} <div class="col-md-10">
<h1>Hello {{ name }}!</h1> <div class="image_area">
{% else %} <p>image</p>
<h1>VVVW</h1> <img src="../static/images/test_small.jpeg" alt="poem">
{% endif %} </div>
</head> </div>
</div>
<div class="row">
<div class="col-md-10">
<div class="iframe_area">
<p>iframe area</p>
<iframe src="../static/images/abstract.pdf" width="300px" height="500px"></iframe>
</div>
</div>
<body> </div>
<div id="draggable">
<img src="../static/images/test1.jpeg" width='500px' alt="test">
</div> </div>
<script src="../static/js/draggable.js"></script> </div>
</body> {% endblock %}
</html>

Write Preview
Loading…
Cancel
Save