From 8b4404724037d77745a245d22405c304c8559086 Mon Sep 17 00:00:00 2001 From: llj Date: Wed, 10 Oct 2012 15:13:48 +0800 Subject: [PATCH 1/4] [group_info]modified right panel with 'info-item' --- group/templates/group/group_info.html | 56 +++++++++++++++------------ 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html index d2b9aacb36..bcdae4bdcd 100644 --- a/group/templates/group/group_info.html +++ b/group/templates/group/group_info.html @@ -10,33 +10,41 @@ {% endblock %} {% block left_panel %} -

管理员

- +
+

管理员

+ +
-

成员

-{% if common_members %} - -{% else %} -

暂无

-{% endif %} +
+

成员

+
+ {% if common_members %} + + {% else %} +

暂无

+ {% endif %} +
+
{% if is_join %} -

操作

- +
+

操作

+ +
{% endif %} {% endblock %} From 0c6c2b1d2a6af68c0eb2391ea5a40f7d659ac00c Mon Sep 17 00:00:00 2001 From: llj Date: Wed, 10 Oct 2012 15:54:17 +0800 Subject: [PATCH 2/4] [groups]clean code --- group/templates/group/groups.html | 6 ------ organizations/templates/organizations/org_groups.html | 6 ------ templates/snippets/group_add_js.html | 4 ++++ 3 files changed, 4 insertions(+), 12 deletions(-) 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/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 }}', From ece34c58fac9c4555be5379cae10b3d055393ef8 Mon Sep 17 00:00:00 2001 From: llj Date: Wed, 10 Oct 2012 17:08:38 +0800 Subject: [PATCH 3/4] [group]added avatar to msg-form --- group/templates/group/group_info.html | 17 ++++++++++------- media/css/seahub.css | 6 +++++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html index bcdae4bdcd..544d1a0e49 100644 --- a/group/templates/group/group_info.html +++ b/group/templates/group/group_info.html @@ -96,13 +96,16 @@

信息栏

-
-
- {% for error in form.message.errors %} -

{{ error|escape }}

- {% endfor %} - -
+
+ +
+
+ {% for error in form.message.errors %} +

{{ error|escape }}

+ {% endfor %} + +
+
{% if group_msgs %}
    diff --git a/media/css/seahub.css b/media/css/seahub.css index 2036ddad35..65a73f187c 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -1058,6 +1058,7 @@ ul.with-bg li { /* group message and replies */ #group-reply { + width:602px; margin-top:50px; } .msg-num { @@ -1072,11 +1073,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 { From 4f67c85694d7492f5a5196bdf0c1935a2ecbfb6a Mon Sep 17 00:00:00 2001 From: llj Date: Wed, 10 Oct 2012 18:11:13 +0800 Subject: [PATCH 4/4] [group]added basic-info --- group/templates/group/group_info.html | 11 +++++++++-- media/css/seahub.css | 10 ++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html index 544d1a0e49..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,6 +10,13 @@ {% endblock %} {% block left_panel %} +
    +

    基本信息

    +
    + {{ group.props.group_name }}的图标 +

    {{ group.creator_name }} 创建于
    {{ group.timestamp|tsstr_sec }}

    +
    +

    管理员

      @@ -97,7 +104,7 @@

      信息栏

      - + 默认头像

      {% for error in form.message.errors %} diff --git a/media/css/seahub.css b/media/css/seahub.css index 65a73f187c..bfad8820f1 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; @@ -1029,6 +1035,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%; }