diff --git a/hello.py b/hello.py index 01e9476..0ecb2c8 100644 --- a/hello.py +++ b/hello.py @@ -18,10 +18,10 @@ def dated_url_for(endpoint, **values): @app.route('/') def hello_world(): - return 'VVVW' + return render_template('hello.html') -# @app.route('/hello/') +@app.route('/hello/') @app.route('/perspectiveB/') def perspectiveB(): return render_template('perspectiveB.html') diff --git a/static/css/style.css b/static/css/style.css index 85bbe5a..64f64a2 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -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 { margin-top: 300px; } diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 0000000..035bc51 --- /dev/null +++ b/templates/base.html @@ -0,0 +1,19 @@ + + + +{% block head %} +{% block title %}VVVW{% endblock %} + + +{% endblock %} + + +
+ {% block body %} {% endblock %} +
+ + + + + + diff --git a/templates/hello.html b/templates/hello.html index db218c1..4e3af42 100644 --- a/templates/hello.html +++ b/templates/hello.html @@ -1,23 +1,29 @@ - - - - -Hello from Flask -{% if name %} -

Hello {{ name }}!

-{% else %} -

VVVW

-{% endif %} - +{% extends "base.html" %} +{% block title %}Hello{% endblock %} +{% block body %} +
+
+
Map area
+
+
+
+
+
+

image

+poem +
+
+ +
+
+
+
+

iframe area

+ +
+
- -
- test +
- - - +
+{% endblock %}