diff --git a/contacts/templates/contacts/contact_list.html b/contacts/templates/contacts/contact_list.html index 9d32352a14..4fc96d9fc9 100644 --- a/contacts/templates/contacts/contact_list.html +++ b/contacts/templates/contacts/contact_list.html @@ -18,10 +18,10 @@ - + - + {% for contact in contacts %} diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html index 7045fe6561..cbbc659d09 100644 --- a/group/templates/group/group_info.html +++ b/group/templates/group/group_info.html @@ -81,10 +81,10 @@ - + - + {% for repo in repos %} @@ -130,9 +130,9 @@ - + - + {% for cmt in recent_commits %} diff --git a/media/css/seahub.css b/media/css/seahub.css index 3f400575b3..a5c3eac3f8 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -1210,6 +1210,7 @@ textarea:-moz-placeholder {/* for FF */ height:80px; padding:2px; } +#member-add-form, #repo-share-form { width:266px; } @@ -1253,6 +1254,11 @@ textarea:-moz-placeholder {/* for FF */ width:5em; color:#666; } +.ru .group .item-name, +.de .group .item-name, +.it .group .item-name { + width:6em; +} .member { _height:21px; padding-bottom:4px; @@ -1663,6 +1669,7 @@ textarea:-moz-placeholder {/* for FF */ cursor:pointer; } .share-permission-select { + position:relative;/*for long text in other lang in 'share admin'*/ background:#fff; border:1px solid #ddd; border-radius:2px; @@ -1808,6 +1815,12 @@ textarea:-moz-placeholder {/* for FF */ display:inline-block; min-width:66px; } +.ru .pubinfo-item { + min-width:64px; +} +.de .pubinfo-item { + min-width:63px; +} .pubinfo-item .amount { font-size:28px; line-height:1; diff --git a/media/js/base.js b/media/js/base.js index 6abed5b6d1..7a2d60a261 100644 --- a/media/js/base.js +++ b/media/js/base.js @@ -56,6 +56,7 @@ function addConfirmTo(op_ele, popup) { } $('#confirm-con').html('

' + popup['title'] + '

' + popup['con'] + '

'); $('#confirm-popup').modal({appendTo:'#main'}); + $('#simplemodal-container').css({'height':'auto'}); $('#confirm-yes').data('url', $(this).data('url')).click(function() { location.href = $(this).data('url'); }); diff --git a/share/templates/repo/share_admin.html b/share/templates/repo/share_admin.html index efba66b80e..67b427a364 100644 --- a/share/templates/repo/share_admin.html +++ b/share/templates/repo/share_admin.html @@ -28,8 +28,8 @@ - - + + {% for repo in shared_repos %}
{% trans "Email "%}{% trans "Email "%} {% trans "Name"%} {% trans "Note"%}{% trans "Operations"%}{% trans "Operations"%}
{% trans "Name" %}{% trans "Description" %}{% trans "Description" %} {% trans "Last Update" %} {% trans "Shared By" %}{% trans "Operations" %}{% trans "Operations" %}
{% trans "Library" %}{% trans "Description" %}{% trans "Description" %} {% trans "Modified at" %}{% trans "Modifier" %}{% trans "Modifier" %}
{% trans "Name"%} {% trans "Share To"%} {% trans "Permission"%}{% trans "Description"%}{% trans "Operations"%}{% trans "Description"%}{% trans "Operations"%}