diff --git a/group/templates/group/discussion_list.html b/group/templates/group/discussion_list.html index 0ba5454500..ff9056f7fb 100644 --- a/group/templates/group/discussion_list.html +++ b/group/templates/group/discussion_list.html @@ -7,7 +7,7 @@ {% avatar msg.from_email 48 %}
- {{ msg.from_email|email2nickname }} + {{ msg.from_email|email2nickname }} {{ msg.timestamp|translate_seahub_time }}

{{ msg.message|seahub_urlize|find_at|linebreaksbr }}

diff --git a/group/templates/group/group_discuss.html b/group/templates/group/group_discuss.html index 02a504076a..54f1e1611a 100644 --- a/group/templates/group/group_discuss.html +++ b/group/templates/group/group_discuss.html @@ -65,7 +65,7 @@ {% else %} -

{% trans "After login, you can post a discussion and add replies." %}

+

{% trans "After login, you can post discussions and add replies." %}

{% endif %} {% if group_msgs %} diff --git a/media/css/seahub.css b/media/css/seahub.css index c60c0b7a0d..5a7348a781 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -1939,12 +1939,16 @@ textarea:-moz-placeholder {/* for FF */ #discussions-to-grp { height:auto; overflow:auto; + position:relative;/*for ie7*/ } #discussions-to-grp .msg { width:380px; } +#discussions-to-grp .msg-main { + width:282px;/*for ie7*/ +} #discussions-to-grp .reply-input { - width:272px; + width:270px; } #to-group-caret, #discuss-to-group-caret {