modified top-bar, repo, contact_list, user admin pages

contacts/templates/contacts/contact_list.html

@@ -15,8 +15,8 @@
     <tr>
         <th width="25%">邮箱</th>
         <th width="20%">名字</th>
-        <th width="44%">备注</th>
-        <th width="11%">操作</th>
+        <th width="30%">备注</th>
+        <th width="25%">操作</th>
     </tr>
     {% for contact in contacts %}
     <tr>

group/templates/group/group_info.html

@@ -15,7 +15,7 @@
 {% if common_members %}
 <ul>
     {% for member in common_members %}
-	<li>{{ member.short_username }}</li>
+	<li><img src="{{MEDIA_URL}}img/favicon.png" alt="{{ member.short_username }}的图标" class="group-member-icon" /><span class="group-member-name">{{ member.short_username }}</span></li>
     {% endfor %}
 </ul>
 {% else %}

media/css/seahub.css

@@ -68,9 +68,7 @@ tr.first { background-color: #00FF00; }
 .top-bar { height:20px; color:#fff; text-align:right; font-weight:bold; background:#606; }
 .top-bar-in { width:950px; margin:0 auto; }
 .top-bar a { color:#ddd; font-weight:normal; }
-.top-bar a.adminconsole { float:left; color:#ddd; font-weight:normal; margin-right:1em; }
-.top-bar a.myaccount { float:left; color:#ddd; font-weight:normal; }
-
+.top-bar a.cur { background:#A0A; }
 .top-bar a:hover { background:#A0A; }
 /* header */
 #header .top-info { margin-bottom:5px;}
@@ -185,7 +183,7 @@ label { display: inline-block; margin:2px 0px; }
 #repo-page .main {
     width:680px;
 }
-#repo-page a {
+#repo-page .more {
     font-weight:normal;
     font-size:12px;
     color:#080;
@@ -228,3 +226,13 @@ label { display: inline-block; margin:2px 0px; }
 .contact-op-form .submit {
     margin-left:6em;
 }
+/* group */
+.group-member-icon {
+	border-radius: 4px;
+	-moz-border-radius: 4px;
+	margin-right:5px;
+}
+.group-member-icon,
+.group-member-name {
+	vertical-align:middle;
+}

templates/add_user_form.html

@@ -2,21 +2,21 @@
 {% block title %}添加用户{% endblock %}
 {% block nav_useradmin_class %}class="cur"{% endblock %}
 {% block main_panel %}
-<h2>添加用户</h2>
-  <form action="" method="post" id="user-add-form">
-      <label for="id_email">邮箱：</label>
-      {{ form.email }}
-        {% if form.email.errors %}
-        {{ form.email.errors }}
-        {% endif %}<br />
-     <label for="id_password1">密码：</label>
-      {{ form.password1 }}
-        {% if form.password1.errors %}
-        {{ form.password1.errors }}
-        {% endif %}<br />
-    <label for="id_password2">确认密码：</label>
-      {{ form.password2 }}<br />
-      <input type="submit" value="提交" class="submit" />
-  </form>
+<h3>添加用户</h3>
+<form action="" method="post" id="user-add-form">
+	<label for="id_email">邮箱：</label>
+	{{ form.email }}
+	{% if form.email.errors %}
+	{{ form.email.errors }}
+	{% endif %}<br />
+	<label for="id_password1">密码：</label>
+	{{ form.password1 }}
+	{% if form.password1.errors %}
+	{{ form.password1.errors }}
+	{% endif %}<br />
+	<label for="id_password2">确认密码：</label>
+	{{ form.password2 }}<br />
+	<input type="submit" value="提交" class="submit" />
+</form>
 {% endblock %}
  

templates/admin_base.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block top_bar_manager_class %} class="cur"{% endblock %}
 {% block nav %}
 <ul class="nav ovhd">
     {% if request.user.is_staff %}

templates/base.html

@@ -16,10 +16,12 @@
 <div id="wrapper">
     <div id="top-bar">
         <div class="top-bar">
-            <div class="top-bar-in">
+            <div class="top-bar-in ovhd">
                 {% if request.user.is_staff %}
-                <a href="{{ SITE_ROOT }}seafadmin/" class="adminconsole">管理员控制台</a>
-                <a href="{{ SITE_ROOT }}home/my/" class="myaccount">我的帐号</a>
+				<div class="fleft">
+					<a href="{{ SITE_ROOT }}seafadmin/"{% block top_bar_manager_class %}{% endblock %}>管理员控制台</a>
+					<a href="{{ SITE_ROOT }}home/my/"{% block top_bar_myaccount_class %}{% endblock %}>我的帐号</a>
+				</div>
                 {% endif %}
                 {% if request.user.is_authenticated %}
                 欢迎, {{ request.user }}

templates/myhome_base.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block top_bar_myaccount_class %} class="cur"{% endblock %}
 {% block nav %}
 <ul class="nav ovhd">
     <li>

templates/repos.html

@@ -1,10 +1,10 @@
 {% extends "admin_base.html" %}
- {% block nav_seafadmin_class %}class="cur"{% endblock %}
+{% block nav_seafadmin_class %}class="cur"{% endblock %}
 
 {% block right_panel %}
-<h2>所有同步目录</h2>
+<h3>所有同步目录</h3>
 {% if repos %}
-<table class="repo-list">
+<table>
     <tr>
         <th width="20%">名字</th>
         <th width="20%">拥有者</th>

templates/useradmin.html

@@ -2,7 +2,8 @@
 
 {% block nav_useradmin_class %}class="cur"{% endblock %}
 {% block left_panel %}
-<ul>
+<h3>操作</h3>
+<ul class="with-bg">
     <li><a href="{{ SITE_ROOT }}useradmin/add/">添加用户</a></li>
 </ul>
 {% endblock %}
@@ -10,8 +11,8 @@
 
 {% block right_panel %}
 
-<h2>所有用户</h2>
-<table class="user-list">
+<h3>所有用户</h3>
+<table>
     <tr>
         <th width="60%">邮箱</th>
         <th width="30%">是否激活</th>
@@ -56,7 +57,7 @@ $(".add-role-btn").each(function() {
         $(this).click(function() {
             var url = "{{ SITE_ROOT }}useradmin/" + $(this).attr("userid") + "/role/add/";
             $("#add-role-form").attr('action', url);
-            $("#add-role-form #user_email").html($(this).attr("email"));
+            $("#user_email").html($(this).attr("email"));
             $("#add-role-form").modal({appendTo: "#main"});
             });
         });

templates/userinfo.html

@@ -1,6 +1,6 @@
-{% extends "myhome_base.html" %}
+{% extends "admin_base.html" %}
 
-{% block nav_useradmin_class %}class=""{% endblock %}
+{% block nav_useradmin_class %}class="cur"{% endblock %}
 {% block left_panel %}
 <!--
 <ul>
@@ -13,9 +13,9 @@
 {% endblock %}
 
 {% block right_panel %}
-<h3>{{ email }}拥有的同步目录</h3>
+<h3>{{ email }} 拥有的同步目录</h3>
 {% if owned_repos %}
-<table class="repo-list">
+<table>
     <tr>
         <th width="30%">名字</th>
         <th width="50%">描述</th>
@@ -36,7 +36,7 @@
 <p>暂无</p>
 {% endif %}
 
-<h3>共享给{{ email }}的同步目录</h3>
+<h3>共享给 {{ email }} 的同步目录</h3>
 {% if in_repos %}
 <table class="repo-list">
     <tr>
@@ -59,7 +59,7 @@
 <p>暂无</p>
 {% endif %}
 
-<h3>{{ email }}的计算机：</h3>
+<h3>{{ email }} 的计算机</h3>
 <table class="user-list">
     <tr>
         <th width="60%">计算机名</th>
@@ -88,6 +88,3 @@
 </table>
 
 {% endblock %}
-
-{% block extra_script %}
-{% endblock %}