diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html
index d2b9aacb36..440030a32b 100644
--- a/group/templates/group/group_info.html
+++ b/group/templates/group/group_info.html
@@ -1,6 +1,6 @@
{% extends base_template %}
-{% load seahub_tags avatar_tags %}
+{% load seahub_tags avatar_tags group_avatar_tags %}
{% load url from future %}
{% block nav_group_class %}class="cur"{% endblock %}
@@ -10,33 +10,48 @@
{% endblock %}
{% block left_panel %}
-
管理员
-
+
+
基本信息
+
+

+
{{ group.creator_name }} 创建于
{{ group.timestamp|tsstr_sec }}
+
+
+
-成员
-{% if common_members %}
-
-{% else %}
-暂无
-{% endif %}
+
+
成员
+
+ {% if common_members %}
+
+ {% else %}
+
暂无
+ {% endif %}
+
+
{% if is_join %}
-操作
-
-{% if is_staff %}
- - 群组管理
-{% else %}
- - 退出群组
-{% endif %}
-
+
+
操作
+
+ {% if is_staff %}
+ - 群组管理
+ {% else %}
+ - 退出群组
+ {% endif %}
+
+
{% endif %}
{% endblock %}
@@ -88,13 +103,16 @@
信息栏
-
+
+

+
+
{% if group_msgs %}
diff --git a/group/templates/group/groups.html b/group/templates/group/groups.html
index 291e1cc8d7..748704760e 100644
--- a/group/templates/group/groups.html
+++ b/group/templates/group/groups.html
@@ -13,15 +13,9 @@
{% block extra_script %}
{% endblock %}
diff --git a/media/css/seahub.css b/media/css/seahub.css
index b8db565080..ead20d264a 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -197,6 +197,9 @@ ul.with-bg li {
border-style: dashed dashed dashed solid;
border-left-color: #bbb;
}
+.avatar {
+ border-radius:3px;
+}
.info-item {
border: 1px solid #eee;
border-radius: 2px;
@@ -206,6 +209,9 @@ ul.with-bg li {
.info-item p {
margin:0;
}
+.info-item h3 {
+ font-size:1.15em;
+}
.info-item-top {
padding: 4px 10px;
background: #f8f8f8;
@@ -1032,6 +1038,10 @@ ul.with-bg li {
-webkit-box-shadow: 0 2px 4px rgba(0,0,0,0.2);
-moz-box-shadow: 0 2px 4px rgba(0,0,0,0.2);
}
+.group-basic-info .txt {
+ width:145px;
+ word-wrap:break-word;
+}
/* notification admin */
.cur-note { color: red; font-size: 75%; }
@@ -1061,6 +1071,7 @@ ul.with-bg li {
/* group message and replies */
#group-reply {
+ width:602px;
margin-top:50px;
}
.msg-num {
@@ -1075,11 +1086,14 @@ ul.with-bg li {
height: 80px;
margin-top: 4px;
}
+#message {
+ width:538px;
+ margin-top:0;
+}
#group-reply .submit {
margin-top:3px;
}
.msg-list {
- width:602px;
margin-top: 10px;
}
.msg {
diff --git a/organizations/templates/organizations/org_groups.html b/organizations/templates/organizations/org_groups.html
index 8989426f77..36d348ebac 100644
--- a/organizations/templates/organizations/org_groups.html
+++ b/organizations/templates/organizations/org_groups.html
@@ -14,15 +14,9 @@
{% block extra_script %}
{% endblock %}
diff --git a/templates/snippets/group_add_js.html b/templates/snippets/group_add_js.html
index 4b50e16f55..513e5a9286 100644
--- a/templates/snippets/group_add_js.html
+++ b/templates/snippets/group_add_js.html
@@ -1,3 +1,7 @@
+$("#group-add").click(function() {
+ $("#group-add-form").modal({appendTo: "#main"});
+});
+
$('#group-add-submit').click(function() {
$.ajax({
url: '{{ post_url }}',