diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-02-01 19:21:15 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-02-01 19:21:15 +0200 |
| commit | 8529e057a988d22696676c7a4f649636dde932b9 (patch) | |
| tree | 15135e50f67ede5d9e873a23bf9a98569f07a0c9 | |
| parent | 692d530b9348ea7192d4d2773609cbb03979245a (diff) | |
login: use base template
| -rw-r--r-- | res/templates/index.html | 1 | ||||
| -rw-r--r-- | res/templates/login.html | 22 |
2 files changed, 9 insertions, 14 deletions
diff --git a/res/templates/index.html b/res/templates/index.html index 15f656d9..c8e6d023 100644 --- a/res/templates/index.html +++ b/res/templates/index.html @@ -7,7 +7,6 @@ <script src="/static/local_config.js"></script> {% endblock %} {% block content %} -<body> <script type="text/javascript"> var logged_username = "{{ username }}"; </script> diff --git a/res/templates/login.html b/res/templates/login.html index b773bd13..fc43285b 100644 --- a/res/templates/login.html +++ b/res/templates/login.html @@ -1,10 +1,7 @@ -<!DOCTYPE html> -<head> -<meta charset="UTF-8"> -<title>Welcome to Rhizi</title> -<link href="/static/css/style.css" rel="stylesheet" type="text/css"> -<link rel="shortcut icon" href="res/img/favicon2.ico" /> - +{% extends "base.html" %} +{% block title %}Welcome to Rhizi{% endblock %} +{% block head %} +{{ super() }} <script src="/static/lib/jquery.js" type="text/javascript"></script> <script type="text/javascript"> function submit_login_form() { @@ -32,9 +29,9 @@ }); } </script> -</head> - -<body class="login-background"> +{% endblock %} +{% block content %} +<div class="login-background"> <div class="welcome-box"> <img src="/static/img/logo-red.png" class="login-rhizi-logo"> <h1 class="login-header"> Welcome to Rhizi!</h1> @@ -58,7 +55,6 @@ </div> <div class="contact-us-div"><span class="contact-us-icon"></span></div> <p class="login-text contact-us-text"><a class="contact-us-link" href="mailto:feedback_CRI@rhizi.net?subject=Rhizi%20User%20Feedback">Send us an Email</a> about your experience,<br>we would love to hear your suggestions!</p> - </div> -</body> -</html> +</div> +{% endblock %} |