Notify user to bind ccnet ID and other updates

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; }
+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; }

profile/templates/profile/profile.html

@@ -3,7 +3,7 @@
 
 {% block left_panel %}
 <ul>
-  <li><a href="{% url profile_setting %}">绑定 Ccnet 用户 ID</a></li>
+  <li><a href="{% url profile_setting %}">绑定 Ccnet 公钥 ID</a></li>
   <li><a href="{{ SITE_ROOT }}accounts/password/change/">修改网站帐号密码</a></li>
 </ul>
 {% endblock %}
@@ -11,8 +11,8 @@
 
 {% block right_panel %}
 
-<h3>Ccnet/Seafile 当前设置</h3>
-<p>Ccnet ID: {{ profile.ccnet_user_id }}</p>
+<h3>当前设置</h3>
+<p>Ccnet 公钥 ID: {{ profile.ccnet_user_id }}</p>
 
 
 {% endblock %}

profile/templates/profile/set_profile.html

@@ -2,14 +2,14 @@
 
 
 {% block right_panel %}
-<h2>绑定 Ccnet/Seafile 用户 ID</h2>
+<h2>绑定 Ccnet/Seafile 公钥 ID</h2>
 
 <form action="" method="post">
     {% if error_msg %}
     <p class="error">{{ error_msg }}</p>
     {% endif %}
-    <label>用户 ID:</label><br/>
-    <input id="id_ccnet_user_id" type="text" name="ccnet_user_id" value="{{ origin_id }}" maxlength="40" /><br/>
+    <label>公钥 ID:</label><br/>
+    <input id="id_ccnet_user_id" class="ccnet_id" type="text" name="ccnet_user_id" value="{{ origin_id }}" maxlength="40" /><br/>
     <input type="submit" value="提交" />
 </form>
 

templates/base.html

@@ -38,7 +38,7 @@
             <img src="{{ MEDIA_URL }}img/logo.png" id="logo-img" title="Seafile" alt="Seafile logo" />
             {% if request.user.is_authenticated %}
             <div id="user-info">
-                <span>用户 ID:</span>{{user.user_id}}
+                <span>公钥 ID:</span>{{user.user_id}}
             </div>
             {% else %}
             <div id="logo-info">
@@ -90,7 +90,7 @@
         <div class="clear"></div>
     </div>
     <div id="footer">
-        <p class="fleft">Copyright © 2012 GongGeng. All rights reserved.</p>
+        <p class="fleft">Copyright © 2012 海文互知. All rights reserved.</p>
         <p class="fright">Contact | About</p>
         <div class="clear"></div>
     </div>

templates/myhome.html

@@ -8,7 +8,13 @@
 
 {% block right_panel %}
 
-<h3>我的文件盒</h3>
+{% if not user.user_id %}
+<div class="notification">
+你还没有绑定 Ccnet/Seafile 公钥 ID, 现在<a href="{{ SITE_ROOT }}profile/edit/">绑定</a>
+</div>
+{% endif %}
+
+<h3>我的同步目录</h3>
 <table class="repo-list default">
     <tr>
         <th>名字</th>

templates/registration/activate.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "myhome_base.html" %}
 
 {% block title %}Create an account{% endblock %}
 

templates/registration/activation_complete.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "myhome_base.html" %}
 
 {% block title %}Create an account{% endblock %}
 

templates/registration/login.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "myhome_base.html" %}
 {% block title %}用户登录{% endblock %}
 {% block main_panel %}
 <h2>用户登录</h2>

templates/registration/logout.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "myhome_base.html" %}
 
 {% block title %}退出{% endblock %}
 

templates/registration/registration_closed.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "myhome_base.html" %}
 
 {% block title %}Create an account{% endblock %}
 

templates/registration/registration_complete.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "myhome_base.html" %}
 {% block title %}感谢注册{% endblock %}
 {% block main_panel %}
 <p>感谢注册，激活邮件已发往您的邮箱,请查收。如果您在收件箱里没找到，请检查下是否被当成垃圾邮件了。</p>

templates/registration/registration_form.html

@@ -1,9 +1,9 @@
-{% extends "base.html" %}
+{% extends "myhome_base.html" %}
 {% block title %}用户注册{% endblock %}
 {% block main_panel %}
 <h2>用户注册</h2>
   <form action="" method="post" class="reg">
-    <label for="id_username">Ccnet 公钥 ID：</label>
+    <label for="id_username">公钥 ID：</label>
       {{ form.userid }} (可以以后再绑定)
         {% if form.userid.errors %}
         {{ form.userid.errors }}