diff --git a/media/css/seahub.css b/media/css/seahub.css index 8c3a41f82c..80409343ea 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -148,4 +148,6 @@ div.home-page h2 { font-style: italic; } #id_repo_id { width:300px; } -span.small-action-link { font-size: 9px; } \ No newline at end of file +span.small-action-link { font-size: 9px; } +input.ccnet_id { width: 300px; } +.notification { background:#FDF; width:580px; margin:10px 0; border:1px solid #faf; padding-left:2px; } diff --git a/profile/templates/profile/profile.html b/profile/templates/profile/profile.html index 365eb2204e..a09589a3f5 100644 --- a/profile/templates/profile/profile.html +++ b/profile/templates/profile/profile.html @@ -3,7 +3,7 @@ {% block left_panel %} {% endblock %} @@ -11,8 +11,8 @@ {% block right_panel %} -

Ccnet/Seafile 当前设置

-

Ccnet ID: {{ profile.ccnet_user_id }}

+

当前设置

+

Ccnet 公钥 ID: {{ profile.ccnet_user_id }}

{% endblock %} diff --git a/profile/templates/profile/set_profile.html b/profile/templates/profile/set_profile.html index c342468538..5e24bcb1fa 100644 --- a/profile/templates/profile/set_profile.html +++ b/profile/templates/profile/set_profile.html @@ -2,14 +2,14 @@ {% block right_panel %} -

绑定 Ccnet/Seafile 用户 ID

+

绑定 Ccnet/Seafile 公钥 ID

{% if error_msg %}

{{ error_msg }}

{% endif %} -
-
+
+
diff --git a/templates/base.html b/templates/base.html index 77e4bb4405..2604ecc8d1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -38,7 +38,7 @@ Seafile logo {% if request.user.is_authenticated %}
- 用户 ID:{{user.user_id}} + 公钥 ID:{{user.user_id}}
{% else %}
@@ -90,7 +90,7 @@
diff --git a/templates/myhome.html b/templates/myhome.html index 97ce5a5052..92292aa251 100644 --- a/templates/myhome.html +++ b/templates/myhome.html @@ -8,7 +8,13 @@ {% block right_panel %} -

我的文件盒

+{% if not user.user_id %} +
+你还没有绑定 Ccnet/Seafile 公钥 ID, 现在绑定 +
+{% endif %} + +

我的同步目录

diff --git a/templates/registration/activate.html b/templates/registration/activate.html index 02c829e06c..86d2faf655 100644 --- a/templates/registration/activate.html +++ b/templates/registration/activate.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "myhome_base.html" %} {% block title %}Create an account{% endblock %} diff --git a/templates/registration/activation_complete.html b/templates/registration/activation_complete.html index 5076fcea04..a84599f880 100644 --- a/templates/registration/activation_complete.html +++ b/templates/registration/activation_complete.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "myhome_base.html" %} {% block title %}Create an account{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html index 7bd1b10772..fd7d04bfde 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "myhome_base.html" %} {% block title %}用户登录{% endblock %} {% block main_panel %}

用户登录

diff --git a/templates/registration/logout.html b/templates/registration/logout.html index 00f80fb3f0..f3ef80480c 100644 --- a/templates/registration/logout.html +++ b/templates/registration/logout.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "myhome_base.html" %} {% block title %}退出{% endblock %} diff --git a/templates/registration/registration_closed.html b/templates/registration/registration_closed.html index 72e1ef0b07..37152dc408 100644 --- a/templates/registration/registration_closed.html +++ b/templates/registration/registration_closed.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "myhome_base.html" %} {% block title %}Create an account{% endblock %} diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html index c2414189d3..1d1284a7a0 100644 --- a/templates/registration/registration_complete.html +++ b/templates/registration/registration_complete.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "myhome_base.html" %} {% block title %}感谢注册{% endblock %} {% block main_panel %}

感谢注册,激活邮件已发往您的邮箱,请查收。如果您在收件箱里没找到,请检查下是否被当成垃圾邮件了。

diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index 2936b978b2..0817195a20 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -1,9 +1,9 @@ -{% extends "base.html" %} +{% extends "myhome_base.html" %} {% block title %}用户注册{% endblock %} {% block main_panel %}

用户注册

- + {{ form.userid }} (可以以后再绑定) {% if form.userid.errors %} {{ form.userid.errors }}
名字