diff --git a/project/templates/base.html b/project/templates/base.html index 727f618..4cf96bd 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -1,52 +1,64 @@ - - - - - - + + + + + + + Flask - - + + - - - + + -
-
- {% block content %} - {% endblock %} -
+
+ {% block content %} + {% endblock content %} +
- - - - \ No newline at end of file + + diff --git a/project/templates/index.html b/project/templates/index.html index 61feefe..b043252 100644 --- a/project/templates/index.html +++ b/project/templates/index.html @@ -1,34 +1,30 @@ {% extends "base.html" %} - {% block content %} - -

+

+ {% if user and user.is_authenticated %} + 你好，{{ user.name }}！ + {% else %} + 你好，游客！ + {% endif %} +

{% if user and user.is_authenticated %} - 你好，{{ user.name }}！ - {% else%} - 你好，游客！ + {% if user.isActivated %} + + + + {% else %} +

您的账号暂未激活，请等待管理员激活此账号。

+ {% endif %} + {% else %} + + + + 或 + + + {% endif %} - - -{% if user and user.is_authenticated %} -{% if user.isActivated %} - -{% else%} -

您的账号暂未激活，请等待管理员激活此账号。

-{% endif %} -{% else %} - -或 - -{% endif %} - - -{% with messages = get_flashed_messages() %} -{% if messages %} -
- {{ messages[0] }} -
-{% endif %} -{% endwith %} - -{% endblock %} \ No newline at end of file + {% with messages = get_flashed_messages() %} + {% if messages %}
{{ messages[0] }}
{% endif %} + {% endwith %} +{% endblock content %} diff --git a/project/templates/login.html b/project/templates/login.html index 54827e2..7f3b448 100644 --- a/project/templates/login.html +++ b/project/templates/login.html @@ -1,36 +1,37 @@ {% extends "base.html" %} - {% block content %} -
+

登录

- {% with messages = get_flashed_messages() %} - {% if messages %} -
- {{ messages[0] }} + {% with messages = get_flashed_messages() %} + {% if messages %}
{{ messages[0] }}
{% endif %} + {% endwith %} +
+
+
+ +
- {% endif %} - {% endwith %} - -
-
- -
-
- -
-
- -
-
-
- -
- -
+
+
+ +
+
+
+ +
+ +
-
-{% endblock %} \ No newline at end of file +
+{% endblock content %} diff --git a/project/templates/manage.html b/project/templates/manage.html index 0644078..1c59dbd 100644 --- a/project/templates/manage.html +++ b/project/templates/manage.html @@ -1,53 +1,56 @@ {% extends "base.html" %} - {% block content %} - -

- {% if user.is_authenticated and user.role == "admin" %} -

注册账户列表：

- - - - - - - - - - - - - - {% for account in accounts %} - - - - - - - - - - {% endfor %} - -
id邮箱用户名角色已激活提交删除
{{ account.id }}{{ account.email }}{{ account.name }} - -
- {% endif %} - - -{% with messages = get_flashed_messages() %} -{% if messages %} -
- {{ messages[0] }} -
-{% endif %} -{% endwith %} - - - - + - -{% with messages = get_flashed_messages() %} -{% if messages %} -
- {{ messages[0] }} -
-{% endif %} -{% endwith %} - -{% endblock %} \ No newline at end of file + + {% with messages = get_flashed_messages() %} + {% if messages %}
{{ messages[0] }}
{% endif %} + {% endwith %} +{% endblock content %} diff --git a/project/templates/profile.html b/project/templates/profile.html index 67a9d63..7616fe7 100644 --- a/project/templates/profile.html +++ b/project/templates/profile.html @@ -1,57 +1,58 @@ {% extends "base.html" %} - {% block content %} -

- 欢迎回来，{{ user.name }}! -

-{% if user.isActivated %} -

账户状态：

- -{% if user.role=='admin' %} - -

注册账户列表：

- - - - - - - - - - - - - {% for account in accounts %} - - - - - - - - - {% endfor %} - -
id管理邮箱用户名角色已激活
{{ account.id }}管理{{ account.email }}{{ account.name }}{{ account.role }}{% if account.isActivated %}是{% else %}否{% endif %}
- -{% else %} - -{% endif %} -{% else %} - -

您的账号暂未激活，请等待管理员激活此账号。

-{% endif %} - -{% with messages = get_flashed_messages() %} -{% if messages %} -
- {{ messages[0] }} -
-{% endif %} -{% endwith %} - -{% endblock %} \ No newline at end of file + + {% else %} + + {% endif %} + {% else %} + +

您的账号暂未激活，请等待管理员激活此账号。

+ {% endif %} + {% with messages = get_flashed_messages() %} + {% if messages %}
{{ messages[0] }}
{% endif %} + {% endwith %} +{% endblock content %} diff --git a/project/templates/signup.html b/project/templates/signup.html index d6c37f4..1f1fb07 100644 --- a/project/templates/signup.html +++ b/project/templates/signup.html @@ -1,41 +1,47 @@ {% extends "base.html" %} - {% block content %} -
+

注册

- {% with messages = get_flashed_messages() %} + {% with messages = get_flashed_messages() %} {% if messages %} -
+
{{ messages[0] }} - {% if messages[0] == '此邮箱已注册！' %} - 点此登录. - {% endif %} -
+ {% if messages[0] == '此邮箱已注册！' %}点此登录.{% endif %} +
{% endif %} - {% endwith %} -
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- - -
+ {% endwith %} +
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+ +
-
-{% endblock %} \ No newline at end of file +
+{% endblock content %}