Resolve confflicts when merge lj

media/css/seahub.css

@@ -58,7 +58,7 @@ div.nav-separator { clear: both; border-top: #DDD 1px solid; border-bottom: none
 /* footer */
 #footer a { color:#333; text-decoration:none; }
 /* main */
-h2 { font-size:18px; color:#808; }
+h2 { font-size:18px; color:#808; margin-bottom:8px; }
 h3 { font-size:14px; color:#808; font-weight:normal; }
 p { line-height: 20px; margin: 2px 0 12px 0; }
 ol { margin:0; padding:0px 0 0 2em; list-style-position:inside; }
@@ -103,6 +103,9 @@ label { display: inline-block; margin:2px 0px; }
 .login .submit {
     margin-left:3em;
 }
+.login .error {
+    margin:3px 0 0 3em;
+}
 /* form */
 /* forms */
 

profile/templates/profile/profile.html

@@ -3,7 +3,9 @@
 
 {% block left_panel %}
 <ul>
+  {% if not profile.ccnet_user_id %}
   <li><a href="{% url profile_setting %}">绑定个人 ID</a></li>
+  {% endif %}
   <li><a href="{{ SITE_ROOT }}accounts/password/change/">修改网站帐号密码</a></li>
 </ul>
 {% endblock %}

templates/myhome_base.html

@@ -6,7 +6,7 @@
     </li>
     {% if request.user.is_staff %}
     <li>
-        <a href="{{ SITE_ROOT }}seafadmin/">目录管理</a>
+        <a href="{{ SITE_ROOT }}seafadmin/" {% block nav_seafadmin_class %}{% endblock %}>目录管理</a>
     </li>
     <li>
         <a href="{{ SITE_ROOT }}useradmin/" {% block nav_useradmin_class %}{% endblock %}>用户管理</a>

templates/registration/login.html

@@ -4,9 +4,9 @@
 <h2>用户登录</h2>
 <form action="" method="post" class="login">
   <label for="username">帐号：</label>
-  <input type="text" name="username" value="用户名或注册邮箱" style="color:#666;" /><br />
+  <input type="text" name="username" value="用户名或注册邮箱" style="color:#666;" autocomplete="off" /><br />
   <label for="password">密码：</label>
-   <input type="password" name="password" value="" /><br />
+   <input type="password" name="password" value="" autocomplete="off" /><br />
     <p class="error hide"></p>
     <input type="submit" value="提交" class="submit" />
     <a href="{{ SITE_ROOT }}accounts/password/reset/">忘记密码？</a>

templates/repos.html

@@ -1,9 +1,10 @@
 {% extends "myhome_base.html" %}
+ {% block nav_seafadmin_class %}class="cur"{% endblock %}
 
 {% block right_panel %}
-
 <h2>所有同步目录</h2>
-<table class="repo-list default">
+{% if repos %}
+<table class="repo-list">
     <tr>
         <th>名字</th>
         <th>拥有者</th>
@@ -17,7 +18,7 @@
         <td><a href="{{ SITE_ROOT }}home/owner/{{ repo.owner_id }}/?owner={{ repo.owner }}">{{ repo.owner}}</a></td>
         <td>{{ repo.props.id }}</td>
         <td>{{ repo.props.desc }}</td>
-        <td><a href="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/">删除</a></td>
+        <td><button data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/" class="repo-delete-btn">删除</button></td>
     </tr>
     {% endfor %}
 </table>
@@ -46,4 +47,18 @@
     <a href="{{ SITE_ROOT }}seafadmin/?per_page=100" class="per-page">100</a>
     {% endif %}
 </div>
+{% else %}
+<p>暂无</p>
+{% endif %}
 {% endblock %}
+
+{% block extra_script %}
+<script type="text/javascript">
+    $('.repo-delete-btn').each(function() {
+        $(this).click(function() {
+            location.href = $(this).attr('data');
+        });
+    });
+</script>
+{% endblock %}
+ 

templates/useradmin.html

@@ -32,7 +32,7 @@
         <td>{{ user.profile.ccnet_user_id }}</td>
         <td>
             {% for role in user.role_list %}
-            {{ role }}<span class="small-action-link">(<a href="{{ SITE_ROOT }}useradmin/{{ user.profile.ccnet_user_id }}/role/remove/?role={{ role }}">删除</a>)</span> 
+            {{ role }} <button data="{{ SITE_ROOT }}useradmin/{{ user.profile.ccnet_user_id }}/role/remove/?role={{ role }}" class="role-delete-btn">删除</button><br /> 
             {% endfor %}
         </td>
         {% else %}
@@ -74,6 +74,11 @@
             location.href = $(this).attr('data');
         });
     });
+    $('.role-delete-btn').each(function(){
+        $(this).click(function(){
+            location.href = $(this).attr('data');
+        });
+    });
 $(function() {
 
 $(".add-role-btn").each(function() {