diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py --- a/rhodecode/config/routing.py +++ b/rhodecode/config/routing.py @@ -296,6 +296,11 @@ def make_map(config): action="my_account_update", conditions=dict(method=["PUT"])) m.connect("admin_settings_create_repository", "/create_repository", action="create_repository", conditions=dict(method=["GET"])) + m.connect("admin_settings_my_repos", "/my_account/repos", + action="my_account_my_repos", conditions=dict(method=["GET"])) + m.connect("admin_settings_my_pullrequests", "/my_account/pull_requests", + action="my_account_my_pullrequests", conditions=dict(method=["GET"])) + #NOTIFICATION REST ROUTES with rmap.submapper(path_prefix=ADMIN_PREFIX, diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -1096,6 +1096,10 @@ tbody .yui-dt-editable { cursor: pointer color: #FFFFFF; } +#content div.box div.title .link-white.current{ + color: #BFE3FF; +} + #content div.box div.title ul.links li { list-style: none; float: left; @@ -4336,6 +4340,15 @@ form.comment-inline-form { } /**** +PULL REQUESTS +*****/ +.pullrequests_section_head { + padding:10px 10px 10px 0px; + font-size:16px; + font-weight: bold; +} + +/**** PERMS *****/ #perms .perms_section_head { diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -28,67 +28,27 @@
- - ${_('My repos')} / ${_('My permissions')} +
- %if h.HasPermissionAny('hg.admin','hg.create.repository')(): -
-
-
- - - - - - - - - - - <%namespace name="dt" file="/data_table/_dt_elements.html"/> - %if c.user_repos: - %for repo in c.user_repos: - - ##QUICK MENU - - ##REPO NAME AND ICONS - - ##LAST REVISION - - - - - %endfor - %else: -
- ${_('No repositories yet')} - %if h.HasPermissionAny('hg.admin','hg.create.repository')(): - ${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-btn")} - %endif -
- %endif - -
${_('Name')}${_('Revision')}${_('Action')}${_('Action')}
- ${dt.quick_menu(repo['name'])} - - ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'))} - - ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} - ${_('private')} - ${h.form(url('repo_settings_delete', repo_name=repo['name']),method='delete')} - ${h.submit('remove_%s' % repo['name'],'',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo['name']+"');")} - ${h.end_form()} -
-
-
- + + diff --git a/rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html b/rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html new file mode 100644 --- /dev/null +++ b/rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html @@ -0,0 +1,22 @@ + +
${_('Opened by me')}
+ + +
${_('I participate in')}
+ diff --git a/rhodecode/templates/admin/users/user_edit_my_account_repos.html b/rhodecode/templates/admin/users/user_edit_my_account_repos.html new file mode 100644 --- /dev/null +++ b/rhodecode/templates/admin/users/user_edit_my_account_repos.html @@ -0,0 +1,46 @@ +
+ + + + + + + + + + + <%namespace name="dt" file="/data_table/_dt_elements.html"/> + %if c.user_repos: + %for repo in c.user_repos: + + ##QUICK MENU + + ##REPO NAME AND ICONS + + ##LAST REVISION + + + + + %endfor + %else: +
+ ${_('No repositories yet')} + %if h.HasPermissionAny('hg.admin','hg.create.repository')(): + ${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-btn")} + %endif +
+ %endif + +
${_('Name')}${_('Revision')}${_('Action')}${_('Action')}
+ ${dt.quick_menu(repo['name'])} + + ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'))} + + ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} + ${_('private')} + ${h.form(url('repo_settings_delete', repo_name=repo['name']),method='delete')} + ${h.submit('remove_%s' % repo['name'],'',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo['name']+"');")} + ${h.end_form()} +
+
\ No newline at end of file