Mercurial > kallithea
changeset 2722:ef7520340c44 beta
fixed missing div on my_account + added nothing here yet when there are no
pull requests for user
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 20 Aug 2012 18:10:23 +0200 |
| parents | 36915dd4544d |
| children | 04aa0ea1ddd0 |
| files | rhodecode/public/css/style.css rhodecode/templates/admin/users/user_edit.html rhodecode/templates/admin/users/user_edit_my_account.html rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html |
| diffstat | 4 files changed, 32 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Sun Aug 19 01:17:39 2012 +0200 +++ b/rhodecode/public/css/style.css Mon Aug 20 18:10:23 2012 +0200 @@ -219,6 +219,11 @@ margin-bottom: 0; margin-top: 5px; } + +.empty_data{ + color:#B9B9B9; +} + a.permalink{ visibility: hidden; }
--- a/rhodecode/templates/admin/users/user_edit.html Sun Aug 19 01:17:39 2012 +0200 +++ b/rhodecode/templates/admin/users/user_edit.html Mon Aug 20 18:10:23 2012 +0200 @@ -183,7 +183,7 @@ %for section in sorted(c.perm_user.permissions.keys()): <div class="perms_section_head">${section.replace("_"," ").capitalize()}</div> %if not c.perm_user.permissions[section]: - <span style="color:#B9B9B9">${_('Nothing here yet')}</span> + <span class="empty_data">${_('Nothing here yet')}</span> %else: <div id='tbl_list_wrap_${section}' class="yui-skin-sam"> <table id="tbl_list_${section}">
--- a/rhodecode/templates/admin/users/user_edit_my_account.html Sun Aug 19 01:17:39 2012 +0200 +++ b/rhodecode/templates/admin/users/user_edit_my_account.html Mon Aug 20 18:10:23 2012 +0200 @@ -96,8 +96,11 @@ </div> <div id="my" class="table" style="display:none"> </div> - <div id="pullrequests" class="table" style="display:none"> + <div id="pullrequests" class="table" style="display:none"></div> </div> + + + <script type="text/javascript"> var filter_activate = function(){ var nodes = YUQ('#my tr td a.repo_name');
--- a/rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html Sun Aug 19 01:17:39 2012 +0200 +++ b/rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html Mon Aug 20 18:10:23 2012 +0200 @@ -1,22 +1,30 @@ <div class="pullrequests_section_head">${_('Opened by me')}</div> <ul> - %for pull_request in c.my_pull_requests: - <li> - <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}"> - ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))} - </a> - </li> - %endfor + %if c.my_pull_requests: + %for pull_request in c.my_pull_requests: + <li> + <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}"> + ${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))} + </a> + </li> + %endfor + %else: + <li><span class="empty_data">${_('Nothing here yet')}</span></li> + %endif </ul> <div class="pullrequests_section_head">${_('I participate in')}</div> <ul> - %for pull_request in c.participate_in_pull_requests: - <li> - <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}"> - ${_('Pull request #%s opened by %s on %s') % (pull_request.pull_request_id, pull_request.author.full_name, h.fmt_date(pull_request.created_on))} - </a> - </li> - %endfor + %if c.my_pull_requests: + %for pull_request in c.participate_in_pull_requests: + <li> + <a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}"> + ${_('Pull request #%s opened by %s on %s') % (pull_request.pull_request_id, pull_request.author.full_name, h.fmt_date(pull_request.created_on))} + </a> + </li> + %endfor + %else: + <li><span class="empty_data">${_('Nothing here yet')}</span></li> + %endif </ul>